dirty_associations 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c35d26cc36f27c04d6498116a6eadefe32b8e38
-  data.tar.gz: a81fa91183efb5cef250d469ca8326edb5e37479
+  metadata.gz: 053ba80b3d4e3764f1aeea8fae54416b1561af28
+  data.tar.gz: 61a8276db83af320e03f3c743aaf8d899ffe27c4
 SHA512:
-  metadata.gz: cec571b1f0fe99bb131f0be8ceb07a00153b47006a6b5d899e3c6890ac464a4d340792e0b80f8a6999cd9fd89f16cebf986c7cddb8eb423ff1db21297d96f5ee
-  data.tar.gz: 43c76320d0e4f79de94cafb130fbb9540a0d30ae6e489638225dcb6d8bf9a015cc40d9e2a89ab7ce0372402e029dbf4863fec173730bd5a74c705dddd34bda62
+  metadata.gz: f31875def37d4bad43200c00fbb965b0bbb0a0454cda57356c6366295fbed4e63fe7fc6f3432f2480337c1f2db6d18f6ae0fac014d2ee00c2d147921b71f6490
+  data.tar.gz: fa9910330333548683423af9648efcf307d6a23695f9439aef579db8dc875d6a661a353183f96fb282123158de4832a5e40ae744a79a54293327d1c87d3b71cb

data/lib/dirty_associations.rb

@@ -13,14 +13,19 @@ module DirtyAssociations
     #
     # The +association+ parameter should be a string or symbol representing the name of an association.
     def monitor_association_changes(association)
+      define_method "#{association}=" do |value|
+        attribute_will_change!(association.to_s) if _association_will_change?(association, value)
+        super(value)
+      end
+
       ids = "#{association.to_s.singularize}_ids"
 
-      [association, ids].each do |name|
-        define_method "#{name}=" do |value|
-          attribute_will_change!(association.to_s) unless send(name) == value
-          super(value)
-        end
+      define_method "#{ids}=" do |value|
+        attribute_will_change!(association.to_s) if _ids_will_change?(ids, value)
+        super(value)
+      end
 
+      [association, ids].each do |name|
         define_method "#{name}_change" do
           changes[name]
         end
@@ -35,4 +40,15 @@ module DirtyAssociations
       end
     end
   end
+
+  private
+
+  def _association_will_change?(association, value)
+    send(association) != value
+  end
+
+  def _ids_will_change?(ids, value)
+    value = Array(value).reject &:blank?
+    send(ids) != value
+  end
 end

data/lib/dirty_associations/version.rb

@@ -1,3 +1,3 @@
 module DirtyAssociations
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/dirty_associations_test.rb

@@ -30,6 +30,24 @@ class DirtyAssociationsTest < ActiveSupport::TestCase
     assert bar.foos_changed?
   end
 
+  test "setting has_many association ids works with non-array" do
+    foo = FactoryGirl.create(:foo)
+
+    refute bar.foos_changed?
+
+    bar.foo_ids = foo.id
+    assert_equal [ foo.id ], bar.foo_ids
+    assert bar.foos_changed?
+  end
+
+  test "setting has_many association ids ignores blanks" do
+    foos = bar.foos
+    bar.foo_ids += [ "", nil ]
+    assert_equal foos, bar.foos
+
+    refute bar.foos_changed?
+  end
+
   test "changes reset by save" do
     bar.foos = [ FactoryGirl.create(:foo) ]
     assert bar.foos_changed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dirty_associations
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jen Page
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails