lazy_resource 0.3.2 → 0.3.3

data/lib/lazy_resource/mapping.rb

@@ -33,8 +33,8 @@ module LazyResource
             relation.load(objects)
           end
         else
-          if self.root_node_name && objects.key?(self.root_node_name.to_s)
-            self.load(objects.delete(self.root_node_name.to_s)).tap do |obj|
+          if mapped_name = self.mapped_root_node_name(objects)
+            self.load(objects.delete(mapped_name)).tap do |obj|
               obj.other_attributes = objects
             end
           else
@@ -42,6 +42,13 @@ module LazyResource
           end
         end
       end
+
+      def mapped_root_node_name(objects)
+        if self.root_node_name
+          root_node_names = self.root_node_name.is_a?(Array) ? self.root_node_name : [self.root_node_name]
+          mapped_name = (root_node_names.map(&:to_s) & objects.keys).first
+        end
+      end
     end
 
     def load(hash, persisted=true)
@@ -51,9 +58,9 @@ module LazyResource
         resource.persisted = persisted
         resource.fetched = false
 
-        if resource.class.root_node_name && hash.key?(resource.class.root_node_name.to_s)
+        if mapped_name = resource.class.mapped_root_node_name(hash)
           other_attributes = hash
-          hash = other_attributes.delete(resource.class.root_node_name.to_s)
+          hash = other_attributes.delete(mapped_name)
           self.other_attributes = other_attributes
         end
 

data/lib/lazy_resource/version.rb

@@ -1,3 +1,3 @@
 module LazyResource
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/lazy_resource/mapping_spec.rb

@@ -162,6 +162,19 @@ describe LazyResource::Mapping do
       user.load('data' => { :id => 123 }, 'length' => 12)
       user.other_attributes.should == { 'length' => 12 }
     end
+
+    it 'supports multiple root node names with a single resource' do
+      Foo.root_node_name = [:data, :datum]
+      user = Foo.new
+      user.load('data' => { :id => 123 })
+      user.id.should == 123
+    end
+
+    it 'supports multiple root node names with a collection' do
+      Foo.root_node_name = [:data, :datum]
+      users = Foo.load('data' => [{ :id => 123 }, { :id => 124 }])
+      users.map(&:id).should == [123, 124]
+    end
   end
 
   describe '#load' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_resource
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-07 00:00:00.000000000 Z
+date: 2012-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -137,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1900980543301721831
+      hash: -809900452515726390
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1900980543301721831
+      hash: -809900452515726390
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24