libxml-ruby 2.1.1 → 2.1.2

data/test/tc_gc.rb

@@ -0,0 +1,86 @@
+# encoding: UTF-8
+require './test_helper'
+require 'test/unit'
+
+class TestFoo < Test::Unit::TestCase
+  def namespaces
+    {'kml' => 'http://earth.google.com/kml/2.2'}
+  end
+
+  def doc
+    path = File.expand_path(File.join('model', 'kml_sample.xml'))
+    data = File.read(path)
+    parser = LibXML::XML::Parser.string(data)
+    doc = parser.parse
+    result = doc.root
+    doc = nil
+    GC.start
+  end
+
+  def test_read
+    1000.times do
+      read_placemarks
+      GC.start
+    end
+  end
+
+  def read_placemarks
+    root = doc.root
+    result = Array.new
+    root.find('//kml:Placemark', self.namespaces).each do |entry|
+      result << self.read_placemark(entry)
+    end
+    result
+  end
+
+  def read_placemark(entry)
+    geometries = read_geoms(entry)
+    #stop processing this placemark if there aren't any geometries.
+    return if geometries.empty?
+  end
+
+  def read_geoms(entry)
+
+    geoms = []
+    entry.find('//kml:Point', self.namespaces).each do |point_entry|
+      geoms << parse_point(point_entry)
+    end
+
+    entry.find('//kml:LineString', self.namespaces).each do |point_entry|
+      geoms << parse_point(point_entry)
+    end
+
+    entry.find('//kml:Polygon', self.namespaces).each do |point_entry|
+      geoms << parse_polygon(point_entry)
+    end
+
+    geoms
+  end
+
+  def parse_point(entry)
+    coordinate_entry = entry.find('//kml:coordinates',self.namespaces).first
+    coordinate_entry.content.split(",")
+  end
+
+  def parse_coordinate_string(entry)
+    coordinates = entry.content.split
+  end
+
+  def parse_line_string(entry)
+    coord_sequence = parse_coordinate_string(entry.find('kml:coordinates',self.namespaces).first)
+  end
+
+  def parse_linear_ring(entry)
+    coord_sequence = parse_coordinate_string(entry.find('kml:coordinates',self.namespaces).first)
+  end
+
+  def parse_polygon(entry)
+    exterior_ring = parse_linear_ring(entry.find('kml:outerBoundaryIs/kml:LinearRing', self.namespaces).first)
+
+    interior_rings = []
+    entry.find('kml:innerBoundaryIs/kml:LinearRing', self.namespaces).each do |interior_ring|
+      interior_rings << parse_linear_ring(interior_ring)
+    end
+    interior_rings
+  end
+end

data/test/tc_reader.rb

@@ -200,6 +200,37 @@ class TestReader < Test::Unit::TestCase
     assert_equal(1, entries.length)
   end
 
+  def test_expand_invalid
+    reader = XML::Reader.file(XML_FILE)
+
+    # Expand a node before one has been read
+    error = assert_raise(RuntimeError) do
+      reader.expand
+    end
+    assert_equal("The reader does not have a document.  Did you forget to call read?", error.to_s)
+  end
+
+  def test_expand_invalid_access
+    reader = XML::Reader.file(XML_FILE)
+
+    # Read a node
+    reader.read
+    reader.read
+
+    # Expand the node
+    node = reader.expand
+    assert_equal('feed', node.name)
+
+    # Read another node, this makes the last node invalid
+    reader.next
+
+    # The previous node is now invalid
+    error = assert_raise(RuntimeError) do
+      assert_equal('feed', node.name)
+    end
+    assert_equal("This node has already been freed.", error.to_s)
+  end
+
   def test_mode
     reader = XML::Reader.string('<xml/>')
     assert_equal(XML::Reader::MODE_INITIAL, reader.read_state)

data/test/tc_xpath.rb

@@ -207,4 +207,4 @@ class TestXPath < Test::Unit::TestCase
     end
     assert_equal("Error: Invalid expression.", error.to_s)
   end
-end
+end

data/test/tc_xpath_context.rb

@@ -20,11 +20,12 @@ class TestXPathContext < Test::Unit::TestCase
     @context = nil
   end
   
-  #def test_no_ns
-    #assert_raise(XML::XPath::InvalidPath) do
-      #@context.find('/soap:Envelope')
-    #end
-  #end    
+  def test_no_ns
+    error = assert_raise(LibXML::XML::Error) do
+      @context.find('/soap:Envelope')
+    end
+    assert_equal("Error: Undefined namespace prefix.", error.to_s)
+  end    
 
   def test_ns_register
     @context.register_namespace(SOAP_PREFIX, SOAP_URI)
@@ -77,4 +78,12 @@ class TestXPathContext < Test::Unit::TestCase
     @context.enable_cache(10)
     @context.disable_cache
   end
-end
+
+  def test_require_doc
+    doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
+    error = assert_raise(TypeError) do
+      @context = XML::XPath::Context.new(doc.root)
+    end
+    assert_equal("Supplied argument must be a document or node.", error.to_s)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libxml-ruby
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - Ross Bamform
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 Z
+date: 2011-08-03 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"
@@ -145,6 +145,7 @@ files:
 - test/model/bands.utf-8.xml
 - test/model/bands.xml
 - test/model/books.xml
+- test/model/kml_sample.xml
 - test/model/merge_bug_data.xml
 - test/model/ruby-lang.html
 - test/model/rubynet.xml
@@ -163,6 +164,7 @@ files:
 - test/tc_document_write.rb
 - test/tc_dtd.rb
 - test/tc_error.rb
+- test/tc_gc.rb
 - test/tc_html_parser.rb
 - test/tc_html_parser_context.rb
 - test/tc_namespace.rb
@@ -235,6 +237,7 @@ test_files:
 - test/tc_document_write.rb
 - test/tc_dtd.rb
 - test/tc_error.rb
+- test/tc_gc.rb
 - test/tc_html_parser.rb
 - test/tc_html_parser_context.rb
 - test/tc_namespace.rb