nokogiri 1.4.1 → 1.4.2

data/test/xml/test_node_set.rb

@@ -459,6 +459,15 @@ module Nokogiri
         assert_equal employees.length, employees[0, employees.length].length
       end
 
+      def test_slice_waaaaaay_off_the_end
+        xml = Nokogiri::XML::Builder.new {
+          root { 100.times { div } }
+        }.doc
+        nodes = xml.css "div"
+        assert_equal 1, nodes.slice(99,  100_000).length
+        assert_equal 0, nodes.slice(100, 100_000).length
+      end
+
       def test_array_slice_with_start_and_end
         employees = @xml.search("//employee")
         assert_equal [employees[1], employees[2], employees[3]], employees[1,3].to_a
@@ -577,6 +586,64 @@ module Nokogiri
 
         assert_equal children, children.reverse.reverse
       end
+
+      def test_node_set_dup_result_has_document_and_is_decorated
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        node_set = @xml.css("address")
+        new_set  = node_set.dup
+        assert_equal node_set.document, new_set.document
+        assert new_set.respond_to?(:awesome!)
+      end
+
+      def test_node_set_union_result_has_document_and_is_decorated
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        node_set1 = @xml.css("address")
+        node_set2 = @xml.css("address")
+        new_set  = node_set1 | node_set2
+        assert_equal node_set1.document, new_set.document
+        assert new_set.respond_to?(:awesome!)
+      end
+
+      def test_node_set_intersection_result_has_document_and_is_decorated
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        node_set1 = @xml.css("address")
+        node_set2 = @xml.css("address")
+        new_set  = node_set1 & node_set2
+        assert_equal node_set1.document, new_set.document
+        assert new_set.respond_to?(:awesome!)
+      end
+
+      def test_node_set_difference_result_has_document_and_is_decorated
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        node_set1 = @xml.css("address")
+        node_set2 = @xml.css("address")
+        new_set  = node_set1 - node_set2
+        assert_equal node_set1.document, new_set.document
+        assert new_set.respond_to?(:awesome!)
+      end
+
+      def test_node_set_slice_result_has_document_and_is_decorated
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        node_set = @xml.css("address")
+        new_set  = node_set[0..-1]
+        assert_equal node_set.document, new_set.document
+        assert new_set.respond_to?(:awesome!)
+      end
     end
   end
 end

data/test/xml/test_text.rb

@@ -25,6 +25,14 @@ module Nokogiri
         node = Nokogiri::XML::Element.new('foo', doc)
         text = Text.new('hello world', node)
       end
+
+      def test_content=
+        node = Text.new('foo', Document.new)
+        assert_equal('foo', node.content)
+        node.content = '& <foo> &amp;'
+        assert_equal('& <foo> &amp;', node.content)
+        assert_equal('&amp; &lt;foo&gt; &amp;amp;', node.to_xml)
+      end
     end
   end
 end

data/test/xml/test_xpath.rb

@@ -27,9 +27,30 @@ module Nokogiri
           def my_filter set, attribute, value
             set.find_all { |x| x[attribute] == value }
           end
+
+          def saves_node_set node_set
+            @things = node_set
+          end
         }.new
       end
 
+      def test_unknown_attribute
+        assert_equal 0, @xml.xpath('//employee[@id="asdfasdf"]/@fooo').length
+        assert_nil @xml.xpath('//employee[@id="asdfasdf"]/@fooo')[0]
+      end
+
+      def test_boolean
+        assert_equal false, @xml.xpath('1 = 2')
+      end
+
+      def test_number
+        assert_equal 2, @xml.xpath('1 + 1')
+      end
+
+      def test_string
+        assert_equal 'foo', @xml.xpath('concat("fo", "o")')
+      end
+
       def test_css_search_uses_custom_selectors_with_arguments
         set = @xml.css('employee > address:my_filter("domestic", "Yes")', @handler)
         assert set.length > 0
@@ -95,6 +116,17 @@ module Nokogiri
         assert_equal(set.to_a, @handler.things.flatten)
       end
 
+      def test_custom_xpath_handler_is_passed_a_decorated_node_set
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+        set = @xml.xpath('//employee/name')
+        @xml.xpath('//employee[saves_node_set(name)]', @handler)
+        assert_equal @xml, @handler.things.document
+        assert @handler.things.respond_to?(:awesome!)
+      end
+
       def test_code_that_invokes_OP_RESET_inside_libxml2
         doc = "<html><body id='foo'><foo>hi</foo></body></html>"
         xpath = 'id("foo")//foo'

metadata

@@ -1,79 +1,101 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Aaron Patterson
 - Mike Dalessio
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMQ8wDQYDVQQDDAZhYXJv
-  bnAxGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZFgNv
-  cmcwHhcNMDkxMTA1MDAwNDQ4WhcNMTAxMTA1MDAwNDQ4WjBBMQ8wDQYDVQQDDAZh
-  YXJvbnAxGTAXBgoJkiaJk/IsZAEZFglydWJ5Zm9yZ2UxEzARBgoJkiaJk/IsZAEZ
-  FgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNSD14Gb2mCX/5
-  fE85uW/jT7fcYI8XolrzdpzfvxD3y+Pt/yA5eciBiE+hNAWU2PM1ZMOq4MOV9EqR
-  hYzupp/zFoC7ZZ3PF8nJBFKgfKNf0sp9o3XCUviaZjoSYNIvGQocrakQo+h3x3Od
-  NqZWtVsLz9P/G1foUBpc95gGGBodbj/CZVc32F+xVvmejqe3RaMLGI70ZOuTcsRi
-  t8V4T7okmUbLi6VmPYlH/9mKvU7ObRHXMYNhkkife5phh8vjsiCd8Q397+jFaL0f
-  Cd23idNV7lbvdjIuYLV+9u5cPkDjANLAnGRaRS1x2SEfH/8g0Te6/jeKfzBH83D0
-  5v5HTx+HAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBTs3LnPhoi2m7BTf9tHvNQYsOG7aTANBgkqhkiG9w0BAQUFAAOCAQEAVH7G+nSf
-  WMPz7Iwcnd+WrWWq/mr5ke0qQoiz4tk0h7bsa3fEnUDBiMfmQhv/uBzA4Gkw9zxB
-  IfKljsZq0yE+du/1u2Mph7dMIg2oiwMurpduPpx9sfaqsqSBBOzggxiUEmHDNrPT
-  uTzaid0gdOx/TacZ4RwrEnx6XNkhxC2YaTH2Y68hoJzSzRGtdU2Kk6mT4YraCP+u
-  ETP5hCJAiB5l4jC8U6wwvKQDHTMoaUu3eu/txe1PDjoe3GICzs/e6bzYBWYmKu7J
-  5YM3l5J4rDvIPAGH4VRr5nSs+qbZh+kCdE1khvTxH51xkR3qAfEEogAd2VlnjELM
-  f9Gw8x3RwgLvkA==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2009-12-10 00:00:00 -08:00
+date: 2010-05-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: racc
+  name: rubyforge
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: racc
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rexical
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: minitest
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id006
 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\
@@ -91,6 +113,38 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.ja.rdoc
 - README.rdoc
+- ext/nokogiri/html_document.c
+- ext/nokogiri/html_element_description.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_attr.c
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/xml_cdata.c
+- ext/nokogiri/xml_comment.c
+- ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_document_fragment.c
+- ext/nokogiri/xml_dtd.c
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_encoding_handler.c
+- ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_namespace.c
+- ext/nokogiri/xml_node.c
+- ext/nokogiri/xml_node_set.c
+- ext/nokogiri/xml_processing_instruction.c
+- ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_relax_ng.c
+- ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_sax_push_parser.c
+- ext/nokogiri/xml_schema.c
+- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xslt_stylesheet.c
 files: 
 - .autotest
 - CHANGELOG.ja.rdoc
@@ -162,8 +216,6 @@ files:
 - ext/nokogiri/xml_syntax_error.h
 - ext/nokogiri/xml_text.c
 - ext/nokogiri/xml_text.h
-- ext/nokogiri/xml_xpath.c
-- ext/nokogiri/xml_xpath.h
 - ext/nokogiri/xml_xpath_context.c
 - ext/nokogiri/xml_xpath_context.h
 - ext/nokogiri/xslt_stylesheet.c
