xml_resource 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9b84a85add7d0dace9d14d734bae2cbbebbeebf
-  data.tar.gz: c5ff1e51e574d32546b621b4272717b90eceb8c7
+  metadata.gz: e6d08265845c5ecc6dcfda46dd66776e0d23c489
+  data.tar.gz: 242e0b821fd361a46d38a864d654b1f4324446e6
 SHA512:
-  metadata.gz: 3850b3775a4eae2ffbfc51a89192d8adac3ee1b74175243c4ca017375b79bdfd572a0c283c20e6d4b6e43263ae19f31e5929a0f674c66f53ba23152310bea28d
-  data.tar.gz: f60b7497c7c28d07421723e1dae9dbc2bee1ca66fdc61b9622d78497489a0b912bbb510712b2b64dde4b6b35b29fabf0e945e3f86b9e82c409e150d67a72b742
+  metadata.gz: c8cea6a257f708fcd7d6a89f51c2487c06420a2c4d807a9920962a24774d260e4ac5f1538011e2ca19845c2f66c92955f75e924364783595f004a3f3126af56d
+  data.tar.gz: 549b9daeb15309b922fe9240ec3a54c319ea2e52e8cd8691c706ef85b2fc36819ed1e94571cc06fedc9fc925ccd75d0af9a4a6b688d8c7adc2196fc35f7db09c

data/lib/xml_resource/base.rb

@@ -13,7 +13,7 @@ module XmlResource
   
     class << self
     
-      def from_xml(xml_or_string)
+      def from_xml(xml_or_string, default_attrs = {})
         xml_or_string and xml = parse(xml_or_string) or return
         attrs = {}
         self.attributes.each do |name, options|
@@ -23,7 +23,7 @@ module XmlResource
             if !value.nil? && type = attribute_type(name)
               value = cast_to(type, value)
             end
-            attrs[name] = value
+            attrs[name] = value.nil? ? default_attrs[name] : value
           end
         end
         self.objects.each do |name, options|
@@ -39,8 +39,8 @@ module XmlResource
         new attrs
       end
     
-      def collection_from_xml(xml_or_string)
-        parse(xml_or_string).search(root).map { |element| from_xml(element) }.compact
+      def collection_from_xml(xml_or_string, default_attrs = {})
+        parse(xml_or_string).search(root).map { |element| from_xml(element, default_attrs) }.compact
       end
     
       def basename

data/lib/xml_resource/version.rb

@@ -1,3 +1,3 @@
 module XmlResource
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/test/cases/xml_resource_test.rb

@@ -58,7 +58,7 @@ class XmlResourceTest < ActiveSupport::TestCase
     camels = Camel.collection_from_xml(xml)
     dromedaries = Dromedary.collection_from_xml(xml)
     assert_equal [2, 2], camels.map(&:humps)
-    assert_equal [1], dromedaries.map(&:humps)
+    assert_equal [1, nil], dromedaries.map(&:humps)
     
     shark = Shark.collection_from_xml(xml).first
     assert_equal '2 m', shark.shark_size
@@ -68,6 +68,12 @@ class XmlResourceTest < ActiveSupport::TestCase
     assert_equal 'grey', elephant.color
   end
   
+  test 'Default attributes' do
+    xml = load_xml(:inflection)
+    dromedaries = Dromedary.collection_from_xml(xml, humps: 3)
+    assert_equal [1, 3], dromedaries.map(&:humps)
+  end
+  
   private
   
   def orders

data/test/data/inflection.xml

@@ -16,6 +16,9 @@
   <Dromedary>
     <Humps>1</Humps>
   </Dromedary>
+  <Dromedary>
+    <Color>gold</Color>
+  </Dromedary>
   <ELEPHANT>
     <COLOR>grey</COLOR>
   </ELEPHANT>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xml_resource
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Matthias Grosser