restful_resource 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07bcb86564c632f57564ed219caa375746d34b5
-  data.tar.gz: 8c2a169aa6eb5d3d1375f3d1db51c71a02507d67
+  metadata.gz: 75f132684cd87920b174105e1f5c2a119b10c47a
+  data.tar.gz: 1e9567b9c0c5a11f6b9c4e0c4a691df725f40b8f
 SHA512:
-  metadata.gz: 25e1171702db43da2dde02f46ea774f035f17599d3f90ec21715f801ad60baabb4109393f4f1346077fb88ab6cdd67add5d88938211282c0fc4f6392aed2ad89
-  data.tar.gz: bfc2b2cec9c773f70b024614a0d01dc6c3b871312ff131afe659ec4f63ab439292433764f54f6adf454e5bfb959179b0b43db599e5a33bdba143d8ac0039dae3
+  metadata.gz: 0e1f0075a6cf5cc0176528123e583197305d618d5118541ef48a94893344daf48983a2a85907be8fd689ea52e81081f1ea08e215d920377bb71eea93955143c8
+  data.tar.gz: e15ec1d715e9ec81df46eab480ba81dc365b9a17e6b810b7b58bda68df9de97234d2d9679455331176d257c3dad8b06a887c603428e6a66b984d251eee4de7db

data/lib/restful_resource.rb

@@ -12,6 +12,7 @@ require_relative 'restful_resource/response'
 require_relative 'restful_resource/authorization'
 require_relative 'restful_resource/http_client'
 require_relative "restful_resource/associations"
+require_relative 'restful_resource/rails_validations'
 require_relative "restful_resource/base"
 require_relative "restful_resource/old_base"
 

data/lib/restful_resource/base.rb

@@ -37,8 +37,9 @@ module RestfulResource
       RestfulResource::OpenObject.new(parse_json(response.body))
     end
 
-    def self.put(data: {}, **params)
-      http.put(collection_url(params), data)
+    def self.put(id, data: {}, **params)
+      response = http.put(member_url(id, params), data)
+      self.new(parse_json(response.body))
     end
 
     def self.all

data/lib/restful_resource/http_client.rb

@@ -1,5 +1,13 @@
 module RestfulResource
   class HttpClient
+    class UnprocessableEntity < RuntimeError
+      attr_reader :response
+
+      def initialize(response)
+        @response = Response.new(body: response.body, headers: response.headers, status: response.code)
+      end
+    end
+
     def initialize(authorization: nil)
       @authorization = authorization
     end
@@ -10,7 +18,11 @@ module RestfulResource
     end
 
     def put(url, data: {})
-      response = RestClient.put(url, data, :accept => :json, authorization: @authorization)
+      begin
+        response = RestClient.put(url, data, :accept => :json, authorization: @authorization)
+      rescue RestClient::UnprocessableEntity => e
+        raise HttpClient::UnprocessableEntity.new(e.response)
+      end
       Response.new(body: response.body, headers: response.headers, status: response.code)
     end
   end

data/lib/restful_resource/old_base.rb

@@ -68,7 +68,7 @@ module RestfulResource
     end
 
     def valid?
-      errors.nil? || errors.count == g
+      errors.nil? || errors.count == 0
     end
 
     def self.find(id, url_params={})

data/lib/restful_resource/rails_validations.rb

@@ -0,0 +1,23 @@
+module RestfulResource
+  module RailsValidations
+    module ClassMethods
+      def put(id, data: {}, **params)
+        begin
+          super(id, data: data, **params)
+        rescue HttpClient::UnprocessableEntity => e
+          errors = parse_json(e.response.body)
+          result = data.merge(errors)
+          self.new(result)
+        end
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def valid?
+      errors.nil? || errors.count == 0
+    end
+  end
+end

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.8.5"
+  VERSION = "0.8.6"
 end

data/spec/fixtures.rb

@@ -8,6 +8,12 @@ class Model < RestfulResource::Base
   resource_path "groups/:group_id/makes/:make_slug/models"
 end
 
+class Dealer < RestfulResource::Base
+  include RestfulResource::RailsValidations
+
+  resource_path "dealers"
+end
+
 class BaseA < RestfulResource::Base
 end
 

data/spec/restful_resource/base_spec.rb

@@ -120,13 +120,44 @@ describe RestfulResource::Base do
   end
 
   describe "#put" do
-    it 'should put data properly' do
-      expected_response = RestfulResource::Response.new(body: nil, status: 200)
-      expect_put('http://api.carwow.co.uk/makes?make_slug=Volkswagen', expected_response)
+    it 'should put no data with no params' do
+      expected_response = RestfulResource::Response.new(body: {name: 'Audi'}.to_json, status: 200)
+      expect_put('http://api.carwow.co.uk/makes/1', expected_response)
 
