nokogiri 1.5.0.beta.1 → 1.5.0.beta.2

data/test/xml/test_node_set.rb

@@ -3,6 +3,27 @@ require "helper"
 module Nokogiri
   module XML
     class TestNodeSet < Nokogiri::TestCase
+      class TestNodeSetNamespaces < Nokogiri::TestCase
+        def setup
+          super
+          @xml = Nokogiri.XML('<foo xmlns:n0="http://example.com" />')
+          @list = @xml.xpath('//namespace::*')
+        end
+
+        def test_include?
+          assert @list.include?(@list.first), 'list should have item'
+        end
+
+        def test_push
+          @list.push @list.first
+        end
+
+        def test_delete
+          @list.push @list.first
+          @list.delete @list.first
+        end
+      end
+
       def setup
         super
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
@@ -255,11 +276,26 @@ module Nokogiri
         assert_match '<a>', html
       end
 
+      def test_gt_string_arg
+        assert node_set = @xml.search('//employee')
+        assert_equal node_set.xpath('./employeeId'), (node_set > 'employeeId')
+      end
+
       def test_at
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set.at(0)
       end
 
+      def test_at_xpath
+        assert node_set = @xml.search('//employee')
+        assert_equal node_set.first.first_element_child, node_set.at_xpath('./employeeId')
+      end
+
+      def test_at_css
+        assert node_set = @xml.search('//employee')
+        assert_equal node_set.first.first_element_child, node_set.at_css('employeeId')
+      end
+
       def test_percent
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set % 0
@@ -410,7 +446,7 @@ module Nokogiri
         names_len = names.length
         positions_len = positions.length
 
-        assert_raises(ArgumentError) { result = names + positions.first }
+        assert_raises(ArgumentError) { names + positions.first }
 
         result = names + positions
         assert_equal names_len,                         names.length
@@ -434,7 +470,7 @@ module Nokogiri
         employees_len = employees.length
         females_len = females.length
 
-        assert_raises(ArgumentError) { result = employees - females.first }
+        assert_raises(ArgumentError) { employees - females.first }
 
         result = employees - females
         assert_equal employees_len,                     employees.length

data/test/xml/test_text.rb

@@ -3,6 +3,13 @@ require "helper"
 module Nokogiri
   module XML
     class TestText < Nokogiri::TestCase
+      def test_css_path
+        doc  = Nokogiri.XML "<root> foo <a>something</a> bar bazz </root>"
+        node = doc.root.children[2]
+        assert_instance_of Nokogiri::XML::Text, node
+        assert_equal node, doc.at_css(node.css_path)
+      end
+
       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
@@ -19,11 +26,13 @@ module Nokogiri
         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)
+
+        assert_nothing_raised do
+          Text.new('hello world', node)
+        end
       end
 
       def test_content=

data/test/xml/test_unparented_node.rb

@@ -129,7 +129,7 @@ module Nokogiri
       def test_add_child_in_same_document
         child = @node.css('employee').first
 
-        assert previous_last_child = child.children.last
+        assert child.children.last
         assert new_child = child.children.first
 
         last = child.children.last

data/test/xml/test_xpath.rb

@@ -92,11 +92,13 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        css_set = if Nokogiri.uses_libxml?
-                    @xml.css('employee:thing()', @handler)
-                  else
-                    @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
-                  end
+        assert_nothing_raised do
+          if Nokogiri.uses_libxml?
+            @xml.css('employee:thing()', @handler)
+          else
+            @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
+          end
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
@@ -184,7 +186,9 @@ module Nokogiri
           def awesome! ; end
         end
         util_decorate(@xml, x)
-        set = @xml.xpath('//employee/name')
+
+        assert @xml.xpath('//employee/name')
+
         @xml.xpath('//employee[saves_node_set(name)]', @handler)
         assert_equal @xml, @handler.things.document
         assert @handler.things.respond_to?(:awesome!)
@@ -194,7 +198,7 @@ module Nokogiri
         doc = "<html><body id='foo'><foo>hi</foo></body></html>"
         xpath = 'id("foo")//foo'
         nokogiri = Nokogiri::HTML.parse(doc)
-        tree = nokogiri.xpath(xpath)
+        assert nokogiri.xpath(xpath)
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 62196433
+  hash: 62196439
   prerelease: true
   segments: 
   - 1
   - 5
   - 0
   - beta
-  - 1
-  version: 1.5.0.beta.1
+  - 2
+  version: 1.5.0.beta.2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -04:00
+date: 2010-07-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -146,6 +146,7 @@ extra_rdoc_files:
 - ext/nokogiri/xml_entity_decl.c
 - ext/nokogiri/xml_entity_reference.c
 - ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_libxml2_hacks.c
 - ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_node_set.c
@@ -170,6 +171,59 @@ files:
 - Rakefile
 - bin/nokogiri
 - deps.rip
+- ext/java/nokogiri/EncodingHandler.java
+- ext/java/nokogiri/HtmlDocument.java
+- ext/java/nokogiri/HtmlElementDescription.java
+- ext/java/nokogiri/HtmlEntityLookup.java
+- ext/java/nokogiri/HtmlSaxParserContext.java
+- ext/java/nokogiri/NokogiriService.java
+- ext/java/nokogiri/XmlAttr.java
+- ext/java/nokogiri/XmlAttributeDecl.java
+- ext/java/nokogiri/XmlCdata.java
+- ext/java/nokogiri/XmlComment.java
+- ext/java/nokogiri/XmlDocument.java
+- ext/java/nokogiri/XmlDocumentFragment.java
+- ext/java/nokogiri/XmlDtd.java
+- ext/java/nokogiri/XmlElement.java
+- ext/java/nokogiri/XmlElementContent.java
+- ext/java/nokogiri/XmlElementDecl.java
+- ext/java/nokogiri/XmlEntityDecl.java
+- ext/java/nokogiri/XmlEntityReference.java
+- ext/java/nokogiri/XmlNamespace.java
+- ext/java/nokogiri/XmlNode.java
+- ext/java/nokogiri/XmlNodeSet.java
+- ext/java/nokogiri/XmlProcessingInstruction.java
+- ext/java/nokogiri/XmlReader.java
+- ext/java/nokogiri/XmlRelaxng.java
+- ext/java/nokogiri/XmlSaxParserContext.java
+- ext/java/nokogiri/XmlSaxPushParser.java
+- ext/java/nokogiri/XmlSchema.java
+- ext/java/nokogiri/XmlSyntaxError.java
+- ext/java/nokogiri/XmlText.java
+- ext/java/nokogiri/XmlXpathContext.java
+- ext/java/nokogiri/XsltStylesheet.java
+- ext/java/nokogiri/internals/HtmlDomParserContext.java
+- ext/java/nokogiri/internals/NokogiriDocumentCache.java
+- ext/java/nokogiri/internals/NokogiriErrorHandler.java
+- ext/java/nokogiri/internals/NokogiriHandler.java
+- ext/java/nokogiri/internals/NokogiriHelpers.java
+- ext/java/nokogiri/internals/NokogiriNamespaceCache.java
+- ext/java/nokogiri/internals/NokogiriNamespaceContext.java
+- ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java
+- ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java
+- ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java
+- ext/java/nokogiri/internals/NokogiriXPathFunction.java
+- ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java
+- ext/java/nokogiri/internals/ParserContext.java
+- ext/java/nokogiri/internals/PushInputStream.java
+- ext/java/nokogiri/internals/ReaderNode.java
+- ext/java/nokogiri/internals/SaveContext.java
+- ext/java/nokogiri/internals/SchemaErrorHandler.java
+- ext/java/nokogiri/internals/XmlDeclHandler.java
+- ext/java/nokogiri/internals/XmlDomParser.java
+- ext/java/nokogiri/internals/XmlDomParserContext.java
+- ext/java/nokogiri/internals/XmlSaxParser.java
+- ext/nokogiri/depend
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
 - ext/nokogiri/html_document.h
@@ -207,6 +261,8 @@ files:
 - ext/nokogiri/xml_entity_reference.h
 - ext/nokogiri/xml_io.c
 - ext/nokogiri/xml_io.h
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/xml_libxml2_hacks.h
 - ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_namespace.h
 - ext/nokogiri/xml_node.c
@@ -235,6 +291,10 @@ files:
 - ext/nokogiri/xml_xpath_context.h
 - ext/nokogiri/xslt_stylesheet.c
 - ext/nokogiri/xslt_stylesheet.h
+- lib/isorelax.jar
+- lib/jing.jar
+- lib/nekodtd.jar
+- lib/nekohtml.jar
 - lib/nokogiri.rb
 - lib/nokogiri/css.rb
 - lib/nokogiri/css/generated_parser.rb
@@ -256,9 +316,9 @@ files:
 - lib/nokogiri/html/entity_lookup.rb
 - lib/nokogiri/html/sax/parser.rb
 - lib/nokogiri/html/sax/parser_context.rb
+- lib/nokogiri/nokogiri.jar
 - 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
@@ -296,7 +356,10 @@ files:
 - lib/nokogiri/xml/xpath_context.rb
 - lib/nokogiri/xslt.rb
 - lib/nokogiri/xslt/stylesheet.rb
+- lib/xercesImpl.jar
 - lib/xsd/xmlparser/nokogiri.rb
+- spec/helper.rb
+- spec/xml/reader_spec.rb
 - tasks/cross_compile.rb
 - tasks/test.rb
 - test/css/test_nthiness.rb

data/lib/nokogiri/version_warning.rb

@@ -1,14 +0,0 @@
-module Nokogiri
-  if self.is_2_6_16?
-    VERSION_INFO['warnings'] << "libxml 2.6.16 is old and buggy."
-    if !defined?(I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2)
-      warn <<-eom
-HI.  You're using libxml2 version 2.6.16 which is over 4 years old and has
-plenty of bugs.  We suggest that for maximum HTML/XML parsing pleasure, you
-upgrade your version of libxml2 and re-install nokogiri.  If you like using
-libxml2 version 2.6.16, but don't like this warning, please define the constant
-I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2 before requring nokogiri.
-      eom
-    end
-  end
-end