api-model 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52cac4da2cc85c6c496d340cb4cca2c4b6662de2
-  data.tar.gz: 6009b3cf582247c64c7f34b5b3eec4f4405a23b0
+  metadata.gz: f9c93627a25e5ed27edbdeba7fd75e973b556a17
+  data.tar.gz: 952b794e9c4c29872063c3345381859c858509a6
 SHA512:
-  metadata.gz: 5acbe5cfb9066089acdb1cccf1b663062052196287b28d7f04eae7f16fd47b94b37799b8160a525da52cddd02f42c234e4b9aff3ebb86fae0dd350ab9894cb84
-  data.tar.gz: d3da9f0ec5bd00b6114fae65cc8fee7cc7f0a6c0707f98815f85e556187a74fa344e8f47d20eab5ecf39c63125aafe2ee6058cc83f25b9dbb5c9af8dc73c23b0
+  metadata.gz: bd5b4a8a302f38b114a175ef8cd40d5d5ad7d05129c5231b950f97bdcf255d9dbf3b45cb00e4dc5143a4d73e5cfa639be86d7fad90c582062fe9c86482ee1c62
+  data.tar.gz: 9ef3158fa99900f5c0295dba9e1b27ddb47f8f8a2bce39903b83b88309c9295ec70004cf73d05a9856e3f5a06c76eb5f3fd51f0032ecf0a98cac62af44c04a27

data/.gitignore

@@ -3,4 +3,4 @@ log/*.log
 pkg/
 *.gem
 .idea
-*.iml
+*.iml

data/.rspec

@@ -1,2 +1,2 @@
 --color
---format progress
+--format progress

data/.travis.yml

@@ -4,4 +4,5 @@ rvm:
   - 2.0.0
   - 2.1.1
   - 2.1.0
-script: bundle exec rspec spec
+  - 2.2.0
+script: bundle exec rspec spec

data/Gemfile

@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.3.0)
+    api-model (2.3.1)
       activemodel (~> 4.1)
       activesupport (~> 4.1)
       hash-pipe (~> 0.0)
@@ -35,21 +35,21 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
-    domain_name (0.5.22)
+    domain_name (0.5.23)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.9)
-    ethon (0.7.1)
+    ethon (0.7.3)
       ffi (>= 1.3.0)
     ffi (1.9.6)
-    hash-pipe (0.0.2)
+    hash-pipe (0.2.0)
       activesupport (~> 4.1)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
-    json (1.8.1)
+    i18n (0.7.0)
+    ice_nine (0.11.1)
+    json (1.8.2)
     method_source (0.8.2)
-    minitest (5.4.3)
+    minitest (5.5.1)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -65,7 +65,7 @@ GEM
     safe_yaml (0.9.7)
     slop (3.4.6)
     thread_safe (0.3.4)
-    typhoeus (0.6.9)
+    typhoeus (0.7.1)
       ethon (>= 0.7.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -73,7 +73,7 @@ GEM
       unf_ext
     unf_ext (0.0.6)
     vcr (2.8.0)
-    virtus (1.0.3)
+    virtus (1.0.4)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)

data/README.md

@@ -263,4 +263,4 @@ ApiModel::HttpRequest.class_eval do
     end
   end
 end
-```
+```

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.3.0"
+  s.version     = "2.3.1"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api-model.rb

@@ -51,4 +51,4 @@ module ApiModel
     include InstanceMethods
   end
 
-end
+end

data/lib/api_model/assignment.rb

@@ -17,4 +17,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/builder/hash.rb

@@ -8,4 +8,4 @@ module ApiModel
 
     end
   end
-end
+end

data/lib/api_model/cache_stategy/no_cache.rb

@@ -11,4 +11,4 @@ module ApiModel
 
     end
   end
-end
+end

data/lib/api_model/class_methods.rb

@@ -45,4 +45,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/configuration.rb

@@ -55,4 +55,4 @@ module ApiModel
 
     end
   end
-end
+end

data/lib/api_model/http_request.rb

@@ -45,4 +45,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/initializer.rb

@@ -15,4 +15,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/instance_methods.rb

@@ -29,14 +29,24 @@ module ApiModel
       errors_hash.each do |field,messages|
         if messages.is_a?(Array)
           messages.each do |message|
-            obj.errors.add field.to_sym, message
+            set_error_on_self_or_child field, message, obj
           end
         else
-          obj.errors.add field.to_sym, messages
+          set_error_on_self_or_child field, messages, obj
         end
       end
     end
 
+    # If the field to apply errors to is another ApiModel instance, call ++set_errors_from_hash++ on it.
+    # Otherwise, go ahead and treat it as a normal ActiveModel error on the current ++obj++ instance.
+    def set_error_on_self_or_child(field, messages, obj = self)
+      if obj.respond_to?(field.to_sym) && obj.send(field.to_sym).respond_to?(:set_error_on_self_or_child)
+        obj.send(field.to_sym).set_errors_from_hash messages
+      else
+        obj.errors.add field.to_sym, messages
+      end
+    end
+
     # Sends a request to the api to update a resource. If the response was successful, then it will
     # update the instance with any changes which the API has returned. If not, it will set ActiveModel
     # errors.
@@ -82,4 +92,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/response.rb

@@ -106,4 +106,4 @@ module ApiModel
     end
 
   end
-end
+end

data/lib/api_model/response_parser/json.rb

@@ -11,4 +11,4 @@ module ApiModel
 
     end
   end
-end
+end

data/spec/api-model/api_model_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'support/mock_models/blog_post'
 require 'support/mock_models/car'
 require 'support/mock_models/user'
+require 'support/mock_models/garage'
 
 describe ApiModel do
 
@@ -164,6 +165,23 @@ describe ApiModel do
     end
   end
 
+  describe "setting errors on nested models" do
+    let(:car) { Car.new }
+    let(:garage) { Garage.new car: car }
+
+    before do
+      garage.set_errors_from_hash style: "is invalid", car: { name: "sounds funny" }
+    end
+
+    it 'should set errors on the parent normally' do
+      garage.errors[:style].should eq ["is invalid"]
+    end
+
+    it 'should set errors on the child normally' do
+      garage.car.errors[:name].should eq ["sounds funny"]
+    end
+  end
+
   describe "updating attributes from a hash" do
     let(:car) { Car.new }
 
@@ -309,7 +327,7 @@ describe ApiModel do
     it 'should not pass custom cache_ids onto api requests' do
       expect {
         VCR.use_cassette('posts') { BlogPost.get_json "http://api-model-specs.com/single_post", {}, cache_id: "custom_key" }
-      }.to_not raise_error(Ethon::Errors::InvalidOption)
+      }.to_not raise_error
     end
   end
 
@@ -348,4 +366,4 @@ describe ApiModel do
     end
   end
 
-end
+end

data/spec/api-model/configuration_spec.rb

@@ -140,4 +140,4 @@ describe ApiModel, "Configuration" do
     Banana.api_model_configuration.host.should eq "new-host.com"
   end
 
-end
+end

data/spec/api-model/http_request_spec.rb

@@ -82,4 +82,4 @@ describe ApiModel::HttpRequest do
       request.api_call.success?.should eq true
     end
   end
-end
+end

data/spec/api-model/initializer_spec.rb

@@ -31,4 +31,4 @@ describe ApiModel::Initializer do
     Banana.new foo: "bar"
   end
 
-end
+end

data/spec/api-model/json_response_parser_spec.rb

@@ -14,4 +14,4 @@ describe ApiModel::ResponseParser::Json do
     }.to_not raise_error
   end
 
-end
+end

data/spec/api-model/response_spec.rb

@@ -211,4 +211,4 @@ describe ApiModel::Response do
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -21,4 +21,4 @@ RSpec.configure do |config|
     ApiModel::Base.reset_api_configuration
   end
 
-end
+end

data/spec/support/fixtures/cookies.yml

@@ -27,4 +27,4 @@ http_interactions:
       encoding: UTF-8
       string: "{}"
     http_version:
-  recorded_at: Thu, 28 Nov 2013 16:02:20 GMT
+  recorded_at: Thu, 28 Nov 2013 16:02:20 GMT

data/spec/support/mock_models/banana.rb

@@ -2,4 +2,4 @@ class Banana < ApiModel::Base
   attribute :color, String
   attribute :size, String
   attribute :ripe, Boolean
-end
+end

data/spec/support/mock_models/blog_post.rb

@@ -8,4 +8,4 @@ class BlogPost < ApiModel::Base
     end
   end
 
-end
+end

data/spec/support/mock_models/car.rb

@@ -16,4 +16,4 @@ class Car < ApiModel::Base
     top_speed > 300
   end
 
-end
+end

data/spec/support/mock_models/garage.rb

@@ -0,0 +1,4 @@
+class Garage < ApiModel::Base
+  attribute :car, Car
+  attribute :style, String
+end

data/spec/support/mock_models/multiple_hosts.rb

@@ -11,4 +11,4 @@ class MultipleHostsBar < ApiModel::Base
 end
 
 class MultipleHostsNone < ApiModel::Base
-end
+end

data/spec/support/mock_models/user.rb

@@ -1,4 +1,4 @@
 class User < ApiModel::Base
   attribute :name, String
   attribute :email_address, String
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Damien Timewell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -194,6 +194,7 @@ files:
 - spec/support/mock_models/banana.rb
 - spec/support/mock_models/blog_post.rb
 - spec/support/mock_models/car.rb
+- spec/support/mock_models/garage.rb
 - spec/support/mock_models/multiple_hosts.rb
 - spec/support/mock_models/user.rb
 homepage: https://github.com/iZettle/api-model
@@ -236,6 +237,6 @@ test_files:
 - spec/support/mock_models/banana.rb
 - spec/support/mock_models/blog_post.rb
 - spec/support/mock_models/car.rb
+- spec/support/mock_models/garage.rb
 - spec/support/mock_models/multiple_hosts.rb
 - spec/support/mock_models/user.rb
-has_rdoc: