nokogiri 1.3.3-x86-mingw32 → 1.4.0-x86-mingw32

data/test/xml/test_node_encoding.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_node_set.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -6,6 +6,79 @@ module Nokogiri
       def setup
         super
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
+        @list = @xml.css('employee')
+      end
+
+      def test_remove_attr
+        @list.each { |x| x['class'] = 'blah' }
+        assert_equal @list, @list.remove_attr('class')
+        @list.each { |x| assert_nil x['class'] }
+      end
+
+      def test_add_class
+        assert_equal @list, @list.add_class('bar')
+        @list.each { |x| assert_equal 'bar', x['class'] }
+
+        @list.add_class('bar')
+        @list.each { |x| assert_equal 'bar', x['class'] }
+
+        @list.add_class('baz')
+        @list.each { |x| assert_equal 'bar baz', x['class'] }
+      end
+
+      def test_remove_class_with_no_class
+        assert_equal @list, @list.remove_class('bar')
+        @list.each { |e| assert_nil e['class'] }
+
+        @list.each { |e| e['class'] = '' }
+        assert_equal @list, @list.remove_class('bar')
+        @list.each { |e| assert_nil e['class'] }
+      end
+
+      def test_remove_class_single
+        @list.each { |e| e['class'] = 'foo bar' }
+
+        assert_equal @list, @list.remove_class('bar')
+        @list.each { |e| assert_equal 'foo', e['class'] }
+      end
+
+      def test_remove_class_completely
+        @list.each { |e| e['class'] = 'foo' }
+
+        assert_equal @list, @list.remove_class
+        @list.each { |e| assert_nil e['class'] }
+      end
+
+      def test_attribute_set
+        @list.each { |e| assert_nil e['foo'] }
+
+        [ ['attribute', 'bar'], ['attr', 'biz'], ['set', 'baz'] ].each do |t|
+          @list.send(t.first.to_sym, 'foo', t.last)
+          @list.each { |e| assert_equal t.last, e['foo'] }
+        end
+      end
+
+      def test_attribute_set_with_block
+        @list.each { |e| assert_nil e['foo'] }
+
+        [ ['attribute', 'bar'], ['attr', 'biz'], ['set', 'baz'] ].each do |t|
+          @list.send(t.first.to_sym, 'foo') { |x| t.last }
+          @list.each { |e| assert_equal t.last, e['foo'] }
+        end
+      end
+
+      def test_attribute_set_with_hash
+        @list.each { |e| assert_nil e['foo'] }
+
+        [ ['attribute', 'bar'], ['attr', 'biz'], ['set', 'baz'] ].each do |t|
+          @list.send(t.first.to_sym, 'foo' => t.last)
+          @list.each { |e| assert_equal t.last, e['foo'] }
+        end
+      end
+
+      def test_attribute_no_args
+        @list.first['foo'] = 'bar'
+        assert_equal @list.first.attribute('foo'), @list.attribute('foo')
       end
 
       def test_search_empty_node_set
@@ -15,6 +88,39 @@ module Nokogiri
         assert_equal 0, set.search('foo').length
       end
 
+      def test_xpath_with_custom_object
+        set = @xml.xpath('//staff')
+        custom_employees = set.xpath('//*[awesome(.)]', Class.new {
+          def awesome ns
+            ns.select { |n| n.name == 'employee' }
+          end
+        }.new)
+
+        assert_equal @xml.xpath('//employee'), custom_employees
+      end
+
+      def test_css_with_custom_object
+        set = @xml.xpath('//staff')
+        custom_employees = set.css('*:awesome', Class.new {
+          def awesome ns
+            ns.select { |n| n.name == 'employee' }
+          end
+        }.new)
+
+        assert_equal @xml.xpath('//employee'), custom_employees
+      end
+
+      def test_search_with_custom_object
+        set = @xml.xpath('//staff')
+        custom_employees = set.search('//*[awesome(.)]', Class.new {
+          def awesome ns
+            ns.select { |n| n.name == 'employee' }
+          end
+        }.new)
+
+        assert_equal @xml.xpath('//employee'), custom_employees
+      end
+
       def test_css_searches_match_self
         html = Nokogiri::HTML("<html><body><div class='a'></div></body></html>")
         set = html.xpath("/html/body/div")
@@ -148,7 +254,7 @@ module Nokogiri
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set.at(0)
       end
-      
+
       def test_percent
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set % 0
@@ -284,6 +390,14 @@ module Nokogiri
         assert_equal 'employee', @xml.search("//wrapper").first.children[0].name
       end
 
+      def test_wrap_preserves_document_structure
+        assert_equal "employeeId",
+                     @xml.at_xpath("//employee").children.detect{|j| ! j.text? }.name
+        @xml.xpath("//employeeId[text()='EMP0001']").wrap("<wrapper/>")
+        assert_equal "wrapper",
+                     @xml.at_xpath("//employee").children.detect{|j| ! j.text? }.name
+      end
+
       def test_plus_operator
         names = @xml.search("name")
         positions = @xml.search("position")
@@ -302,6 +416,12 @@ module Nokogiri
         assert_equal result.length, names.length
       end
 
+      def test_union
+        names = @xml.search("name")
+
+        assert_equal(names.length, (names | @xml.search("name")).length)
+      end
+
       def test_minus_operator
         employees = @xml.search("//employee")
         females = @xml.search("//employee[gender[text()='Female']]")
@@ -328,6 +448,12 @@ module Nokogiri
         assert_nil employees.index(other)
       end
 
+      def test_slice_too_far
+        employees = @xml.search("//employee")
+        assert_equal employees.length, employees[0, employees.length + 1].length
+        assert_equal employees.length, employees[0, employees.length].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
@@ -392,6 +518,14 @@ module Nokogiri
         assert_equal count, set.length
       end
 
+      def test_inspect
+        employees = @xml.search("//employee")
+        inspected = employees.inspect
+
+        assert_equal "[#{employees.map { |x| x.inspect }.join(', ')}]",
+          inspected
+      end
+
     end
   end
 end

data/test/xml/test_parse_options.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_processing_instruction.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_reader_encoding.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_relax_ng.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_schema.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_syntax_error.rb

@@ -0,0 +1,27 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestSyntaxError < Nokogiri::TestCase
+      def test_new
+        error = Nokogiri::XML::SyntaxError.new 'hello'
+        assert_equal 'hello', error.message
+      end
+
+      def test_exception
+        error = Nokogiri::XML::SyntaxError.new 'hello'
+        dup = error.exception 'world'
+        assert_equal 'hello', dup.message
+        assert_not_equal error.message.object_id, dup.message.object_id
+      end
+
+      def test_initialize_copy
+        error = Nokogiri::XML::SyntaxError.new 'hello'
+        dup = error.dup
+        assert_equal 'hello', dup.message
+        assert_not_equal error.object_id, dup.object_id
+        assert_not_equal error.message.object_id, dup.message.object_id
+      end
+    end
+  end
+end

data/test/xml/test_text.rb

@@ -1,8 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestText < Nokogiri::TestCase
+      def test_inspect
+        node = Text.new('hello world', Document.new)
+        assert_equal "#<#{node.class.name}:#{sprintf("0x%x",node.object_id)} #{node.text.inspect}>", node.inspect
+      end
+
       def test_new
         node = Text.new('hello world', Document.new)
         assert node
@@ -13,6 +18,13 @@ module Nokogiri
       def test_lots_of_text
         100.times { Text.new('hello world', Document.new) }
       end
+
+      # No assertion because this was a segv
+      def test_new_without_document
+        doc = Document.new
+        node = Nokogiri::XML::Element.new('foo', doc)
+        text = Text.new('hello world', node)
+      end
     end
   end
 end

data/test/xml/test_unparented_node.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 require 'stringio'
 

data/test/xml/test_xpath.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.3.3
+  version: 1.4.0
 platform: x86-mingw32
 authors: 
 - Aaron Patterson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-06 00:00:00 -07:00
+date: 2009-10-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,12 +86,14 @@ files:
 - ext/nokogiri/html_element_description.h
 - ext/nokogiri/html_entity_lookup.c
 - ext/nokogiri/html_entity_lookup.h
-- ext/nokogiri/html_sax_parser.c
-- ext/nokogiri/html_sax_parser.h
+- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/html_sax_parser_context.h
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
 - ext/nokogiri/xml_attr.c
 - ext/nokogiri/xml_attr.h
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/xml_attribute_decl.h
 - ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_cdata.h
 - ext/nokogiri/xml_comment.c
@@ -102,6 +104,12 @@ files:
 - ext/nokogiri/xml_document_fragment.h
 - ext/nokogiri/xml_dtd.c
 - ext/nokogiri/xml_dtd.h
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_element_content.h
+- ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_element_decl.h
+- ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/xml_entity_decl.h
 - ext/nokogiri/xml_entity_reference.c
 - ext/nokogiri/xml_entity_reference.h
 - ext/nokogiri/xml_io.c
@@ -120,6 +128,8 @@ files:
 - ext/nokogiri/xml_relax_ng.h
 - ext/nokogiri/xml_sax_parser.c
 - ext/nokogiri/xml_sax_parser.h
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_sax_parser_context.h
 - ext/nokogiri/xml_sax_push_parser.c
 - ext/nokogiri/xml_sax_push_parser.h
 - ext/nokogiri/xml_schema.c
@@ -134,7 +144,6 @@ files:
 - ext/nokogiri/xml_xpath_context.h
 - ext/nokogiri/xslt_stylesheet.c
 - ext/nokogiri/xslt_stylesheet.h
-- lib/action-nokogiri.rb
 - lib/nokogiri.rb
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/generated_parser.rb
@@ -146,16 +155,11 @@ files:
 - lib/nokogiri/css/tokenizer.rb
 - lib/nokogiri/css/tokenizer.rex
 - lib/nokogiri/css/xpath_visitor.rb
-- lib/nokogiri/decorators.rb
-- lib/nokogiri/decorators/hpricot.rb
-- lib/nokogiri/decorators/hpricot/node.rb
-- lib/nokogiri/decorators/hpricot/node_set.rb
-- lib/nokogiri/decorators/hpricot/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
 - lib/nokogiri/ffi/html/document.rb
 - lib/nokogiri/ffi/html/element_description.rb
 - lib/nokogiri/ffi/html/entity_lookup.rb
-- lib/nokogiri/ffi/html/sax/parser.rb
+- lib/nokogiri/ffi/html/sax/parser_context.rb
 - lib/nokogiri/ffi/io_callbacks.rb
 - lib/nokogiri/ffi/libxml.rb
 - lib/nokogiri/ffi/structs/common_node.rb
@@ -163,13 +167,19 @@ files:
 - lib/nokogiri/ffi/structs/html_entity_desc.rb
 - lib/nokogiri/ffi/structs/xml_alloc.rb
 - lib/nokogiri/ffi/structs/xml_attr.rb
+- lib/nokogiri/ffi/structs/xml_attribute.rb
 - lib/nokogiri/ffi/structs/xml_buffer.rb
 - lib/nokogiri/ffi/structs/xml_document.rb
 - lib/nokogiri/ffi/structs/xml_dtd.rb
+- lib/nokogiri/ffi/structs/xml_element.rb
+- lib/nokogiri/ffi/structs/xml_element_content.rb
+- lib/nokogiri/ffi/structs/xml_entity.rb
+- lib/nokogiri/ffi/structs/xml_enumeration.rb
 - lib/nokogiri/ffi/structs/xml_node.rb
 - lib/nokogiri/ffi/structs/xml_node_set.rb
 - lib/nokogiri/ffi/structs/xml_notation.rb
 - lib/nokogiri/ffi/structs/xml_ns.rb
+- lib/nokogiri/ffi/structs/xml_parser_context.rb
 - lib/nokogiri/ffi/structs/xml_relax_ng.rb
 - lib/nokogiri/ffi/structs/xml_sax_handler.rb
 - lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb
@@ -181,11 +191,15 @@ files:
 - lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb
 - lib/nokogiri/ffi/structs/xslt_stylesheet.rb
 - lib/nokogiri/ffi/xml/attr.rb
+- lib/nokogiri/ffi/xml/attribute_decl.rb
 - lib/nokogiri/ffi/xml/cdata.rb
 - lib/nokogiri/ffi/xml/comment.rb
 - lib/nokogiri/ffi/xml/document.rb
 - lib/nokogiri/ffi/xml/document_fragment.rb
 - lib/nokogiri/ffi/xml/dtd.rb
+- lib/nokogiri/ffi/xml/element_content.rb
+- lib/nokogiri/ffi/xml/element_decl.rb
+- lib/nokogiri/ffi/xml/entity_decl.rb
 - lib/nokogiri/ffi/xml/entity_reference.rb
 - lib/nokogiri/ffi/xml/namespace.rb
 - lib/nokogiri/ffi/xml/node.rb
@@ -194,6 +208,7 @@ files:
 - lib/nokogiri/ffi/xml/reader.rb
 - lib/nokogiri/ffi/xml/relax_ng.rb
 - lib/nokogiri/ffi/xml/sax/parser.rb
+- lib/nokogiri/ffi/xml/sax/parser_context.rb
 - lib/nokogiri/ffi/xml/sax/push_parser.rb
 - lib/nokogiri/ffi/xml/schema.rb
 - lib/nokogiri/ffi/xml/syntax_error.rb
@@ -201,7 +216,6 @@ files:
 - lib/nokogiri/ffi/xml/xpath.rb
 - lib/nokogiri/ffi/xml/xpath_context.rb
 - lib/nokogiri/ffi/xslt/stylesheet.rb
-- lib/nokogiri/hpricot.rb
 - lib/nokogiri/html.rb
 - lib/nokogiri/html/builder.rb
 - lib/nokogiri/html/document.rb
@@ -209,17 +223,22 @@ files:
 - lib/nokogiri/html/element_description.rb
 - lib/nokogiri/html/entity_lookup.rb
 - lib/nokogiri/html/sax/parser.rb
+- lib/nokogiri/html/sax/parser_context.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
 - lib/nokogiri/version_warning.rb
 - lib/nokogiri/xml.rb
 - lib/nokogiri/xml/attr.rb
+- lib/nokogiri/xml/attribute_decl.rb
 - lib/nokogiri/xml/builder.rb
 - lib/nokogiri/xml/cdata.rb
+- lib/nokogiri/xml/character_data.rb
 - lib/nokogiri/xml/document.rb
 - lib/nokogiri/xml/document_fragment.rb
 - lib/nokogiri/xml/dtd.rb
-- lib/nokogiri/xml/entity_declaration.rb
+- 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
@@ -227,13 +246,16 @@ files:
 - lib/nokogiri/xml/node_set.rb
 - lib/nokogiri/xml/notation.rb
 - lib/nokogiri/xml/parse_options.rb
+- lib/nokogiri/xml/pp.rb
+- lib/nokogiri/xml/pp/character_data.rb
+- lib/nokogiri/xml/pp/node.rb
 - lib/nokogiri/xml/processing_instruction.rb
 - lib/nokogiri/xml/reader.rb
 - lib/nokogiri/xml/relax_ng.rb
 - lib/nokogiri/xml/sax.rb
 - lib/nokogiri/xml/sax/document.rb
-- lib/nokogiri/xml/sax/legacy_handlers.rb
 - lib/nokogiri/xml/sax/parser.rb
+- lib/nokogiri/xml/sax/parser_context.rb
 - lib/nokogiri/xml/sax/push_parser.rb
 - lib/nokogiri/xml/schema.rb
 - lib/nokogiri/xml/syntax_error.rb
@@ -259,31 +281,17 @@ files:
 - test/files/foo/foo.xsd
 - test/files/po.xml
 - test/files/po.xsd
+- test/files/shift_jis.html
 - test/files/shift_jis.xml
 - test/files/snuggles.xml
+- test/files/staff.dtd
 - test/files/staff.xml
 - test/files/staff.xslt
 - test/files/tlm.html
 - test/files/valid_bar.xml
 - test/helper.rb
-- test/hpricot/files/basic.xhtml
-- test/hpricot/files/boingboing.html
-- test/hpricot/files/cy0.html
-- test/hpricot/files/immob.html
-- test/hpricot/files/pace_application.html
-- test/hpricot/files/tenderlove.html
-- test/hpricot/files/uswebgen.html
-- test/hpricot/files/utf8.html
-- test/hpricot/files/week9.html
-- test/hpricot/files/why.xml
-- test/hpricot/load_files.rb
-- test/hpricot/test_alter.rb
-- test/hpricot/test_builder.rb
-- test/hpricot/test_parser.rb
-- test/hpricot/test_paths.rb
-- test/hpricot/test_preserved.rb
-- test/hpricot/test_xml.rb
 - test/html/sax/test_parser.rb
+- test/html/sax/test_parser_context.rb
 - test/html/test_builder.rb
 - test/html/test_document.rb
 - test/html/test_document_encoding.rb
@@ -291,6 +299,7 @@ files:
 - test/html/test_element_description.rb
 - test/html/test_named_characters.rb
 - test/html/test_node.rb
+- test/html/test_node_encoding.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
 - test/test_gc.rb
@@ -301,8 +310,10 @@ files:
 - test/xml/node/test_save_options.rb
 - test/xml/node/test_subclass.rb
 - test/xml/sax/test_parser.rb
+- test/xml/sax/test_parser_context.rb
 - test/xml/sax/test_push_parser.rb
 - test/xml/test_attr.rb
+- test/xml/test_attribute_decl.rb
 - test/xml/test_builder.rb
 - test/xml/test_cdata.rb
 - test/xml/test_comment.rb
@@ -311,6 +322,9 @@ files:
 - test/xml/test_document_fragment.rb
 - test/xml/test_dtd.rb
 - test/xml/test_dtd_encoding.rb
+- test/xml/test_element_content.rb
+- test/xml/test_element_decl.rb
+- test/xml/test_entity_decl.rb
 - test/xml/test_entity_reference.rb
 - test/xml/test_namespace.rb
 - test/xml/test_node.rb
@@ -322,6 +336,7 @@ files:
 - test/xml/test_reader_encoding.rb
 - test/xml/test_relax_ng.rb
 - test/xml/test_schema.rb
+- test/xml/test_syntax_error.rb
 - test/xml/test_text.rb
 - test/xml/test_unparented_node.rb
 - test/xml/test_xpath.rb
@@ -334,7 +349,7 @@ files:
 - ext/nokogiri/libexslt.dll
 - ext/nokogiri/libxslt.dll
 has_rdoc: true
-homepage: http://nokogiri.org/
+homepage: http://nokogiri.org
 licenses: []
 
 post_install_message: 
@@ -366,31 +381,31 @@ summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
 - test/test_nokogiri.rb
 - test/test_convert_xpath.rb
-- test/hpricot/test_xml.rb
-- test/hpricot/test_alter.rb
-- test/hpricot/test_builder.rb
-- test/hpricot/test_paths.rb
-- test/hpricot/test_parser.rb
-- test/hpricot/test_preserved.rb
 - test/test_memory_leak.rb
 - test/html/test_document_fragment.rb
 - test/html/test_named_characters.rb
 - test/html/test_builder.rb
 - test/html/test_node.rb
 - test/html/test_document.rb
+- test/html/test_node_encoding.rb
 - test/html/sax/test_parser.rb
+- test/html/sax/test_parser_context.rb
 - test/html/test_document_encoding.rb
 - test/html/test_element_description.rb
 - test/xml/test_unparented_node.rb
 - test/xml/test_document_fragment.rb
+- test/xml/test_attribute_decl.rb
 - test/xml/test_node_set.rb
+- test/xml/test_element_content.rb
 - test/xml/test_dtd.rb
+- test/xml/test_entity_decl.rb
 - test/xml/test_schema.rb
 - test/xml/test_builder.rb
 - test/xml/test_attr.rb
 - test/xml/test_processing_instruction.rb
 - test/xml/test_text.rb
 - test/xml/test_node_attributes.rb
+- test/xml/test_element_decl.rb
 - test/xml/test_node.rb
 - test/xml/test_reader_encoding.rb
 - test/xml/test_comment.rb
@@ -400,10 +415,12 @@ test_files:
 - test/xml/test_cdata.rb
 - test/xml/test_dtd_encoding.rb
 - test/xml/test_document.rb
+- test/xml/test_syntax_error.rb
 - test/xml/test_node_encoding.rb
 - test/xml/test_relax_ng.rb
 - test/xml/sax/test_push_parser.rb
 - test/xml/sax/test_parser.rb
+- test/xml/sax/test_parser_context.rb
 - test/xml/test_namespace.rb
 - test/xml/test_document_encoding.rb
 - test/xml/test_entity_reference.rb