fixed problem with comment()

diff --git a/.Changes.swp b/.Changes.swp
index 7503a8a..01476db 100644 (file)
Binary files a/.Changes.swp and b/.Changes.swp differ

diff --git a/Changes b/Changes
index bccd2b0..68ef185 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,12 @@
 $Id: /html-treebuilder-xpath/Changes 40 2006-05-15T07:42:34.182385Z mrodrigu  $
 Revision history for Perl extension HTML::TreeBuilder::XPath.
 
+version 0.14
+date: 2011-09-20
+# bug fix
+fix:   comment() did not work, as the text was in {text} not {_text}
+       report and initial patch by perlover
+
 version 0.13
 date: 2011-06-19
 # minor improvement

diff --git a/HTML-TreeBuilder-XPath-0.12.tar b/HTML-TreeBuilder-XPath-0.12.tar
new file mode 100644 (file)
index 0000000..4360cc9
Binary files /dev/null and b/HTML-TreeBuilder-XPath-0.12.tar differ

diff --git a/HTML-TreeBuilder-XPath-0.13.tar.gz b/HTML-TreeBuilder-XPath-0.13.tar.gz
new file mode 100644 (file)
index 0000000..ac05ca0
Binary files /dev/null and b/HTML-TreeBuilder-XPath-0.13.tar.gz differ

diff --git a/HTML-TreeBuilder-XPath-0.14.tar.gz b/HTML-TreeBuilder-XPath-0.14.tar.gz
new file mode 100644 (file)
index 0000000..6a15c72
Binary files /dev/null and b/HTML-TreeBuilder-XPath-0.14.tar.gz differ

diff --git a/MYMETA.json b/MYMETA.json
new file mode 100644 (file)
index 0000000..838d794
--- /dev/null
+++ b/MYMETA.json
@@ -0,0 +1,43 @@
+{
+   "abstract" : "add XPath support to HTML::TreeBuilder",
+   "author" : [
+      "Michel Rodriguez <mrodrigu@localdomain>"
+   ],
+   "dynamic_config" : 0,
+   "generated_by" : "ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001",
+   "license" : [
+      "perl_5"
+   ],
+   "meta-spec" : {
+      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
+      "version" : "2"
+   },
+   "name" : "HTML-TreeBuilder-XPath",
+   "no_index" : {
+      "directory" : [
+         "t",
+         "inc"
+      ]
+   },
+   "prereqs" : {
+      "build" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : 0
+         }
+      },
+      "configure" : {
+         "requires" : {
+            "ExtUtils::MakeMaker" : 0
+         }
+      },
+      "runtime" : {
+         "requires" : {
+            "HTML::TreeBuilder" : 0,
+            "List::Util" : 0,
+            "XML::XPathEngine" : "0.12"
+         }
+      }
+   },
+   "release_status" : "stable",
+   "version" : "0.14"
+}

diff --git a/MYMETA.yml b/MYMETA.yml
index 44ead65..51ebd11 100644 (file)
--- a/MYMETA.yml
+++ b/MYMETA.yml
@@ -6,9 +6,8 @@ build_requires:
   ExtUtils::MakeMaker: 0
 configure_requires:
   ExtUtils::MakeMaker: 0
-distribution_type: module
 dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.57_05'
+generated_by: 'ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -22,4 +21,4 @@ requires:
   HTML::TreeBuilder: 0
   List::Util: 0
   XML::XPathEngine: 0.12
-version: 0.12
+version: 0.14

diff --git a/Makefile b/Makefile
index 524769c..37e1e3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # This Makefile is for the HTML::TreeBuilder::XPath extension to perl.
 #
 # It was generated automatically by MakeMaker version
-# 6.57_05 (Revision: 65705) from the contents of
+# 6.58 (Revision: 65800) from the contents of
 # Makefile.PL. Don't edit this file, edit Makefile.PL instead.
 #
 #       ANY CHANGES MADE HERE WILL BE LOST!
@@ -14,6 +14,7 @@
 #     ABSTRACT_FROM => q[lib/HTML/TreeBuilder/XPath.pm]
 #     AUTHOR => [q[Michel Rodriguez <mrodrigu@localdomain>]]
 #     BUILD_REQUIRES => {  }
+#     CONFIGURE_REQUIRES => {  }
 #     LICENSE => q[perl]
 #     NAME => q[HTML::TreeBuilder::XPath]
 #     PREREQ_PM => { List::Util=>q[0], XML::XPathEngine=>q[0.12], HTML::TreeBuilder=>q[0] }
@@ -24,7 +25,7 @@
 
 # --- MakeMaker const_config section:
 
-# These definitions are from config.sh (via /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux/Config.pm).
+# These definitions are from config.sh (via /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1/i686-linux/Config.pm).
 # They may have been overridden via Makefile.PL or on the command line.
 AR = ar
 CC = cc
