xml-mapping 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9fc1ba6799b750d709b7ee01630bf670f8488854
-  data.tar.gz: be07c8311cce21655d28124edfed9d18378d4a71
+SHA256:
+  metadata.gz: 1d3c510b64931acb9fcd54695e9e594e87663da7dab9d052a19e52eb1feadd58
+  data.tar.gz: 1712f4e61dd043d89e18315773cba8a90b54c12b75259e197b58138680c917e0
 SHA512:
-  metadata.gz: fdec3b02611b85281ed21da509f57e04f4eb5516947ec6c42879fd7381cc020a960245ab9ab7ae683f07a218d24517488a8169c04af2958e94eaf1d647179b46
-  data.tar.gz: c13f9e1ccf415ffd0bc4fa7f0faef0c7e9c37f83f1b2916519212de729087a8abd606dcee5b40712ecad5c18e4b362c10504b532b7786c2c562c6f12f640a324
+  metadata.gz: 91bf0706631fb3bc90fbb36cf9ee4e49ff3a6c6223e22dc97770e516ac4e92237fc95f8e45a3ceabf03c4531d5f086cfb6718ab8895917c07a932a34577ed654
+  data.tar.gz: 447cf363db2974074a321a3caabc7aee7f0e824aff0ec2edbe0db158f7dd8aa69709575cbf48f3412c911347dfe58fd54879869faba3191db99937bd03927496

data/Rakefile

@@ -10,7 +10,6 @@ require 'rake/testtask'
 require 'rdoc/task'
 require 'rake/packagetask'
 require 'rubygems/package_task'
-require 'rake/contrib/sshpublisher'
 
 require File.dirname(__FILE__)+"/lib/xml/mapping/version"
 
@@ -45,10 +44,7 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include(*FILES_RDOC_EXTRA)
   rdoc.rdoc_files.include('lib/**/*.rb')
 
-  # additional file dependencies for the rdoc task
-  #   this somewhat of a black art because RDocTask doesn't document the
-  #   prerequisite of its rdoc task (<rdoc_dir>/index.html)
-  file "#{rdoc.rdoc_dir}/index.html" => (FileList.new("examples/**/*.rb") + FILES_RDOC_INCLUDES)
+  task :rdoc => (FileList.new("examples/**/*.rb") + FILES_RDOC_INCLUDES)
 end
 
 

data/TODO.txt

@@ -1,3 +1,5 @@
+- consider switching from REXML to nokogiri and/or, maybe, ox.
+
 - XML::XXPath: Write a real XPath parser eventually
 
 - XML::XXPath: avoid duplicates in path.all(node) result arrays when

data/examples/company_usage.intout

@@ -1,11 +1,11 @@
 c = Company.load_from_file('company.xml') 
-=> #<Company:0x007fb015492e98 @name="ACME inc.", @address=#<Address:0x007fb015492380 @city="Berlin", @zip=10113>, @customers=[#<Customer:0x007fb015490030 @id="jim", @name="James Kirk">, #<Customer:0x007fb01548eeb0 @id="ernie", @name="Ernie">, #<Customer:0x007fb01548da38 @id="bert", @name="Bert">]>
+=> #<Company:0x00007fa87c0251a8 @name="ACME inc.", @address=#<Address:0x00007fa87c869940 @city="Berlin", @zip=10113>, @customers=[#<Customer:0x00007fa87c843740 @id="jim", @name="James Kirk">, #<Customer:0x00007fa87b98e6c8 @id="ernie", @name="Ernie">, #<Customer:0x00007fa87babfbc8 @id="bert", @name="Bert">]>
 c.name 
 => "ACME inc."
 c.customers.size 
 => 3
 c.customers[1] 
-=> #<Customer:0x007fb01548eeb0 @id="ernie", @name="Ernie">
+=> #<Customer:0x00007fa87b98e6c8 @id="ernie", @name="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:0x007fb015490030 @id="jim", @name="James Tiberius Kirk">, #<Customer:0x007fb01548eeb0 @id="ernie", @name="Ernie">, #<Customer:0x007fb01548da38 @id="bert", @name="Bert">, #<Customer:0x007fb01547f1b8 @id="cm", @name="Cookie Monster">]
+=> [#<Customer:0x00007fa87c843740 @id="jim", @name="James Tiberius Kirk">, #<Customer:0x00007fa87b98e6c8 @id="ernie", @name="Ernie">, #<Customer:0x00007fa87babfbc8 @id="bert", @name="Bert">, #<Customer:0x00007fa87babd558 @id="cm", @name="Cookie Monster">]
 xml2 = c.save_to_xml 
 => <company name='ACME inc.'> ... </>
 xml2.write($stdout,2) 

data/examples/documents_folders_usage.intout

@@ -1,10 +1,10 @@
 
 root = XML::Mapping.load_object_from_file "documents_folders.xml" 
-=> #<Folder:0x007fb015437098 @entries=[#<Document:0x007fb015436148 @name="plan", @contents=" inhale, exhale">, #<Folder:0x007fb0154352c0 @entries=[#<Folder:0x007fb015434550 @entries=[#<Document:0x007fb015432e30 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">], @name="home">
+=> #<Folder:0x00007fa87c9362d8 @entries=[#<Document:0x00007fa87c935310 @name="plan", @contents=" inhale, exhale">, #<Folder:0x00007fa87c934758 @entries=[#<Folder:0x00007fa87c9639b8 @entries=[#<Document:0x00007fa87c961e88 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">], @name="home">
 root.name 
 => "home"
 root.entries 
-=> [#<Document:0x007fb015436148 @name="plan", @contents=" inhale, exhale">, #<Folder:0x007fb0154352c0 @entries=[#<Folder:0x007fb015434550 @entries=[#<Document:0x007fb015432e30 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">]
+=> [#<Document:0x00007fa87c935310 @name="plan", @contents=" inhale, exhale">, #<Folder:0x00007fa87c934758 @entries=[#<Folder:0x00007fa87c9639b8 @entries=[#<Document:0x00007fa87c961e88 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">]
 
 root.append "etc", Folder.new
 root["etc"].append "passwd", Document.new

data/examples/order_signature_enhanced_usage.intout

@@ -1,5 +1,5 @@
 s=Signature.load_from_file("order_signature_enhanced.xml") 
-=> #<Signature:0x007fb015310840 @position="product manager", @signed_on=2005-02-13 00:00:00 +0100, @name="John Doe">
+=> #<Signature:0x00007fa87c919188 @position="product manager", @signed_on=2005-02-13 00:00:00 +0100, @name="John Doe">
 s.signed_on 
 => 2005-02-13 00:00:00 +0100
 s.signed_on=Time.local(1976,12,18) 

data/examples/order_usage.intout

@@ -1,10 +1,10 @@
 ####read access
 o=Order.load_from_file("order.xml") 
-=> #<Order:0x007fb01549d438 @signatures=[#<Signature:0x007fb015493b68 @position="product manager", @name="John Doe">, #<Signature:0x007fb015492c68 @position="clerk", @name="Jill Smith">, #<Signature:0x007fb015491a20 @position="Some Employee", @name="Miles O'Brien">], @reference="12343-AHSHE-314159", @client=#<Client:0x007fb01549c998 @work_address=#<Address:0x007fb01549a238 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x007fb01549bbb0 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>, @items={"RF-0001"=>#<Item:0x007fb0154989b0 @descr="Stuffed Penguin", @quantity=10, @unit_price=8.95>, "RF-0034"=>#<Item:0x007fb015496638 @descr="Chocolate", @quantity=5, @unit_price=28.5>, "RF-3341"=>#<Item:0x007fb015495300 @descr="Cookie", @quantity=30, @unit_price=0.85>}>
+=> #<Order:0x00007fa87c968e68 @signatures=[#<Signature:0x00007fa87c970fc8 @position="product manager", @name="John Doe">, #<Signature:0x00007fa87c970500 @position="clerk", @name="Jill Smith">, #<Signature:0x00007fa87bacf8e8 @position="Some Employee", @name="Miles O'Brien">], @reference="12343-AHSHE-314159", @client=#<Client:0x00007fa87c968508 @work_address=#<Address:0x00007fa87babdcb0 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x00007fa87babf808 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>, @items={"RF-0001"=>#<Item:0x00007fa87c973ea8 @descr="Stuffed Penguin", @quantity=10, @unit_price=8.95>, "RF-0034"=>#<Item:0x00007fa87c972e68 @descr="Chocolate", @quantity=5, @unit_price=28.5>, "RF-3341"=>#<Item:0x00007fa87c971f68 @descr="Cookie", @quantity=30, @unit_price=0.85>}>
 o.reference 
 => "12343-AHSHE-314159"
 o.client 
-=> #<Client:0x007fb01549c998 @work_address=#<Address:0x007fb01549a238 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x007fb01549bbb0 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>
+=> #<Client:0x00007fa87c968508 @work_address=#<Address:0x00007fa87babdcb0 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x00007fa87babf808 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>
 o.items.keys 
 => ["RF-0001", "RF-0034", "RF-3341"]
 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:0x007fb015493b68 @position="product manager", @name="John Doe">, #<Signature:0x007fb015492c68 @position="clerk", @name="Jill Smith">, #<Signature:0x007fb015491a20 @position="Some Employee", @name="Miles O'Brien">]
+=> [#<Signature:0x00007fa87c970fc8 @position="product manager", @name="John Doe">, #<Signature:0x00007fa87c970500 @position="clerk", @name="Jill Smith">, #<Signature:0x00007fa87bacf8e8 @position="Some Employee", @name="Miles O'Brien">]
 o.signatures[2].name 
 => "Miles O'Brien"
 o.signatures[2].position 
@@ -150,17 +150,17 @@ xml.write($stdout,2)
 
 ####Starting a new order from scratch
 o = Order.new 
-=> #<Order:0x007fb0153bfef8 @signatures=[]>
+=> #<Order:0x00007fa87c94f328 @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 /home/olaf/xml-mapping/lib/xml/mapping/base.rb:712:in `obj_to_xml'
-	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:218:in `block in fill_into_xml'
-	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:217:in `each'
-	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:217:in `fill_into_xml'
-	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:229:in `save_to_xml'
+	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:724:in `obj_to_xml'
+	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:218:in `block in fill_into_xml'
+	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:217:in `each'
+	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:217:in `fill_into_xml'
+	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:229:in `save_to_xml'
 ## can't save as long as there are still unset attributes without
 ## default values
 

data/examples/person.intout

@@ -10,13 +10,13 @@ end
 ### usage
 
 p1 = Person.load_from_xml(REXML::Document.new('<person name="Jim"/>').root)
-=> #<Person:0x007fb014e95298 @name="Jim">
+=> #<Person:0x00007fa87bb3a6e8 @name="Jim">
 
 p2 = Person.load_from_xml(REXML::Document.new('<person><name>James</name></person>').root)
-=> #<Person:0x007fb014e847b8 @name="James">
+=> #<Person:0x00007fa87ba83b50 @name="James">
 
 p3 = Person.load_from_xml(REXML::Document.new('<person>Suzy</person>').root)
-=> #<Person:0x007fb014e6c550 @name="Suzy">
+=> #<Person:0x00007fa87bb43ef0 @name="Suzy">
 
 
 p1.save_to_xml.write($stdout)

data/examples/person_mm.intout

@@ -66,7 +66,7 @@ xml = REXML::Document.new('
 
 ## load using the default mapping
 p = Person.load_from_xml xml 
-=> #<Person:0x007fb015506640 @name="Suzy", @age=28, @address=#<Address:0x007fb015505a38 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
+=> #<Person:0x00007fa87ba674c8 @name="Suzy", @age=28, @address=#<Address:0x00007fa87ba65dd0 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
 
 ## save using the default mapping
 xml2 = p.save_to_xml
@@ -109,6 +109,6 @@ other_xml.write $stdout,2
 </individual>
 ## load it again using the :other mapping
 p2 = Person.load_from_xml other_xml, :mapping=>:other 
-=> #<Person:0x007fb0154bad30 @name="Suzy", @age=28, @address=#<Address:0x007fb0154b98e0 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
+=> #<Person:0x00007fa87c0b3f98 @name="Suzy", @age=28, @address=#<Address:0x00007fa87c0b3638 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
 
 ## p2 identical to p 

data/examples/publication.intout

@@ -9,7 +9,7 @@ end
 ### usage
 
 p1 = Publication.load_from_xml(REXML::Document.new('<publication author="Jim"/>').root)
-=> #<Publication:0x007fb01548e668 @author="Jim">
+=> #<Publication:0x00007fa87c9b95e8 @author="Jim">
 
 p2 = Publication.load_from_xml(REXML::Document.new('
 <publication>
@@ -17,4 +17,4 @@ p2 = Publication.load_from_xml(REXML::Document.new('
   <contr>Mel</contr>
   <contr>Toby</contr>
 </publication>').root)
-=> #<Publication:0x007fb01547ef38 @contributors=["Chris", "Mel", "Toby"]>
+=> #<Publication:0x00007fa87c0b5d48 @contributors=["Chris", "Mel", "Toby"]>

data/examples/reader.intout

@@ -12,7 +12,7 @@ class Foo
 end
 
 f = Foo.load_from_xml(REXML::Document.new('<foo name="Jim" more="XYZ"/>').root)
-=> #<Foo:0x007fb015460c40 @name="JimXYZ">
+=> #<Foo:0x00007fa87bb5b550 @name="JimXYZ">
 
 xml = f.save_to_xml 
 xml.write $stdout,2 

data/examples/stringarray_usage.intout

@@ -1,5 +1,5 @@
 ppl=People.load_from_file("stringarray.xml") 
-=> #<People:0x007fb015431a58 @names=["Jim", "Susan", "Herbie", "Nancy"]>
+=> #<People:0x00007fa87ba28228 @names=["Jim", "Susan", "Herbie", "Nancy"]>
 ppl.names 
 => ["Jim", "Susan", "Herbie", "Nancy"]
 

data/examples/time_augm.intout

@@ -15,21 +15,21 @@ nowxml=Time.now.save_to_xml
 nowxml.write($stdout,2)
 <time>
   <year>
-    2014
+    2018
   </year>
   <month>
-    9
+    2
   </month>
   <mday>
-    19
+    28
   </mday>
   <hours>
-    14
+    16
   </hours>
   <minutes>
-    1
+    3
   </minutes>
   <seconds>
-    43
+    33
   </seconds>
 </time>

data/examples/xpath_create_new.intout

@@ -64,7 +64,7 @@ firstbazelt=XML::XXPath.new("/bar/baz").first(rootelt)
 path2=XML::XXPath.new("@key2")
 
 path2.create_new(firstbazelt)
-=> #<XML::XXPath::Accessors::Attribute:0x007fb014e37210 @parent=<baz key='work' key2='[unset]'> ... </>, @name="key2">
+=> #<XML::XXPath::Accessors::Attribute:0x00007fa87bbf3698 @parent=<baz key='work' key2='[unset]'> ... </>, @name="key2">
 d.write($stdout,2)
  
 <foo>
@@ -87,12 +87,11 @@ d.write($stdout,2)
 ### same call again...
 path2.create_new(firstbazelt)
 XML::XXPathError: XPath (@key2): create_new and attribute already exists
-	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:215:in `create_on'
-	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `call'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `all'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:70:in `first'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:215:in `create_on'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:91:in `all'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:70:in `first'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
 ### can't create that path anew again -- an element can't have more
 ### than one attribute with the same name
 
@@ -150,12 +149,11 @@ d.write($stdout,2)
 
 XML::XXPath.new("baz[6]").create_new(baz6elt.parent)
 XML::XXPathError: XPath: baz[6]: create_new and element already exists
-	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:167:in `create_on'
-	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `call'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `all'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:70:in `first'
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:167:in `create_on'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:91:in `all'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:70:in `first'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
 ### yep, baz[6] already existed and thus couldn't be created once
 ### again
 

data/examples/xpath_ensure_created.intout

@@ -96,7 +96,7 @@ d.write($stdout,2)
 </foo>### no change
 
 XML::XXPath.new("/bar/baz[6]/@haha").first(rootelt,:ensure_created=>true)
-=> #<XML::XXPath::Accessors::Attribute:0x007fb014a51d08 @parent=<baz haha='[unset]'/>, @name="haha">
+=> #<XML::XXPath::Accessors::Attribute:0x00007fa87c9d32e0 @parent=<baz haha='[unset]'/>, @name="haha">
 d.write($stdout,2)
  
 <foo>
@@ -115,7 +115,7 @@ d.write($stdout,2)
 </foo>### 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:0x007fb014a479c0 @parent=<baz haha='[unset]'/>, @name="haha">
+=> #<XML::XXPath::Accessors::Attribute:0x00007fa87b0ee068 @parent=<baz haha='[unset]'/>, @name="haha">
 d.write($stdout,2)
  
 <foo>

data/examples/xpath_usage.intout

@@ -44,7 +44,7 @@ path2.all(d)
 ## "first" raises XML::XXPathError in such cases...
 path2.first(d)
 XML::XXPathError: path not found: /foo/bar[2]/baz[4]
-	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:75:in `first'
+	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:75:in `first'
 
 ##...unless we allow nil returns
 path2.first(d,:allow_nil=>true)

data/lib/xml/mapping/base.rb

@@ -85,7 +85,7 @@ module XML
     # can't really use a class variable for this because it must be
     # shared by all class methods mixed into classes by including
     # Mapping. See
-    # http://user.cs.tu-berlin.de/~klischat/mydocs/ruby/mixin_class_methods_global_state.txt.html
+    # http://multi-io.github.io/mydocs-pub/ruby/mixin_class_methods_global_state.txt.html
     # for a more detailed discussion.
     Classes_by_rootelt_names = {}  #:nodoc:
     class << Classes_by_rootelt_names
@@ -258,8 +258,9 @@ module XML
     # The XML is obtained by calling #save_to_xml.
     def save_to_file(filename, options={:mapping=>:_default})
       xml = save_to_xml :mapping=>options[:mapping]
+      formatter = options[:formatter] || self.class.mapping_output_formatter
       File.open(filename,"w") do |f|
-        REXML::Formatters::Transitive.new(2,false).write(xml,f)
+        formatter.write(xml, f)
       end
     end
 
@@ -435,6 +436,17 @@ module XML
         self.name.split('::')[-1].gsub(/^(.)/){$1.downcase}.gsub(/(.)([A-Z])/){$1+"-"+$2.downcase}
       end
 
+      # the formatter to be used for output formatting when writing
+      # xml to character streams (Files/IOs). Combined
+      # getter/setter. Defaults to simple (compact/no-whitespace)
+      # formatting, may be overridden on a per-call base via options
+      def mapping_output_formatter(formatter=nil)
+        # TODO make it per-mapping
+        if formatter
+          @mapping_output_formatter = formatter
+        end
+        @mapping_output_formatter ||= REXML::Formatters::Default.new
+      end
     end
 
 

data/lib/xml/mapping/standard_nodes.rb

@@ -48,14 +48,21 @@ module XML
         @path = XML::XXPath.new(path)
         args
       end
+
       def extract_attr_value(xml) # :nodoc:
         txt = default_when_xpath_err{ @path.first(xml).text }
-        begin
-          Integer(txt)
-        rescue ArgumentError
-          Float(txt)
+
+        if txt.nil?
+          raise NoAttrValueSet, "Attribute #{@attrname} not set (text missing)"
+        else
+          begin
+            Integer(txt)
+          rescue ArgumentError
+            Float(txt)
+          end
         end
       end
+
       def set_attr_value(xml, value) # :nodoc:
         raise RuntimeError, "Not an integer: #{value}" unless Numeric===value
         @path.first(xml,:ensure_created=>true).text = value.to_s

data/lib/xml/mapping/version.rb

@@ -3,6 +3,6 @@
 
 module XML
   module Mapping
-    VERSION = '0.10.0'
+    VERSION = '0.10.1'
   end
 end

data/lib/xml/rexml_ext.rb

@@ -152,7 +152,7 @@ begin
   # temporarily suppress warnings
   class <<Kernel
     alias_method :old_warn, :warn
-    def warn(msg)
+    def warn(*args)
     end
   end
   begin

data/test/fixtures/number.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<number>
+  <value/>
+</number>

data/test/number.rb

@@ -0,0 +1,11 @@
+require 'xml/mapping'
+
+class Number
+  include XML::Mapping
+
+  use_mapping :no_default
+  numeric_node :value, 'value'
+
+  use_mapping :with_default
+  numeric_node :value, 'value', default_value: 0
+end

data/test/xml_mapping_test.rb

@@ -46,6 +46,22 @@ class XmlMappingTest < Test::Unit::TestCase
     assert_equal 18, @c.offices[1].address.number
   end
 
+  def test_int_node_default_value
+    require 'number'
+    xml = REXML::Document.new(File.new(File.dirname(__FILE__) + "/fixtures/number.xml"))
+
+    assert_raise(XML::MappingError.new('no value, and no default value: Attribute value not set (text missing)')) do
+      Number.load_from_xml(xml.root, :mapping => :no_default)
+    end
+
+    num = nil
+    assert_nothing_raised do
+      num = Number.load_from_xml(xml.root, :mapping => :with_default)
+    end
+
+    assert_equal 0, num.value
+  end
+
   def test_getter_boolean_node
     path=XML::XXPath.new("offices/office[2]/classified")
     assert_equal(path.first(@xml.root).text == "yes",
@@ -356,4 +372,29 @@ class XmlMappingTest < Test::Unit::TestCase
     assert_equal 'no',     xml2.root.elements[5].elements[3].elements[1].text
   end
 
+
+  def test_file_io
+    require 'tmpdir'
+    Dir.mktmpdir do |dir|
+      @c.save_to_file "#{dir}/out.xml"
+      c2 = Company.load_from_file "#{dir}/out.xml"
+      assert_equal @c, c2, 'read back object equals original'
+
+      @c.save_to_file "#{dir}/out_default.xml", :formatter=>REXML::Formatters::Default.new
+
+      assert FileUtils.compare_file("#{dir}/out.xml", "#{dir}/out_default.xml"), 'default formatter is Formatters::Default'
+      assert File.open("#{dir}/out_default.xml").readlines.grep(/^\s/).empty?, 'default formatter produces no indentations'
+
+      @c.save_to_file "#{dir}/out_pretty.xml", :formatter=>REXML::Formatters::Pretty.new
+      assert not(File.open("#{dir}/out_pretty.xml").readlines.grep(/^\s/).empty?), 'pretty formatter does produce indentations'
+
+      Company.class_eval <<-EOS
+        mapping_output_formatter REXML::Formatters::Pretty.new
+      EOS
+
+      @c.save_to_file "#{dir}/out2.xml"
+      assert FileUtils.compare_file("#{dir}/out2.xml", "#{dir}/out_pretty.xml"), 'default formatter can be changed on a per-class basis'
+    end
+  end
+
 end

data/user_manual.md

@@ -15,10 +15,10 @@ https://github.com/multi-io/xml-mapping
 - {Single-attribute Nodes}[rdoc-label:label-Single-attribute+Nodes]
     - {Default Values}[rdoc-label:label-Default+Values]
     - {Single-attribute Nodes with Sub-objects}[rdoc-label:label-Single-attribute+Nodes+with+Sub-objects]
-    - {Attribute Handling Details, Augmenting Existing Classes}[rdoc-label:label-Attribute+Handling+Details%2C+Augmenting+Existing+Classes]
+    - {Attribute Handling Details, Augmenting Existing Classes}[rdoc-label:label-Attribute+Handling+Details-2C+Augmenting+Existing+Classes]
 - {Other Nodes}[rdoc-label:label-Other+Nodes]
     - {choice_node}[rdoc-label:label-choice_node]
-    - {Readers/Writers}[rdoc-label:label-Readers%2FWriters]
+    - {Readers/Writers}[rdoc-label:label-Readers-2FWriters]
 - {Multiple Mappings per Class}[rdoc-label:label-Multiple+Mappings+per+Class]
 - {Defining your own Node Types}[rdoc-label:label-Defining+your+own+Node+Types]
 - {XPath Interpreter}[rdoc-label:label-XPath+Interpreter]
@@ -153,11 +153,11 @@ http://www.castor.org/xml-mapping.html)
 
     ####read access
     o=Order.load_from_file("order.xml") 
-    => #<Order:0x007fb01549d438 @signatures=[#<Signature:0x007fb015493b68 @position="product manager", @name="John Doe">, #<Signature:0x007fb015492c68 @position="clerk", @name="Jill Smith">, #<Signature:0x007fb015491a20 @position="Some Employee", @name="Miles O'Brien">], @reference="12343-AHSHE-314159", @client=#<Client:0x007fb01549c998 @work_address=#<Address:0x007fb01549a238 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x007fb01549bbb0 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>, @items={"RF-0001"=>#<Item:0x007fb0154989b0 @descr="Stuffed Penguin", @quantity=10, @unit_price=8.95>, "RF-0034"=>#<Item:0x007fb015496638 @descr="Chocolate", @quantity=5, @unit_price=28.5>, "RF-3341"=>#<Item:0x007fb015495300 @descr="Cookie", @quantity=30, @unit_price=0.85>}>
+    => #<Order:0x00007fa316170280 @signatures=[#<Signature:0x00007fa316153c98 @position="product manager", @name="John Doe">, #<Signature:0x00007fa316152320 @position="clerk", @name="Jill Smith">, #<Signature:0x00007fa31614b890 @position="Some Employee", @name="Miles O'Brien">], @reference="12343-AHSHE-314159", @client=#<Client:0x00007fa31616afb0 @work_address=#<Address:0x00007fa316168210 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x00007fa316169d18 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>, @items={"RF-0001"=>#<Item:0x00007fa316160f60 @descr="Stuffed Penguin", @quantity=10, @unit_price=8.95>, "RF-0034"=>#<Item:0x00007fa31615b920 @descr="Chocolate", @quantity=5, @unit_price=28.5>, "RF-3341"=>#<Item:0x00007fa31615a2a0 @descr="Cookie", @quantity=30, @unit_price=0.85>}>
     o.reference 
     => "12343-AHSHE-314159"
     o.client 
-    => #<Client:0x007fb01549c998 @work_address=#<Address:0x007fb01549a238 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x007fb01549bbb0 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>
+    => #<Client:0x00007fa31616afb0 @work_address=#<Address:0x00007fa316168210 @city="San Francisco", @state="CA", @zip=94102, @street="98765, Fulton Street">, @name="Jean Smith", @home_address=#<Address:0x00007fa316169d18 @city="San Mateo", @state="CA", @zip=94403, @street="2000, Alameda de las Pulgas">>
     o.items.keys 
     => ["RF-0001", "RF-0034", "RF-3341"]
     o.items["RF-0034"].descr 
@@ -165,7 +165,7 @@ http://www.castor.org/xml-mapping.html)
     o.items["RF-0034"].total_price 
     => 142.5
     o.signatures 
-    => [#<Signature:0x007fb015493b68 @position="product manager", @name="John Doe">, #<Signature:0x007fb015492c68 @position="clerk", @name="Jill Smith">, #<Signature:0x007fb015491a20 @position="Some Employee", @name="Miles O'Brien">]
+    => [#<Signature:0x00007fa316153c98 @position="product manager", @name="John Doe">, #<Signature:0x00007fa316152320 @position="clerk", @name="Jill Smith">, #<Signature:0x00007fa31614b890 @position="Some Employee", @name="Miles O'Brien">]
     o.signatures[2].name 
     => "Miles O'Brien"
     o.signatures[2].position 
@@ -303,17 +303,17 @@ http://www.castor.org/xml-mapping.html)
     
     ####Starting a new order from scratch
     o = Order.new 
-    => #<Order:0x007fb0153bfef8 @signatures=[]>
+    => #<Order:0x00007fa3160c9f48 @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 /home/olaf/xml-mapping/lib/xml/mapping/base.rb:712:in `obj_to_xml'
-    	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:218:in `block in fill_into_xml'
-    	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:217:in `each'
-    	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:217:in `fill_into_xml'
-    	from /home/olaf/xml-mapping/lib/xml/mapping/base.rb:229:in `save_to_xml'
+    	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:724:in `obj_to_xml'
+    	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:218:in `block in fill_into_xml'
+    	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:217:in `each'
+    	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:217:in `fill_into_xml'
+    	from /Users/oklischat/xml-mapping/lib/xml/mapping/base.rb:229:in `save_to_xml'
     ## can't save as long as there are still unset attributes without
     ## default values
     
@@ -568,7 +568,7 @@ document like this one:
 usage:
 
     ppl=People.load_from_file("stringarray.xml") 
-    => #<People:0x007fb015431a58 @names=["Jim", "Susan", "Herbie", "Nancy"]>
+    => #<People:0x00007fa316332050 @names=["Jim", "Susan", "Herbie", "Nancy"]>
     ppl.names 
     => ["Jim", "Susan", "Herbie", "Nancy"]
     
@@ -675,11 +675,11 @@ Usage:
 
     
     root = XML::Mapping.load_object_from_file "documents_folders.xml" 
-    => #<Folder:0x007fb015437098 @entries=[#<Document:0x007fb015436148 @name="plan", @contents=" inhale, exhale">, #<Folder:0x007fb0154352c0 @entries=[#<Folder:0x007fb015434550 @entries=[#<Document:0x007fb015432e30 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">], @name="home">
+    => #<Folder:0x00007fa3162cadd8 @entries=[#<Document:0x00007fa3162ca018 @name="plan", @contents=" inhale, exhale">, #<Folder:0x00007fa3162c9410 @entries=[#<Folder:0x00007fa3162c8768 @entries=[#<Document:0x00007fa316132318 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">], @name="home">
     root.name 
     => "home"
     root.entries 
-    => [#<Document:0x007fb015436148 @name="plan", @contents=" inhale, exhale">, #<Folder:0x007fb0154352c0 @entries=[#<Folder:0x007fb015434550 @entries=[#<Document:0x007fb015432e30 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">]
+    => [#<Document:0x00007fa3162ca018 @name="plan", @contents=" inhale, exhale">, #<Folder:0x00007fa3162c9410 @entries=[#<Folder:0x00007fa3162c8768 @entries=[#<Document:0x00007fa316132318 @name="README", @contents="foo bar baz">], @name="xml-mapping">], @name="work">]
     
     root.append "etc", Folder.new
     root["etc"].append "passwd", Document.new
@@ -933,22 +933,22 @@ declarations that declare XML mappings for the day, month etc. fields:
     nowxml.write($stdout,2)
     <time>
       <year>
-        2014
+        2017
       </year>
       <month>
-        9
+        12
       </month>
       <mday>
-        19
+        29
       </mday>
       <hours>
-        14
+        16
       </hours>
       <minutes>
-        1
+        9
       </minutes>
       <seconds>
-        43
+        59
       </seconds>
     </time>
 
@@ -1031,7 +1031,7 @@ attribute) or several "contributors" (contained in a sequence of
     ### usage
     
     p1 = Publication.load_from_xml(REXML::Document.new('<publication author="Jim"/>').root)
-    => #<Publication:0x007fb01548e668 @author="Jim">
+    => #<Publication:0x00007fa3178fb940 @author="Jim">
     
     p2 = Publication.load_from_xml(REXML::Document.new('
     <publication>
@@ -1039,7 +1039,7 @@ attribute) or several "contributors" (contained in a sequence of
       <contr>Mel</contr>
       <contr>Toby</contr>
     </publication>').root)
-    => #<Publication:0x007fb01547ef38 @contributors=["Chris", "Mel", "Toby"]>
+    => #<Publication:0x00007fa317902420 @contributors=["Chris", "Mel", "Toby"]>
 
 The symbols :if, :then, and :elsif (but not :else -- see below) in the
 +choice_node+'s node factory method call are ignored; they may be
@@ -1093,13 +1093,13 @@ itself. You can achieve this with +choice_node+ like this:
     ### usage
     
     p1 = Person.load_from_xml(REXML::Document.new('<person name="Jim"/>').root)
-    => #<Person:0x007fb014e95298 @name="Jim">
+    => #<Person:0x00007fa31704d3e8 @name="Jim">
     
     p2 = Person.load_from_xml(REXML::Document.new('<person><name>James</name></person>').root)
-    => #<Person:0x007fb014e847b8 @name="James">
+    => #<Person:0x00007fa31700ead0 @name="James">
     
     p3 = Person.load_from_xml(REXML::Document.new('<person>Suzy</person>').root)
-    => #<Person:0x007fb014e6c550 @name="Suzy">
+    => #<Person:0x00007fa3170042d8 @name="Suzy">
     
     
     p1.save_to_xml.write($stdout)
@@ -1147,7 +1147,7 @@ Here's a (really contrived) example:
     end
     
     f = Foo.load_from_xml(REXML::Document.new('<foo name="Jim" more="XYZ"/>').root)
-    => #<Foo:0x007fb015460c40 @name="JimXYZ">
+    => #<Foo:0x00007fa31723eaa8 @name="JimXYZ">
     
     xml = f.save_to_xml 
     xml.write $stdout,2 
@@ -1309,7 +1309,7 @@ age and an address:
     
     ## load using the default mapping
     p = Person.load_from_xml xml 
-    => #<Person:0x007fb015506640 @name="Suzy", @age=28, @address=#<Address:0x007fb015505a38 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
+    => #<Person:0x00007fa31788b7d0 @name="Suzy", @age=28, @address=#<Address:0x00007fa31788ac68 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
     
     ## save using the default mapping
     xml2 = p.save_to_xml
@@ -1352,7 +1352,7 @@ age and an address:
     </individual>
     ## load it again using the :other mapping
     p2 = Person.load_from_xml other_xml, :mapping=>:other 
-    => #<Person:0x007fb0154bad30 @name="Suzy", @age=28, @address=#<Address:0x007fb0154b98e0 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
+    => #<Person:0x00007fa3178ba8a0 @name="Suzy", @age=28, @address=#<Address:0x00007fa3178b9ce8 @street="Abbey Road", @number=72, @city="London", @zip=18827>>
     
     ## p2 identical to p 
 

data/user_manual_xxpath.md

@@ -141,7 +141,7 @@ updated in-place.
     ## "first" raises XML::XXPathError in such cases...
     path2.first(d)
     XML::XXPathError: path not found: /foo/bar[2]/baz[4]
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:75:in `first'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:75:in `first'
     
     ##...unless we allow nil returns
     path2.first(d,:allow_nil=>true)
@@ -343,7 +343,7 @@ Examples:
     </foo>### no change
     
     XML::XXPath.new("/bar/baz[6]/@haha").first(rootelt,:ensure_created=>true)
-    => #<XML::XXPath::Accessors::Attribute:0x007fb014a51d08 @parent=<baz haha='[unset]'/>, @name="haha">
+    => #<XML::XXPath::Accessors::Attribute:0x00007fa317891770 @parent=<baz haha='[unset]'/>, @name="haha">
     d.write($stdout,2)
      
     <foo>
@@ -362,7 +362,7 @@ Examples:
     </foo>### 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:0x007fb014a479c0 @parent=<baz haha='[unset]'/>, @name="haha">
+    => #<XML::XXPath::Accessors::Attribute:0x00007fa316308660 @parent=<baz haha='[unset]'/>, @name="haha">
     d.write($stdout,2)
      
     <foo>
@@ -456,7 +456,7 @@ Examples:
     path2=XML::XXPath.new("@key2")
     
     path2.create_new(firstbazelt)
-    => #<XML::XXPath::Accessors::Attribute:0x007fb014e37210 @parent=<baz key='work' key2='[unset]'> ... </>, @name="key2">
+    => #<XML::XXPath::Accessors::Attribute:0x00007fa316862138 @parent=<baz key='work' key2='[unset]'> ... </>, @name="key2">
     d.write($stdout,2)
      
     <foo>
@@ -479,12 +479,11 @@ Examples:
     ### same call again...
     path2.create_new(firstbazelt)
     XML::XXPathError: XPath (@key2): create_new and attribute already exists
-    	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:215:in `create_on'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `call'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `all'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:70:in `first'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:215:in `create_on'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:91:in `all'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:70:in `first'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
     ### can't create that path anew again -- an element can't have more
     ### than one attribute with the same name
     
@@ -542,12 +541,11 @@ Examples:
     
     XML::XXPath.new("baz[6]").create_new(baz6elt.parent)
     XML::XXPathError: XPath: baz[6]: create_new and element already exists
-    	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:167:in `create_on'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `call'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:91:in `all'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:70:in `first'
-    	from /home/olaf/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:167:in `create_on'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath/steps.rb:80:in `block in creator'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:91:in `all'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:70:in `first'
+    	from /Users/oklischat/xml-mapping/lib/xml/xxpath.rb:112:in `create_new'
     ### yep, baz[6] already existed and thus couldn't be created once
     ### again
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml-mapping
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Olaf Klischat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -92,10 +92,12 @@ files:
 - test/fixtures/company1.xml
 - test/fixtures/documents_folders.xml
 - test/fixtures/documents_folders2.xml
+- test/fixtures/number.xml
 - test/fixtures/triangle_m1.xml
 - test/fixtures/triangle_m2.xml
 - test/inheritance_test.rb
 - test/multiple_mappings_test.rb
+- test/number.rb
 - test/rexml_xpath_benchmark.rb
 - test/tests_init.rb
 - test/triangle_mm.rb
@@ -128,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: xml-mapping
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: XML-Object mapper for Ruby