libxml-ruby 0.9.1 → 0.9.2

data/ext/libxml/ruby_xml_xpath_expression.c

@@ -0,0 +1,69 @@
+/* $Id: ruby_xml_xpath.c 461 2008-07-15 21:35:56Z cfis $ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#include "ruby_libxml.h"
+#include "ruby_xml_xpath.h"
+#include "ruby_xml_xpath_expression.h"
+
+/*
+ * Document-class: LibXML::XML::XPath::Expression
+ * 
+ * The XML::XPath::Expression class is used to compile  
+ * XPath expressions so they can be parsed only once
+ * but reused multiple times.
+ *
+ *  doc = XML::Document.string(IO.read('some xml file'))
+ *  expr = XPath::Expression.new('//first')
+ *  doc.root.each do |node|
+ *   result = node.find(expr) # many, many, many times
+ *   # ...
+ *  end
+ */
+
+VALUE cXMLXPathExpression;
+
+void
+ruby_xml_xpath_expression_free(xmlXPathCompExprPtr expr) {
+  xmlXPathFreeCompExpr(expr);
+}
+
+VALUE
+ruby_xml_xpath_expression_alloc(VALUE klass) {
+  return Data_Wrap_Struct(cXMLXPathExpression,
+						  NULL,
+						  ruby_xml_xpath_expression_free,
+						  NULL);
+}
+
+/* call-seq:
+ *    XPath::Expression.new(expression) -> XPath::Expression
+ * 
+ * Compiled XPatch expression. Work faster when find called many times 
+ * same expression.
+ *
+ *  doc = XML::Document.string('<header><first>hi</first></header>')
+ *  expr = XPath::Expression.new('//first')
+ *  nodes = doc.find(expr)
+ */
+VALUE
+ruby_xml_xpath_expression_initialize(VALUE self, VALUE expression) {
+  xmlXPathCompExprPtr compexpr = xmlXPathCompile(StringValueCStr(expression));  
+
+  if (compexpr == NULL) {
+	  xmlErrorPtr xerror = xmlGetLastError();
+	  ruby_xml_raise(xerror);
+  }
+
+  DATA_PTR(self) = compexpr;
+  return self;
+}
+
+void
+ruby_init_xml_xpath_expression(void) {
+  cXMLXPathExpression = rb_define_class_under(mXPath, "Expression", rb_cObject);
+  rb_define_alloc_func(cXMLXPathExpression, ruby_xml_xpath_expression_alloc);
+  rb_define_singleton_method(rb_cRegexp, "compile", rb_class_new_instance, 1);
+
+  rb_define_method(cXMLXPathExpression, "initialize", ruby_xml_xpath_expression_initialize, 1);
+}

data/ext/libxml/ruby_xml_xpath_expression.h

