restful_resource 0.8.26 → 0.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 497d9ea8fabfad7bf1476db40238c550d76b07d8
-  data.tar.gz: a2a22720cda6d80f92722dbbf916819ddadf5242
+  metadata.gz: 97ee3bdc58923601c58f73bfdc73b9c9dae0f919
+  data.tar.gz: 9639fff43755fe48221473be09e234d79884abb0
 SHA512:
-  metadata.gz: 49421e9608e455840b389b53cda68b67c18b5257414cba27cec065663e8ff8064df2f5c8c99505e17c088f34fa398fb53220131a1ffbc04a023cdc71e5579cae
-  data.tar.gz: 2bd91a065fba45e08843ce1e0bbd381526cbcc362847e81e32ee84b7c5b0516c0d28a3d76c1be5d57547b88da8821ae8e6cead8a88dfd99d6831ceb110245d8b
+  metadata.gz: e0d0329baa0ecd710a706a25e39f639480bca7fca58d1d4add1973726124839e9d96bf6053fd6daa603b178b4ca65d920bbc018be281954fc6979ef4ae5e4f3a
+  data.tar.gz: f6153a1eab7c7040a73b298384d0d208528a7d950ab31f919cb4741dd13c14a0a196d8b10b5140a91b71d9e0e2602b05ad411ac89572ed94a9712652ea55f992

data/lib/restful_resource/rails_validations.rb

@@ -9,10 +9,8 @@ module RestfulResource
           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])
+            result = data.merge(errors: errors)
           end
           self.new(result)
         end
@@ -26,10 +24,8 @@ module RestfulResource
           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])
+            result = data.merge(errors: errors)
           end
           self.new(result)
         end
@@ -41,7 +37,7 @@ module RestfulResource
     end
 
     def valid?
-      @inner_object.errors.nil? || @inner_object.errors.count == 0
+      @inner_object.errors.nil?
     end
   end
 end

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.8.26"
+  VERSION = "0.8.27"
 end

data/spec/restful_resource/rails_validations_spec.rb

@@ -51,24 +51,14 @@ describe RestfulResource::RailsValidations 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
+      expect(@object.valid?).to be_falsey
+      expect(@object.errors).to eq @error
     end
 
   end
@@ -117,24 +107,14 @@ describe RestfulResource::RailsValidations 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
+      expect(@object.valid?).to be_falsey
+      expect(@object.errors).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.26
+  version: 0.8.27
 platform: ruby
 authors:
 - David Santoro