@@ -41,10 +42,10 @@ LIBC =
 LIB_EXT = .a
 OBJ_EXT = .o
 OSNAME = linux
-OSVERS = 2.6.38-8-generic-pae
+OSVERS = 2.6.38-10-generic-pae
 RANLIB = :
-SITELIBEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1
-SITEARCHEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1/i686-linux
+SITELIBEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/site_perl/5.15.1
+SITEARCHEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/site_perl/5.15.1/i686-linux
 SO = so
 VENDORARCHEXP = 
 VENDORLIBEXP = 
@@ -56,11 +57,11 @@ DIRFILESEP = /
 DFSEP = $(DIRFILESEP)
 NAME = HTML::TreeBuilder::XPath
 NAME_SYM = HTML_TreeBuilder_XPath
-VERSION = 0.12
+VERSION = 0.14
 VERSION_MACRO = VERSION
-VERSION_SYM = 0_12
+VERSION_SYM = 0_14
 DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
-XS_VERSION = 0.12
+XS_VERSION = 0.14
 XS_VERSION_MACRO = XS_VERSION
 XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
 INST_ARCHLIB = blib/arch
@@ -74,55 +75,55 @@ MAN3EXT = 3
 INSTALLDIRS = site
 DESTDIR = 
 PREFIX = $(SITEPREFIX)
-PERLPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1
-SITEPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1
+PERLPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1
+SITEPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1
 VENDORPREFIX = 
-INSTALLPRIVLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1
+INSTALLPRIVLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1
 DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB)
-INSTALLSITELIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1
+INSTALLSITELIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/site_perl/5.15.1
 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB)
 INSTALLVENDORLIB = 
 DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB)
-INSTALLARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux
+INSTALLARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1/i686-linux
 DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB)
-INSTALLSITEARCH = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1/i686-linux
+INSTALLSITEARCH = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/site_perl/5.15.1/i686-linux
 DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH)
 INSTALLVENDORARCH = 
 DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH)
-INSTALLBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
+INSTALLBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin
 DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN)
-INSTALLSITEBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
+INSTALLSITEBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin
 DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN)
 INSTALLVENDORBIN = 
 DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN)
-INSTALLSCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
+INSTALLSCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin
 DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT)
-INSTALLSITESCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
+INSTALLSITESCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin
 DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT)
 INSTALLVENDORSCRIPT = 
 DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT)
-INSTALLMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man1
+INSTALLMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/man/man1
 DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
-INSTALLSITEMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man1
+INSTALLSITEMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/man/man1
 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
 INSTALLVENDORMAN1DIR = 
 DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
-INSTALLMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man3
+INSTALLMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/man/man3
 DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
-INSTALLSITEMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man3
+INSTALLSITEMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/man/man3
 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
 INSTALLVENDORMAN3DIR = 
 DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR)
-PERL_LIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1
-PERL_ARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux
+PERL_LIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1
+PERL_ARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1/i686-linux
 LIBPERL_A = libperl.a
 FIRST_MAKEFILE = Makefile
 MAKEFILE_OLD = Makefile.old
 MAKE_APERL_FILE = Makefile.aperl
 PERLMAINCC = $(CC)
-PERL_INC = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux/CORE
-PERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
-FULLPERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
+PERL_INC = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1/i686-linux/CORE
+PERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin/perl5.15.1
+FULLPERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin/perl5.15.1
 ABSPERL = $(PERL)
 PERLRUN = $(PERL)
 FULLPERLRUN = $(FULLPERL)
@@ -135,9 +136,9 @@ PERM_DIR = 755
 PERM_RW = 644
 PERM_RWX = 755
 
-MAKEMAKER   = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/ExtUtils/MakeMaker.pm
-MM_VERSION  = 6.57_05
-MM_REVISION = 65705
+MAKEMAKER   = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/lib/5.15.1/ExtUtils/MakeMaker.pm
+MM_VERSION  = 6.58
+MM_REVISION = 65800
 
 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
 # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
@@ -196,7 +197,7 @@ PM_TO_BLIB = XPath_with_as_XML_clean.pm \
 
 
 # --- MakeMaker platform_constants section:
-MM_Unix_VERSION = 6.57_05
+MM_Unix_VERSION = 6.58
 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc
 
 
@@ -261,7 +262,7 @@ RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
 DIST_CP = best
 DIST_DEFAULT = tardist
 DISTNAME = HTML-TreeBuilder-XPath
-DISTVNAME = HTML-TreeBuilder-XPath-0.12
+DISTVNAME = HTML-TreeBuilder-XPath-0.14
 
 
 # --- MakeMaker macro section:
@@ -448,18 +449,19 @@ clean :: clean_subdirs
          *$(LIB_EXT) core \
          core.[0-9] $(INST_ARCHAUTODIR)/extralibs.all \
          core.[0-9][0-9] $(BASEEXT).bso \
