nokogiri 1.5.2 → 1.5.3.rc2

data/lib/nokogiri/css/parser.y

@@ -88,7 +88,7 @@ rule
     |
     ;
   attrib
-    : LSQUARE namespaced_ident attrib_val_0or1 RSQUARE {
+    : LSQUARE attrib_name attrib_val_0or1 RSQUARE {
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
@@ -105,6 +105,18 @@ rule
         )
       }
     ;
+  attrib_name
+    : namespace '|' IDENT {
+        result = Node.new(:ELEMENT_NAME,
+          [[val.first, val.last].compact.join(':')]
+        )
+      }
+    | IDENT {
+        # Default namespace is not applied to attributes.
+        # So we don't add prefix "xmlns:" as in namespaced_ident.
+        result = Node.new(:ELEMENT_NAME, [val.first])
+      }
+    ;
   function
     : FUNCTION RPAREN {
         result = Node.new(:FUNCTION, [val.first.strip])

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.5.2'
+  VERSION = '1.5.3.rc2'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/css/test_parser.rb

@@ -6,6 +6,10 @@ module Nokogiri
       def setup
         super
         @parser = Nokogiri::CSS::Parser.new
+        @parser_with_ns = Nokogiri::CSS::Parser.new({
+          "xmlns" => "http://default.example.com/",
+          "hoge" => "http://hoge.example.com/",
+        })
       end
 
       def test_extra_single_quote
@@ -292,6 +296,13 @@ module Nokogiri
         # assert_xpath ['//x/y', '//y/z'], @parser.parse('x > y | y > z')
       end
 
+      def test_attributes_with_namespace
+        ## Default namespace is not applied to attributes.
+        ## So this must be @class, not @xmlns:class.
+        assert_xpath "//xmlns:a[@class = 'bar']", @parser_with_ns.parse("a[class='bar']")
+        assert_xpath "//xmlns:a[@hoge:class = 'bar']", @parser_with_ns.parse("a[hoge|class='bar']")
+      end
+
       def assert_xpath expecteds, asts
         expecteds = [expecteds].flatten
         expecteds.zip(asts).each do |expected, actual|

data/test/files/to_be_xincluded.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<included>this snippet is to be included from xinclude.xml</included>

data/test/files/xinclude.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<test xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="to_be_xincluded.xml"/>
+</test>

data/test/xml/test_document.rb

@@ -358,13 +358,17 @@ module Nokogiri
       def test_subclass_parse
         klass = Class.new(Nokogiri::XML::Document)
         doc = klass.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, doc.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, doc.root.to_s
         assert_instance_of klass, doc
       end
 
       def test_document_parse_method
         xml = Nokogiri::XML::Document.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, xml.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, xml.root.to_s
       end
 
       def test_encoding=

data/test/xml/test_unparented_node.rb

@@ -252,8 +252,8 @@ module Nokogiri
         doc = Nokogiri::XML "<root>foo</root>"
         pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo.xsl"})
         doc.root.add_previous_sibling pi
-        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>\n}
-        assert_equal expected_doc, doc.to_xml
+        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>}
+        assert_includes doc.to_xml, expected_doc
       end
 
       def test_find_by_css_with_tilde_eql

data/test/xml/test_xpath.rb

@@ -254,6 +254,17 @@ module Nokogiri
         end
         assert_equal 123.456, value
       end
+
+      def test_custom_xpath_with_bullshit_arguments
+        xml = %q{<foo> </foo>}
+        doc = Nokogiri::XML.parse(xml)
+        foo = doc.xpath('//foo[bool_function(bar/baz)]', Class.new {
+            def bool_function(value)
+              true
+            end
+          }.new)
+        assert_equal foo, doc.xpath("//foo")
+      end
     end
   end
 end

data/test_all

@@ -0,0 +1,84 @@
+#! /usr/bin/env bash
+#
+#  script to run tests on all relevant rubies, and valgrind on supported rubies.
+#  outputs tests to `test.log` and valgrind output to `valgrind.log`.
+#
+#  requires `rvm` to be installed. sorry about that, multiruby dudes.
+#
+
+RUBIES="ruby-1.9.3 jruby-1.6.5 ree-1.8.7 ruby-1.9.2 ruby-1.8.7"
+TEST_LOG=test.log
+VALGRIND_LOG=valgrind.log
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+    source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+    source "/usr/local/rvm/scripts/rvm"
+else
+    echo "ERROR: An RVM installation was not found.\n"
+fi
+
+> $TEST_LOG
+> $VALGRIND_LOG
+set -o errexit
+
+function rvm_use {
+    current_ruby=$1
+    rvm use "${1}@nokogiri" --create
+}
+
+function generate_parser_and_tokenizer {
+    old_ruby=$current_ruby
+    rvm_use ruby-1.8.7
+    bundle exec rake generate 2>&1 > /dev/null
+    rvm_use $old_ruby
+}
+
+function clean {
+    bundle exec rake clean clobber 2>&1 > /dev/null
+}
+
+function compile {
+    echo "** compiling ..."
+    generate_parser_and_tokenizer
+    bundle exec rake compile 2>&1 > /dev/null
+}
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    if gem list bundler | fgrep -v 1.1.rc 2>&1 > /dev/null ; then
+        gem install bundler --pre
+    fi
+    bundle install --quiet --local || bundle install
+    clean
+done
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    echo -e "**\n** testing nokogiri on ${ruby}\n**" | tee -a $TEST_LOG
+    clean
+    compile
+    echo "** running tests ..."
+    if [[ $ruby =~ "jruby" ]] ; then
+        # I get:
+        #   /usr/lib/jvm/java-7-oracle/bin/java: symbol lookup error: /home/mike/.rvm/gems/jruby-1.6.5@nokogiri/gems/racc-1.4.7/lib/racc/cparse.so: undefined symbol: rb_catch
+        # if I use 'bundle exec' with jruby. Anybody?
+        rake test 2>&1 | tee -a $TEST_LOG
+    else
+        bundle exec rake test 2>&1 | tee -a $TEST_LOG
+    fi
+    clean
+done
+
+for ruby in $RUBIES ; do
+    if [[ ! $ruby =~ "jruby" ]] ; then
+        rvm_use ${ruby}
+        echo -e "**\n** nokogiri prerelease: ${ruby}\n**" | tee -a $VALGRIND_LOG
+        clean
+        compile
+        echo "** running valgrind on tests ..."
+        bundle exec rake test:valgrind 2>&1 | tee -a $VALGRIND_LOG
+        clean
+    fi
+done

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
+  hash: -1629906982
+  prerelease: 6
   segments: 
   - 1
   - 5
+  - 3
+  - rc
   - 2
-  version: 1.5.2
+  version: 1.5.3.rc2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-09 00:00:00 Z
+date: 2012-03-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -32,8 +34,8 @@ dependencies:
         version: "1.1"
   prerelease: false
   requirement: *id001
-  type: :development
   name: hoe-bundler
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -48,8 +50,8 @@ dependencies:
         version: 1.0.3
   prerelease: false
   requirement: *id002
-  type: :development
   name: hoe-debugging
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,8 +65,8 @@ dependencies:
         version: "1.0"
   prerelease: false
   requirement: *id003
-  type: :development
   name: hoe-gemspec
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,8 +80,8 @@ dependencies:
         version: "1.4"
   prerelease: false
   requirement: *id004
-  type: :development
   name: hoe-git
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -94,8 +96,8 @@ dependencies:
         version: 0.2.2
   prerelease: false
   requirement: *id005
-  type: :development
   name: mini_portile
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -110,8 +112,8 @@ dependencies:
         version: 2.2.2
   prerelease: false
   requirement: *id006
-  type: :development
   name: minitest
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -126,8 +128,8 @@ dependencies:
         version: 1.4.6
   prerelease: false
   requirement: *id007
-  type: :development
   name: racc
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -142,8 +144,8 @@ dependencies:
         version: 0.8.0
   prerelease: false
   requirement: *id008
-  type: :development
   name: rake-compiler
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -158,8 +160,8 @@ dependencies:
         version: 1.0.5
   prerelease: false
   requirement: *id009
-  type: :development
   name: rexical
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -173,8 +175,8 @@ dependencies:
         version: "3.10"
   prerelease: false
   requirement: *id010
-  type: :development
   name: rdoc
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -188,8 +190,8 @@ dependencies:
         version: "2.13"
   prerelease: false
   requirement: *id011
-  type: :development
   name: hoe
+  type: :development
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
   many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
   XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
@@ -248,11 +250,16 @@ files:
 - .gemtest
 - CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
+- C_CODING_STYLE.rdoc
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- ROADMAP.md
 - Rakefile
+- STANDARD_RESPONSES.md
+- Y_U_NO_GEMSPEC.md
 - bin/nokogiri
+- build_all
 - ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
@@ -384,7 +391,6 @@ files:
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
 - lib/xsd/xmlparser/nokogiri.rb
-- nokogiri_help_responses.md
 - tasks/cross_compile.rb
 - tasks/nokogiri.org.rb
 - tasks/test.rb
@@ -414,7 +420,9 @@ files:
 - test/files/staff.xml
 - test/files/staff.xslt
 - test/files/tlm.html
+- test/files/to_be_xincluded.xml
 - test/files/valid_bar.xml
+- test/files/xinclude.xml
 - test/helper.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
@@ -442,6 +450,7 @@ files:
 - test/xml/test_attr.rb
 - test/xml/test_attribute_decl.rb
 - test/xml/test_builder.rb
+- test/xml/test_c14n.rb
 - test/xml/test_cdata.rb
 - test/xml/test_comment.rb
 - test/xml/test_document.rb
@@ -457,9 +466,9 @@ files:
 - test/xml/test_node.rb
 - test/xml/test_node_attributes.rb
 - test/xml/test_node_encoding.rb
+- test/xml/test_node_inheritance.rb
 - test/xml/test_node_reparenting.rb
 - test/xml/test_node_set.rb
-- test/xml/test_node_inheritance.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb
 - test/xml/test_reader_encoding.rb
@@ -468,12 +477,11 @@ files:
 - test/xml/test_syntax_error.rb
 - test/xml/test_text.rb
 - test/xml/test_unparented_node.rb
+- test/xml/test_xinclude.rb
 - test/xml/test_xpath.rb
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
-- test/xml/test_c14n.rb
-- test/xml/test_xinclude.rb
-- C_CODING_STYLE.rdoc
+- test_all
 homepage: http://nokogiri.org
 licenses: []
 
@@ -497,16 +505,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"