spyke 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5862d16d060c727c750f6ef6fa7f785d729747f5
-  data.tar.gz: '09585cb44ae03a6fda4c919d04ec24175dc55392'
+  metadata.gz: 9124e2e536f848aee4a144556f24e0ccad5515e5
+  data.tar.gz: c1f33a42164811126c79b044b54265de252ddade
 SHA512:
-  metadata.gz: 3fba59829a12e29b2b8290f8aaa6a75fff77ecd274c11a32a46e60797d61f4fcfd08ff24cb9b36083f6c248367778e8668613e69289b7d89b22b98c32d19b3eb
-  data.tar.gz: b4ff64f835373b9bb7eaeda69d3d67e29ead1926dbf4fecbdd745f0a2409164d1d5ebb3778ac9d9dee6bf907ea2981a1863bf7d0aa1841ff13cf99cb54747f76
+  metadata.gz: 7f34c8c2f7b875e742ea9ed51b28d2518af3f62561978683374ea7956082403bd980b54aa176adb6dbb43b97c11c3e23599120d49b540ea9096395ad70c545b9
+  data.tar.gz: b087f095780cbd94b6d7a620eb8ef87a589978837130dd9d3471292ea65285f8609996ff199885a67d44ceda15fc9c2070b3679efcb6505921bcca580fdf4942

data/lib/spyke/http.rb

@@ -3,6 +3,7 @@ require 'faraday_middleware'
 require 'spyke/config'
 require 'spyke/path'
 require 'spyke/result'
+require 'spyke/normalized_validation_error'
 
 module Spyke
   module Http
@@ -102,9 +103,9 @@ module Spyke
 
       def add_errors_to_model(errors_hash)
         errors_hash.each do |field, field_errors|
-          field_errors.each do |attributes|
-            error_name = attributes.delete(:error).to_sym
-            errors.add(field.to_sym, error_name, attributes.symbolize_keys)
+          field_errors.each do |error_attributes|
+            error = NormalizedValidationError.new(error_attributes)
+            errors.add(field.to_sym, error.message, error.options)
           end
         end
       end

data/lib/spyke/normalized_validation_error.rb

@@ -0,0 +1,27 @@
+module Spyke
+  class NormalizedValidationError
+    ERROR_KEY = :error
+
+    def initialize(attributes)
+      @attributes = attributes
+    end
+
+    def message
+      case @attributes
+      when String
+        @attributes
+      when Hash
+        @attributes[ERROR_KEY].to_sym
+      end
+    end
+
+    def options
+      case @attributes
+      when String
+        {}
+      when Hash
+        @attributes.except(ERROR_KEY).symbolize_keys
+      end
+    end
+  end
+end

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.1.0'
+  VERSION = '5.2.0'
 end

data/test/orm_test.rb

@@ -93,6 +93,16 @@ module Spyke
       assert_requested endpoint
     end
 
+    def test_create_with_server_returning_string_validation_errors
+      endpoint = stub_request(:put, 'http://sushi.com/recipes/1').to_return_json(id: 'write_error:400', errors: { title: ["is too short"], groups: ["can't be blank"] })
+
+      recipe = Recipe.create(id: 1, title: 'sus')
+
+      assert_equal 'sus', recipe.title
+      assert_equal ['Title is too short', "Groups can't be blank"], recipe.errors.full_messages
+      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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -275,6 +275,7 @@ files:
 - lib/spyke/instrumentation.rb
 - lib/spyke/instrumentation/controller_runtime.rb
 - lib/spyke/instrumentation/log_subscriber.rb
+- lib/spyke/normalized_validation_error.rb
 - lib/spyke/orm.rb
 - lib/spyke/path.rb
 - lib/spyke/relation.rb