-      Make.put(make_slug: 'Volkswagen')
+      object = Make.put(1)
 
-      expect(expected_response.status).to eq 200
+      expect(object.name).to eq 'Audi'
+    end
+
+    it 'should put no data with params passed' do
+      expected_response = RestfulResource::Response.new(body: {name: 'Audi'}.to_json, status: 200)
+      expect_put('http://api.carwow.co.uk/makes/1?make_slug=Volkswagen', expected_response)
+
+      object = Make.put(1, make_slug: 'Volkswagen')
+
+      expect(object.name).to eq 'Audi'
+    end
+
+    it 'should put data with no params passed' do
+      data = {make_slug: 'Audi'}.to_json
+
+      expected_response = RestfulResource::Response.new(body: {name: 'Audi'}.to_json, status: 200)
+      expect_put('http://api.carwow.co.uk/makes/1', expected_response, data: data)
+
+      object = Make.put(1, data: data)
+
+      expect(object.name).to eq 'Audi'
+    end
+
+    it 'should put data with params passed' do
+      data = {make_slug: 'Audi'}.to_json
+
+      expected_response = RestfulResource::Response.new(body: {name: 'Audi'}.to_json, status: 200)
+      expect_put('http://api.carwow.co.uk/makes/1?make_slug=Volkswagen', expected_response, data: data)
+
+      object = Make.put(1, data: data, make_slug: 'Volkswagen')
+
+      expect(object.name).to eq 'Audi'
     end
   end
 

data/spec/restful_resource/http_client_spec.rb

@@ -15,6 +15,10 @@ describe RestfulResource::HttpClient do
       response = @http_client.put('http://httpbin.org/put', data: { name: 'Alfred' })
       expect(response.status).to eq 200
     end
+
+    it 'should raise error 422' do
+      expect { @http_client.put('http://httpbin.org/status/422', data: { name: 'Mad cow' }) }.to raise_error(RestfulResource::HttpClient::UnprocessableEntity)
+    end
   end
 
   describe 'Authentication' do

data/spec/restful_resource/rails_validations_spec.rb

@@ -0,0 +1,36 @@
+require_relative '../spec_helper'
+
+describe RestfulResource::RailsValidations do
+  before :each do
+    @mock_http = double("mock_http")
+    RestfulResource::Base.http = @mock_http
+    RestfulResource::Base.base_url = "http://api.carwow.co.uk/"
+  end
+
+  context "#put with errors" do
+    before :each do
+      data = {name: 'Leonardo'}
+      @error = 'Cannot use Ninja Turtles names'
+      expected_response = RestfulResource::Response.new(body: {errors: [@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)
+    end
+
+    it "should have an error" do
+      expect(@object.errors.count).to eq 1
+    end
+
+    it 'should have correct error' do
+      expect(@object.errors.first).to eq @error
+    end
+
+    it 'should return properly built object' do
+      expect(@object.name).to eq 'Leonardo'
+    end
+
+    it 'should return not valid object' do
+      expect(@object.valid?).to be_falsey
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -15,3 +15,9 @@ end
 def expect_put(url, response, data: {})
   expect(@mock_http).to receive(:put).with(url, data).and_return(response)
 end
+
+def expect_put_with_unprocessable_entity(url, response, data: {})
+  rest_client_response = OpenStruct.new({body: response.body, headers: response.headers, code: response.status})
+  exception = RestfulResource::HttpClient::UnprocessableEntity.new(rest_client_response)
+  expect(@mock_http).to receive(:put).with(url, data).and_raise(exception)
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,6 +131,7 @@ files:
 - lib/restful_resource/open_object.rb
 - lib/restful_resource/paginated_array.rb
 - lib/restful_resource/parameter_missing_error.rb
+- lib/restful_resource/rails_validations.rb
 - lib/restful_resource/response.rb
 - lib/restful_resource/version.rb
 - restful_resource.gemspec
@@ -140,6 +141,7 @@ files:
 - spec/restful_resource/http_client_spec.rb
 - spec/restful_resource/old_base_spec.rb
 - spec/restful_resource/open_object_spec.rb
+- spec/restful_resource/rails_validations_spec.rb
 - spec/restful_resource/rest_client_spec.rb
 - spec/spec_helper.rb
 homepage: http://www.github.com/carwow/restful_resource
@@ -174,5 +176,6 @@ test_files:
 - spec/restful_resource/http_client_spec.rb
 - spec/restful_resource/old_base_spec.rb
 - spec/restful_resource/open_object_spec.rb
+- spec/restful_resource/rails_validations_spec.rb
 - spec/restful_resource/rest_client_spec.rb
 - spec/spec_helper.rb