shutl_resource 1.5.5 → 1.5.6

data/lib/shutl/resource/rest_class_methods.rb

@@ -37,7 +37,8 @@ module Shutl::Resource
 
       check_fail response, "Failed to find #{name}! args: #{args}, params: #{params}"
 
-      including_parent_attributes = response.body[@resource_name].merge args
+      parent_attributes = response.body[@resource_name] || {}
+      including_parent_attributes = parent_attributes.merge args
       new_object including_parent_attributes, response.body
     end
 

data/lib/shutl/resource/version.rb

@@ -1,5 +1,5 @@
 module Shutl
   module Resource
-    VERSION = '1.5.5'
+    VERSION = '1.5.6'
   end
 end

data/spec/rest_resource_spec.rb

@@ -233,6 +233,18 @@ describe Shutl::Resource::Rest do
       end
 
     end
+
+    context 'with returned error' do
+      before do
+        @request = stub_request(:get, 'http://host/test_rests/a?arg1=val1&arg2=val2').
+          to_return(:status => 200, :body => '{"errors": { "base":["Bing::DistanceLookupError"] } }', :headers => headers)
+      end
+
+      it 'should contain the errors' do
+        resource = TestRest.find('a', arg1: 'val1', arg2: 'val2')
+        resource.errors.should == { 'base' => ["Bing::DistanceLookupError"]}
+      end
+    end
   end
 
   describe '#all' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shutl_resource
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shutl_auth
@@ -213,12 +213,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2145160790752704754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2145160790752704754
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23