active_record-acts_as 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cc915fa77c939869175617ca452707352f1c958
-  data.tar.gz: 49e729130f7d047cd550791e47d91f8aae02233e
+  metadata.gz: 5f5963e720c4d133aec9bbcadb5d8034e805c5da
+  data.tar.gz: b72a5773b65e24a08baa22ef43ff420f25d24d29
 SHA512:
-  metadata.gz: a33e98e3a6fe6df92f4e3a89b597ae503e3091deb9b65c73596d38b14cb29bcf12d0d900e9f0e2779b36e7e902f3b5a767db18b550c6b290e0bee48aee7fd9e7
-  data.tar.gz: 4cbe6d4237c1ca1c198bd95a0176ee3cbbe561b773073f3a9168fe739da35a006cdb316467c0a2fc8b3856fcb1a9e4ea498b86128cd16e3b11b7dad44a0da619
+  metadata.gz: 6308fb4da307ca8d479ed40e6f6e1245dec31cbdc031ed28f6ebb4832dc1d282f28622235d074b296c9783ee1eb7c82e1aab6a93cc5fbf03f96918e824927a29
+  data.tar.gz: cb452a38e28515964324e1540cf562631cdb0c3e403fdb9f512682a36d5076a9ad0f31d4b989fffc2fe65da828fe46266a91ed3cd3991985088821bca482f016

data/CHANGELOG.md

@@ -4,7 +4,7 @@ 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]
+## [2.0.4] - 2016-12-07
 ### Fixed
 - Touch associated objects if supermodel is updated
 
@@ -32,7 +32,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Fixed `remove_actable` migration helper (https://github.com/hzamani/active_record-acts_as/pull/71, thanks to [nuclearpidgeon](https://github.com/nuclearpidgeon)!)
 
-[Unreleased]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.3...HEAD
+[Unreleased]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.4...HEAD
+[2.0.4]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.3...v2.0.4
 [2.0.3]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.2...v2.0.3
 [2.0.2]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.0...v2.0.1

data/README.md

@@ -167,7 +167,7 @@ acts_as :person, -> { includes(:friends) }
 ```
 
 `actable` support all `belongs_to` options, where defaults are these:
-`polymorphic: true, dependent: :delete, autosave: true`
+`polymorphic: true, dependent: :destroy, autosave: true`
 
 Make sure you know what you are doing when overwriting `polymorphic` option.
 

data/lib/active_record/acts_as/instance_methods.rb

@@ -23,11 +23,6 @@ module ActiveRecord
         !acting_as.id.nil? && !acting_as_foreign_key.nil?
       end
 
-      def touch_actable
-        return unless changed?
-        acting_as.touch
-      end
-
       def actable_must_be_valid
         if validates_actable
           unless acting_as.valid?
@@ -97,7 +92,7 @@ module ActiveRecord
       end
 
       def touch
-        acting_as.touch
+        acting_as.touch if acting_as.persisted?
       end
 
       def respond_to?(name, include_private = false, as_original_class = false)

data/lib/active_record/acts_as/relation.rb

@@ -24,7 +24,10 @@ module ActiveRecord
             end
           }
           validate :actable_must_be_valid
-          after_update :touch_actable unless touch == false
+
+          unless touch == false
+            after_update :touch, if: :changed?
+          end
 
           before_save do
             @_acting_as_changed = acting_as.changed?
@@ -70,7 +73,7 @@ module ActiveRecord
         def actable(options = {})
           name = options.delete(:as) || :actable
 
-          reflections = belongs_to name, {polymorphic: true, dependent: :delete, autosave: true}.merge(options)
+          reflections = belongs_to(name, options.reverse_merge(polymorphic: true, dependent: :destroy, autosave: true))
 
           cattr_reader(:actable_reflection) { reflections.stringify_keys[name.to_s] }
 

data/lib/active_record/acts_as/version.rb

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

data/spec/acts_as_spec.rb

@@ -152,7 +152,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
 
   describe "._reflections" do
     it "merges the reflections on both superclass and subclass" do
-      expect(Pen._reflections.length).to eq(Product._reflections.length + 2)
+      expect(Pen._reflections.length).to eq(Product._reflections.length + 3)
     end
   end
 
@@ -198,6 +198,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
           "name": "pen",
           "price": 0.8,
           "store_id": null,
+          "pen_collection_id": null,
           "settings": {"global_option":"globalvalue", "option1":"value1"},
           "color": "red",
           "created_at": ' + pen.created_at.to_json + ',
@@ -214,6 +215,20 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(pen.color).to eq('red')
     end
 
+    context "deleting" do
+      it "destroys associated records defined with `has_many dependent: :destroy` on supermodel" do
+        pen.save!
+        pen.buyers.create!
+        expect { pen.destroy }.to change { Buyer.count }.by(-1)
+      end
+
+      it "destroys associated records defined with `has_many dependent: :destroy` on submodel" do
+        pen.save!
+        pen.pen_caps.create!
+        expect { pen.destroy }.to change { PenCap.count }.by(-1)
+      end
+    end
+
     context "touching" do
       it "touches supermodel on save" do
         pen.save
@@ -316,7 +331,13 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
 
     context "includes supermodel attributes in .to_json response" do
       it "unless the submodel instance association doesn't exist" do
-        expect(JSON.parse(isolated_pen.to_json)).to eq(JSON.parse('{"id":null,"color":"red"}'))
+        expect(JSON.parse(isolated_pen.to_json)).to eq(JSON.parse('''
+          {
+            "id": null,
+            "color": "red",
+            "pen_collection_id": null
+          }
+        '''))
       end
 
       it "if the submodel instance association exists" do
@@ -328,6 +349,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
             "name": "pen",
             "price": 0.8,
             "store_id": null,
+            "pen_collection_id": null,
             "settings": {},
             "color": "red",
             "created_at": ' + pen.created_at.to_json + ',

data/spec/models.rb

@@ -4,7 +4,7 @@ require 'active_record/acts_as'
 class Product < ActiveRecord::Base
   actable
   belongs_to :store, touch: true
-  has_many :buyers
+  has_many :buyers, dependent: :destroy
   validates_presence_of :name, :price
   store :settings, accessors: [:global_option]
 
@@ -25,7 +25,7 @@ class Pen < ActiveRecord::Base
   acts_as :product
   store_accessor :settings, :option1
 
-  has_many :pen_caps
+  has_many :pen_caps, dependent: :destroy
   belongs_to :pen_collection, touch: true
 
   validates_presence_of :color
@@ -100,7 +100,7 @@ def initialize_schema
     end
 
     create_table :pen_caps do |t|
-      t.integer :buyer_id
+      t.integer :pen_id
     end
 
     create_table :inventory_pen_lids do |t|

metadata

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