restful_resource 0.8.23 → 0.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2958228fd32634e5bebecbdb029068e72b25ca9d
-  data.tar.gz: c01b261848ed5156fa933db672bfdda79db43c0b
+  metadata.gz: 6e2b83be86b56f31f8e1b4186c4a1784c01e39de
+  data.tar.gz: cb04d1da2bc7ff5d77b2f25079002b676cf3d343
 SHA512:
-  metadata.gz: eae726157b14eaa50d6de77f163f69544ec66718ab03e460341d4c8cb1c3d2fd03d86fa1d09e97081a7aeab55905ad5e8bc3657c331fe0892ff0ea93592c595f
-  data.tar.gz: 01c6ef5fe52719ecf615b28400afba28b5dbebb08fe991128b93d29d5ed56ba2d6ebf1148892869c791946eefc0133143bf0a6fcf4d1aa9bb8c94ab6df886981
+  metadata.gz: 33294bdf10f2ea9e833b6b97b71c191b9832235880c9cb7177a17f27c15639ea6394e860906a08e9edd836d97291ae767d81f290c641de65817a0402cf6bf539
+  data.tar.gz: 806b7711995ed7baf3d62309efe42e7948c79943937e7044bfecd15faa359e8e530137d2bc0354f97c8c0b7ac9fbf3c2be22fd27e6d6366e1632b32c9dcd7eb9

data/lib/restful_resource/rails_validations.rb

@@ -6,7 +6,14 @@ module RestfulResource
           super(id, data: data, **params)
         rescue HttpClient::UnprocessableEntity => e
           errors = parse_json(e.response.body)
-          result = data.merge(errors)
+          result = nil
+          if errors.is_a?(Hash) && errors.has_key?('errors')
+            result = data.merge(errors)
+          elsif errors.is_a?(Array)
+            result = data.merge(errors: errors)
+          else
+            result = data.merge(errors: [errors])
+          end
           self.new(result)
         end
       end
@@ -16,7 +23,14 @@ module RestfulResource
           super(data: data, **params)
         rescue HttpClient::UnprocessableEntity => e
           errors = parse_json(e.response.body)
-          result = data.merge(errors)
+          result = nil
+          if errors.is_a?(Hash) && errors.has_key?('errors')
+            result = data.merge(errors)
+          elsif errors.is_a?(Array)
+            result = data.merge(errors: errors)
+          else
+            result = data.merge(errors: [errors])
+          end
           self.new(result)
         end
       end

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.8.23"
+  VERSION = "0.8.24"
 end

data/spec/restful_resource/rails_validations_spec.rb

@@ -50,6 +50,27 @@ describe RestfulResource::RailsValidations do
     it 'should return not valid object' do
       expect(@object.valid?).to be_falsey
     end
+
+    it 'should handle errors returned as root array' do
+      data = {name: 'Michelangelo'}
+      expected_response = RestfulResource::Response.new(body: [@error].to_json)
+      expect_put_with_unprocessable_entity("http://api.carwow.co.uk/dealers/1", expected_response, data: data)
+
+      @object = Dealer.put(1, data: data)
+      expect(@object.errors.count).to eq 1
+      expect(@object.errors.first).to eq @error
+    end
+
+    it 'should handle errors returned as root object' do
+      data = {name: 'Michelangelo'}
+      expected_response = RestfulResource::Response.new(body: @error.to_json)
+      expect_put_with_unprocessable_entity("http://api.carwow.co.uk/dealers/1", expected_response, data: data)
+
+      @object = Dealer.put(1, data: data)
+      expect(@object.errors.count).to eq 1
+      expect(@object.errors.first).to eq @error
+    end
+
   end
 
   context "#post without errors" do
@@ -95,5 +116,25 @@ describe RestfulResource::RailsValidations do
     it 'should return not valid object' do
       expect(@object.valid?).to be_falsey
     end
+
+    it 'should handle errors returned as root object' do
+      data = {name: 'Michelangelo'}
+      expected_response = RestfulResource::Response.new(body: [@error].to_json)
+      expect_post_with_unprocessable_entity("http://api.carwow.co.uk/dealers", expected_response, data: data)
+
+      @object = Dealer.post(data: data)
+      expect(@object.errors.count).to eq 1
+      expect(@object.errors.first).to eq @error
+    end
+
+    it 'should handle errors returned as root object' do
+      data = {name: 'Michelangelo'}
+      expected_response = RestfulResource::Response.new(body: @error.to_json)
+      expect_post_with_unprocessable_entity("http://api.carwow.co.uk/dealers", expected_response, data: data)
+
+      @object = Dealer.post(data: data)
+      expect(@object.errors.count).to eq 1
+      expect(@object.errors.first).to eq @error
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.8.23
+  version: 0.8.24
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler