xml-mapping 0.8.1 → 0.9.1

data/test/xpath_test.rb

@@ -4,6 +4,7 @@ require 'test/unit'
 
 require "rexml/document"
 require "xml/xxpath"
+require "xml/xxpath_methods"
 
 
 class XPathTest < Test::Unit::TestCase
@@ -17,6 +18,24 @@ class XPathTest < Test::Unit::TestCase
       <foo key='xy'>
         y
         <u/>
+        <bar barkey='hello'>
+          bar2
+          <bar barkey='hello'>
+            bar3
+          </bar>
+          <quux barkey='hello'>
+            quux1
+          </quux>
+          <bar>
+            bar4
+          </bar>
+          <foo>
+            z
+            <bar>
+              bar5
+            </bar>
+          </foo>
+        </bar>
       </foo>
     </bla>
     EOS
@@ -43,6 +62,15 @@ class XPathTest < Test::Unit::TestCase
   end
 
 
+  def test_read_bythisnode
+    assert_equal [@d.root], XML::XXPath.new(".").all(@d.root)
+    assert_equal @d.root.elements.to_a("foo"), XML::XXPath.new("foo/.").all(@d.root)
+    assert_equal @d.root.elements.to_a("foo"), XML::XXPath.new("foo/./././.").all(@d.root)
+    assert_equal @d.root.elements.to_a("foo")[0], XML::XXPath.new("foo/.").first(@d.root)
+    assert_equal @d.root.elements.to_a("foo")[0], XML::XXPath.new("foo/./././.").first(@d.root)
+  end
+
+
   def test_read_byattr
     assert_equal [@d.root.elements[3]], XML::XXPath.new("foo[@key='xy']").all(@d.root)
     assert_equal [], XML::XXPath.new("foo[@key='notthere']").all(@d.root)
@@ -80,6 +108,56 @@ class XPathTest < Test::Unit::TestCase
     assert_equal [], XML::XXPath.new("foo[3]/u").all(@d.root)
   end
 
+
+  def test_read_alternative_names
+    assert_equal ["bar3","quux1","bar4"],
+                 XML::XXPath.new("foo/bar/bar|quux").all(@d.root).map{|node|node.text.strip}
+  end
+
+
+  def test_read_attr
+    assert_equal [@d.root.elements[3]],
+                 XML::XXPath.new(".[@key='xy']").all(@d.root.elements[3])
+    assert_equal [@d.root.elements[3]],
+                 XML::XXPath.new("self::*[@key='xy']").all(@d.root.elements[3])
+    assert_equal [],
+                 XML::XXPath.new(".[@key='xz']").all(@d.root.elements[3])
+
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/foo[2]/.[@key='xy']")
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/foo[2]/self::*[@key='xy']")
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/*/.[@key='xy']")
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/*/self::*[@key='xy']")
+    assert_equal [], @d.all_xpath("bla/foo[2]/.[@key='xy2']")
+    assert_equal [], @d.all_xpath("bla/foo[2]/.[@key2='xy']")
+    assert_equal [], @d.all_xpath("bla/foo[2]/self::*[@key2='xy']")
+  end
+
+
+  def test_read_textnodes
+    assert_equal ["bar3"], @d.root.all_xpath("foo[2]/bar/bar[1]/text()").map{|x|x.text.strip}
+  end
+
+
+  def test_read_descendant
+    assert_equal ["bar1","bar2","bar3","bar4","bar5"],
+                 XML::XXPath.new("//bar").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar2","bar3"],
+                 XML::XXPath.new("//bar[@barkey='hello']").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar2","bar5"],
+                 XML::XXPath.new("//foo/bar").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar3","bar4"],
+                 XML::XXPath.new("//bar/bar").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar2","bar3","bar4","bar5"],
+                 XML::XXPath.new("foo//bar").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar2","bar3","bar4","bar5","bar5"],
+                 XML::XXPath.new("//foo//bar").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["z"],
+                 XML::XXPath.new("//bar//foo").all(@d.root).map{|node|node.text.strip}
+    assert_equal ["bar2","bar3","quux1"],
+                 XML::XXPath.new("//@barkey").all(@d.root).map{|node|node.parent.text.strip}
+  end
+  
+
   def test_read_first
     assert_equal @d.root.elements[3].elements[1], XML::XXPath.new("foo[2]/u").first(@d.root)
   end
@@ -158,6 +236,69 @@ class XPathTest < Test::Unit::TestCase
   end
 
 
+  def test_write_alternative_names
+    node = XML::XXPath.new("foo/bar/bar|quux").first(@d.root,:ensure_created=>true)
+    assert_equal XML::XXPath.new("foo/bar/bar").first(@d.root), node
+
+    node = XML::XXPath.new("foo/bar/bar|quux").create_new(@d.root)
+    assert node.unspecified?
+  end
+
+
+  def test_write_attr
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/foo[2]/.[@key='xy']", :ensure_created=>true)
+    assert_equal "xy", @d.root.elements[3].attributes['key']
+    assert_equal [@d.root.elements[3]], @d.all_xpath("bla/foo[2]/self::*[@key2='ab']", :ensure_created=>true)
+    assert_equal "ab", @d.root.elements[3].attributes['key2']
+    assert_equal "xy", @d.root.elements[3].attributes['key']
+
+    assert_raises(XML::XXPathError) {
+      @d.root.elements[3].create_new_xpath ".[@key='xy']"
+    }
+    assert_raises(XML::XXPathError) {
+      @d.root.elements[3].create_new_xpath "self::*[@notthere='foobar']"
+    }
+  end
+
+
+  def test_write_textnodes
+    @d.root.create_new_xpath("morestuff/text()").text = "hello world"
+    assert_equal "hello world", @d.root.first_xpath("morestuff").text
+  end
+
+
+  def test_write_descendant
+    assert_equal @d.root.elements[3].elements[2].elements[2],
+                 node1 = XML::XXPath.new("//bar[@barkey='hello']//quux").first(@d.root,:ensure_created=>true)
+    node1 = XML::XXPath.new("//bar[@barkey='hello']/hiho").first(@d.root,:ensure_created=>true)
+    assert_equal "hiho", node1.name
+    assert_equal @d.root.elements[3].elements[2], node1.parent
+
+    node1 = XML::XXPath.new("/foo//quux/new").first(@d.root,:ensure_created=>true)
+    assert_equal "new", node1.name
+    assert_equal @d.root.elements[3].elements[2].elements[2], node1.parent
+
+    assert_raises(XML::XXPathError) {
+      XML::XXPath.new("//bar[@barkey='hello']//new2").first(@d.root,:ensure_created=>true)
+    }
+  end
+
+
+  def test_write_bythisnode
+    s1 = @d.elements[1].elements.size
+    s2 = @d.elements[1].elements[1].elements.size
+    node = XML::XXPath.new("foo/././.").first(@d.root, :ensure_created=>true)
+    assert_equal @d.elements[1].elements[1], node
+
+    node = XML::XXPath.new("foo/new1/././.").first(@d.root, :ensure_created=>true)
+    assert_equal "new1", node.name
+    assert node.attributes.empty?
+    assert_equal @d.elements[1].elements[1].elements[1], node
+    assert_equal s1, @d.elements[1].elements.size
+    assert_equal s2+1, @d.elements[1].elements[1].elements.size
+  end
+
+
   def test_create_new_byname
     s1 = @d.elements[1].elements.size
     s2 = @d.elements[1].elements[1].elements.size
@@ -258,6 +399,19 @@ class XPathTest < Test::Unit::TestCase
   end
 
 
+  def test_create_new_bythisnode
+    s1 = @d.elements[1].elements.size
+    s2 = @d.elements[1].elements[1].elements.size
+    startnode = @d.elements[1].elements[1]
+    assert_raises(XML::XXPathError) {
+      node1 = XML::XXPath.new("new1/.").create_new(startnode)
+    }
+    assert_raises(XML::XXPathError) {
+      node2 = XML::XXPath.new("new1/././.").first(startnode, :create_new=>true)
+    }
+  end
+
+
   def test_unspecifiedness
     node1 = XML::XXPath.new("foo/hello").create_new(@d.root)
     assert(!(node1.unspecified?))

