xml_resource 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6d08265845c5ecc6dcfda46dd66776e0d23c489
-  data.tar.gz: 242e0b821fd361a46d38a864d654b1f4324446e6
+  metadata.gz: 39d686a14bc85492ab2c14febba48aa87f4f6886
+  data.tar.gz: ac9700fdf9aaeebf0c33dcf7a9afb6af044942b0
 SHA512:
-  metadata.gz: c8cea6a257f708fcd7d6a89f51c2487c06420a2c4d807a9920962a24774d260e4ac5f1538011e2ca19845c2f66c92955f75e924364783595f004a3f3126af56d
-  data.tar.gz: 549b9daeb15309b922fe9240ec3a54c319ea2e52e8cd8691c706ef85b2fc36819ed1e94571cc06fedc9fc925ccd75d0af9a4a6b688d8c7adc2196fc35f7db09c
+  metadata.gz: d58ea3703ec35453f365641d47537d6d2ceba5637453d7f54355d2985fc29a14d7609690ca833937fde57a96c1a7dc335d62d563efbd4166281fd1e1d207081a
+  data.tar.gz: e154eeeaac55e95cb6ea58c51003fa01144b6e4780af092fa231acfea99cf9d2b4ce98f1620be79c641456169f22b1f8d3748c51aa636c5fa577dba681e67e59

data/lib/xml_resource/base.rb

@@ -8,8 +8,8 @@ module XmlResource
     self.objects = {}
     self.inflection = :underscore
   
-    class XmlResource::ParseError < Exception; end
-    class XmlResource::TypeCastError < Exception; end
+    class XmlResource::ParseError < StandardError; end
+    class XmlResource::TypeCastError < StandardError; end
   
     class << self
     
@@ -23,7 +23,7 @@ module XmlResource
             if !value.nil? && type = attribute_type(name)
               value = cast_to(type, value)
             end
-            attrs[name] = value.nil? ? default_attrs[name] : value
+            attrs[name] = value
           end
         end
         self.objects.each do |name, options|
@@ -36,7 +36,7 @@ module XmlResource
             attrs[name] = collection_class(name).collection_from_xml(xml.at(xpath))
           end
         end
-        new attrs
+        new attrs.reject { |k, v| v.nil? }.reverse_merge(default_attrs)
       end
     
       def collection_from_xml(xml_or_string, default_attrs = {})
@@ -198,4 +198,4 @@ module XmlResource
     end
   
   end
-end
+end

data/lib/xml_resource/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xml_resource
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Matthias Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport