active_record-acts_as 2.0.6 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c9748df03b3540052a5ffdc565d4e7e1533c295
-  data.tar.gz: 6e9bd73f2ca3999edc268e6c40b12510bc76e46c
+  metadata.gz: 8708651ac6d764497b6c4e8da34acae1475c3f7d
+  data.tar.gz: aa82c12e20fa93ac1f42af1e642dd5340cc06076
 SHA512:
-  metadata.gz: 5103fa9f9a3e0cc57ab76270ca05db23008938c7090aa0af4bb9c0fce2b9a4e947a804d512138f4560ceae982e1e15f63bb9073b8ad1d0b15533f1592a23b5ab
-  data.tar.gz: b00229a569085953c49aff5095fc6b1475916cd50979172e84c1cca6f9b790f1a005761aa498745bd14978d484f91a3885a81b841ca639e389d76c252bdb1e90
+  metadata.gz: 1e03ca44f4700ac019b97995bfb7e2c52d281e2357accb77a007f9ad8589f6fb862d0c67910500195925d90d7944a5fec68a5ffbd4dba1835a7a44f593b8b5b2
+  data.tar.gz: 75a8d285074080eb20731ae14a6c4c9713820f7d5bc3513deecea27ba9e51cb786ed8a574dd201d122223c5241343a5a991cf5c051a9393c3178dfc46d0acfb3

data/.travis.yml

@@ -1,8 +1,16 @@
 language: ruby
 sudo: false
 rvm:
-  - 2.2.5
-  - 2.3.1
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
+before_install:
+  - gem update --system
+  - gem update bundler
 gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+matrix:
+  allow_failures:
+    - rvm: 2.4.0
+      gemfile: gemfiles/rails_4.2.gemfile

data/CHANGELOG.md

@@ -4,6 +4,14 @@ 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/).
 
+## [2.0.8] - 2017-02-17
+### Fixed
+- Avoid circular dependency on destroy
+
+## [2.0.7] - 2017-02-17 [YANKED]
+### Fixed
+- Set reference to submodel when building supermodel
+
 ## [2.0.6] - 2017-02-17
 ### Added
 - Allow arguments to #touch and forward them to the supermodel
@@ -41,7 +49,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.6...HEAD
+[Unreleased]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.7...HEAD
+[2.0.7]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.6...v2.0.7
 [2.0.6]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.5...v2.0.6
 [2.0.5]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.4...v2.0.5
 [2.0.4]: https://github.com/hzamani/active_record-acts_as/compare/v2.0.3...v2.0.4

data/lib/active_record/acts_as/relation.rb

@@ -8,7 +8,7 @@ module ActiveRecord
           options, scope = scope, nil if Hash === scope
           association_method = options.delete(:association_method)
           touch = options.delete(:touch)
-          options = {as: :actable, dependent: :destroy, validate: false, autosave: true}.merge options
+          options = options.reverse_merge(as: :actable, validate: false, autosave: true)
 
           cattr_reader(:validates_actable) { options.delete(:validates_actable) == false ? false : true }
 
@@ -36,11 +36,15 @@ module ActiveRecord
           after_commit do
             @_acting_as_changed = nil
           end
+          # Workaround for https://github.com/rails/rails/issues/13609
+          after_destroy do
+            acting_as.destroy if acting_as && !acting_as.destroyed?
+          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 }
-          class_eval "def #{name}; super || build_#{name} end"
+          class_eval "def #{name}; super || build_#{name}(acting_as_model.actable_reflection.name => self); end"
           alias_method :acting_as, name
           alias_method :acting_as=, "#{name}=".to_sym
 

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.0.6"
+    VERSION = "2.0.8"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -80,9 +80,9 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
   end
 
   describe "#acting_as" do
-    it "returns autobuilded acts_as model" do
-      expect(pen.acting_as).to_not be_nil
+    it "builds acts_as model with actable relation set" do
       expect(pen.acting_as).to be_instance_of(Product)
+      expect(pen.acting_as.actable).to be_instance_of(Pen)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.8
 platform: ruby
 authors:
 - Hassan Zamani
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models
@@ -177,3 +177,4 @@ test_files:
 - spec/models.rb
 - spec/rspec_matchers_spec.rb
 - spec/spec_helper.rb
+has_rdoc: