api-model 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4429aa28093885e9a1fe8ec0c21640866b2c9681
-  data.tar.gz: 3a049bf4664ea95bf7510c8f925ef3a5d9a2152c
+  metadata.gz: f8273b2a0168dac33ede420787115f8cf034fedd
+  data.tar.gz: d4353c56c88b74051a74ab7d6dbb6385cd4e9e8a
 SHA512:
-  metadata.gz: 4446f3269d881f915a7f0834d7c887811c1d3f346b7f06d598295495d16d988930355786b17d77aec397063a812fbe1010be42a05a6a7baa43419d71703b826b
-  data.tar.gz: 1419d5dd05f5e6779fe3beed226aa4bcb2ada6d3e76905f1ae48f414d84d0545a970e48cf9d739daaf039a994168b2bd6754f16f290bd3dc7ab0b5f7782ad7a4
+  metadata.gz: dd797e47911ad4b432e3bf0c6da1a0ba456cd46891a1e935dd8598f97146c90bf74ac485eb13fe66641bddfc2c5be868c0a95f9d2a6b97a49872c422b9421f09
+  data.tar.gz: 2a0b2cab17ead05483a17b12f58b07a5609877cb82a1ffade8e05020c2d33afb4b4f6af0d7c1d2aaf6f72f0a33d5e8018dfeee7c41e0f9369f67aa5c3c223409

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.1.0)
+    api-model (2.1.1)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)
@@ -11,10 +11,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.1.0)
-      activesupport (= 4.1.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
       builder (~> 3.1)
-    activesupport (4.1.0)
+    activesupport (4.1.1)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)

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.1.0"
+  s.version     = "2.1.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

@@ -61,7 +61,7 @@ module ApiModel
 
         if response_success
           run_callbacks :successful_save do
-            update_attributes response.response_body
+            update_attributes response.response_build_hash
           end
         else
           run_callbacks :unsuccessful_save do

data/lib/api_model/response.rb

@@ -77,8 +77,6 @@ module ApiModel
       end
     end
 
-    private
-
     # If the model config defines a json root, use it on the response_body
     # to dig down in to the hash.
     def response_build_hash

data/spec/api-model/api_model_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'support/mock_models/blog_post'
 require 'support/mock_models/car'
+require 'support/mock_models/user'
 
 describe ApiModel do
 
@@ -188,10 +189,12 @@ describe ApiModel do
   describe "saving changes on an instance" do
     before do
       BlogPost.api_config { |config| config.host = "http://api-model-specs.com" }
+      User.api_config { |c| c.json_root = "users" }
     end
 
     after do
       BlogPost.reset_api_configuration
+      User.reset_api_configuration
     end
 
     let(:blog_post) { BlogPost.new }
@@ -215,6 +218,14 @@ describe ApiModel do
       VCR.use_cassette('posts') { blog_post.save "/post/2", name: "foobarbaz" }
     end
 
+    it 'should use the config.json_root value when updating attributes' do
+      user = User.new
+
+      expect {
+        VCR.use_cassette('users') { user.save "http://api-model-specs.com/create" }
+      }.to change{ user.name }.from(nil).to("foo")
+    end
+
     it 'should set errors on the instance if the response contains an errors hash' do
       expect {
         VCR.use_cassette('posts') { blog_post.save "/post/with_errors", name: "" }

data/spec/support/fixtures/users.yml

@@ -54,4 +54,31 @@ http_interactions:
     http_version:
   recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
 
+- request:
+    method: put
+    uri: http://api-model-specs.com/create
+    headers:
+      User-Agent:
+      - Typhoeus - https://github.com/typhoeus/typhoeus
+  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: "{\"users\":{\"name\":\"foo\"}}"
+    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.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Damien Timewell
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hash-pipe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
@@ -147,9 +147,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -191,17 +191,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A simple way of interacting with rest APIs