spyke 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9261f1e664c27242d946133701985395af962417
-  data.tar.gz: 11bba7b0d4ca6a79a0066e1faeddf43d19cd339e
+  metadata.gz: 54db6401a61650bf3c2a4eb03c31c7bad268e08f
+  data.tar.gz: 32f5992d2ad3dc9c412d254e276374e38b862e9c
 SHA512:
-  metadata.gz: 1bd18ad389c88b9831ea2b028fb2179064283d7b359a0d4cb99ab4d7fb88edefc1f2fabb45993ef4fea00773eb8f36add91610165b3eaa312a61714b3fcb1389
-  data.tar.gz: 8b392cff15ce16f2d473f27aa967bd91121e1a80e78a0cbccef1669ae28791fa6501a07eee81079590eb58c2b302c0097eb202025a1f22e9d217bffd7b5226a3
+  metadata.gz: 464225c61b899a3fa8c0b67c50e89a6b7899d77ab16d2fdecc965305d010047cbaa2a91ff6afe981352093b97529f43204bc829fc539b7e650d00747c6db7a44
+  data.tar.gz: 720b15b5ee804462d4120e271fc03d3a1bc54fb15054fc1d8f370c15a0c35d5914d7533b5d601f554cadb3beec3f90ebcde55e1e1a82559d60d89d7d4cacc036

data/README.md

@@ -47,10 +47,11 @@ class JSONParser < Faraday::Response::Middleware
     json = MultiJson.load(body, symbolize_keys: true)
     {
       data: json[:result],
-      metadata: json[:metadata]
+      metadata: json[:metadata],
+      errors: [json[:message]]
     }
   rescue MultiJson::ParseError => exception
-    { error: exception.cause }
+    { errors: [exception.cause] }
   end
 end
 
@@ -70,19 +71,19 @@ class User < Spyke::Base
   has_many :posts
 end
 
-user = User.find(3) 
+user = User.find(3)
 # => GET http://api.com/users/3
 
-user.posts 
+user.posts
 # => find embedded in returned JSON or GET http://api.com/users/3/posts
 
-user.update_attributes(name: 'Alice') 
+user.update_attributes(name: 'Alice')
 # => PUT http://api.com/users/3 - { user: { name: 'Alice' } }
 
-user.destroy 
+user.destroy
 # => DELETE http://api.com/users/3
 
-User.create(name: 'Bob') 
+User.create(name: 'Bob')
 # => POST http://api.com/users - { user: { name: 'Bob' } }
 ```
 

data/lib/spyke/http.rb

@@ -62,17 +62,27 @@ module Spyke
     METHODS.each do |method|
       define_method(method) do |action = nil, params = {}|
         params = action if action.is_a?(Hash)
-        path = case action
-               when Symbol then uri.join(action)
-               when String then Path.new(action, attributes)
-               else uri
-               end
-        self.attributes = self.class.send("#{method}_raw", path, params).data
+        path = resolve_path_from_action(action)
+
+        result = self.class.send("#{method}_raw", path, params)
+
+        result.errors.each { |error| errors.add(:base, error) }
+        self.attributes = result.data
       end
     end
 
     def uri
       Path.new(@uri_template, attributes)
     end
+
+    private
+
+      def resolve_path_from_action(action)
+        case action
+        when Symbol then uri.join(action)
+        when String then Path.new(action, attributes)
+        else uri
+        end
+      end
   end
 end

data/lib/spyke/result.rb

@@ -19,7 +19,7 @@ module Spyke
     end
 
     def errors
-      body[:errors]
+      body[:errors] || []
     end
   end
 end

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/test/orm_test.rb

@@ -79,6 +79,16 @@ module Spyke
       assert_requested endpoint
     end
 
+    def test_create_with_server_failure
+      endpoint = stub_request(:put, 'http://sushi.com/recipes/1').to_return_json(id: 'write_error:400', message: 'Unable to save recipe')
+
+      recipe = Recipe.create(id: 1, title: 'Sushi')
+
+      assert_equal 'Sushi', recipe.title
+      assert_equal ['Unable to save recipe'], recipe.errors[:base]
+      assert_requested endpoint
+    end
+
     def test_find_using_custom_uri_template
       endpoint = stub_request(:get, 'http://sushi.com/images/photos/1').to_return_json(result: { id: 1 })
       Photo.find(1)

data/test/support/api.rb

@@ -4,10 +4,11 @@ class JSONParser < Faraday::Response::Middleware
     json = MultiJson.load(body, symbolize_keys: true)
     {
       data: json[:result],
-      metadata: json[:metadata]
+      metadata: json[:metadata],
+      errors: [json[:message]]
     }
   rescue MultiJson::ParseError => exception
-    { error: exception.cause }
+    { errors: [exception.cause] }
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport