nokogiri 1.6.5 → 1.6.6.1

data/test/xml/test_xpath.rb

@@ -13,12 +13,6 @@ module Nokogiri
       # functions to be in a namespace. This is not required by XPath, afaik,
       # but it is an usual convention though.
       #
-      # Furthermore, CSS does not support extension functions but it does in
-      # Nokogiri. Result: you cannot use them in JRuby impl. At least, until
-      # the CSS to XPath parser is patched, and let me say that there are more
-      # important features to add before that happens. I hope you will forgive
-      # me.
-      #
       # Yours truly,
       #
       # The guy whose headaches belong to Nokogiri JRuby impl.
@@ -69,6 +63,10 @@ module Nokogiri
         assert_equal 4, @xml.xpath('//address[@domestic=$value]', nil, :value => 'Yes').length
       end
 
+      def test_variable_binding_with_search
+        assert_equal 4, @xml.search('//address[@domestic=$value]', nil, :value => 'Yes').length
+      end
+
       def test_unknown_attribute
         assert_equal 0, @xml.xpath('//employee[@id="asdfasdf"]/@fooo').length
         assert_nil @xml.xpath('//employee[@id="asdfasdf"]/@fooo')[0]
@@ -86,12 +84,28 @@ module Nokogiri
         assert_equal 'foo', @xml.xpath('concat("fo", "o")')
       end
 
+      def test_node_search_with_multiple_queries
+        xml = '<document>
+                 <thing>
+                   <div class="title">important thing</div>
+                 </thing>
+                 <thing>
+                   <div class="content">stuff</div>
+                 </thing>
+                 <thing>
+                   <p class="blah">more stuff</div>
+                 </thing>
+               </document>'
+        node = Nokogiri::XML(xml).root
+        assert_kind_of Nokogiri::XML::Node, node
+
+        assert_equal 3, node.xpath('.//div', './/p').length
+        assert_equal 3, node.css('.title', '.content', 'p').length
+        assert_equal 3, node.search('.//div', 'p.blah').length
+      end
+
       def test_css_search_uses_custom_selectors_with_arguments
-        set = if Nokogiri.uses_libxml?
-                @xml.css('employee > address:my_filter("domestic", "Yes")', @handler)
-              else
-                @xml.xpath("//employee/address[nokogiri:my_filter(., \"domestic\", \"Yes\")]", @ns, @handler)
-               end
+        set = @xml.css('employee > address:my_filter("domestic", "Yes")', @handler)
         assert set.length > 0
         set.each do |node|
           assert_equal 'Yes', node['domestic']
@@ -100,15 +114,31 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        if Nokogiri.uses_libxml?
-          @xml.css('employee:thing()', @handler)
-        else
-          @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
-        end
+        @xml.css('employee:thing()', @handler)
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
 
+      def test_search_with_css_query_uses_custom_selectors_with_arguments
+        set = @xml.search('employee > address:my_filter("domestic", "Yes")', @handler)
+        assert set.length > 0
+        set.each do |node|
+          assert_equal 'Yes', node['domestic']
+        end
+      end
+
+      def test_search_with_xpath_query_uses_custom_selectors_with_arguments
+        set = if Nokogiri.uses_libxml?
+                @xml.search('//employee/address[my_filter(., "domestic", "Yes")]', @handler)
+              else
+                @xml.search('//employee/address[nokogiri:my_filter(., "domestic", "Yes")]', @ns, @handler)
+              end
+        assert set.length > 0
+        set.each do |node|
+          assert_equal 'Yes', node['domestic']
+        end
+      end
+
       def test_pass_self_to_function
         set = if Nokogiri.uses_libxml?
                 @xml.xpath('//employee/address[my_filter(., "domestic", "Yes")]', @handler)
@@ -179,6 +209,22 @@ module Nokogiri
         assert_send [elapsed_time, :<, time_limit], "XPath is taking too long"
       end
 
+      # issue #1109 (jruby impl's xpath() cache not being cleared on attr removal)
+      def test_xpath_results_cache_should_get_cleared_on_attr_removal
+        doc = Nokogiri::HTML('<html><div name="foo"></div></html>')
+        element = doc.at_xpath('//div[@name="foo"]')
+        element.remove_attribute('name')
+        assert_nil doc.at_xpath('//div[@name="foo"]')
+      end
+
+      # issue #1109 (jruby impl's xpath() cache not being cleared on attr update )
+      def test_xpath_results_cache_should_get_cleared_on_attr_update
+        doc = Nokogiri::HTML('<html><div name="foo"></div></html>')
+        element = doc.at_xpath('//div[@name="foo"]')
+        element['name'] = 'bar'
+        assert_nil doc.at_xpath('//div[@name="foo"]')
+      end
+
       def test_custom_xpath_function_returns_string
         if Nokogiri.uses_libxml?
           result = @xml.xpath('thing("asdf")', @handler)
@@ -332,7 +378,7 @@ END
             <RecordReference>a</RecordReference>
           </Product>
         </ONIXMessage>}
-        
+
         xml_doc = Nokogiri::XML(xml_string)
         onix = xml_doc.children.first
         assert_equal 'a', onix.at_xpath('xmlns:Product').at_xpath('xmlns:RecordReference').text
@@ -350,7 +396,7 @@ END
               <title>Artikkelin otsikko Hydrangea artiklan 1</title>
           </titleInfo>
         </mods>}
-        
+
         xml_doc = Nokogiri::XML(xml_string)
         ns_hash = {'mods'=>'http://www.loc.gov/mods/v3'}
         node = xml_doc.at_xpath('//mods:titleInfo[1]',ns_hash)
@@ -371,7 +417,7 @@ END
               <title>Artikkelin otsikko Hydrangea artiklan 1</title>
           </titleInfo>
         </mods>}
-        
+
         xml_doc = Nokogiri::XML(xml_string)
         ns_hash = {'mods'=>'http://www.loc.gov/mods/v3'}
         node = xml_doc.at_xpath('//mods:titleInfo[1]',ns_hash)

data/test_all

@@ -10,7 +10,17 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-2.2.0-preview1 ruby-2.1 ruby-2.0.0-p481 ruby-1.9.3 jruby-1.7.15"
+# I'd add rubinius, but rvm errors when building it on my machine. :(
+RUBIES="\
+  ruby-2.2 \
+  ruby-2.1 \
+  ruby-2.0.0-p598 \
+  ruby-1.9.3-p551 \
+  ruby-1.9.2-p330 \
+  jruby-9.0.0.0.pre1 \
+  jruby-1.7.18
+  "
+
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6.1
 platform: ruby
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
@@ -60,16 +60,16 @@ dependencies:
   name: hoe-debugging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: hoe-gemspec
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ extra_rdoc_files:
 - ext/nokogiri/xslt_stylesheet.c
 files:
 - .autotest
+- .cross_rubies
 - .editorconfig
 - .gemtest
 - .travis.yml
@@ -385,6 +386,7 @@ files:
 - lib/nokogiri/xml/sax/parser_context.rb
 - lib/nokogiri/xml/sax/push_parser.rb
 - lib/nokogiri/xml/schema.rb
+- lib/nokogiri/xml/searchable.rb
 - lib/nokogiri/xml/syntax_error.rb
 - lib/nokogiri/xml/text.rb
 - lib/nokogiri/xml/xpath.rb
@@ -409,12 +411,12 @@ files:
 - ports/patches/libxslt/0013-Memory-leak-in-xsltCompileIdKeyPattern-error-path.patch
 - ports/patches/libxslt/0014-Fix-for-bug-436589.patch
 - ports/patches/libxslt/0015-Fix-mkdir-for-mingw.patch
+- ports/patches/sort-patches-by-date
 - suppressions/README.txt
 - suppressions/nokogiri_ree-1.8.7.358.supp
 - suppressions/nokogiri_ruby-1.8.7.370.supp
 - suppressions/nokogiri_ruby-1.9.2.320.supp
 - suppressions/nokogiri_ruby-1.9.3.327.supp
-- tasks/nokogiri.org.rb
 - tasks/test.rb
 - test/css/test_nthiness.rb
 - test/css/test_parser.rb
@@ -459,6 +461,7 @@ files:
 - test/helper.rb
 - test/html/sax/test_parser.rb
 - test/html/sax/test_parser_context.rb
+- test/html/sax/test_push_parser.rb
 - test/html/test_builder.rb
 - test/html/test_document.rb
 - test/html/test_document_encoding.rb
@@ -595,6 +598,7 @@ test_files:
 - test/html/test_document_fragment.rb
 - test/html/sax/test_parser_context.rb
 - test/html/sax/test_parser.rb
+- test/html/sax/test_push_parser.rb
 - test/html/test_element_description.rb
 - test/html/test_document.rb
 - test/html/test_named_characters.rb

data/tasks/nokogiri.org.rb

@@ -1,24 +0,0 @@
-#
-#  note that this file will only work if you've got the `nokogiri.org`
-#  repo checked out, and you've got an rvm gemset "1.8.7@nokogiri"
-#  bundled with both nokogiri's and nokogiri.org's gems.
-#
-namespace :docs do
-  desc "generate HTML docs for nokogiri.org"
-  task :website do
-    system 'rvm use 1.8.7@nokogiri' # see above
-    title = "#{HOE.name}-#{HOE.version} Documentation"
-
-    options = []
-    options << "--main=#{HOE.readme_file}"
-    options << '--format=activerecord'
-    options << '--threads=1'
-    options << "--title=#{title.inspect}"
-
-    options += HOE.spec.require_paths
-    options += HOE.spec.extra_rdoc_files
-    require 'rdoc/rdoc'
-    ENV['RAILS_ROOT'] ||= File.expand_path(File.join('..', 'nokogiri_ws'))
-    RDoc::RDoc.new.document options
-  end
-end