@@ -0,0 +1,12 @@
+/* $Id$ */
+
+/* Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_XML_XPATH_EXPRESSION__
+#define __RUBY_XML_XPATH_EXPRESSION__
+
+extern VALUE cXMLXPathExpression;
+
+void ruby_init_xml_xpath_expression(void);
+
+#endif

data/ext/libxml/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  "0.9.1"
+#define RUBY_LIBXML_VERSION  "0.9.2"
 #define RUBY_LIBXML_VERNUM   0
 #define RUBY_LIBXML_VER_MAJ   0
 #define RUBY_LIBXML_VER_MIN   9
-#define RUBY_LIBXML_VER_MIC   1
+#define RUBY_LIBXML_VER_MIC   2
 #define RUBY_LIBXML_VER_PATCH 0

data/ext/vc/libxml_ruby.vcproj

@@ -63,7 +63,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="msvcrt-ruby18.lib libxml2.lib"
-				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.1-x86-mswin32-60\lib\$(ProjectName).so"
+				OutputFile="C:\Development\ruby\lib\ruby\gems\1.8\gems\libxml-ruby-0.9.2-x86-mswin32-60\lib\$(ProjectName).so"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="C:\Development\ruby\lib;C:\Development\msys\local\lib"
 				GenerateDebugInformation="true"
@@ -273,6 +273,10 @@
 				RelativePath="..\libxml\ruby_xml_xpath_context.c"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_xpath_expression.c"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_xpath_object.c"
 				>
@@ -375,6 +379,10 @@
 				RelativePath="..\libxml\ruby_xml_xpath_context.h"
 				>
 			</File>
+			<File
+				RelativePath="..\libxml\ruby_xml_xpath_expression.h"
+				>
+			</File>
 			<File
 				RelativePath="..\libxml\ruby_xml_xpath_object.h"
 				>

data/test/tc_document_write.rb

@@ -143,4 +143,18 @@ class TestDocumentWrite < Test::Unit::TestCase
     assert_instance_of(XML::Node, @doc.root)
     assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<rubynet/>\n", @doc.to_s)
   end
+
+  def test_encoding_to_s
+    doc = XML::Document.new
+    doc.encoding = 'UTF-8'
+    doc.root = XML::Node.new 'node'
+    doc.root.content = '&#1;'
+
+    xml = doc.to_s(true, 'UTF-8')
+    puts xml
+
+    parser = XML::Parser.string(xml)
+    doc = parser.parse
+    p doc.root.content
+  end
 end

data/test/tc_xpath_expression.rb

@@ -0,0 +1,35 @@
+require "xml"
+require 'test/unit'
+
+class TestXPathExpression < Test::Unit::TestCase
+  def setup
+    xp = XML::Parser.new()
+    str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
+    xp.string = str
+    @doc = xp.parse
+  end
+  
+  def teardown
+    @doc = nil
+  end
+
+  def nodes
+    expr = XML::XPath::Expression.compile('/ruby_array/fixnum')
+    @doc.find(expr)
+  end
+
+  def test_find_class
+    expr = XML::XPath::Expression.new('/ruby_array/fixnum')
+    set = @doc.find(expr)
+    assert_instance_of(XML::XPath::Object, set)
+    assert_equal(2, set.size)
+  end
+
+  def test_find_invalid
+    error = assert_raise(TypeError) do
+      set = @doc.find(999)
+    end
+    assert_equal('Argument should be an intance of a String or XPath::Expression',
+                 error.to_s)
+  end
+end

data/test/test_suite.rb

@@ -24,6 +24,7 @@ require 'tc_traversal'
 require 'tc_well_formed'
 require 'tc_xinclude'
 require 'tc_xpath'
+require 'tc_xpath_expression'
 require 'tc_xpointer'
 
 # Compatibility

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -07:00
+date: 2008-11-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - ext/libxml/cbg.c
 - ext/libxml/extconf.rb
 - ext/libxml/libxml.c
+- ext/libxml/libxml.c.rej
 - ext/libxml/ruby_libxml.h
 - ext/libxml/ruby_xml_attr.c
 - ext/libxml/ruby_xml_attr.h
@@ -73,6 +74,8 @@ files:
 - ext/libxml/ruby_xml_xpath.h
 - ext/libxml/ruby_xml_xpath_context.c
 - ext/libxml/ruby_xml_xpath_context.h
+- ext/libxml/ruby_xml_xpath_expression.c
+- ext/libxml/ruby_xml_xpath_expression.h
 - ext/libxml/ruby_xml_xpath_object.c
 - ext/libxml/ruby_xml_xpath_object.h
 - ext/libxml/ruby_xml_xpointer.c
@@ -158,6 +161,7 @@ files:
 - test/tc_xml.rb
 - test/tc_xpath.rb
 - test/tc_xpath_context.rb
+- test/tc_xpath_expression.rb
 - test/tc_xpointer.rb
 - test/test_suite.rb
 has_rdoc: true
@@ -218,4 +222,5 @@ test_files:
 - test/tc_xml.rb
 - test/tc_xpath.rb
 - test/tc_xpath_context.rb
+- test/tc_xpath_expression.rb
 - test/tc_xpointer.rb