active_record-acts_as 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bdab6c5656685b37735b973c0469d7685f59184
-  data.tar.gz: 2e194b3da56bf01749ec5b25f6735a44fdbd1db1
+  metadata.gz: 9cc915fa77c939869175617ca452707352f1c958
+  data.tar.gz: 49e729130f7d047cd550791e47d91f8aae02233e
 SHA512:
-  metadata.gz: 3dfdd0ed588ae99de26d55c11d27ee9807d2403def3ddb312b7f88fdb2b4be281be9ffbba85ff6b3731a925597b7298c84e724c5b0a6d20b17fa69eb0982d8bb
-  data.tar.gz: 072b7afcbae99749ead9b32e0a2feba7456214a0e58d09f2122a346833d097c98fe6343cb9a70d06263595184cfba3b4bfc624e4070abd9f078745b97fedadbf
+  metadata.gz: a33e98e3a6fe6df92f4e3a89b597ae503e3091deb9b65c73596d38b14cb29bcf12d0d900e9f0e2779b36e7e902f3b5a767db18b550c6b290e0bee48aee7fd9e7
+  data.tar.gz: 4cbe6d4237c1ca1c198bd95a0176ee3cbbe561b773073f3a9168fe739da35a006cdb316467c0a2fc8b3856fcb1a9e4ea498b86128cd16e3b11b7dad44a0da619

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+### Fixed
+- Touch associated objects if supermodel is updated
+
 ## [2.0.3] - 2016-11-07
 ### Fixed
 - Fix defining associations on `acting_as` model after calling `acting_as`

data/lib/active_record/acts_as/instance_methods.rb

@@ -9,6 +9,10 @@ module ActiveRecord
         super || acting_as?(klass)
       end
 
+      def changed?
+        super || acting_as.changed? || @_acting_as_changed
+      end
+
       def acting_as_foreign_key
         acting_as[acting_as_reflection.foreign_key]
       end

data/lib/active_record/acts_as/relation.rb

@@ -26,6 +26,14 @@ module ActiveRecord
           validate :actable_must_be_valid
           after_update :touch_actable unless touch == false
 
+          before_save do
+            @_acting_as_changed = acting_as.changed?
+            true
+          end
+          after_commit do
+            @_acting_as_changed = nil
+          end
+
           cattr_reader(:acting_as_reflection) { reflections.stringify_keys[name.to_s] }
           cattr_reader(:acting_as_name) { name.to_s }
           cattr_reader(:acting_as_model) { (options[:class_name] || name.to_s.camelize).constantize }

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.0.3"
+    VERSION = "2.0.4"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -214,25 +214,41 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(pen.color).to eq('red')
     end
 
-    it "touches supermodel on save" do
-      pen.save
-      pen.reload
-      update = pen.product.updated_at
-      pen.color = "gray"
-      pen.save
-      expect(pen.updated_at).not_to eq(update)
-    end
+    context "touching" do
+      it "touches supermodel on save" do
+        pen.save
+        pen.reload
+        update = pen.product.updated_at
+        pen.color = "gray"
+        pen.save
+        expect(pen.updated_at).not_to eq(update)
+      end
 
-    it "touches supermodel only when attributes changed" do
-      pen.save
+      it "touches supermodel only when attributes changed" do
+        pen.save
 
-      expect { pen.save }.to_not change { pen.reload.product.updated_at }
-    end
+        expect { pen.save }.to_not change { pen.reload.product.updated_at }
+      end
 
-    it "touches supermodel when #touch is called" do
-      pen.save
+      it "touches supermodel when #touch is called" do
+        pen.save
+
+        expect { pen.touch }.to change { pen.product.updated_at }
+      end
 
-      expect { pen.touch }.to change { pen.product.updated_at }
+      it "touches belongs_to-touch associations if supermodel is updated" do
+        pen.build_pen_collection
+        pen.save!
+        pen.name = "superpen"
+        expect { pen.save! }.to change { pen.pen_collection.updated_at }
+      end
+
+      it "touches belongs_to-touch associations of supermodel when submodel is updated" do
+        pen.store = store
+        pen.save!
+        pen.color = "gray"
+        expect { pen.save! }.to change { pen.store.updated_at }
+      end
     end
 
     it "raises NoMethodEror on unexisting method call" do

data/spec/models.rb

@@ -3,7 +3,7 @@ require 'active_record/acts_as'
 
 class Product < ActiveRecord::Base
   actable
-  belongs_to :store
+  belongs_to :store, touch: true
   has_many :buyers
   validates_presence_of :name, :price
   store :settings, accessors: [:global_option]
@@ -17,11 +17,16 @@ class Product < ActiveRecord::Base
   end
 end
 
+class PenCollection < ActiveRecord::Base
+  has_many :pens
+end
+
 class Pen < ActiveRecord::Base
   acts_as :product
   store_accessor :settings, :option1
 
   has_many :pen_caps
+  belongs_to :pen_collection, touch: true
 
   validates_presence_of :color
 end
@@ -67,8 +72,13 @@ end
 
 def initialize_schema
   initialize_database do
+    create_table :pen_collections do |t|
+      t.timestamps null: true
+    end
+
     create_table :pens do |t|
       t.string :color
+      t.integer :pen_collection_id
     end
 
     create_table :products do |t|
@@ -82,6 +92,7 @@ def initialize_schema
 
     create_table :stores do |t|
       t.string :name
+      t.timestamps null: true
     end
 
     create_table :buyers do |t|
@@ -103,4 +114,5 @@ def initialize_schema
     end
   end
 end
+
 initialize_schema

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Hassan Zamani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3