nokogiri 1.6.4.1-java → 1.6.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8353cac07237f5e65173ea5c626e1a18caf5a6a2
-  data.tar.gz: 1cf345611b8685978c8c0f8b7090d1e79d046a50
+  metadata.gz: 1148b14986575ffdf88e32369713e071b058ed5b
+  data.tar.gz: aff3cd8473522f0eece98be2bcde6bc1fdbc35d2
 SHA512:
-  metadata.gz: b48fcad3ebed969d2117353f7e0fa474c67f6de83877fc77ffd56722798f11d66d75fe92cb8c269472f9a0ab2b14a88ef514cecc60607fd09be484a63f3ab5c8
-  data.tar.gz: cde24f8b555391062500989f99a0e4186a175dc17e6d866f27470d29f15a6d6c3dc6e4a9b39de090b25eb4de2d92f3202a45ab5afd3a580248aa7c7c22ffe04b
+  metadata.gz: 60e01772a9bb88140f6fec66ea489ea19d24d515c209ddb98250183c8a7afee3fcdbd17c767ee52dc1eb81b53afc5002f8c7b36cd01329a8ad863b119a139753
+  data.tar.gz: b8e5157309140b6c767a34adf1f2d700fad690dd373638cb108cc6969873dc1e8b600c5f37a59b1080c3d835d1484b218c2169f2f4c952d0c1e0bc2d9ebeb61c

data/CHANGELOG.ja.rdoc

@@ -1,6 +1,20 @@
+=== 1.6.5 / 未リリース
+
+==== 機能
+
+* Slop#respond_to_missing? を実装 (#1176)
+* Optimized the XPath query generated by an `an+b` CSS query.
+
+
+==== バグ修正
+
+* Capture non-parse errors from Document#dup in Document#errors. (#1196)
+* (JRuby) Document#canonicalize parameters are now consistent with MRI. (#1189)
+
+
 === 1.6.4.1 / 2014年11月5日
 
-==== Bug fixes
+==== バグ修正
 
 * (MRI) 渡したCFLAGSが反映されないバグを修正 (#1188)
 * CSSセレクタの :nth(n) が動かなかったのを修正 (#1187)

data/CHANGELOG.rdoc

@@ -1,3 +1,17 @@
+=== 1.6.5 / unreleased
+
+==== Features
+
+* Implement Slop#respond_to_missing?. (#1176)
+* Optimized the XPath query generated by an `an+b` CSS query.
+
+
+==== Bug fixes
+
+* Capture non-parse errors from Document#dup in Document#errors. (#1196)
+* (JRuby) Document#canonicalize parameters are now consistent with MRI. (#1189)
+
+
 === 1.6.4.1 / 2014-11-05
 
 ==== Bug fixes

data/ext/java/nokogiri/XmlDocument.java

@@ -586,7 +586,10 @@ public class XmlDocument extends XmlNode {
                 throw context.getRuntime().newTypeError("Expected array");
             }
             if (!args[1].isNil()) {
-                inclusive_namespace = (String)((RubyArray)args[1]).get(0);
+              inclusive_namespace = (String)((RubyArray)args[1])
+                .join(context, context.getRuntime().newString(" "))
+                .asString()
+                .asJavaString(); // OMG I wish I knew JRuby better, this is ugly
             }
         }
         if (args.length > 2) {

data/ext/nokogiri/xml_document.c

@@ -317,21 +317,29 @@ static VALUE read_memory( VALUE klass,
  * Copy this Document.  An optional depth may be passed in, but it defaults
  * to a deep copy.  0 is a shallow copy, 1 is a deep copy.
  */
-static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
+static VALUE duplicate_document(int argc, VALUE *argv, VALUE self)
 {
   xmlDocPtr doc, dup;
+  VALUE copy;
   VALUE level;
+  VALUE error_list      = rb_ary_new();
 
   if(rb_scan_args(argc, argv, "01", &level) == 0)
     level = INT2NUM((long)1);
 
   Data_Get_Struct(self, xmlDoc, doc);
 
+  xmlResetLastError();
+  xmlSetStructuredErrorFunc((void *)error_list, Nokogiri_error_array_pusher);
   dup = xmlCopyDoc(doc, (int)NUM2INT(level));
+  xmlSetStructuredErrorFunc(NULL, NULL);
+
   if(dup == NULL) return Qnil;
 
   dup->type = doc->type;
-  return Nokogiri_wrap_xml_document(rb_obj_class(self), dup);
+  copy = Nokogiri_wrap_xml_document(rb_obj_class(self), dup);
+  rb_iv_set(copy, "@errors", error_list);
+  return copy ;
 }
 
 /*
@@ -566,7 +574,7 @@ void init_xml_document()
   rb_define_method(klass, "encoding=", set_encoding, 1);
   rb_define_method(klass, "version", version, 0);
   rb_define_method(klass, "canonicalize", canonicalize, -1);
-  rb_define_method(klass, "dup", duplicate_node, -1);
+  rb_define_method(klass, "dup", duplicate_document, -1);
   rb_define_method(klass, "url", url, 0);
   rb_define_method(klass, "create_entity", create_entity, -1);
   rb_define_method(klass, "remove_namespaces!", remove_namespaces_bang, 0);

data/lib/nokogiri/css/xpath_visitor.rb

@@ -183,11 +183,15 @@ module Nokogiri
           options[:last] ? "(last()-position()+1)" : "position()"
         end
 
-        if (b == 0)
-          return "(#{position} mod #{a}) = 0"
+        if b.zero?
+          "(#{position} mod #{a}) = 0"
         else
-          compare = (a < 0) ? "<=" : ">="
-          return "(#{position} #{compare} #{b}) and (((#{position}-#{b}) mod #{a.abs}) = 0)"
+          compare = a < 0 ? "<=" : ">="
+          if a.abs == 1
+            "#{position} #{compare} #{b}"
+          else
+            "(#{position} #{compare} #{b}) and (((#{position}-#{b}) mod #{a.abs}) = 0)"
+          end
         end
       end
 

data/lib/nokogiri/decorators/slop.rb

@@ -30,6 +30,14 @@ module Nokogiri
         super if list.empty?
         list.length == 1 ? list.first : list
       end
+
+      def respond_to_missing? name, include_private = false
+        prefix = implied_xpath_context
+
+        list = xpath("#{prefix}#{name.to_s.sub(/^_/, '')}")
+
+        !list.empty?
+      end
     end
   end
 end

data/lib/nokogiri/version.rb

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

data/test/css/test_parser.rb

@@ -193,20 +193,20 @@ module Nokogiri
         assert_xpath '//a[(position() mod 2) = 0]', @parser.parse('a:nth-of-type(even)')
         assert_xpath '//a[(position() >= 1) and (((position()-1) mod 2) = 0)]', @parser.parse('a:nth-of-type(odd)')
         assert_xpath '//a[(position() >= 3) and (((position()-3) mod 4) = 0)]', @parser.parse('a:nth-of-type(4n+3)')
-        assert_xpath '//a[(position() <= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(-1n+3)')
-        assert_xpath '//a[(position() <= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(-n+3)')
-        assert_xpath '//a[(position() >= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(1n+3)')
-        assert_xpath '//a[(position() >= 3) and (((position()-3) mod 1) = 0)]', @parser.parse('a:nth-of-type(n+3)')
+        assert_xpath '//a[position() <= 3]', @parser.parse('a:nth-of-type(-1n+3)')
+        assert_xpath '//a[position() <= 3]', @parser.parse('a:nth-of-type(-n+3)')
+        assert_xpath '//a[position() >= 3]', @parser.parse('a:nth-of-type(1n+3)')
+        assert_xpath '//a[position() >= 3]', @parser.parse('a:nth-of-type(n+3)')
 
         assert_xpath '//a[((last()-position()+1) mod 2) = 0]', @parser.parse('a:nth-last-of-type(2n)')
         assert_xpath '//a[((last()-position()+1) >= 1) and ((((last()-position()+1)-1) mod 2) = 0)]', @parser.parse('a:nth-last-of-type(2n+1)')
         assert_xpath '//a[((last()-position()+1) mod 2) = 0]', @parser.parse('a:nth-last-of-type(even)')
         assert_xpath '//a[((last()-position()+1) >= 1) and ((((last()-position()+1)-1) mod 2) = 0)]', @parser.parse('a:nth-last-of-type(odd)')
         assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 4) = 0)]', @parser.parse('a:nth-last-of-type(4n+3)')
-        assert_xpath '//a[((last()-position()+1) <= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(-1n+3)')
-        assert_xpath '//a[((last()-position()+1) <= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(-n+3)')
-        assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(1n+3)')
-        assert_xpath '//a[((last()-position()+1) >= 3) and ((((last()-position()+1)-3) mod 1) = 0)]', @parser.parse('a:nth-last-of-type(n+3)')
+        assert_xpath '//a[(last()-position()+1) <= 3]', @parser.parse('a:nth-last-of-type(-1n+3)')
+        assert_xpath '//a[(last()-position()+1) <= 3]', @parser.parse('a:nth-last-of-type(-n+3)')
+        assert_xpath '//a[(last()-position()+1) >= 3]', @parser.parse('a:nth-last-of-type(1n+3)')
+        assert_xpath '//a[(last()-position()+1) >= 3]', @parser.parse('a:nth-last-of-type(n+3)')
       end
 
       def test_preceding_selector

data/test/decorators/test_slop.rb

@@ -9,8 +9,12 @@ module Nokogiri
           <description>this is the foo thing</description>
         </item>
       eoxml
-      assert doc.item.title
-      assert doc.item._description, 'should have description'
+      assert doc.item.respond_to?(:title)
+      assert_equal 'foo', doc.item.title.text
+      assert doc.item.respond_to?(:_description), 'should have description'
+      assert 'this is the foo thing', doc.item._description.text
+      assert !doc.item.respond_to?(:foo)
+      assert_raise(NoMethodError) { doc.item.foo }
     end
   end
 end

data/test/helper.rb

@@ -47,6 +47,19 @@ module Nokogiri
       end
     end
 
+    def stress_memory_while &block
+      # force the test to explicitly declare a skip
+      raise "JRuby doesn't do GC" if Nokogiri.jruby?
+
+      old_stress = GC.stress
+      begin
+        GC.stress = true
+        yield
+      ensure
+        GC.stress = old_stress
+      end
+    end
+
     def assert_indent amount, doc, message = nil
       nodes = []
       doc.traverse do |node|

data/test/html/test_document.rb

@@ -452,8 +452,7 @@ eohtml
       end
       
       def test_content_size
-        html = Nokogiri::HTML('<div>
-</div>')
+        html = Nokogiri::HTML("<div>\n</div>")
         assert_equal 1, html.content.size
         assert_equal 1, html.content.split("").size
         assert_equal "\n", html.content
@@ -520,7 +519,7 @@ eohtml
       end
 
       def test_inner_html
-        html = Nokogiri::HTML(<<-eohtml)
+        html = Nokogiri::HTML <<-EOHTML
         <html>
           <body>
             <div>
@@ -530,9 +529,9 @@ eohtml
             </div>
           </body>
         </html>
-        eohtml
-        node = html.xpath('//div').first
-        assert_equal('<p>Helloworld!</p>', node.inner_html.gsub(/\s/, ''))
+        EOHTML
+        node = html.xpath("//div").first
+        assert_equal("<p>Helloworld!</p>", node.inner_html.gsub(%r{\s}, ""))
       end
 
       def test_round_trip
@@ -613,6 +612,15 @@ eohtml
         assert_equal "", Nokogiri::HTML.parse(nil).text
         assert_equal "", Nokogiri::HTML.parse("").text
       end
+
+      def test_capturing_nonparse_errors_during_clone
+        # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
+        original = Nokogiri::HTML.parse("<div id='unique'></div><div id='unique'></div>")
+        original_errors = original.errors
+
+        copy = original.dup
+        assert_equal original_errors, copy.errors
+      end
     end
   end
 end

data/test/xml/test_c14n.rb

@@ -104,46 +104,65 @@ module Nokogiri
       def test_c14n_modes
         # http://www.w3.org/TR/xml-exc-c14n/#sec-Enveloping
         
-        doc1 = Nokogiri.XML <<-eoxml
+        doc1 = Nokogiri.XML <<-EOXML
 <n0:local xmlns:n0="http://foobar.org" xmlns:n3="ftp://example.org">
   <n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
     <n3:stuff xmlns:n3="ftp://example.org"/>
   </n1:elem2>
 </n0:local>        
-        eoxml
-        doc2 = Nokogiri.XML <<-eoxml
+        EOXML
+
+        doc2 = Nokogiri.XML <<-EOXML
 <n2:pdu xmlns:n1="http://example.com"
            xmlns:n2="http://foo.example"
+           xmlns:n4="http://foo.example"
            xml:lang="fr"
            xml:space="retain">
   <n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
     <n3:stuff xmlns:n3="ftp://example.org"/>
+    <n4:stuff />
   </n1:elem2>
 </n2:pdu>        
-        eoxml
+        EOXML
 
         c14n = doc1.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize
         assert_equal '<n1:elem2 xmlns:n0="http://foobar.org" xmlns:n1="http://example.net" xmlns:n3="ftp://example.org" xml:lang="en">
     <n3:stuff></n3:stuff>
   </n1:elem2>', c14n
-        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize
-        assert_equal '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xml:lang="en" xml:space="retain">
+
+        expected = '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xmlns:n4="http://foo.example" xml:lang="en" xml:space="retain">
     <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
-  </n1:elem2>', c14n
+    <n4:stuff></n4:stuff>
+  </n1:elem2>'
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize
+        assert_equal expected, c14n
 
-        excl_c14n = '<n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
+        expected = '<n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
     <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
   </n1:elem2>'
         c14n = doc1.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0)
-        assert_equal excl_c14n, c14n
+        assert_equal expected, c14n
+
+        expected = '<n1:elem2 xmlns:n1="http://example.net" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
+    <n4:stuff xmlns:n4="http://foo.example"></n4:stuff>
+  </n1:elem2>'
         c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0)
-        assert_equal excl_c14n, c14n
+        assert_equal expected, c14n
 
-        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0, ['n2'])
-        assert_equal '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xml:lang="en">
+        expected = '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xml:lang="en">
     <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
-  </n1:elem2>', c14n
+    <n4:stuff xmlns:n4="http://foo.example"></n4:stuff>
+  </n1:elem2>'
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0, ['n2'])
+        assert_equal expected, c14n
 
+        expected = '<n1:elem2 xmlns:n1="http://example.net" xmlns:n2="http://foo.example" xmlns:n4="http://foo.example" xml:lang="en">
+    <n3:stuff xmlns:n3="ftp://example.org"></n3:stuff>
+    <n4:stuff></n4:stuff>
+  </n1:elem2>'
+        c14n = doc2.at_xpath('//n1:elem2', {'n1' => 'http://example.net'}).canonicalize(XML::XML_C14N_EXCLUSIVE_1_0, ['n2', 'n4'])
+        assert_equal expected, c14n
       end
 
       def test_wrong_params

data/test/xml/test_node_attributes.rb

@@ -100,12 +100,8 @@ module Nokogiri
         text = Nokogiri::XML::Text.new 'bar', document
         attribute.add_child(text)
 
-        begin
-          gc_previous = GC.stress
-          GC.stress = true
+        stress_memory_while do
           node['visible'] = 'attr'
-        ensure
-          GC.stress = gc_previous
         end
       end
     end

data/test/xml/test_reader_encoding.rb

@@ -123,17 +123,11 @@ module Nokogiri
 
         def test_value_lookup_segfault
           skip("JRuby doesn't do GC.") if Nokogiri.jruby?
-          old_stress = GC.stress
-
-          begin
-            GC.stress = true
-
+          stress_memory_while do
             while node = @reader.read
               nodes = node.send(:attr_nodes)
               nodes.first.name if nodes.first
             end
-          ensure
-            GC.stress = old_stress
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.4.1
+  version: 1.6.5
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc