active_record-acts_as 2.5.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 381abee602366b8d970bc208a1819ff1fdcabeca
-  data.tar.gz: 2d91f0310bc581b9f73082de2f4984c31a0f0345
+SHA256:
+  metadata.gz: 9a9bc3e4aeba36e8d79f1ae9da8d8a542d8536a40ef33338bb5b6008b7957816
+  data.tar.gz: 9a774bbf389710f7abe0fd2aa8a4e212d0198cdc73c4a454be1054680814280d
 SHA512:
-  metadata.gz: 613c0f9a5f14344ca1d69f82ad007b18d12d0089a513eebee7119aeef2e317b05d07e569dd5c31de8e8b1cf5786f69e5ec4e085364355ae9d8438b8dfc6d5755
-  data.tar.gz: 6f4b3bdbda336c4109150a87bb640f2e5e5e7dbe79963a0713c18a08a1cca8aaf564576c05e474ca9d6478d893d71bbcbaf52c6f1cda3c8c00558ad25eb53117
+  metadata.gz: b34df64d7c458ccc596f9d6f3a6ccfb32029c98242406205d87af13b2e2a5dfc0aefb779d2ba81fb36c5f5936c074f64307365ccdc5febddee8f92dee5df4ccf
+  data.tar.gz: bdb531a26f0e161e58a637ff4f0c1d81b255c7d252a0f7835cc505a748ba119cd4fdec1ded399af018e9e5141903a54d854253ee2e03315b9fd2a2d1d37cd6f7

data/.travis.yml

@@ -11,5 +11,4 @@ gemfile:
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
-allow_failures:
-  - gemfile: gemfiles/rails_5.1.gemfile
+  - gemfiles/rails_5.2.gemfile

data/Appraisals

@@ -9,3 +9,7 @@ end
 appraise 'rails-5.1' do
   gem 'rails', '~> 5.1.0'
 end
+
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0.rc1'
+end

data/README.md

@@ -177,7 +177,7 @@ If your `actable` and `acts_as` models are namespaced, you need to configure the
 
 ```
 class MyApp::Product < ApplicationRecord
-  actable inverse_of: :pen
+  actable inverse_of: :product
 end
 
 class MyApp::Pen < ApplicationRecord

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", "<= 5.0"
-  spec.add_dependency "activerecord", ">= 4.2", "<= 5.0"
+  spec.add_dependency "activesupport", ">= 4.2"
+  spec.add_dependency "activerecord", ">= 4.2"
 end

data/gemfiles/rails_5.2.gemfile

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

data/lib/active_record/acts_as/instance_methods.rb

@@ -9,6 +9,10 @@ module ActiveRecord
         super || acting_as?(klass)
       end
 
+      def saved_changes?
+        super || acting_as.has_changes_to_save? || (defined?(@_acting_as_changed) ? @_acting_as_changed : false)
+      end
+
       def changed?
         super || acting_as.changed? || (defined?(@_acting_as_changed) ? @_acting_as_changed : false)
       end

data/lib/active_record/acts_as/querying.rb

@@ -26,12 +26,12 @@ module ActiveRecord
     end
 
     module ScopeForCreate
-      def scope_for_create
-        @scope_for_create ||= if acting_as?
-          where_values_hash.merge(where_values_hash(acting_as_model.table_name)).merge(create_with_value)
-        else
-          where_values_hash.merge(create_with_value)
+      def scope_for_create(attributes = nil)
+        scope = ActiveRecord.version.to_s.to_f >= 5.2 ? super(attributes) : where_values_hash
+        if acting_as?
+          scope.merge!(where_values_hash(acting_as_model.table_name))
         end
+        scope.merge(create_with_value)
       end
     end
   end

data/lib/active_record/acts_as/relation.rb

@@ -32,7 +32,7 @@ module ActiveRecord
           end
 
           before_save do
-            @_acting_as_changed = ActiveRecord.version.to_s.to_f >= 5.1 ? acting_as.saved_changes? : acting_as.changed?
+            @_acting_as_changed = ActiveRecord.version.to_s.to_f >= 5.1 ? acting_as.has_changes_to_save? : 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.5.0"
+    VERSION = "3.0.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -496,8 +496,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     describe '.scope_for_create' do
       it 'includes supermodel attributes' do
         relation = Pen.where(name: 'new name', price: 1.4, color: 'red')
-
-        expect(relation.scope_for_create.keys).to include('name')
+        expect(relation.scope_for_create).to include('name')
         expect(relation.scope_for_create['name']).to eq('new name')
       end
     end
@@ -516,6 +515,14 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     it "has a cattr_reader for the acting_as_model" do
       expect(subject.acting_as_model).to eq Inventory::ProductFeature
     end
+
+    it "can be created" do
+       expect(
+         Inventory::PenLid.create name: 'steve',
+                                  price: 10.1,
+                                  color: 'beige'
+      ).to be_a_kind_of Inventory::PenLid
+     end
   end
 
   context 'different association_methods' do

data/spec/models.rb

@@ -73,7 +73,7 @@ end
 module Inventory
   class ProductFeature < ActiveRecord::Base
     self.table_name = 'inventory_product_features'
-    actable
+    actable inverse_of: 'product_feature'
     validates_presence_of :name, :price
 
     def present

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-29 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -102,9 +102,6 @@ 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
@@ -112,9 +109,6 @@ 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
@@ -122,9 +116,6 @@ 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
@@ -132,9 +123,6 @@ 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:
@@ -161,6 +149,7 @@ files:
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
 - lib/active_record/acts_as.rb
 - lib/active_record/acts_as/class_methods.rb
 - lib/active_record/acts_as/instance_methods.rb
@@ -197,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models