-         pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \
-         MYMETA.yml $(BASEEXT).x \
-         $(BOOTSTRAP) perl$(EXE_EXT) \
-         tmon.out *$(OBJ_EXT) \
-         pm_to_blib $(INST_ARCHAUTODIR)/extralibs.ld \
-         blibdirs.ts core.[0-9][0-9][0-9][0-9][0-9] \
-         *perl.core core.*perl.*.? \
-         $(MAKE_APERL_FILE) perl \
-         $(BASEEXT).def core.[0-9][0-9][0-9] \
-         mon.out lib$(BASEEXT).def \
-         perlmain.c perl.exe \
-         so_locations $(BASEEXT).exp 
+         pm_to_blib.ts MYMETA.json \
+         core.[0-9][0-9][0-9][0-9] MYMETA.yml \
+         $(BASEEXT).x $(BOOTSTRAP) \
+         perl$(EXE_EXT) tmon.out \
+         *$(OBJ_EXT) pm_to_blib \
+         $(INST_ARCHAUTODIR)/extralibs.ld blibdirs.ts \
+         core.[0-9][0-9][0-9][0-9][0-9] *perl.core \
+         core.*perl.*.? $(MAKE_APERL_FILE) \
+         $(BASEEXT).def perl \
+         core.[0-9][0-9][0-9] mon.out \
+         lib$(BASEEXT).def perlmain.c \
+         perl.exe so_locations \
+         $(BASEEXT).exp 
        - $(RM_RF) \
          blib 
        - $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL)
@@ -482,31 +484,76 @@ realclean purge ::  clean realclean_subdirs
 # --- MakeMaker metafile section:
 metafile : create_distdir
        $(NOECHO) $(ECHO) Generating META.yml
-       $(NOECHO) $(ECHO) '--- #YAML:1.0' > META_new.yml
-       $(NOECHO) $(ECHO) 'name:               HTML-TreeBuilder-XPath' >> META_new.yml
-       $(NOECHO) $(ECHO) 'version:            0.12' >> META_new.yml
-       $(NOECHO) $(ECHO) 'abstract:           add XPath support to HTML::TreeBuilder' >> META_new.yml
+       $(NOECHO) $(ECHO) '---' > META_new.yml
+       $(NOECHO) $(ECHO) 'abstract: '\''add XPath support to HTML::TreeBuilder'\''' >> META_new.yml
        $(NOECHO) $(ECHO) 'author:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    - Michel Rodriguez <mrodrigu@localdomain>' >> META_new.yml
-       $(NOECHO) $(ECHO) 'license:            perl' >> META_new.yml
-       $(NOECHO) $(ECHO) 'distribution_type:  module' >> META_new.yml
-       $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    ExtUtils::MakeMaker:  0' >> META_new.yml
+       $(NOECHO) $(ECHO) '  - '\''Michel Rodriguez <mrodrigu@localdomain>'\''' >> META_new.yml
        $(NOECHO) $(ECHO) 'build_requires:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    ExtUtils::MakeMaker:  0' >> META_new.yml
-       $(NOECHO) $(ECHO) 'requires:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    HTML::TreeBuilder:  0' >> META_new.yml
-       $(NOECHO) $(ECHO) '    List::Util:         0' >> META_new.yml
-       $(NOECHO) $(ECHO) '    XML::XPathEngine:   0.12' >> META_new.yml
-       $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    directory:' >> META_new.yml
-       $(NOECHO) $(ECHO) '        - t' >> META_new.yml
-       $(NOECHO) $(ECHO) '        - inc' >> META_new.yml
-       $(NOECHO) $(ECHO) 'generated_by:       ExtUtils::MakeMaker version 6.57_05' >> META_new.yml
+       $(NOECHO) $(ECHO) '  ExtUtils::MakeMaker: 0' >> META_new.yml
+       $(NOECHO) $(ECHO) 'configure_requires:' >> META_new.yml
+       $(NOECHO) $(ECHO) '  ExtUtils::MakeMaker: 0' >> META_new.yml
+       $(NOECHO) $(ECHO) 'dynamic_config: 1' >> META_new.yml
+       $(NOECHO) $(ECHO) 'generated_by: '\''ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001'\''' >> META_new.yml
+       $(NOECHO) $(ECHO) 'license: perl' >> META_new.yml
        $(NOECHO) $(ECHO) 'meta-spec:' >> META_new.yml
-       $(NOECHO) $(ECHO) '    url:      http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml
-       $(NOECHO) $(ECHO) '    version:  1.4' >> META_new.yml
+       $(NOECHO) $(ECHO) '  url: http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml
+       $(NOECHO) $(ECHO) '  version: 1.4' >> META_new.yml
+       $(NOECHO) $(ECHO) 'name: HTML-TreeBuilder-XPath' >> META_new.yml
+       $(NOECHO) $(ECHO) 'no_index:' >> META_new.yml
+       $(NOECHO) $(ECHO) '  directory:' >> META_new.yml
+       $(NOECHO) $(ECHO) '    - t' >> META_new.yml
+       $(NOECHO) $(ECHO) '    - inc' >> META_new.yml
+       $(NOECHO) $(ECHO) 'requires:' >> META_new.yml
+       $(NOECHO) $(ECHO) '  HTML::TreeBuilder: 0' >> META_new.yml
+       $(NOECHO) $(ECHO) '  List::Util: 0' >> META_new.yml
+       $(NOECHO) $(ECHO) '  XML::XPathEngine: 0.12' >> META_new.yml
+       $(NOECHO) $(ECHO) 'version: 0.14' >> META_new.yml
        -$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
+       $(NOECHO) $(ECHO) Generating META.json
+       $(NOECHO) $(ECHO) '{' > META_new.json
+       $(NOECHO) $(ECHO) '   "abstract" : "add XPath support to HTML::TreeBuilder",' >> META_new.json
+       $(NOECHO) $(ECHO) '   "author" : [' >> META_new.json
+       $(NOECHO) $(ECHO) '      "Michel Rodriguez <mrodrigu@localdomain>"' >> META_new.json
+       $(NOECHO) $(ECHO) '   ],' >> META_new.json
+       $(NOECHO) $(ECHO) '   "dynamic_config" : 1,' >> META_new.json
+       $(NOECHO) $(ECHO) '   "generated_by" : "ExtUtils::MakeMaker version 6.58, CPAN::Meta::Converter version 2.110930001",' >> META_new.json
+       $(NOECHO) $(ECHO) '   "license" : [' >> META_new.json
+       $(NOECHO) $(ECHO) '      "perl_5"' >> META_new.json
+       $(NOECHO) $(ECHO) '   ],' >> META_new.json
+       $(NOECHO) $(ECHO) '   "meta-spec" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",' >> META_new.json
+       $(NOECHO) $(ECHO) '      "version" : "2"' >> META_new.json
+       $(NOECHO) $(ECHO) '   },' >> META_new.json
+       $(NOECHO) $(ECHO) '   "name" : "HTML-TreeBuilder-XPath",' >> META_new.json
+       $(NOECHO) $(ECHO) '   "no_index" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '      "directory" : [' >> META_new.json
+       $(NOECHO) $(ECHO) '         "t",' >> META_new.json
+       $(NOECHO) $(ECHO) '         "inc"' >> META_new.json
+       $(NOECHO) $(ECHO) '      ]' >> META_new.json
+       $(NOECHO) $(ECHO) '   },' >> META_new.json
+       $(NOECHO) $(ECHO) '   "prereqs" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '      "build" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '         "requires" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '            "ExtUtils::MakeMaker" : 0' >> META_new.json
+       $(NOECHO) $(ECHO) '         }' >> META_new.json
+       $(NOECHO) $(ECHO) '      },' >> META_new.json
+       $(NOECHO) $(ECHO) '      "configure" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '         "requires" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '            "ExtUtils::MakeMaker" : 0' >> META_new.json
+       $(NOECHO) $(ECHO) '         }' >> META_new.json
+       $(NOECHO) $(ECHO) '      },' >> META_new.json
+       $(NOECHO) $(ECHO) '      "runtime" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '         "requires" : {' >> META_new.json
+       $(NOECHO) $(ECHO) '            "HTML::TreeBuilder" : 0,' >> META_new.json
+       $(NOECHO) $(ECHO) '            "List::Util" : 0,' >> META_new.json
+       $(NOECHO) $(ECHO) '            "XML::XPathEngine" : "0.12"' >> META_new.json
+       $(NOECHO) $(ECHO) '         }' >> META_new.json
+       $(NOECHO) $(ECHO) '      }' >> META_new.json
+       $(NOECHO) $(ECHO) '   },' >> META_new.json
+       $(NOECHO) $(ECHO) '   "release_status" : "stable",' >> META_new.json
+       $(NOECHO) $(ECHO) '   "version" : "0.14"' >> META_new.json
+       $(NOECHO) $(ECHO) '}' >> META_new.json
+       -$(NOECHO) $(MV) META_new.json $(DISTVNAME)/META.json
 
 
 # --- MakeMaker signature section:
@@ -598,8 +645,12 @@ ci :
 
 # --- MakeMaker distmeta section:
 distmeta : create_distdir metafile
-       $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } ' \
+       $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -e q{META.yml};' \
+         -e 'eval { maniadd({q{META.yml} => q{Module YAML meta-data (added by MakeMaker)}}) }' \
          -e '    or print "Could not add META.yml to MANIFEST: $${'\''@'\''}\n"' --
+       $(NOECHO) cd $(DISTVNAME) && $(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e 'exit unless -f q{META.json};' \
+         -e 'eval { maniadd({q{META.json} => q{Module JSON meta-data (added by MakeMaker)}}) }' \
+         -e '    or print "Could not add META.json to MANIFEST: $${'\''@'\''}\n"' --
 
 
 
@@ -752,7 +803,7 @@ $(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
 
 # --- MakeMaker makeaperl section ---
 MAP_TARGET    = perl
-FULLPERL      = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
+FULLPERL      = /home/mrodrigu/perl5/perlbrew/perls/perl-5.15.1/bin/perl5.15.1
 
 $(MAP_TARGET) :: static $(MAKE_APERL_FILE)
        $(MAKE) $(USEMAKEFILE) $(MAKE_APERL_FILE) $@
@@ -796,14 +847,14 @@ testdb_static :: testdb_dynamic
 # --- MakeMaker ppd section:
 # Creates a PPD (Perl Package Description) for a binary distribution.
 ppd :
-       $(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="0.12">' > $(DISTNAME).ppd
+       $(NOECHO) $(ECHO) '<SOFTPKG NAME="$(DISTNAME)" VERSION="0.14">' > $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '    <ABSTRACT>add XPath support to HTML::TreeBuilder</ABSTRACT>' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '    <AUTHOR>Michel Rodriguez &lt;mrodrigu@localdomain&gt;</AUTHOR>' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '    <IMPLEMENTATION>' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="HTML::TreeBuilder" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="List::Util" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="XML::XPathEngine" VERSION="0.12" />' >> $(DISTNAME).ppd
-       $(NOECHO) $(ECHO) '        <ARCHITECTURE NAME="i686-linux-5.14" />' >> $(DISTNAME).ppd
+       $(NOECHO) $(ECHO) '        <ARCHITECTURE NAME="i686-linux-5.15" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <CODEBASE HREF="" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '    </IMPLEMENTATION>' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '</SOFTPKG>' >> $(DISTNAME).ppd

diff --git a/Makefile.old b/Makefile.old
index b39cd34..524769c 100644 (file)
--- a/Makefile.old
+++ b/Makefile.old
@@ -1,7 +1,7 @@
 # This Makefile is for the HTML::TreeBuilder::XPath extension to perl.
 #
 # It was generated automatically by MakeMaker version
-# 6.56 (Revision: 65600) from the contents of
+# 6.57_05 (Revision: 65705) from the contents of
 # Makefile.PL. Don't edit this file, edit Makefile.PL instead.
 #
 #       ANY CHANGES MADE HERE WILL BE LOST!
@@ -12,7 +12,7 @@
 #   MakeMaker Parameters:
 
 #     ABSTRACT_FROM => q[lib/HTML/TreeBuilder/XPath.pm]
-#     AUTHOR => q[Michel Rodriguez <mrodrigu@localdomain>]
+#     AUTHOR => [q[Michel Rodriguez <mrodrigu@localdomain>]]
 #     BUILD_REQUIRES => {  }
 #     LICENSE => q[perl]
 #     NAME => q[HTML::TreeBuilder::XPath]
@@ -24,7 +24,7 @@
 
 # --- MakeMaker const_config section:
 
-# These definitions are from config.sh (via /usr/lib/perl/5.10/Config.pm).
+# These definitions are from config.sh (via /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux/Config.pm).
 # They may have been overridden via Makefile.PL or on the command line.
 AR = ar
 CC = cc
@@ -35,19 +35,19 @@ DLSRC = dl_dlopen.xs
 EXE_EXT = 
 FULL_AR = /usr/bin/ar
 LD = cc
-LDDLFLAGS = -shared -O2 -g -L/usr/local/lib -fstack-protector
+LDDLFLAGS = -shared -O2 -L/usr/local/lib -fstack-protector
 LDFLAGS =  -fstack-protector -L/usr/local/lib
-LIBC = /lib/libc-2.11.1.so
+LIBC = 
 LIB_EXT = .a
 OBJ_EXT = .o
 OSNAME = linux
-OSVERS = 2.6.24-27-server
+OSVERS = 2.6.38-8-generic-pae
 RANLIB = :
-SITELIBEXP = /usr/local/share/perl/5.10.1
-SITEARCHEXP = /usr/local/lib/perl/5.10.1
+SITELIBEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1
+SITEARCHEXP = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1/i686-linux
 SO = so
-VENDORARCHEXP = /usr/lib/perl5
-VENDORLIBEXP = /usr/share/perl5
+VENDORARCHEXP = 
+VENDORLIBEXP = 
 
 
 # --- MakeMaker constants section:
@@ -69,60 +69,60 @@ INST_BIN = blib/bin
 INST_LIB = blib/lib
 INST_MAN1DIR = blib/man1
 INST_MAN3DIR = blib/man3
-MAN1EXT = 1p
-MAN3EXT = 3pm
+MAN1EXT = 1
+MAN3EXT = 3
 INSTALLDIRS = site
 DESTDIR = 
 PREFIX = $(SITEPREFIX)
-PERLPREFIX = /usr
-SITEPREFIX = /usr/local
-VENDORPREFIX = /usr
-INSTALLPRIVLIB = /usr/share/perl/5.10
+PERLPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1
+SITEPREFIX = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1
+VENDORPREFIX = 
+INSTALLPRIVLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1
 DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB)
-INSTALLSITELIB = /usr/local/share/perl/5.10.1
+INSTALLSITELIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1
 DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB)
-INSTALLVENDORLIB = /usr/share/perl5
+INSTALLVENDORLIB = 
 DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB)
-INSTALLARCHLIB = /usr/lib/perl/5.10
+INSTALLARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux
 DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB)
-INSTALLSITEARCH = /usr/local/lib/perl/5.10.1
+INSTALLSITEARCH = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/site_perl/5.14.1/i686-linux
 DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH)
-INSTALLVENDORARCH = /usr/lib/perl5
+INSTALLVENDORARCH = 
 DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH)
-INSTALLBIN = /usr/bin
+INSTALLBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
 DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN)
-INSTALLSITEBIN = /usr/local/bin
+INSTALLSITEBIN = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
 DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN)
-INSTALLVENDORBIN = /usr/bin
+INSTALLVENDORBIN = 
 DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN)
-INSTALLSCRIPT = /usr/bin
+INSTALLSCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
 DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT)
-INSTALLSITESCRIPT = /usr/local/bin
+INSTALLSITESCRIPT = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin
 DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT)
-INSTALLVENDORSCRIPT = /usr/bin
+INSTALLVENDORSCRIPT = 
 DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT)
-INSTALLMAN1DIR = /usr/share/man/man1
+INSTALLMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man1
 DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
-INSTALLSITEMAN1DIR = /usr/local/man/man1
+INSTALLSITEMAN1DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man1
 DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
-INSTALLVENDORMAN1DIR = /usr/share/man/man1
+INSTALLVENDORMAN1DIR = 
 DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
-INSTALLMAN3DIR = /usr/share/man/man3
+INSTALLMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man3
 DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
-INSTALLSITEMAN3DIR = /usr/local/man/man3
+INSTALLSITEMAN3DIR = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/man/man3
 DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
-INSTALLVENDORMAN3DIR = /usr/share/man/man3
+INSTALLVENDORMAN3DIR = 
 DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR)
-PERL_LIB = /usr/share/perl/5.10
-PERL_ARCHLIB = /usr/lib/perl/5.10
+PERL_LIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1
+PERL_ARCHLIB = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux
 LIBPERL_A = libperl.a
 FIRST_MAKEFILE = Makefile
 MAKEFILE_OLD = Makefile.old
 MAKE_APERL_FILE = Makefile.aperl
 PERLMAINCC = $(CC)
-PERL_INC = /usr/lib/perl/5.10/CORE
-PERL = /usr/bin/perl
-FULLPERL = /usr/bin/perl
+PERL_INC = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/i686-linux/CORE
+PERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
+FULLPERL = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
 ABSPERL = $(PERL)
 PERLRUN = $(PERL)
 FULLPERLRUN = $(FULLPERL)
@@ -135,9 +135,9 @@ PERM_DIR = 755
 PERM_RW = 644
 PERM_RWX = 755
 
-MAKEMAKER   = /usr/local/share/perl/5.10.1/ExtUtils/MakeMaker.pm
-MM_VERSION  = 6.56
-MM_REVISION = 65600
+MAKEMAKER   = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/lib/5.14.1/ExtUtils/MakeMaker.pm
+MM_VERSION  = 6.57_05
+MM_REVISION = 65705
 
 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
 # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
@@ -196,7 +196,7 @@ PM_TO_BLIB = XPath_with_as_XML_clean.pm \
 
 
 # --- MakeMaker platform_constants section:
-MM_Unix_VERSION = 6.56
+MM_Unix_VERSION = 6.57_05
 PERL_MALLOC_DEF = -DPERL_EXTMALLOC_DEF -Dmalloc=Perl_malloc -Dfree=Perl_mfree -Drealloc=Perl_realloc -Dcalloc=Perl_calloc
 
 
@@ -449,17 +449,17 @@ clean :: clean_subdirs
          core.[0-9] $(INST_ARCHAUTODIR)/extralibs.all \
          core.[0-9][0-9] $(BASEEXT).bso \
          pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \
-         $(BASEEXT).x $(BOOTSTRAP) \
-         perl$(EXE_EXT) tmon.out \
-         *$(OBJ_EXT) pm_to_blib \
-         $(INST_ARCHAUTODIR)/extralibs.ld blibdirs.ts \
-         core.[0-9][0-9][0-9][0-9][0-9] *perl.core \
-         core.*perl.*.? $(MAKE_APERL_FILE) \
-         perl $(BASEEXT).def \
-         core.[0-9][0-9][0-9] mon.out \
-         lib$(BASEEXT).def perlmain.c \
-         perl.exe so_locations \
-         $(BASEEXT).exp 
+         MYMETA.yml $(BASEEXT).x \
+         $(BOOTSTRAP) perl$(EXE_EXT) \
+         tmon.out *$(OBJ_EXT) \
+         pm_to_blib $(INST_ARCHAUTODIR)/extralibs.ld \
+         blibdirs.ts core.[0-9][0-9][0-9][0-9][0-9] \
+         *perl.core core.*perl.*.? \
+         $(MAKE_APERL_FILE) perl \
+         $(BASEEXT).def core.[0-9][0-9][0-9] \
+         mon.out lib$(BASEEXT).def \
+         perlmain.c perl.exe \
+         so_locations $(BASEEXT).exp 
        - $(RM_RF) \
          blib 
        - $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL)
@@ -502,7 +502,7 @@ metafile : create_distdir
        $(NOECHO) $(ECHO) '    directory:' >> META_new.yml
        $(NOECHO) $(ECHO) '        - t' >> META_new.yml
        $(NOECHO) $(ECHO) '        - inc' >> META_new.yml
-       $(NOECHO) $(ECHO) 'generated_by:       ExtUtils::MakeMaker version 6.56' >> META_new.yml
+       $(NOECHO) $(ECHO) 'generated_by:       ExtUtils::MakeMaker version 6.57_05' >> META_new.yml
        $(NOECHO) $(ECHO) 'meta-spec:' >> META_new.yml
        $(NOECHO) $(ECHO) '    url:      http://module-build.sourceforge.net/META-spec-v1.4.html' >> META_new.yml
        $(NOECHO) $(ECHO) '    version:  1.4' >> META_new.yml
@@ -752,7 +752,7 @@ $(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
 
 # --- MakeMaker makeaperl section ---
 MAP_TARGET    = perl
-FULLPERL      = /usr/bin/perl
+FULLPERL      = /home/mrodrigu/perl5/perlbrew/perls/perl-5.14.1/bin/perl5.14.1
 
 $(MAP_TARGET) :: static $(MAKE_APERL_FILE)
        $(MAKE) $(USEMAKEFILE) $(MAKE_APERL_FILE) $@
@@ -803,7 +803,7 @@ ppd :
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="HTML::TreeBuilder" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="List::Util" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <REQUIRE NAME="XML::XPathEngine" VERSION="0.12" />' >> $(DISTNAME).ppd
-       $(NOECHO) $(ECHO) '        <ARCHITECTURE NAME="i486-linux-gnu-thread-multi-5.10" />' >> $(DISTNAME).ppd
+       $(NOECHO) $(ECHO) '        <ARCHITECTURE NAME="i686-linux-5.14" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '        <CODEBASE HREF="" />' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '    </IMPLEMENTATION>' >> $(DISTNAME).ppd
        $(NOECHO) $(ECHO) '</SOFTPKG>' >> $(DISTNAME).ppd

diff --git a/blib/lib/HTML/TreeBuilder/XPath.pm b/blib/lib/HTML/TreeBuilder/XPath.pm
index 10b035d..6d443c2 100644 (file)
--- a/blib/lib/HTML/TreeBuilder/XPath.pm
+++ b/blib/lib/HTML/TreeBuilder/XPath.pm
@@ -8,7 +8,7 @@ use warnings;
 
 use vars qw($VERSION);
 
-$VERSION = '0.12';
+$VERSION = '0.14';
 
 my %CHAR2DEFAULT_ENT= ( '&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;');
 my %NUM2DEFAULT_ENT= ( '38' => 'amp', '60' => 'lt', '62' => 'gt', '"' => '&quot;');
@@ -149,7 +149,7 @@ sub isTextNode          { return ref $_[0] ? 0 : 1; }
 
 sub getValue 
   { my $elt= shift;
-    if( $elt->isCommentNode) { return $elt->{_text}; }
+    if( $elt->isCommentNode) { return $elt->{text}; }
     return $elt->as_text;
   }
         
@@ -193,7 +193,7 @@ sub getAttributes
 sub to_number { return XML::XPathEngine::Number->new( $_[0]->as_text); }
 sub string_value 
   { my $elt= shift;
-    if( $elt->isCommentNode) { return $elt->{_text}; }
+    if( $elt->isCommentNode) { return $elt->{text}; }
     return $elt->as_text;
   };
 

diff --git a/blib/man3/HTML::TreeBuilder::XPath.3 b/blib/man3/HTML::TreeBuilder::XPath.3
index e844bf9..5c231e1 100644 (file)
--- a/blib/man3/HTML::TreeBuilder::XPath.3
+++ b/blib/man3/HTML::TreeBuilder::XPath.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.18)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "HTML::TreeBuilder::XPath 3"
-.TH HTML::TreeBuilder::XPath 3 "2011-06-19" "perl v5.14.1" "User Contributed Perl Documentation"
+.TH HTML::TreeBuilder::XPath 3 "2011-09-20" "perl v5.15.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/blib/man3/HTML::TreeBuilder::XPath_with_as_XML_clean.3 b/blib/man3/HTML::TreeBuilder::XPath_with_as_XML_clean.3
index ee78685..3f5304f 100644 (file)
--- a/blib/man3/HTML::TreeBuilder::XPath_with_as_XML_clean.3
+++ b/blib/man3/HTML::TreeBuilder::XPath_with_as_XML_clean.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.18)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "XPath_with_as_XML_clean 3"
-.TH XPath_with_as_XML_clean 3 "2010-09-15" "perl v5.14.1" "User Contributed Perl Documentation"
+.TH XPath_with_as_XML_clean 3 "2010-09-15" "perl v5.15.1" "User Contributed Perl Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/lib/HTML/TreeBuilder/.XPath.pm.swp b/lib/HTML/TreeBuilder/.XPath.pm.swp
index 9ea2b59..0d7f1de 100644 (file)
Binary files a/lib/HTML/TreeBuilder/.XPath.pm.swp and b/lib/HTML/TreeBuilder/.XPath.pm.swp differ

diff --git a/lib/HTML/TreeBuilder/XPath.pm b/lib/HTML/TreeBuilder/XPath.pm
index d9a52a6..6d443c2 100644 (file)
--- a/lib/HTML/TreeBuilder/XPath.pm
+++ b/lib/HTML/TreeBuilder/XPath.pm
@@ -8,7 +8,7 @@ use warnings;
 
 use vars qw($VERSION);
 
-$VERSION = '0.13';
+$VERSION = '0.14';
 
 my %CHAR2DEFAULT_ENT= ( '&' => '&amp;', '<' => '&lt;', '>' => '&gt;', '"' => '&quot;');
 my %NUM2DEFAULT_ENT= ( '38' => 'amp', '60' => 'lt', '62' => 'gt', '"' => '&quot;');
@@ -149,7 +149,7 @@ sub isTextNode          { return ref $_[0] ? 0 : 1; }
 
 sub getValue 
   { my $elt= shift;
-    if( $elt->isCommentNode) { return $elt->{_text}; }
+    if( $elt->isCommentNode) { return $elt->{text}; }
     return $elt->as_text;
   }
         
@@ -193,7 +193,7 @@ sub getAttributes
 sub to_number { return XML::XPathEngine::Number->new( $_[0]->as_text); }
 sub string_value 
   { my $elt= shift;
-    if( $elt->isCommentNode) { return $elt->{_text}; }
+    if( $elt->isCommentNode) { return $elt->{text}; }
     return $elt->as_text;
   };
 

diff --git a/t/.test_bugs.t.swp b/t/.test_bugs.t.swp
index 62d62f5..46666cc 100644 (file)
Binary files a/t/.test_bugs.t.swp and b/t/.test_bugs.t.swp differ

diff --git a/t/test_bugs.t b/t/test_bugs.t
index db62a71..a50b8f7 100644 (file)
--- a/t/test_bugs.t
+++ b/t/test_bugs.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use HTML::TreeBuilder::XPath;
-use Test::More tests => 6;
+use Test::More tests => 7;
 
 use utf8;
 
@@ -32,3 +32,9 @@ foreach my $p ($tree->findnodes("//p"))
     is( $p->as_XML_compact, "<p>$as_xml</p>", "p as_XML_compact");
     is( ($p->findnodes( './node()[1]'))[0]->as_XML_indented, $as_xml, "text node as_XML()");
   }
+
+{ my $t=  HTML::TreeBuilder->new;
+  $t->store_comments( 1);
+  $t->parse( '<html><head></head><body><!-- my comment --><p>not a comment</p><!-- more comment --></body></html>');
+  is( $t->findvalue( '/html/body/comment()'), ' my comment  more comment ', 'comment value');
+}

diff --git a/~/.perldb.hist b/~/.perldb.hist
new file mode 100644 (file)
index 0000000..ac251f9
--- /dev/null
+++ b/~/.perldb.hist
@@ -0,0 +1,16 @@
+b 36
+x $t->as_XML
+b 39
+x $t
+x $t->findvalue( '/html/body/comment()'
+$t->findvalue( '/html/body/comment()')
+x $t->findvalue( '/html/body/comment()')
+x $t->findvalue( '//comment()')
+x $t->findnodes( '//comment()')
+x map { $_->getValue } $t->findnodes( '//comment()')
+x $t->findvalue( '//comment()')
+$c= ($t->findnodes( '//comment()'))[0]
+x $c->as_text
+x $c
+x $c->string_value
+x $c->{text}