her 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7626abb2e0aa83555379ffb426c47f766e7e5175
-  data.tar.gz: 9036b8f208b4e9462740eb22fa1b6d21ef48b9c1
+  metadata.gz: e3f3ebeacfc88f8ba6fbb3dc98cb7527975c8531
+  data.tar.gz: c96e0c1b82ef1528529ac806a3d1b71e7e1aa434
 SHA512:
-  metadata.gz: d6a8734624af88d8261d6f26147c517626530c925f886770b284471dde1f9903c455dd77a1dd6e7d21fc8a720d98d293fed0f3f967ccc3516dc05a1528a58b70
-  data.tar.gz: 4badd683f1cc2550dc34758573c6a57b46843b52b1a12b213eb917b6b2c60542cb05ff47038c9cc5aa8d497571fbf8569432a7d56024e7109c83fcf200dedc5b
+  metadata.gz: 71d3c48cf6fc0aa560e5349d695cc234d981602d721e9c6d59e3ce64ab2b4916af39ff360c691c5e1a3f341381d6d4fc158b19d17cacb6ea0fc7310f18fe9d70
+  data.tar.gz: fdda014a8f9c66bf5f9f99b013022be531a798912a8e856d1b098fc846017e181237813849ebad7961d206ad799ab08948f47d64591a0b1955f3a9d3ff3cd476

data/README.md

@@ -8,7 +8,7 @@
   <a href="https://rubygems.org/gems/her"><img src="http://img.shields.io/gem/v/her.svg" /></a>
   <a href="https://codeclimate.com/github/remiprev/her"><img src="http://img.shields.io/codeclimate/github/remiprev/her.svg" /></a>
   <a href='https://gemnasium.com/remiprev/her'><img src="http://img.shields.io/gemnasium/remiprev/her.svg" /></a>
-  <a href="https://travis-ci.org/remiprev/her"><img src="http://img.shields.io/travis/remiprev/her.svg" /></a>
+  <a href="https://travis-ci.org/remiprev/her"><img src="http://img.shields.io/travis/remiprev/her/master.svg" /></a>
 </p>
 
 ---

data/lib/her/model/associations.rb

@@ -36,6 +36,16 @@ module Her
           end
         end
 
+        # @private
+        def association_names
+          associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:name] }
+        end
+
+        # @private
+        def association_keys
+          associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:data_key] }
+        end
+
         # Parse associations data after initializing a new object
         #
         # @private

data/lib/her/model/attributes.rb

@@ -49,8 +49,12 @@ module Her
       #
       # @private
       def self.use_setter_methods(model, params)
-        setter_method_names = model.class.setter_method_names
         params ||= {}
+
+        reserved_keys = [:id, model.class.primary_key] + model.class.association_keys
+        model.class.attributes *params.keys.reject { |k| reserved_keys.include?(k) || reserved_keys.map(&:to_s).include?(k) }
+
+        setter_method_names = model.class.setter_method_names
         params.inject({}) do |memo, (key, value)|
           setter_method = key.to_s + '='
           if setter_method_names.include?(setter_method)

data/lib/her/model/nested_attributes.rb

@@ -20,10 +20,10 @@ module Her
         #
         #   user = User.new(name: "Tobias", role_attributes: { title: "moderator" })
         #   user.role # => #<Role title="moderator">
-        def accepts_nested_attributes_for(*association_names)
-          allowed_association_names = associations.inject([]) { |memo, (name, details)| memo << details }.flatten.map { |a| a[:name] }
+        def accepts_nested_attributes_for(*associations)
+          allowed_association_names = association_names
 
-          association_names.each do |association_name|
+          associations.each do |association_name|
             unless allowed_association_names.include?(association_name)
               raise Her::Errors::AssociationUnknownError.new("Unknown association name :#{association_name}")
             end

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/spec/model/dirty_spec.rb

@@ -10,6 +10,7 @@ describe "Her::Model and ActiveModel::Dirty" do
         builder.adapter :test do |stub|
           stub.get("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Lindsay Fünke" }.to_json] }
           stub.get("/users/2") { |env| [200, {}, { :id => 2, :fullname => "Maeby Fünke" }.to_json] }
+          stub.get("/users/3") { |env| [200, {}, { :user_id => 3, :fullname => "Maeby Fünke" }.to_json] }
           stub.put("/users/1") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke" }.to_json] }
           stub.put("/users/2") { |env| [400, {}, { :errors => ["Email cannot be blank"] }.to_json] }
           stub.post("/users") { |env| [200, {}, { :id => 1, :fullname => "Tobias Fünke" }.to_json] }
@@ -19,6 +20,9 @@ describe "Her::Model and ActiveModel::Dirty" do
       spawn_model "Foo::User" do
         attributes :fullname, :email
       end
+      spawn_model "Dynamic::User" do
+        primary_key :user_id
+      end
     end
 
     context "for existing resource" do
@@ -36,11 +40,20 @@ describe "Her::Model and ActiveModel::Dirty" do
           user.save
           user.should_not be_changed
         end
+
         it "tracks previous changes" do
           user.fullname = "Tobias Fünke"
           user.save
           user.previous_changes.should eq({"fullname"=>"Lindsay Fünke"})
         end
+
+        it 'tracks dirty attribute for mass assign for dynamic created attributes' do
+          user = Dynamic::User.find(3)
+          user.assign_attributes(:fullname => 'New Fullname')
+          user.fullname_changed?.should be_truthy
+          user.should be_changed
+          user.changes.length.should eq(1)
+        end
       end
 
       context "with erroneous save" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake