api-model 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c93627a25e5ed27edbdeba7fd75e973b556a17
-  data.tar.gz: 952b794e9c4c29872063c3345381859c858509a6
+  metadata.gz: 1f815e2fe813c6ab61d66e7cd060c4684c38b41e
+  data.tar.gz: 75056c124a3c1bf7772216ddea09f824db7c1a50
 SHA512:
-  metadata.gz: bd5b4a8a302f38b114a175ef8cd40d5d5ad7d05129c5231b950f97bdcf255d9dbf3b45cb00e4dc5143a4d73e5cfa639be86d7fad90c582062fe9c86482ee1c62
-  data.tar.gz: 9ef3158fa99900f5c0295dba9e1b27ddb47f8f8a2bce39903b83b88309c9295ec70004cf73d05a9856e3f5a06c76eb5f3fd51f0032ecf0a98cac62af44c04a27
+  metadata.gz: cbfbbff8f9dea0f02b804a75d91fb697abadfef39a44e0a9531b053677f0b046b766cc66f4d410074d9bde4fb1947035ddaa33fc21ba150ffdf8022ead0df860
+  data.tar.gz: 695d60e37fc49ec0861516cacf1aaee650e6aa5ab5f0c3e9faf2f20d65d1a46182b4808084c4b56709219150ea8cbaac0b287596e95fd0dc52ca5833b3b64bf5

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
   - 2.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api-model (2.3.1)
+    api-model (2.4.0)
       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.3.1"
+  s.version     = "2.4.0"
   s.authors     = ["Damien Timewell", "Erik Rothoff Andersson"]
   s.email       = ["mail@damientimewell.com", "erik.rothoff@gmail.com"]
   s.licenses    = ['MIT']

data/lib/api_model/class_methods.rb

@@ -1,12 +1,21 @@
 module ApiModel
   module ClassMethods
 
+    def attribute_synonyms
+      @attribute_synonyms ||= {}
+    end
+
     def attribute_synonym(primary_method_name, *alternate_names)
       alternate_names.each do |alternate_name|
         alias_method "#{alternate_name}=".to_sym, "#{primary_method_name}=".to_sym
+        attribute_synonyms[alternate_name] = primary_method_name
       end
     end
 
+    def real_attribute_name_for(name)
+      attribute_synonyms[name] || name
+    end
+
     def get_json(path, params={}, options={})
       call_api :get, path, options.merge(params: params)
     end

data/lib/api_model/instance_methods.rb

@@ -43,7 +43,7 @@ module ApiModel
       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
+        obj.errors.add obj.class.real_attribute_name_for(field.to_sym), messages
       end
     end
 
@@ -83,13 +83,5 @@ module ApiModel
       end
     end
 
-    # Returns all the defined attributes in a hash without the :persisted attribute which was added automatically.
-    #
-    # This is useful for when you need to pass the entire object back to an API, or if you want to serialize the object.
-    def properties_hash
-      ActiveSupport::Deprecation.warn "properties_hash() is deprecated and may be removed from future releases, use as_json() instead.", caller
-      self.as_json.with_indifferent_access
-    end
-
   end
 end

data/spec/api-model/api_model_spec.rb

@@ -163,6 +163,11 @@ describe ApiModel do
     it 'should return false if errors is not a hash' do
       car.set_errors_from_hash("Foobar").should be_false
     end
+
+    it 'should set errors on the aliased method when you refer to the synonym' do
+      car.set_errors_from_hash numberOfDoors: "must be at least 20"
+      car.errors[:number_of_doors].should eq ["must be at least 20"]
+    end
   end
 
   describe "setting errors on nested models" do
@@ -345,25 +350,4 @@ describe ApiModel do
     end
   end
 
-  describe "properties_hash" do
-    let(:blog_post) { BlogPost.new title: "Foo", name: "Bar", something_else: "Baz" }
-
-    it 'should return a hash' do
-      blog_post.properties_hash.should be_a(Hash)
-    end
-
-    it 'should include attributes which are defined as properties' do
-      blog_post.properties_hash.should have_key(:title)
-      blog_post.properties_hash.should have_key(:name)
-    end
-
-    it 'should not include attributes which are not defined as properties' do
-      blog_post.properties_hash.should_not have_key(:something_else)
-    end
-
-    it 'should not include the :persisted attribute, even though it is defined' do
-      blog_post.properties_hash.should_not have_key(:persisted)
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api-model
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Damien Timewell