data/test/xxpath_benchmark.rb

@@ -0,0 +1,36 @@
+require File.dirname(__FILE__)+"/benchmark_fixtures"
+
+require "xml/xxpath"
+
+require 'benchmark'
+include Benchmark
+
+
+xxpath_by_name = XML::XXPath.new(@path_by_name)
+xxpath_by_idx = XML::XXPath.new(@path_by_idx)    # "bar6"
+xxpath_by_idx_idx = XML::XXPath.new(@path_by_idx_idx)    # "bar4-6"
+xxpath_by_attr_idx = XML::XXPath.new(@path_by_attr_idx)    # "bar4-6"
+xxpath_by_attr = XML::XXPath.new(@path_by_attr)    # "xy"
+
+rootelt = @d.root
+foo2elt = rootelt.elements[3]
+res1=res2=res3=res4=res5=nil
+print "(#{@count} runs)\n"
+bmbm(12) do |x|
+  x.report("by_name") { @count.times { res1 = xxpath_by_name.first(rootelt) } }
+  x.report("by_idx") { @count.times { res2 = xxpath_by_idx.first(rootelt) } }
+  x.report("by_idx_idx") { @count.times { res3 = xxpath_by_idx_idx.first(rootelt) } }
+  x.report("by_attr_idx") { @count.times { res4 = xxpath_by_attr_idx.first(rootelt) } }
+  x.report("xxpath_by_attr") { (@count*4).times { res5 = xxpath_by_attr.first(foo2elt) } }
+end
+
+
+def assert_equal(expected,actual)
+  expected==actual or raise "expected: #{expected.inspect}, actual: #{actual.inspect}"
+end
+
+assert_equal "bar4-2", res1.text.strip
+assert_equal "bar6", res2.text.strip
+assert_equal "bar4-6", res3.text.strip
+assert_equal "bar4-6", res4.text.strip
+assert_equal "xy", res5.text.strip

data/test/xxpath_benchmark.result1.txt

@@ -0,0 +1,17 @@
+17.2.06
+
+(500 runs)
+Rehearsal ------------------------------------------------
+by_name        0.560000   0.040000   0.600000 (  0.600790)
+by_idx         0.380000   0.020000   0.400000 (  0.402161)
+by_idx_idx     0.540000   0.050000   0.590000 (  0.596949)
+by_attr_idx    0.520000   0.060000   0.580000 (  0.568362)
+path_by_attr   0.100000   0.000000   0.100000 (  0.096042)
+--------------------------------------- total: 2.270000sec
+
+                   user     system      total        real
+by_name        0.550000   0.070000   0.620000 (  0.622124)
+by_idx         0.380000   0.040000   0.420000 (  0.418242)
+by_idx_idx     0.540000   0.040000   0.580000 (  0.586023)
+by_attr_idx    0.570000   0.030000   0.600000 (  0.593609)
+path_by_attr   0.070000   0.010000   0.080000 (  0.078452)

data/test/xxpath_methods_test.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__)+"/tests_init"
+
+require 'test/unit'
+
+require "rexml/document"
+require "xml/xxpath_methods"
+
+
+class XXPathMethodsTest < Test::Unit::TestCase
+  include REXML
+
+  def setup
+    @d = Document.new <<-EOS
+    <bla>
+      <foo>x</foo>
+      <bar>bar1</bar>
+      <foo key='xy'>
+        y
+        <u/>
+      </foo>
+    </bla>
+    EOS
+  end
+
+  def test_first_xpath
+    pathstr = "foo[2]/u"
+    path = XML::XXPath.new(pathstr)
+    elt = path.first(@d.root)
+    assert_equal elt, @d.root.first_xpath(pathstr)
+    assert_equal elt, @d.root.first_xpath(path)
+  end
+
+  def test_all_xpath
+    pathstr = "foo"
+    path = XML::XXPath.new(pathstr)
+    elts = path.all(@d.root)
+    assert_equal elts, @d.root.all_xpath(pathstr)
+    assert_equal elts, @d.root.all_xpath(path)
+  end
+
+  def test_each_xpath
+    pathstr = "foo"
+    path = XML::XXPath.new(pathstr)
+    elts = []
+    path.each(@d.root) do |elt|
+      elts << elt
+    end
+    elts_actual = []
+    @d.root.each_xpath(pathstr) do |elt|
+      elts_actual << elt
+    end
+    assert_equal elts, elts_actual
+  end
+
+  def test_create_new
+    @d.root.create_new_xpath("foo")
+    @d.root.create_new_xpath(XML::XXPath.new("foo"))
+    assert_equal 4, @d.root.elements.to_a("foo").size
+  end
+
+end

metadata

@@ -1,99 +1,148 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
-specification_version: 1
 name: xml-mapping
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
-date: 2005-12-07 00:00:00 +01:00
-summary: "An easy to use, extensible library for mapping Ruby objects to XML and back. Includes an XPath interpreter."
-require_paths: 
-  - lib
-email: klischat@cs.tu-berlin.de
-homepage: http://xml-mapping.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: xml/mapping
-default_executable: 
+  version: 0.9.1
+platform: ruby
+authors: 
+- Olaf Klischat
+autorequire: 
 bindir: bin
+cert_chain: []
+
+date: 2010-05-21 00:00:00 +02:00
+default_executable: 
+dependencies: []
+
+description: 
+email: olaf.klischat@sofd.de
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- README_XPATH
+- ChangeLog
+- TODO.txt
+- doc/xpath_impl_notes.txt
+files: 
+- README
+- README_XPATH
+- ChangeLog
+- TODO.txt
+- doc/xpath_impl_notes.txt
+- lib/xml/xxpath.rb
+- lib/xml/xxpath_methods.rb
+- lib/xml/xxpath/steps.rb
+- lib/xml/mapping/standard_nodes.rb
+- lib/xml/mapping/core_classes_mapping.rb
+- lib/xml/mapping/version.rb
+- lib/xml/mapping/base.rb
+- lib/xml/rexml_ext.rb
+- lib/xml/mapping.rb
+- examples/xpath_create_new.intin.rb
+- examples/xpath_ensure_created.intout
+- examples/time_augm_loading.intout
+- examples/time_node_w_marshallers.intin.rb
+- examples/order.rb
+- examples/README
+- examples/time_augm.intin.rb
+- examples/stringarray_usage.intin.rb
+- examples/xpath_ensure_created.intin.rb
+- examples/time_augm.intout
+- examples/person_mm.intout
+- examples/person_mm.intin.rb
+- examples/order_signature_enhanced.rb
+- examples/company.xml
+- examples/person.intout
+- examples/stringarray_usage.intout
+- examples/documents_folders_usage.intout
+- examples/time_node.rb
+- examples/person.intin.rb
+- examples/time_node_w_marshallers.xml
+- examples/reader.intin.rb
+- examples/company_usage.intin.rb
+- examples/xpath_pathological.intin.rb
+- examples/xpath_pathological.intout
+- examples/order_signature_enhanced.xml
+- examples/time_augm_loading.intin.rb
+- examples/xpath_usage.intin.rb
+- examples/xpath_docvsroot.intin.rb
+- examples/stringarray.rb
+- examples/time_node.intin.rb
+- examples/publication.intin.rb
+- examples/documents_folders_usage.intin.rb
+- examples/xpath_usage.intout
+- examples/order_signature_enhanced_usage.intin.rb
+- examples/documents_folders.xml
+- examples/order_usage.intin.rb
+- examples/xpath_create_new.intout
+- examples/company.rb
+- examples/order_signature_enhanced_usage.intout
+- examples/order.xml
+- examples/order_usage.intout
+- examples/publication.intout
+- examples/company_usage.intout
+- examples/time_node_w_marshallers.intout
+- examples/reader.intout
+- examples/stringarray.xml
+- examples/xpath_docvsroot.intout
+- examples/documents_folders.rb
+- test/xxpath_benchmark.rb
+- test/xxpath_methods_test.rb
+- test/examples_test.rb
+- test/fixtures/triangle_m2.xml
+- test/fixtures/company1.xml
+- test/fixtures/bookmarks1.xml
+- test/fixtures/benchmark.xml
+- test/fixtures/triangle_m1.xml
+- test/fixtures/documents_folders2.xml
+- test/fixtures/documents_folders.xml
+- test/xml_mapping_test.rb
+- test/triangle_mm.rb
+- test/xpath_test.rb
+- test/xxpath_benchmark.result1.txt
+- test/tests_init.rb
+- test/rexml_xpath_benchmark.rb
+- test/all_tests.rb
+- test/multiple_mappings_test.rb
+- test/inheritance_test.rb
+- test/company.rb
+- test/xml_mapping_adv_test.rb
+- test/bookmarks.rb
+- test/benchmark_fixtures.rb
+- test/documents_folders.rb
+- LICENSE
+- Rakefile
+- install.rb
 has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+homepage: http://xml-mapping.rubyforge.org
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --include
+- examples
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
   version: 
-platform: ruby
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+requirements: []
+
+rubyforge_project: xml-mapping
+rubygems_version: 1.3.5
 signing_key: 
-cert_chain: 
-authors: 
-  - Olaf Klischat
-files: 
-  - README
-  - README_XPATH
-  - TODO.txt
-  - doc/xpath_impl_notes.txt
-  - lib/xml
-  - lib/xml/mapping
-  - lib/xml/mapping.rb
-  - lib/xml/xxpath.rb
-  - lib/xml/xxpath
-  - lib/xml/mapping/base.rb
-  - lib/xml/mapping/version.rb
-  - lib/xml/mapping/standard_nodes.rb
-  - examples/company.xml
-  - examples/company.rb
-  - examples/order_signature_enhanced.rb
-  - examples/company_usage.intin.rb
-  - examples/order.rb
-  - examples/order.xml
-  - examples/company_usage.intout
-  - examples/order_signature_enhanced.xml
-  - examples/order_usage.intin.rb
-  - examples/time_node.rb
-  - examples/order_signature_enhanced_usage.intin.rb
-  - examples/time_augm.intin.rb
-  - examples/xpath_create_new.intin.rb
-  - examples/xpath_docvsroot.intin.rb
-  - examples/xpath_ensure_created.intin.rb
-  - examples/xpath_pathological.intin.rb
-  - examples/xpath_usage.intin.rb
-  - examples/order_usage.intout
-  - examples/time_augm.intout
-  - examples/xpath_usage.intout
-  - examples/xpath_ensure_created.intout
-  - examples/xpath_create_new.intout
-  - examples/xpath_pathological.intout
-  - examples/xpath_docvsroot.intout
-  - examples/order_signature_enhanced_usage.intout
-  - test/all_tests.rb
-  - test/company.rb
-  - test/tests_init.rb
-  - test/fixtures
-  - test/documents_folders.rb
-  - test/multiple_mappings.rb
-  - test/xml_mapping_adv_test.rb
-  - test/xml_mapping_test.rb
-  - test/xpath_test.rb
-  - test/fixtures/bookmarks1.xml
-  - test/fixtures/company1.xml
-  - test/fixtures/documents_folders.xml
-  - test/fixtures/documents_folders2.xml
-  - LICENSE
-  - Rakefile
-  - ChangeLog
-  - install.rb
+specification_version: 3
+summary: An easy to use, extensible library for mapping Ruby objects to XML and back. Includes an XPath interpreter.
 test_files: 
-  - test/all_tests.rb
-rdoc_options: 
-  - "--include"
-  - examples
-extra_rdoc_files: 
-  - README
-  - README_XPATH
-  - TODO.txt
-  - doc/xpath_impl_notes.txt
-executables: []
-extensions: []
-requirements: []
-dependencies: []
+- test/all_tests.rb