xml-mapping 0.8 → 0.8.1

data/ChangeLog

@@ -0,0 +1,128 @@
+2005-12-07  Olaf Klischat
+
+	* release 0.8.1
+
+2005-12-07  Olaf Klischat
+
+	* ChangeLog file
+
+2005/11/30  Olaf Klischat
+
+	* bugfix: clone default values to avoid external modifications
+
+2005/07/07  Olaf Klischat
+
+	* release 0.8
+
+2005/07/04  Olaf Klischat
+
+	* xml/xpath / XML::XPath -> xml/xxpath / XML::XXPath, license ->
+	  Ruby's
+
+2005/06/29  Olaf Klischat
+
+	* when creating elt[@attr='value'] path elements, add a new
+	  element if one with @attr='value' already existed
+
+2005/03/30  Olaf Klischat
+
+	* add_accessor: check for existing accessors.
+
+2005/03/05  Olaf Klischat
+
+	* better support for inheritance among mapping
+	  classes
+
+2005/03/03  Olaf Klischat
+
+	* "polymorphic" nodes via root element
+	  name. SubObjectBaseNode-based nodes es use node polymorphy when
+	  no explicit node marshaller/unmarshaller has been sp ecified.
+	
+2005/02/28  Olaf Klischat
+
+	* mapping root elt name => mapping class;
+	  XML::Mapping::load_object_from_* implemented
+
+2005/02/13  Olaf Klischat
+
+	* IntNode renamed & generalized to NumericNode
+
+2005/02/12  Olaf Klischat
+
+	* renaming *_rexml => *_xml
+
+2005/01/27  Olaf Klischat
+
+	* special exception NoAttrValueSet for indicating absence of a
+	  specific attribute in an XML source
+
+2005/01/23  Olaf Klischat
+
+	* some more documentation, Node.obj_initializing, setting node
+	  values to defaults on initialization
+
+2005/01/10  Olaf Klischat
+
+	* root_element_name
+
+2005/01/07  Olaf Klischat
+
+	* refactoring:
+
+	  Made node types (classes) dynamically addable via
+	  XML::Mapping.add_node_class, xml/mapping.rb moved to
+	  xml/mapping/base.rb, node types moved to
+	  xml/mapping/standard_nodes.rb, xml/mapping.rb now requires base
+	  and standard_nodes and adds all standard node types to
+	  XML::Mapping.
+
+	* additional node class SingleAttributeNode < Node for nodes that
+	  map to a single attribute in their class (that's true for all
+	  nodes we have so far). Call to add_attribute moved from "core"
+	  to SingleAttributeNode.initialize.
+
+	* XML::Mapping: @nodes renamed to @xml_mapping_nodes to minimize
+	  chance of name clashes.
+	
+2004/12/30  Olaf Klischat
+
+	* array node writing, hash node writing
+
+
+2004/12/30  Olaf Klischat
+
+	* xpath: create_new flag, + convenience method
+
+2004/12/21  Olaf Klischat
+
+	* node classes
+	
+2004/12/20  Olaf Klischat
+
+	* hash_node
+	
+2004/12/08  Olaf Klischat
+
+	* xpath: attribute nodes
+
+	* xml_mapping: retargeted from REXML::XPath to XML::XPath
+
+2004/12/02  Olaf Klischat
+
+	* xpath: write accessors
+	
+2004/11/27  Olaf Klischat
+
+	* xpath: read access seems to work
+
+2004/11/25  Olaf Klischat
+
+	* array_node
+
+stone age   Olaf Klischat
+
+	* see http://rubygarden.org/ruby?XmlMapping
+	
+	
+

data/Rakefile

@@ -168,7 +168,7 @@ spec = Gem::Specification.new do |s|
   s.files += Dir.glob("{lib,examples,test}/**/*").delete_if do |item|
     item.include?("CVS") || item =~ /~$/
   end
-  s.files += %w{LICENSE Rakefile install.rb}
+  s.files += %w{LICENSE Rakefile ChangeLog install.rb}
   s.extra_rdoc_files = FILES_RDOC_EXTRA
   s.rdoc_options += %w{--include examples}
 

data/examples/company_usage.intout

@@ -1,11 +1,11 @@
 c = Company.load_from_file('company.xml') 
-=> #<Company:0x40471c18 @address=#<Address:0x40471344 @zip=10113, @city="Berlin">, @name="ACME inc.", @customers=[#<Customer:0x4046fe90 @name="James Kirk", @id="jim">, #<Customer:0x4046f51c @name="Ernie", @id="ernie">, #<Customer:0x4046eba8 @name="Bert", @id="bert">]>
+=> #<Company:0x312dc8 @customers=[#<Customer:0x310bd8 @name="James Kirk", @id="jim">, #<Customer:0x310200 @name="Ernie", @id="ernie">, #<Customer:0x30f7f8 @name="Bert", @id="bert">], @address=#<Address:0x3123d8 @zip=10113, @city="Berlin">, @name="ACME inc.">
 c.name 
 => "ACME inc."
 c.customers.size 
 => 3
 c.customers[1] 
-=> #<Customer:0x4046f51c @name="Ernie", @id="ernie">
+=> #<Customer:0x310200 @name="Ernie", @id="ernie">
 c.customers[1].name 
 => "Ernie"
 c.customers[0].name 
@@ -13,7 +13,7 @@ c.customers[0].name
 c.customers[0].name = 'James Tiberius Kirk' 
 => "James Tiberius Kirk"
 c.customers << Customer.new('cm','Cookie Monster') 
-=> [#<Customer:0x4046fe90 @name="James Tiberius Kirk", @id="jim">, #<Customer:0x4046f51c @name="Ernie", @id="ernie">, #<Customer:0x4046eba8 @name="Bert", @id="bert">, #<Customer:0x4046d7a8 @name="Cookie Monster", @id="cm">]
+=> [#<Customer:0x310bd8 @name="James Tiberius Kirk", @id="jim">, #<Customer:0x310200 @name="Ernie", @id="ernie">, #<Customer:0x30f7f8 @name="Bert", @id="bert">, #<Customer:0x30e118 @name="Cookie Monster", @id="cm">]
 xml2 = c.save_to_xml 
 => <company name='ACME inc.'> ... </>
 xml2.write($stdout,2) 
@@ -23,16 +23,16 @@ xml2.write($stdout,2)
         <zip>10113</zip>
       </address>
       <customers>
-        <customer id='539197256'>
+        <customer id='1607148'>
           <name>James Tiberius Kirk</name>
         </customer>
-        <customer id='539196046'>
+        <customer id='1605888'>
           <name>Ernie</name>
         </customer>
-        <customer id='539194836'>
+        <customer id='1604604'>
           <name>Bert</name>
         </customer>
-        <customer id='539192276'>
+        <customer id='1601676'>
           <name>Cookie Monster</name>
         </customer>
       </customers>

data/examples/order_signature_enhanced_usage.intout

@@ -1,9 +1,9 @@
 s=Signature.load_from_file("order_signature_enhanced.xml") 
-=> #<Signature:0x40476344 @name="John Doe", @signed_on=Sun Feb 13 00:00:00 CET 2005, @position="product manager">
+=> #<Signature:0x1aed60 @signed_on=Sun Feb 13 00:00:00 MET 2005, @name="John Doe", @position="product manager">
 s.signed_on 
-=> Sun Feb 13 00:00:00 CET 2005
+=> Sun Feb 13 00:00:00 MET 2005
 s.signed_on=Time.local(1976,12,18) 
-=> Sat Dec 18 00:00:00 CET 1976
+=> Sat Dec 18 00:00:00 MET 1976
 s.save_to_xml.write($stdout,2) 
 <signature>
       <Name>John Doe</Name>

data/examples/order_usage.intout

@@ -1,10 +1,10 @@
 ####read access
 o=Order.load_from_file("order.xml") 
-=> #<Order:0x40441590 @signatures=[#<Signature:0x40436fc8 @name="John Doe", @position="product manager">, #<Signature:0x404363ac @name="Jill Smith", @position="clerk">, #<Signature:0x40435790 @name="Miles O'Brien", @position="Some Employee">], @items={"RF-3341"=>#<Item:0x40438f58 @unit_price=0.85, @quantity=30, @descr="Cookie">, "RF-0034"=>#<Item:0x4043a7a4 @unit_price=28.5, @quantity=5, @descr="Chocolate">, "RF-0001"=>#<Item:0x4043bff0 @unit_price=8.95, @quantity=10, @descr="Stuffed Penguin">}, @client=#<Client:0x40440be0 @name="Jean Smith", @work_address=#<Address:0x4043e05c @street="98765, Fulton Street", @zip=94102, @state="CA", @city="San Francisco">, @home_address=#<Address:0x4043ff10 @street="2000, Alameda de las Pulgas", @zip=94403, @state="CA", @city="San Mateo">>, @reference="12343-AHSHE-314159">
+=> #<Order:0x404730 @items={"RF-3341"=>#<Item:0x3f7fb0 @unit_price=0.85, @quantity=30, @descr="Cookie">, "RF-0034"=>#<Item:0x3faa70 @unit_price=28.5, @quantity=5, @descr="Chocolate">, "RF-0001"=>#<Item:0x3fcfa8 @unit_price=8.95, @quantity=10, @descr="Stuffed Penguin">}, @signatures=[#<Signature:0x3f4878 @name="John Doe", @position="product manager">, #<Signature:0x3f38d0 @name="Jill Smith", @position="clerk">, #<Signature:0x3f23a0 @name="Miles O'Brien", @position="Some Employee">], @client=#<Client:0x403a70 @work_address=#<Address:0x3ffbb8 @street="98765, Fulton Street", @state="CA", @zip=94102, @city="San Francisco">, @name="Jean Smith", @home_address=#<Address:0x402450 @street="2000, Alameda de las Pulgas", @state="CA", @zip=94403, @city="San Mateo">>, @reference="12343-AHSHE-314159">
 o.reference 
 => "12343-AHSHE-314159"
 o.client 
-=> #<Client:0x40440be0 @name="Jean Smith", @work_address=#<Address:0x4043e05c @street="98765, Fulton Street", @zip=94102, @state="CA", @city="San Francisco">, @home_address=#<Address:0x4043ff10 @street="2000, Alameda de las Pulgas", @zip=94403, @state="CA", @city="San Mateo">>
+=> #<Client:0x403a70 @work_address=#<Address:0x3ffbb8 @street="98765, Fulton Street", @state="CA", @zip=94102, @city="San Francisco">, @name="Jean Smith", @home_address=#<Address:0x402450 @street="2000, Alameda de las Pulgas", @state="CA", @zip=94403, @city="San Mateo">>
 o.items.keys 
 => ["RF-3341", "RF-0034", "RF-0001"]
 o.items["RF-0034"].descr 
@@ -12,7 +12,7 @@ o.items["RF-0034"].descr
 o.items["RF-0034"].total_price 
 => 142.5
 o.signatures 
-=> [#<Signature:0x40436fc8 @name="John Doe", @position="product manager">, #<Signature:0x404363ac @name="Jill Smith", @position="clerk">, #<Signature:0x40435790 @name="Miles O'Brien", @position="Some Employee">]
+=> [#<Signature:0x3f4878 @name="John Doe", @position="product manager">, #<Signature:0x3f38d0 @name="Jill Smith", @position="clerk">, #<Signature:0x3f23a0 @name="Miles O'Brien", @position="Some Employee">]
 o.signatures[2].name 
 => "Miles O'Brien"
 o.signatures[2].position 
@@ -92,13 +92,13 @@ xml.write($stdout,2)
     </order>
 ####Starting a new order from scratch
 o = Order.new 
-=> #<Order:0x4053a014 @signatures=[]>
+=> #<Order:0x3b5500 @signatures=[]>
 ## attributes with default values (here: signatures) are set
 ## automatically
 
 xml=o.save_to_xml 
 XML::MappingError: no value, and no default value, for attribute: reference
-	from ../lib/xml/../xml/mapping/base.rb:377:in `obj_to_xml'
+	from ../lib/xml/../xml/mapping/base.rb:381:in `obj_to_xml'
 	from ../lib/xml/../xml/mapping/base.rb:157:in `fill_into_xml'
 	from ../lib/xml/../xml/mapping/base.rb:156:in `each'
 	from ../lib/xml/../xml/mapping/base.rb:156:in `fill_into_xml'

data/examples/time_augm.intout

@@ -15,9 +15,9 @@ nowxml=Time.now.save_to_xml
 nowxml.write($stdout,2)
 <time>
       <year>2005</year>
-      <month>7</month>
+      <month>12</month>
       <mday>7</mday>
-      <hours>6</hours>
-      <minutes>10</minutes>
-      <seconds>49</seconds>
+      <hours>20</hours>
+      <minutes>52</minutes>
+      <seconds>4</seconds>
     </time>

data/examples/xpath_create_new.intout

@@ -58,7 +58,7 @@ firstbazelt=XML::XXPath.new("/bar/baz").first(rootelt)
 path2=XML::XXPath.new("@key2")
 
 path2.create_new(firstbazelt)
-=> #<XML::XXPath::Accessors::Attribute:0x404b0c4c @name="key2", @parent=<baz key2='[unset]' key='work'> ... </>>
+=> #<XML::XXPath::Accessors::Attribute:0x314bf8 @parent=<baz key2='[unset]' key='work'> ... </>, @name="key2">
 d.write($stdout,2)
     <foo>
     <bar>

data/examples/xpath_ensure_created.intout

@@ -81,7 +81,7 @@ d.write($stdout,2)
 ### no change
 
 XML::XXPath.new("/bar/baz[6]/@haha").first(rootelt,:ensure_created=>true)
-=> #<XML::XXPath::Accessors::Attribute:0x404d5ce0 @name="haha", @parent=<baz haha='[unset]'/>>
+=> #<XML::XXPath::Accessors::Attribute:0x3223b0 @parent=<baz haha='[unset]'/>, @name="haha">
 d.write($stdout,2)
     <foo>
     <bar>
@@ -97,7 +97,7 @@ d.write($stdout,2)
 ### for there to be a 6th "baz" element, there must be 1st..5th "baz" elements
 
 XML::XXPath.new("/bar/baz[6]/@haha").first(rootelt,:ensure_created=>true)
-=> #<XML::XXPath::Accessors::Attribute:0x404d086c @name="haha", @parent=<baz haha='[unset]'/>>
+=> #<XML::XXPath::Accessors::Attribute:0x31f830 @parent=<baz haha='[unset]'/>, @name="haha">
 d.write($stdout,2)
     <foo>
     <bar>

data/lib/xml/mapping/base.rb

@@ -350,7 +350,11 @@ module XML
           unless @options.has_key? :default_value
             raise XML::MappingError, "no value, and no default value: #{err}"
           end
-          obj.send :"#{@attrname}=", @options[:default_value]
+          begin
+            obj.send :"#{@attrname}=", @options[:default_value].clone
+          rescue
+            obj.send :"#{@attrname}=", @options[:default_value]
+          end
         end
       end
 
@@ -386,7 +390,11 @@ module XML
       end
       def obj_initializing(obj)  # :nodoc:
         if @options.has_key? :default_value
-          obj.send :"#{@attrname}=", @options[:default_value]
+          begin
+            obj.send :"#{@attrname}=", @options[:default_value].clone
+          rescue
+            obj.send :"#{@attrname}=", @options[:default_value]
+          end
         end
       end
       # utility method to be used by implementations of

data/lib/xml/mapping/version.rb

@@ -3,6 +3,6 @@
 
 module XML
   module Mapping
-    VERSION = '0.8'
+    VERSION = '0.8.1'
   end
 end

data/test/company.rb

@@ -21,6 +21,8 @@ class Company
   text_node :ent3, "arrtest/entry[3]"
 
   array_node :stuff, "stuff", "*"
+
+  object_node :test_default_value_identity, "dummy", :default_value => ["default"]
 end
 
 

data/test/xml_mapping_test.rb

@@ -165,6 +165,25 @@ class XmlMappingTest < Test::Unit::TestCase
   end
 
 
+  def test_default_value_identity_on_initialize
+    c = Company.new
+    assert_equal ["default"], c.test_default_value_identity
+    c.test_default_value_identity << "foo"
+
+    c2 = Company.new
+    assert_equal ["default"], c2.test_default_value_identity
+  end
+
+
+  def test_default_value_identity_on_load
+    assert_equal ["default"], @c.test_default_value_identity
+    @c.test_default_value_identity << "bar"
+
+    c2 = Company.load_from_file(File.dirname(__FILE__) + "/fixtures/company1.xml")
+    assert_equal ["default"], c2.test_default_value_identity
+  end
+
+
   def test_polymorphic_node
     assert_equal 3, @c.stuff.size
     assert_equal 'Saddam Hussein', @c.stuff[0].name

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.11
 specification_version: 1
 name: xml-mapping
 version: !ruby/object:Gem::Version 
-  version: "0.8"
-date: 2005-07-07
-summary: "An easy to use, extensible library for mapping Ruby objects to XML and back.
-  Includes an XPath interpreter."
+  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
@@ -25,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Olaf Klischat
 files: 
@@ -36,40 +37,41 @@ files:
   - lib/xml/mapping
   - lib/xml/mapping.rb
   - lib/xml/xxpath.rb
-  - lib/xml/mapping/version.rb
+  - lib/xml/xxpath
   - lib/xml/mapping/base.rb
+  - lib/xml/mapping/version.rb
   - lib/xml/mapping/standard_nodes.rb
-  - examples/time_augm.intout
-  - examples/company.rb
   - examples/company.xml
+  - examples/company.rb
+  - examples/order_signature_enhanced.rb
   - examples/company_usage.intin.rb
   - examples/order.rb
   - examples/order.xml
-  - examples/order_signature_enhanced.rb
+  - examples/company_usage.intout
   - examples/order_signature_enhanced.xml
-  - examples/order_signature_enhanced_usage.intin.rb
   - examples/order_usage.intin.rb
-  - examples/time_augm.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/company_usage.intout
+  - 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
-  - examples/order_usage.intout
-  - test/fixtures
   - test/all_tests.rb
   - test/company.rb
+  - test/tests_init.rb
+  - test/fixtures
   - test/documents_folders.rb
   - test/multiple_mappings.rb
-  - test/tests_init.rb
   - test/xml_mapping_adv_test.rb
   - test/xml_mapping_test.rb
   - test/xpath_test.rb
@@ -79,6 +81,7 @@ files:
   - test/fixtures/documents_folders2.xml
   - LICENSE
   - Rakefile
+  - ChangeLog
   - install.rb
 test_files: 
   - test/all_tests.rb