nokogiri 1.0.6 → 1.0.7

data/History.ja.txt

@@ -1,3 +1,14 @@
+=== 1.0.7
+
+* バグの修正
+
+  * Dike 使用時中のメモリーリークの修正
+  * SAX パーサーが現在 IO Stream 同時解析
+  * コメント nodes が独自のクラスを継承する
+  * Nokogiri() は Nokogiri.parse() へデリゲートする
+  * ENV['PATH'] に付加せれる代わりに先頭へデータ挿入される
+  * 複雑な CSS 内のバグを修正完了 :not selector ではありません
+
 === 1.0.6
 
 * 5つの修正

data/History.txt

@@ -1,3 +1,14 @@
+=== 1.0.7
+
+* Bugfixes
+
+  * Fixed memory leak when using Dike
+  * SAX parser now parses IO streams
+  * Comment nodes have their own class
+  * Nokogiri() should delegate to Nokogiri.parse()
+  * Prepending rather than appending to ENV['PATH'] on windows
+  * Fixed a bug in complex CSS negation selectors
+
 === 1.0.6
 
 * 5 Bugfixes

data/Manifest.txt

@@ -13,6 +13,8 @@ ext/nokogiri/native.c
 ext/nokogiri/native.h
 ext/nokogiri/xml_cdata.c
 ext/nokogiri/xml_cdata.h
+ext/nokogiri/xml_comment.c
+ext/nokogiri/xml_comment.h
 ext/nokogiri/xml_document.c
 ext/nokogiri/xml_document.h
 ext/nokogiri/xml_dtd.c
@@ -37,6 +39,7 @@ ext/nokogiri/xml_xpath_context.c
 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
@@ -53,6 +56,7 @@ 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/hpricot.rb
 lib/nokogiri/html.rb
 lib/nokogiri/html/builder.rb
@@ -64,6 +68,7 @@ lib/nokogiri/xml/after_handler.rb
 lib/nokogiri/xml/before_handler.rb
 lib/nokogiri/xml/builder.rb
 lib/nokogiri/xml/cdata.rb
+lib/nokogiri/xml/comment.rb
 lib/nokogiri/xml/document.rb
 lib/nokogiri/xml/dtd.rb
 lib/nokogiri/xml/element.rb
@@ -114,12 +119,14 @@ test/html/test_document.rb
 test/test_convert_xpath.rb
 test/test_css_cache.rb
 test/test_gc.rb
+test/test_memory_leak.rb
 test/test_nokogiri.rb
 test/test_reader.rb
 test/test_xslt_transforms.rb
 test/xml/sax/test_parser.rb
 test/xml/test_builder.rb
 test/xml/test_cdata.rb
+test/xml/test_comment.rb
 test/xml/test_document.rb
 test/xml/test_dtd.rb
 test/xml/test_node.rb

data/README.txt

@@ -73,6 +73,13 @@ The bug tracker is available here:
 
 * sudo gem install nokogiri
 
+== DEVELOPMENT:
+
+Developing Nokogiri requires racc and frex.
+
+* rake install:deps
+* rake test
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -30,7 +30,7 @@ HOE = Hoe.new('nokogiri', Nokogiri::VERSION) do |p|
     GENERATED_TOKENIZER,
     'cross',
   ]
-  p.spec_extras = { :extensions => ["Rakefile"] }
+  p.spec_extras = { :extensions => ["ext/nokogiri/extconf.rb"] }
 end
 
 namespace :gem do
@@ -87,7 +87,9 @@ end
 
 file GENERATED_PARSER => "lib/nokogiri/css/parser.y" do |t|
   begin
-    sh "racc -o #{t.name} #{t.prerequisites.first}"
+    racc = `which racc`.strip
+    racc = "#{::Config::CONFIG['bindir']}/racc" if racc.empty?
+    sh "#{racc} -o #{t.name} #{t.prerequisites.first}"
   rescue
     abort "need racc, get the tarball from http://i.loveruby.net/archive/racc/racc-1.4.5-all.tar.gz" 
   end
@@ -277,8 +279,47 @@ namespace :test do
     ENV['NOKOGIRI_GC'] = "true"
     Rake::Task["test"].invoke
   end
+
+  desc "find call-seq in the rdoc"
+  task :rdoc => 'docs' do
+    Dir['doc/**/*.html'].each { |docfile|
+      next if docfile =~ /\.src/
+      puts "FAIL: #{docfile}" if File.read(docfile) =~ /call-seq/
+    }
+  end
 end
 
+namespace :install do
+  desc "Install frex and racc for development"
+  task :deps => %w(frex racc)
+
+  directory "stash"
+
+  file "stash/racc-1.4.5-all.tar.gz" => "stash" do |t|
+    puts "Downloading racc to #{t.name}..."
+
+    Dir.chdir File.dirname(t.name) do
+      url = "http://i.loveruby.net/archive/racc/racc-1.4.5-all.tar.gz"
+      system "wget #{url} || curl -O #{url}"
+    end
+  end
+
+  task :racc => "stash/racc-1.4.5-all.tar.gz" do |t|
+    sh "tar xvf #{t.prerequisites.first} -C stash"
+
+    Dir.chdir "stash/#{File.basename(t.prerequisites.first, ".tar.gz")}" do
+      sh "ruby setup.rb config"
+      sh "ruby setup.rb setup"
+      sh "sudo ruby setup.rb install"
+    end
+
+    puts "The racc binary is likely in #{::Config::CONFIG["bindir"]}."
+  end
+
+  task :frex do
+    sh "sudo gem install aaronp-frex -s http://gems.github.com"
+  end
+end
 
 # Only do this on unix, since we can't build on windows
 unless windows

data/ext/nokogiri/native.c

@@ -28,6 +28,7 @@ void Init_native()
   init_xml_node();
   init_xml_text();
   init_xml_cdata();
+  init_xml_comment();
   init_xml_node_set();
   init_xml_xpath_context();
   init_xml_xpath();

data/ext/nokogiri/native.h

@@ -17,6 +17,7 @@
 #include <xml_node.h>
 #include <xml_text.h>
 #include <xml_cdata.h>
+#include <xml_comment.h>
 #include <xml_node_set.h>
 #include <xml_xpath.h>
 #include <xml_dtd.h>
@@ -36,13 +37,11 @@ extern VALUE mNokogiriXslt ;
 
 #ifdef DEBUG
 
-#define NOKOGIRI_DEBUG_START_NODE(p) if (getenv("NOKOGIRI_NO_FREE")) return ; if (getenv("NOKOGIRI_DEBUG")) fprintf(stderr,"nokogiri: %s:%d %p start node (%p %x %p/%s)\n", __FILE__, __LINE__, p, p->_private, p->type, p->name, p->name);
 #define NOKOGIRI_DEBUG_START(p) if (getenv("NOKOGIRI_NO_FREE")) return ; if (getenv("NOKOGIRI_DEBUG")) fprintf(stderr,"nokogiri: %s:%d %p start\n", __FILE__, __LINE__, p);
 #define NOKOGIRI_DEBUG_END(p) if (getenv("NOKOGIRI_DEBUG")) fprintf(stderr,"nokogiri: %s:%d %p end\n", __FILE__, __LINE__, p);
 
 #else
 
-#define NOKOGIRI_DEBUG_START_NODE(p)
 #define NOKOGIRI_DEBUG_START(p)
 #define NOKOGIRI_DEBUG_END(p)
 

data/ext/nokogiri/xml_cdata.c

@@ -29,11 +29,13 @@ void init_xml_cdata()
 {
   VALUE nokogiri = rb_define_module("Nokogiri");
   VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+  VALUE text = rb_define_class_under(xml, "Text", node);
 
   /*
    * CData represents a CData node in an xml document.
    */
-  VALUE klass = rb_define_class_under(xml, "CData", cNokogiriXmlNode);
+  VALUE klass = rb_define_class_under(xml, "CDATA", text);
 
 
   cNokogiriXmlCData = klass;

data/ext/nokogiri/xml_comment.c

@@ -0,0 +1,42 @@
+#include <xml_comment.h>
+
+/*
+ * call-seq:
+ *  new(document, content)
+ *
+ * Create a new Comment element on the +document+ with +content+
+ */
+static VALUE new(VALUE klass, VALUE doc, VALUE content)
+{
+  xmlDocPtr xml_doc;
+  Data_Get_Struct(doc, xmlDoc, xml_doc);
+
+  xmlNodePtr node = xmlNewDocComment(
+      xml_doc,
+      (const xmlChar *)StringValuePtr(content)
+  );
+
+  VALUE rb_node = Nokogiri_wrap_xml_node(node);
+
+  if(rb_block_given_p()) rb_yield(rb_node);
+
+  return rb_node;
+}
+
+VALUE cNokogiriXmlComment;
+void init_xml_comment()
+{
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+
+  /*
+   * Comment represents a comment node in an xml document.
+   */
+  VALUE klass = rb_define_class_under(xml, "Comment", node);
+
+
+  cNokogiriXmlComment = klass;
+
+  rb_define_singleton_method(klass, "new", new, 2);
+}

data/ext/nokogiri/xml_comment.h

@@ -0,0 +1,9 @@
+#ifndef NOKOGIRI_XML_COMMENT
+#define NOKOGIRI_XML_COMMENT
+
+#include <native.h>
+
+void init_xml_comment();
+
+extern VALUE cNokogiriXmlComment;
+#endif

data/ext/nokogiri/xml_document.c

@@ -199,6 +199,7 @@ VALUE Nokogiri_wrap_xml_document(VALUE klass, xmlDocPtr doc)
   VALUE rb_doc = Qnil;
 
   rb_doc = Data_Wrap_Struct(klass ? klass : cNokogiriXmlDocument, 0, dealloc, doc) ;
+  rb_iv_set(rb_doc, "@decorators", Qnil);
   doc->_private = (void *)rb_doc;
 
   return rb_doc ;

data/ext/nokogiri/xml_node.c

@@ -1,5 +1,15 @@
 #include <xml_node.h>
 
+#ifdef DEBUG
+static void debug_node_dealloc(xmlNodePtr x)
+{
+  NOKOGIRI_DEBUG_START(x)
+  NOKOGIRI_DEBUG_END(x)
+}
+#else
+#  define debug_node_dealloc 0
+#endif
+
 /*
  * call-seq:
  *  pointer_id
@@ -532,26 +542,30 @@ VALUE Nokogiri_wrap_xml_node(xmlNodePtr node)
 
     case XML_TEXT_NODE:
       klass = rb_const_get(mNokogiriXml, rb_intern("Text"));
-      rb_node = Data_Wrap_Struct(klass, 0, 0, node) ;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
+      break;
+    case XML_COMMENT_NODE:
+      klass = cNokogiriXmlComment;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     case XML_ELEMENT_NODE:
       klass = rb_const_get(mNokogiriXml, rb_intern("Element"));
-      rb_node = Data_Wrap_Struct(klass, 0, 0, node) ;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     case XML_ENTITY_DECL:
       klass = rb_const_get(mNokogiriXml, rb_intern("EntityDeclaration"));
-      rb_node = Data_Wrap_Struct(klass, 0, 0, node) ;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     case XML_CDATA_SECTION_NODE:
-      klass = rb_const_get(mNokogiriXml, rb_intern("CDATA"));
-      rb_node = Data_Wrap_Struct(klass, 0, 0, node) ;
+      klass = cNokogiriXmlCData;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     case XML_DTD_NODE:
       klass = rb_const_get(mNokogiriXml, rb_intern("DTD"));
-      rb_node = Data_Wrap_Struct(klass, 0, 0, node) ;
+      rb_node = Data_Wrap_Struct(klass, 0, debug_node_dealloc, node) ;
       break;
     default:
-      rb_node = Data_Wrap_Struct(cNokogiriXmlNode, 0, 0, node) ;
+      rb_node = Data_Wrap_Struct(cNokogiriXmlNode, 0, debug_node_dealloc, node) ;
   }
 
   rb_hash_aset(node_cache, index, rb_node);

data/ext/nokogiri/xml_sax_parser.c

@@ -20,6 +20,31 @@ static VALUE parse_memory(VALUE self, VALUE data)
   return data;
 }
 
+/*
+ * call-seq:
+ *  native_parse_io(data, encoding)
+ *
+ * Parse the document accessable via +io+
+ */
+static VALUE native_parse_io(VALUE self, VALUE io, VALUE encoding)
+{
+  xmlSAXHandlerPtr handler;
+  Data_Get_Struct(self, xmlSAXHandler, handler);
+
+  xmlCharEncoding enc = (xmlCharEncoding)NUM2INT(encoding); 
+
+  xmlParserCtxtPtr sax_ctx = xmlCreateIOParserCtxt(
+      handler,
+      (void *)self,
+      (xmlInputReadCallback)io_read_callback,
+      (xmlInputCloseCallback)io_close_callback,
+      (void *)io,
+      enc
+  );
+  xmlParseDocument(sax_ctx);
+  return io;
+}
+
 static VALUE native_parse_file(VALUE self, VALUE data)
 {
   xmlSAXHandlerPtr handler;
@@ -171,4 +196,5 @@ void init_xml_sax_parser()
   rb_define_alloc_func(klass, allocate);
   rb_define_method(klass, "parse_memory", parse_memory, 1);
   rb_define_private_method(klass, "native_parse_file", native_parse_file, 1);
+  rb_define_private_method(klass, "native_parse_io", native_parse_io, 2);
 }

data/ext/nokogiri/xml_syntax_error.c

@@ -178,6 +178,10 @@ void init_xml_syntax_error()
 {
   VALUE nokogiri = rb_define_module("Nokogiri");
   VALUE xml = rb_define_module_under(nokogiri, "XML");
+
+  /*
+   * The XML::SyntaxError is raised on parse errors
+   */
   VALUE klass = rb_define_class_under(xml, "SyntaxError", rb_eSyntaxError);
   cNokogiriXmlSyntaxError = klass;
 

data/ext/nokogiri/xml_text.c

@@ -1,5 +1,11 @@
 #include <xml_text.h>
 
+/*
+ * call-seq:
+ *  new(content, document)
+ *
+ * Create a new Text element on the +document+ with +content+
+ */
 static VALUE new(VALUE klass, VALUE string, VALUE document)
 {
   xmlDocPtr doc;
@@ -18,7 +24,16 @@ static VALUE new(VALUE klass, VALUE string, VALUE document)
 VALUE cNokogiriXmlText ;
 void init_xml_text()
 {
-  VALUE klass = cNokogiriXmlText = rb_const_get(mNokogiriXml, rb_intern("Text"));
+  VALUE nokogiri = rb_define_module("Nokogiri");
+  VALUE xml = rb_define_module_under(nokogiri, "XML");
+  VALUE node = rb_define_class_under(xml, "Node", rb_cObject);
+
+  /*
+   * Wraps Text nodes.
+   */
+  VALUE klass = rb_define_class_under(xml, "Text", node);
+
+  cNokogiriXmlText = klass;
 
   rb_define_singleton_method(klass, "new", new, 2);
 }

data/ext/nokogiri/xml_xpath_context.c

@@ -80,6 +80,10 @@ VALUE cNokogiriXmlXpathContext;
 void init_xml_xpath_context(void)
 {
   VALUE module = rb_define_module("Nokogiri");
+
+  /*
+   * Nokogiri::XML
+   */
   VALUE xml = rb_define_module_under(module, "XML");
 
   /*

data/ext/nokogiri/xslt_stylesheet.c

@@ -73,7 +73,7 @@ static VALUE apply_to(int argc, VALUE* argv, VALUE self)
     Data_Get_Struct(xmldoc, xmlDoc, xml);
     Data_Get_Struct(self, xsltStylesheet, ss);
 
-    param_len = RARRAY(paramobj)->len;
+    param_len = NUM2INT(rb_funcall(paramobj, rb_intern("length"), 0));
     params = calloc((size_t)param_len+1, sizeof(char*));
     for (j = 0 ; j < param_len ; j++) {
       VALUE entry = rb_ary_entry(paramobj, j);

data/lib/action-nokogiri.rb

@@ -0,0 +1,30 @@
+require 'nokogiri'
+
+#
+#  to use this in your Rails view or controller tests, simply:
+#
+#  require 'action-nokogiri'
+#
+#  class KittehControllerTest < ActionController::TestCase
+#  def test_i_can_does_test_with_nokogiri
+#    get(:index, {:wants => "cheezburgers"})
+#    assert @response.html.at("h2.lolcats")
+#  end
+#
+module ActionController
+  module TestResponseBehavior
+
+    def html(flavor=nil)
+      if flavor == :hpricot
+        @_nokogiri_html_hpricot ||= Nokogiri::Hpricot(body)
+      else
+        @_nokogiri_html_vanilla ||= Nokogiri::HTML(body)
+      end
+    end
+
+    def xml
+      @_nokogiri_xml ||= Nokogiri::XML(body)
+    end
+
+  end
+end