api-model 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f815e2fe813c6ab61d66e7cd060c4684c38b41e
-  data.tar.gz: 75056c124a3c1bf7772216ddea09f824db7c1a50
+  metadata.gz: 2824a025d53804254f083f5def2121ea04c9ca02
+  data.tar.gz: a0b7b7a237529233ebd6f325e7727ffcab36605c
 SHA512:
-  metadata.gz: cbfbbff8f9dea0f02b804a75d91fb697abadfef39a44e0a9531b053677f0b046b766cc66f4d410074d9bde4fb1947035ddaa33fc21ba150ffdf8022ead0df860
-  data.tar.gz: 695d60e37fc49ec0861516cacf1aaee650e6aa5ab5f0c3e9faf2f20d65d1a46182b4808084c4b56709219150ea8cbaac0b287596e95fd0dc52ca5833b3b64bf5
+  metadata.gz: 6c048dc626f37626351951594c90d25b58f4e113fbf07dd1ab129c27b1f0afe6f9da00e0cc8b5a121aa18e9b83fe7ef4c3938dc36cfe7b16f74a7f02cbff1e03
+  data.tar.gz: 8811f67f0e7e36663090b86257bf80c84fea21f62c9582c4dee36e851e8e322db1484a7d6e2d4f43d13d0460d66909e842d37f32f3af5a959ba37a8a06187ff1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.4.0)
+    api-model (2.4.1)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)

data/api-model.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "api-model"
-  s.version     = "2.4.0"
+  s.version     = "2.4.1"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api_model/instance_methods.rb

@@ -68,15 +68,16 @@ module ApiModel
       run_callbacks :save do
         response = self.class.call_api_with_json request_method, path, body, options.reverse_merge(builder: ApiModel::Builder::Hash.new)
         response_success = response.http_response.api_call.success?
+        error_messages = response.fetch_from_body(errors_root)
+
+        set_errors_from_hash error_messages if error_messages.present?
 
         if response_success
           run_callbacks :successful_save do
             update_attributes response.response_build_hash
           end
         else
-          run_callbacks :unsuccessful_save do
-            set_errors_from_hash response.fetch_from_body(errors_root)
-          end
+          run_callbacks :unsuccessful_save
         end
 
         response_success

data/lib/api_model/response.rb

@@ -87,7 +87,7 @@ module ApiModel
     # Then calling ++fetch_from_body("foo.bar.baz")++ would return "Hello world"
     def fetch_from_body(key_reference)
       key_reference.split(".").inject(response_body) do |hash,key|
-        hash.fetch(key)
+        hash.fetch(key, nil)
       end
     end
 

data/spec/api-model/api_model_spec.rb

@@ -256,6 +256,13 @@ describe ApiModel do
       blog_post.errors[:name].should eq ["Cannot be blank"]
     end
 
+    it 'should set errors on the instance even if the request was sucessful' do
+      expect {
+        VCR.use_cassette('posts') { blog_post.save "/post/200_with_errors", name: "" }
+      }.to change{ blog_post.errors.size }.from(0).to(1)
+      blog_post.errors[:name].should eq ["Cannot be blank"]
+    end
+
     it 'should be possible to change the error root when making the save call' do
       expect {
         VCR.use_cassette('posts') { blog_post.save "/post/with_nested_errors", {name: ""}, json_errors_root: "result.errors" }

data/spec/support/fixtures/posts.yml

@@ -280,4 +280,33 @@ http_interactions:
     http_version:
   recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
 
+- request:
+    method: put
+    uri: http://api-model-specs.com/post/200_with_errors
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+    body:
+      string: "{\"name\":\"\"}"
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.1
+      Date:
+      - Thu, 28 Nov 2013 16:02:56 GMT
+      Content-Type:
+      - text/plain; charset=utf-8
+      Content-Length:
+      - '248'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: "{\"errors\":{\"name\":\"Cannot be blank\"}}"
+    http_version:
+  recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
+
 recorded_with: VCR 2.8.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Damien Timewell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport