nokogiri 1.0.4-x86-mswin32-60 → 1.0.5-x86-mswin32-60

data/History.txt

@@ -1,10 +1,17 @@
+=== 1.0.5
+
+* Bugfixes
+
+  * Added mailing list and ticket tracking information to the README.txt
+  * Sets ENV['PATH'] on windows if it doesn't exist
+  * Caching results of NodeSet#[] on Document
+
 === 1.0.4
 
 * Bugfixes
 
   * Changed memory mangement from weak refs to document refs
   * Plugged some memory leaks
-  * extconf.rb now complains if your libxml2 is not between 2.6.13 and 2.6.99
   * Builder blocks can call methods from surrounding contexts
 
 === 1.0.3

data/README.ja.txt

@@ -3,6 +3,8 @@
 * http://nokogiri.rubyforge.org/
 * http://github.com/tenderlove/nokogiri/wikis
 * http://github.com/tenderlove/nokogiri/tree/master
+* http://rubyforge.org/mailman/listinfo/nokogiri-talk
+* http://nokogiri.lighthouseapp.com/projects/19607-nokogiri/overview
 
 == DESCRIPTION:
 

data/README.txt

@@ -3,6 +3,8 @@
 * http://nokogiri.rubyforge.org/
 * http://github.com/tenderlove/nokogiri/wikis
 * http://github.com/tenderlove/nokogiri/tree/master
+* http://rubyforge.org/mailman/listinfo/nokogiri-talk
+* http://nokogiri.lighthouseapp.com/projects/19607-nokogiri/overview
 
 == DESCRIPTION:
 
@@ -25,6 +27,16 @@ Here is a speed test:
 Nokogiri also features an Hpricot compatibility layer to help ease the change
 to using correct CSS and XPath.
 
+== SUPPORT:
+
+The Nokogiri mailing list is available here:
+
+  * http://rubyforge.org/mailman/listinfo/nokogiri-talk
+
+The bug tracker is available here:
+
+  * http://nokogiri.lighthouseapp.com/projects/19607-nokogiri/overview
+
 == SYNOPSIS:
 
   require 'nokogiri'

data/Rakefile

@@ -21,6 +21,7 @@ require 'nokogiri/version'
 
 HOE = Hoe.new('nokogiri', Nokogiri::VERSION) do |p|
   p.developer('Aaron Patterson', 'aaronp@rubyforge.org')
+  p.developer('Mike Dalessio', 'mike.dalessio@gmail.com')
   p.clean_globs = [
     'ext/nokogiri/Makefile',
     'ext/nokogiri/*.{o,so,bundle,a,log,dll}',

data/ext/nokogiri/extconf.rb

@@ -52,9 +52,6 @@ else
   end
 
   version = try_constant('LIBXML_VERSION', 'libxml/xmlversion.h')
-  if version > 20699 || version < 20616
-    abort "Make sure your libxml is in the 2.6.X series"
-  end
 end
 
 create_makefile('nokogiri/native')

data/ext/nokogiri/xml_node.c

@@ -383,7 +383,8 @@ static VALUE get_name(VALUE self)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  return rb_str_new2((const char *)node->name);
+  if(node->name) return rb_str_new2((const char *)node->name);
+  return Qnil;
 }
 
 /*

data/ext/nokogiri/xml_node_set.c

@@ -52,7 +52,22 @@ static VALUE index_at(VALUE self, VALUE number)
   if(i < 0)
     i = i + node_set->nodeNr;
 
-  return Nokogiri_wrap_xml_node(node_set->nodeTab[i]);
+  VALUE document = rb_funcall(self, rb_intern("document"), 0);
+  if(Qnil == document)
+    rb_raise(rb_eRuntimeError, "You forgot to set a document.");
+
+  VALUE index = INT2NUM((int)node_set->nodeTab[i]);
+
+  VALUE node_cache = rb_funcall(document, rb_intern("node_cache"), 0);
+
+  VALUE node = rb_hash_aref(node_cache, index);
+
+  if(Qnil == node) {
+    node = Nokogiri_wrap_xml_node(node_set->nodeTab[i]);
+    rb_hash_aset(node_cache, index, node);
+  }
+
+  return node;
 }
 
 static void deallocate(xmlNodeSetPtr node_set)
@@ -101,7 +116,7 @@ static VALUE allocate(VALUE klass)
 
 VALUE Nokogiri_wrap_xml_node_set(xmlNodeSetPtr node_set)
 {
-    return Data_Wrap_Struct(cNokogiriXmlNodeSet, 0, deallocate, node_set);
+  return Data_Wrap_Struct(cNokogiriXmlNodeSet, 0, deallocate, node_set);
 }
 
 VALUE cNokogiriXmlNodeSet ;

data/ext/nokogiri/xml_xpath.c

@@ -23,10 +23,17 @@ static VALUE node_set(VALUE self)
   xmlXPathObjectPtr xpath;
   Data_Get_Struct(self, xmlXPathObject, xpath);
 
+  VALUE node_set = Qnil;
+
   if (xpath->nodesetval)
-    return Nokogiri_wrap_xml_node_set(xpath->nodesetval);
+    node_set = Nokogiri_wrap_xml_node_set(xpath->nodesetval);
+
+  if(Qnil == 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 Nokogiri_wrap_xml_node_set(xmlXPathNodeSetCreate(NULL));
+  return node_set;
 }
 
 VALUE cNokogiriXmlXpath;

data/ext/nokogiri/xml_xpath_context.c

@@ -41,7 +41,19 @@ static VALUE evaluate(VALUE self, VALUE search_path)
   if(xpath == NULL) {
     rb_raise(rb_eRuntimeError, "Couldn't evaluate expression '%s'", query);
   }
-  return Nokogiri_wrap_xml_xpath(xpath);
+
+  VALUE xpath_object = Nokogiri_wrap_xml_xpath(xpath);
+
+  assert(ctx->node);
+  assert(ctx->node->doc);
+  assert(ctx->node->doc->_private);
+
+  rb_funcall( xpath_object,
+              rb_intern("document="),
+              1,
+              (VALUE)ctx->node->doc->_private
+            );
+  return xpath_object;
 }
 
 /*

data/lib/nokogiri.rb

@@ -8,9 +8,9 @@ require 'nokogiri/html/builder'
 require 'nokogiri/hpricot'
 
 # Modify the PATH on windows so that the external DLLs will get loaded.
-ENV['PATH'] += ";" + File.expand_path(
+ENV['PATH'] = [ENV['PATH'], File.expand_path(
   File.join(File.dirname(__FILE__), "..", "ext", "nokogiri")
-) if RUBY_PLATFORM =~ /mswin/i
+)].compact.join(';') if RUBY_PLATFORM =~ /mswin/i
 
 require 'nokogiri/native' unless RUBY_PLATFORM =~ /java/
 

data/lib/nokogiri/hpricot.rb

@@ -17,8 +17,9 @@ module Nokogiri
       end
 
       def make string
-        ns = XML::NodeSet.new
-        ns << XML::Text.new(string, XML::Document.new)
+        doc = XML::Document.new
+        ns = XML::NodeSet.new(doc)
+        ns << XML::Text.new(string, doc)
         ns
       end
 

data/lib/nokogiri/version.rb

@@ -1,3 +1,3 @@
 module Nokogiri
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/nokogiri/xml/document.rb

@@ -22,6 +22,10 @@ module Nokogiri
         end
       end
 
+      def node_cache
+        @node_cache ||= {}
+      end
+
       def to_xml
         serialize
       end

data/lib/nokogiri/xml/node.rb

@@ -25,8 +25,7 @@ module Nokogiri
       ###
       # Get the list of children for this node as a NodeSet
       def children
-        list = NodeSet.new
-        list.document = document
+        list = NodeSet.new(document)
         document.decorate(list)
 
         first = self.child
@@ -56,7 +55,7 @@ module Nokogiri
       def xpath *paths
         ns = paths.last.is_a?(Hash) ? paths.pop : {}
 
-        return NodeSet.new unless document.root
+        return NodeSet.new(document) unless document.root
 
         sets = paths.map { |path|
           ctx = XPathContext.new(self)
@@ -68,7 +67,7 @@ module Nokogiri
         }
         return sets.first if sets.length == 1
 
-        NodeSet.new do |combined|
+        NodeSet.new(document) do |combined|
           document.decorate(combined)
           sets.each do |set|
             set.each do |node|

data/lib/nokogiri/xml/node_set.rb

@@ -5,7 +5,8 @@ module Nokogiri
 
       attr_accessor :document
 
-      def initialize
+      def initialize document
+        @document = document
         yield self if block_given?
       end
 
@@ -50,7 +51,6 @@ module Nokogiri
       # current context.
       def unlink
         each { |node| node.unlink }
-        self.document = nil
         self
       end
       alias :remove :unlink
@@ -58,14 +58,13 @@ module Nokogiri
       ###
       # Search this document for +paths+
       def search *paths
-        sub_set = NodeSet.new
+        sub_set = NodeSet.new(document)
         document.decorate(sub_set)
         each do |node|
           node.search(*paths).each do |sub_node|
             sub_set << sub_node
           end
         end
-        sub_set.document = document
         sub_set
       end
       alias :/ :search

data/lib/nokogiri/xml/xpath.rb

@@ -1,6 +1,8 @@
 module Nokogiri
   module XML
     class XPath
+      attr_accessor :document
+
     end
   end
 end

data/test/xml/test_document.rb

@@ -78,6 +78,17 @@ module Nokogiri
         assert @xml.document
       end
 
+      def test_singleton_methods
+        assert node_set = @xml.search('//name')
+        assert node_set.length > 0
+        node = node_set.first
+        def node.test
+          'test'
+        end
+        assert node_set = @xml.search('//name')
+        assert_equal 'test', node_set.first.test
+      end
+
       def test_multiple_search
         assert node_set = @xml.search('//employee', '//name')
         employees = @xml.search('//employee')

data/test/xml/test_node_set.rb

@@ -54,7 +54,6 @@ module Nokogiri
           assert !node.previous_sibling
           assert !node.next_sibling
         end
-        assert !set.document
         assert_no_match(/Hello world/, xml.to_s)
       end
 
@@ -76,7 +75,7 @@ module Nokogiri
       end
 
       def test_new_nodeset
-        node_set = Nokogiri::XML::NodeSet.new
+        node_set = Nokogiri::XML::NodeSet.new(@xml)
         assert_equal(0, node_set.length)
         node = Nokogiri::XML::Node.new('form', @xml)
         node_set << node

metadata

@@ -1,21 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: x86-mswin32-60
 authors: 
 - Aaron Patterson
+- Mike Dalessio
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-11-09 00:00:00 -08:00
+date: 2008-11-11 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser."
 email: 
 - aaronp@rubyforge.org
+- mike.dalessio@gmail.com
 executables: []
 
 extensions: []