@@ -216,6 +268,7 @@ files:
 - lib/nokogiri/ffi/structs/xml_xpath_object.rb
 - lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb
 - lib/nokogiri/ffi/structs/xslt_stylesheet.rb
+- lib/nokogiri/ffi/weak_bucket.rb
 - lib/nokogiri/ffi/xml/attr.rb
 - lib/nokogiri/ffi/xml/attribute_decl.rb
 - lib/nokogiri/ffi/xml/cdata.rb
@@ -265,7 +318,6 @@ files:
 - lib/nokogiri/xml/element_content.rb
 - lib/nokogiri/xml/element_decl.rb
 - lib/nokogiri/xml/entity_decl.rb
-- lib/nokogiri/xml/fragment_handler.rb
 - lib/nokogiri/xml/namespace.rb
 - lib/nokogiri/xml/node.rb
 - lib/nokogiri/xml/node/save_options.rb
@@ -285,12 +337,14 @@ files:
 - lib/nokogiri/xml/sax/push_parser.rb
 - lib/nokogiri/xml/schema.rb
 - lib/nokogiri/xml/syntax_error.rb
+- lib/nokogiri/xml/text.rb
 - lib/nokogiri/xml/xpath.rb
 - lib/nokogiri/xml/xpath/syntax_error.rb
 - lib/nokogiri/xml/xpath_context.rb
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
 - lib/xsd/xmlparser/nokogiri.rb
+- tasks/cross_compile.rb
 - tasks/test.rb
 - test/css/test_nthiness.rb
 - test/css/test_parser.rb
@@ -378,23 +432,24 @@ rdoc_options:
 - README.rdoc
 require_paths: 
 - lib
-- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"

data/ext/nokogiri/xml_xpath.c

@@ -1,53 +0,0 @@
-#include <xml_xpath.h>
-
-static void deallocate(xmlXPathObjectPtr xpath)
-{
-  NOKOGIRI_DEBUG_START(xpath);
-  xmlXPathFreeNodeSetList(xpath); // despite the name, this frees the xpath but not the contained node set
-  NOKOGIRI_DEBUG_END(xpath);
-}
-
-VALUE Nokogiri_wrap_xml_xpath(xmlXPathObjectPtr xpath)
-{
-  return Data_Wrap_Struct(cNokogiriXmlXpath, 0, deallocate, xpath);
-}
-
-/*
- * call-seq:
- *  node_set
- *
- * Fetch the node set associated with this xpath context.
- */
-static VALUE node_set(VALUE self)
-{
-  xmlXPathObjectPtr xpath;
-  Data_Get_Struct(self, xmlXPathObject, xpath);
-
-  VALUE node_set = Qnil;
-
-  if (xpath->nodesetval)
-    node_set = Nokogiri_wrap_xml_node_set(xpath->nodesetval);
-
-  if(NIL_P(node_set))
-    node_set = Nokogiri_wrap_xml_node_set(xmlXPathNodeSetCreate(NULL));
-
-  rb_funcall(node_set, rb_intern("document="), 1, rb_iv_get(self, "@document"));
-
-  return node_set;
-}
-
-VALUE cNokogiriXmlXpath;
-void init_xml_xpath(void)
-{
-  VALUE module = rb_define_module("Nokogiri");
-  VALUE xml = rb_define_module_under(module, "XML");
-
-  /*
-   * This class wraps an XPath object and should only be instantiated from
-   * XPathContext.
-   */
-  VALUE klass = rb_define_class_under(xml, "XPath", rb_cObject);
-
-  cNokogiriXmlXpath = klass;
-  rb_define_method(klass, "node_set", node_set, 0);
-}

data/ext/nokogiri/xml_xpath.h

@@ -1,11 +0,0 @@
-#ifndef NOKOGIRI_XML_XPATH
-#define NOKOGIRI_XML_XPATH
-
-#include <nokogiri.h>
-
-void init_xml_xpath();
-VALUE Nokogiri_wrap_xml_xpath(xmlXPathObjectPtr xpath);
-
-extern VALUE cNokogiriXmlXpath;
-#endif
-