libxml-ruby 2.0.6 → 2.0.9

data/HISTORY

@@ -1,5 +1,11 @@
 = Release History
 
+== 2.0.8 / 2011-06-23 Charlie Savage
+
+* Add in 2 new HTML Parser constants - NODEFDTD and NOIMPLIED.
+
+* Fix compile issue on Ruby 1.9.3
+
 == 2.0.6 / 2011-05-23 Charlie Savage
 
 * Fix segfault that sometimes occurred when looking up encodings on 1.9.

data/Rakefile

@@ -3,7 +3,9 @@
 require "rubygems"
 require "rake/extensiontask"
 require "rake/testtask"
-require 'hanna/rdoctask'
+require "rubygems/package_task"
+##require 'hanna/rdoctask'
+require "rdoc/task"
 require "grancher/task"
 require "yaml"
 
@@ -20,10 +22,11 @@ Rake::ExtensionTask.new do |ext|
   ext.ext_dir = "ext/libxml"
   ext.lib_dir = "lib/#{RUBY_VERSION.sub(/\.\d$/, '')}"
   ext.config_options << "--with-xml2-include=C:/MinGW/local/include/libxml2"
+  ext.config_options << "--with-zlib-dir=C:/MinGW/local"
 end
 
 # Setup generic gem
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.package_dir = 'pkg'
   pkg.need_tar    = false
 end
@@ -42,7 +45,7 @@ if RUBY_PLATFORM.match(/win32|mingw32/)
   win_spec.extensions = nil
 
   # Rake task to build the windows package
-  Rake::GemPackageTask.new(win_spec) do |pkg|
+  Gem::PackageTask.new(win_spec) do |pkg|
     pkg.package_dir = 'pkg'
     pkg.need_tar = false
   end
@@ -50,7 +53,7 @@ end
 
 # RDoc Task
 desc "Generate rdoc documentation"
-Rake::RDocTask.new("rdoc") do |rdoc|
+RDoc::Task.new("rdoc") do |rdoc|
   rdoc.rdoc_dir = 'doc/libxml-ruby/rdoc'
   rdoc.title    = "LibXML"
   # Show source inline with line numbers
@@ -86,4 +89,4 @@ Grancher::Task.new do |g|
 end
 
 desc "Build docs, and publish the website"
-task :publish_with_docs => [:rdoc, :publish]
+task :publish_with_docs => [:rdoc, :publish]

data/ext/libxml/extconf.rb

@@ -2,15 +2,6 @@
 
 require 'rbconfig'
 
-def method_missing(s, *args)
-  if v = Config::CONFIG[s] || Config::CONFIG[s.upcase]
-    return v
-  else
-    puts "missing: #{s}"
-    super
-  end
-end
-
 require 'mkmf'
 
 if defined?(CFLAGS)

data/ext/libxml/ruby_xml_html_parser_context.c

@@ -284,11 +284,21 @@ static VALUE rxml_html_parser_context_disable_cdata_set(VALUE self, VALUE bool)
 static VALUE rxml_html_parser_context_options_set(VALUE self, VALUE options)
 {
   int result;
+  int xml_options = NUM2INT(options);
   htmlParserCtxtPtr ctxt;
   Check_Type(options, T_FIXNUM);
 
   Data_Get_Struct(self, htmlParserCtxt, ctxt);
-  result = htmlCtxtUseOptions(ctxt, NUM2INT(options));
+  result = htmlCtxtUseOptions(ctxt, xml_options);
+
+#if LIBXML_VERSION >= 20707
+  /* Big hack here, but htmlCtxtUseOptions doens't support HTML_PARSE_NOIMPLIED.
+     So do it ourselves. There must be a better way??? */
+  if (xml_options & HTML_PARSE_NOIMPLIED) 
+  {
+	  ctxt->options |= HTML_PARSE_NOIMPLIED;
+  }
+#endif
 
   return self;
 }

data/ext/libxml/ruby_xml_html_parser_options.c

@@ -20,6 +20,10 @@ void rxml_init_html_parser_options(void)
 #if LIBXML_VERSION >= 20621
   /* 1: Relax parsing. */
   rb_define_const(mXMLHtmlParserOptions, "RECOVER", INT2NUM(HTML_PARSE_RECOVER)); 
+#endif
+#if LIBXML_VERSION >= 20708
+  /* 2:  Do not default a doctype if not found */
+  rb_define_const(mXMLHtmlParserOptions, "NODEFDTD", INT2NUM(HTML_PARSE_NODEFDTD));
 #endif
   /* 32: Suppress error reports. */
   rb_define_const(mXMLHtmlParserOptions, "NOERROR", INT2NUM(HTML_PARSE_NOERROR)); 
@@ -35,4 +39,8 @@ void rxml_init_html_parser_options(void)
   /* 65536: Compact small text nodes. */
   rb_define_const(mXMLHtmlParserOptions, "COMPACT", INT2NUM(HTML_PARSE_COMPACT));
 #endif
+#if LIBXML_VERSION >= 20707
+  /* 8192:  Do not add implied html/body... elements */
+  rb_define_const(mXMLHtmlParserOptions, "NOIMPLIED", INT2NUM(HTML_PARSE_NOIMPLIED));
+#endif
 }

data/ext/libxml/ruby_xml_node.c

@@ -1056,7 +1056,7 @@ static VALUE rxml_node_attributes_get(VALUE self)
  *    node.property("name") -> "string"
  *    node["name"]          -> "string"
  *
- * Obtain the named pyroperty.
+ * Obtain the named property.
  */
 static VALUE rxml_node_attribute_get(VALUE self, VALUE name)
 {

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "2.0.6"
-#define RUBY_LIBXML_VERNUM   206
+#define RUBY_LIBXML_VERSION  "2.0.9"
+#define RUBY_LIBXML_VERNUM   209
 #define RUBY_LIBXML_VER_MAJ   2
 #define RUBY_LIBXML_VER_MIN   0
-#define RUBY_LIBXML_VER_MIC   6
+#define RUBY_LIBXML_VER_MIC   9
 #define RUBY_LIBXML_VER_PATCH 0

data/test/tc_html_parser.rb

@@ -137,4 +137,11 @@ class HTMLParserTest < Test::Unit::TestCase
     assert_instance_of XML::Node, world
     assert_equal 'World', world.content
   end
+
+  def test_no_implied
+    html = "hello world"
+    parser = XML::HTMLParser.string(html, :options => XML::HTMLParser::Options::NOIMPLIED)
+    doc = parser.parse
+    assert_equal("<p>#{html}</p>", doc.root.to_s)
+  end
 end

data/test/tc_html_parser_context.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+
+require './test_helper'
+
+require 'test/unit'
+
+class TestHtmlParserContext < Test::Unit::TestCase
+  def test_default_options
+    context = XML::HTMLParser::Context.new
+    assert_equal(0, context.options)
+  end
+
+  def test_no_options
+    context = XML::HTMLParser::Context.new
+    context.options = 0
+    assert_equal(0, context.options)
+  end
+
+  def test_options
+    context = XML::HTMLParser::Context.new
+    context.options = XML::HTMLParser::Options::NOERROR
+    assert_equal(XML::HTMLParser::Options::NOERROR, context.options)
+  end
+end

data/test/test_suite.rb

@@ -13,6 +13,7 @@ require './tc_document_write'
 require './tc_dtd'
 require './tc_error'
 require './tc_html_parser'
+require './tc_html_parser_context'
 require './tc_namespace'
 require './tc_namespaces'
 require './tc_node'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 0
-  - 6
-  version: 2.0.6
+  - 9
+  version: 2.0.9
 platform: ruby
 authors: 
 - Ross Bamform
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-06-25 00:00:00 Z
 dependencies: []
 
 description: "    The Libxml-Ruby project provides Ruby language bindings for the GNOME\n    Libxml2 XML toolkit. It is free software, released under the MIT License.\n    Libxml-ruby's primary advantage over REXML is performance - if speed\n    is your need, these are good libraries to consider, as demonstrated\n    by the informal benchmark below.\n"
@@ -164,6 +164,7 @@ files:
 - test/tc_dtd.rb
 - test/tc_error.rb
 - test/tc_html_parser.rb
+- test/tc_html_parser_context.rb
 - test/tc_namespace.rb
 - test/tc_namespaces.rb
 - test/tc_node.rb
@@ -235,6 +236,7 @@ test_files:
 - test/tc_dtd.rb
 - test/tc_error.rb
 - test/tc_html_parser.rb
+- test/tc_html_parser_context.rb
 - test/tc_namespace.rb
 - test/tc_namespaces.rb
 - test/tc_node.rb