active_record-acts_as 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d36aaa8f22e66b7d9fd5c2280f4548e9efe3b3fe
-  data.tar.gz: 9f30018fa7aaaffc40c8c915b0ed6cc7cd8abda3
+  metadata.gz: 381abee602366b8d970bc208a1819ff1fdcabeca
+  data.tar.gz: 2d91f0310bc581b9f73082de2f4984c31a0f0345
 SHA512:
-  metadata.gz: 7b9a24160409f92c1bc8e1e81e85dcd2553c133804507bf1eb848aff3865a65a9bb173a0cc6f237d7877998761acd7d89fa838ff7484486e4a50ba188429d1e0
-  data.tar.gz: 672a6b0320fdaa101567546b887a652a993a61d1ccb0d130d3eb55c332c68b09750d2cceb5990aac57cfbc03fee4536c6d3c20b68f03dbdcac614b1ca56c014d
+  metadata.gz: 613c0f9a5f14344ca1d69f82ad007b18d12d0089a513eebee7119aeef2e317b05d07e569dd5c31de8e8b1cf5786f69e5ec4e085364355ae9d8438b8dfc6d5755
+  data.tar.gz: 6f4b3bdbda336c4109150a87bb640f2e5e5e7dbe79963a0713c18a08a1cca8aaf564576c05e474ca9d6478d893d71bbcbaf52c6f1cda3c8c00558ad25eb53117

data/.travis.yml

@@ -10,3 +10,6 @@ before_install:
 gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
+allow_failures:
+  - gemfile: gemfiles/rails_5.1.gemfile

data/Appraisals

@@ -5,3 +5,7 @@ end
 appraise 'rails-5.0' do
   gem 'rails', '~> 5.0.0'
 end
+
+appraise 'rails-5.1' do
+  gem 'rails', '~> 5.1.0'
+end

data/README.md

@@ -171,6 +171,19 @@ acts_as :person, -> { includes(:friends) }
 
 Make sure you know what you are doing when overwriting `polymorphic` option.
 
+### Namespaced models
+
+If your `actable` and `acts_as` models are namespaced, you need to configure them like this:
+
+```
+class MyApp::Product < ApplicationRecord
+  actable inverse_of: :pen
+end
+
+class MyApp::Pen < ApplicationRecord
+  acts_as :product, class_name: 'MyApp::Product'
+end
+```
 
 ## Caveats
 

data/active_record-acts_as.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal", "~> 2.1"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
 
-  spec.add_dependency "activesupport", ">= 4.2"
-  spec.add_dependency "activerecord", ">= 4.2"
+  spec.add_dependency "activesupport", ">= 4.2", "<= 5.0"
+  spec.add_dependency "activerecord", ">= 4.2", "<= 5.0"
 end

data/gemfiles/rails_4.2.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require => false
+gem "coveralls", require: false
 gem "rails", "~> 4.2.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "coveralls", :require => false
+gem "coveralls", require: false
 gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "coveralls", require: false
+gem "rails", "~> 5.1.0"
+
+gemspec path: "../"

data/lib/active_record/acts_as/instance_methods.rb

@@ -42,7 +42,7 @@ module ActiveRecord
         if attribute_method?(store_attribute.to_s)
           super
         else
-          acting_as.read_store_attribute(store_attribute, key)
+          acting_as.send(:read_store_attribute, store_attribute, key)
         end
       end
 

data/lib/active_record/acts_as/relation.rb

@@ -28,11 +28,11 @@ module ActiveRecord
           validate :actable_must_be_valid if validates_actable
 
           unless touch == false
-            after_update :touch, if: :changed?
+            after_update :touch, if: ActiveRecord.version.to_s.to_f >= 5.1 ? :saved_changes? : :changed?
           end
 
           before_save do
-            @_acting_as_changed = acting_as.changed?
+            @_acting_as_changed = ActiveRecord.version.to_s.to_f >= 5.1 ? acting_as.saved_changes? : acting_as.changed?
             true
           end
           after_commit do

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "2.4.2"
+    VERSION = "2.5.0"
   end
 end
 

data/spec/migrations_spec.rb

@@ -1,22 +1,23 @@
 require 'database_helper'
 require 'active_record/acts_as'
 
-
 class Product < ActiveRecord::Base
 end
 
-class RemoveActableFromProducts < ActiveRecord::Migration
+migration_class = ActiveRecord::Migration.respond_to?(:[]) ? ActiveRecord::Migration[4.2] : ActiveRecord::Migration
+
+class RemoveActableFromProducts < migration_class
   def change
-    change_table(:products) do |t|
+    change_table :products do |t|
       t.remove_actable
     end
   end
 end
 
-class RemoveProduceableFromProducts < ActiveRecord::Migration
+class RemoveProduceableFromProducts < migration_class
   def change
-    change_table(:products) do |t|
-      t.remove_actable(as: :produceable)
+    change_table :products do |t|
+      t.remove_actable as: :produceable
     end
   end
 end

data/spec/spec_helper.rb

@@ -6,3 +6,8 @@ RSpec.configure do |config|
   config.filter_run_including focus: true
   config.run_all_when_everything_filtered = true
 end
+
+require 'active_record'
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -102,6 +102,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,6 +112,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +122,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,6 +132,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: Simulate multi-table inheritance for activerecord models using a plymorphic
   association
 email:
@@ -148,6 +160,7 @@ files:
 - bin/console
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/active_record/acts_as.rb
 - lib/active_record/acts_as/class_methods.rb
 - lib/active_record/acts_as/instance_methods.rb
@@ -184,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models