libxml-ruby 2.3.2 → 2.3.3

data/HISTORY

@@ -1,5 +1,10 @@
 = Release History
 
+== 2.3.3 / 2012-07-01 Charlie Savage
+
+* Add LibXML::XML::Error.get_handler (Carsten Zimmermann)
+* Fix variable name in example (Marcus)
+
 == 2.3.2 / 2012-03-20 Charlie Savage
 
 * Define various canonicalize constants to support libxml2 versions

data/ext/libxml/ruby_xml_error.c

@@ -22,6 +22,10 @@ static ID ERROR_HANDLER_ID;
  *
  *   XML::Error.set_handler(&XML::Error::QUIET_HANDLER)
  *
+ * Get the current handler:
+ *
+ *   proc = XML::Error.get_handler
+ *
  * Install your own handler:
  *
  *   XML::Error.set_handler do |error|
@@ -42,6 +46,19 @@ static void rxml_set_handler(VALUE self, VALUE block)
 #endif
 }
 
+/*
+ * call-seq:
+ *    Error.get_error_handler
+ *
+ * Returns the proc that will be called when libxml generates
+ * warning, error or fatal error messages.
+ */
+static VALUE rxml_error_get_handler()
+{
+  VALUE block = rb_cvar_get(eXMLError, ERROR_HANDLER_ID);
+  return block;
+}
+
 /*
  * call-seq:
  *    Error.set_error_handler {|error| ... }
@@ -129,7 +146,7 @@ static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)
   VALUE error = rxml_error_wrap(xerror);
 
   /* Wrap error up as Ruby object and send it off to ruby */
-  VALUE block = rb_cvar_get(eXMLError, ERROR_HANDLER_ID);
+  VALUE block = rxml_error_get_handler();
 
   /* Now call global handler */
   if (block != Qnil)
@@ -155,6 +172,7 @@ void rxml_init_error()
 
   /* Error class */
   eXMLError = rb_define_class_under(mXML, "Error", rb_eStandardError);
+  rb_define_singleton_method(eXMLError, "get_handler", rxml_error_get_handler, 0);
   rb_define_singleton_method(eXMLError, "set_handler", rxml_error_set_handler, 0);
   rb_define_singleton_method(eXMLError, "reset_handler", rxml_error_reset_handler, 0);
 

data/ext/libxml/ruby_xml_reader.c

@@ -20,7 +20,7 @@
  *
  * Example:
  *
- *  parser = XML::Reader.string("<foo><bar>1</bar><bar>2</bar><bar>3</bar></foo>")
+ *  reader = XML::Reader.string("<foo><bar>1</bar><bar>2</bar><bar>3</bar></foo>")
  *  reader.read
  *  assert_equal('foo', reader.name)
  *  assert_equal(nil, reader.value)

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.3.2"
-#define RUBY_LIBXML_VERNUM   232
+#define RUBY_LIBXML_VERSION  "2.3.3"
+#define RUBY_LIBXML_VERNUM   233
 #define RUBY_LIBXML_VER_MAJ   2
 #define RUBY_LIBXML_VER_MIN   3
-#define RUBY_LIBXML_VER_MIC   2
+#define RUBY_LIBXML_VER_MIC   3
 #define RUBY_LIBXML_VER_PATCH 0

data/test/tc_error.rb

@@ -59,6 +59,18 @@ class TestError < Test::Unit::TestCase
     assert_nil(exception)
   end
 
+  def test_get_handler
+    assert_respond_to(XML::Error, :get_handler)
+    assert_equal(0, XML::Error.method(:get_handler).arity)
+
+    saved_handler = XML::Error.get_handler
+    XML::Error.set_handler{ puts "New handler" }
+    assert_not_equal(XML::Error.get_handler, saved_handler)
+
+    XML::Error.set_handler(&saved_handler)
+    assert_equal(XML::Error.get_handler, saved_handler)
+  end
+
   def test_verbose_handler
     XML::Error.set_handler(&XML::Error::VERBOSE_HANDLER)
     output = StringIO.new
@@ -147,4 +159,4 @@ class TestError < Test::Unit::TestCase
     end
     assert_equal('Must specify a string with one or more characters', error.to_s)
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-20 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 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
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby Bindings for LibXML2