active_record-acts_as 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343f5f0ec73829580cfedcf39acaf118c672a73b
-  data.tar.gz: 07f06e2d9e8102b00030627222b2c9781593396b
+  metadata.gz: 003f08a2aa83c2fbd3b38d573f53b0a54b2f08f4
+  data.tar.gz: 9fc859b6b9a7a6139950d6f33d5aaaae767ba61b
 SHA512:
-  metadata.gz: 6e48b05426332a971ab3b175178ff758ff5a67b38892f1e98c101eb23cdbbc5ae5543b7ed29ff50af4708a03ec2a0ac446547dd7469080b24d7306d28449c13d
-  data.tar.gz: f642986b3c589b62663b94641abd58aacb1260e1ae85bc237ab3ef539e6572eb17bee0096989ab6f78ccc1b490ec9012b6532196915bbd880105a467c09937d3
+  metadata.gz: 62fcb7cd4f2a32c18375409f47afa2cdcd2478f1cc56954dd1e5b8910e7414b6d5eb6cd9c02455827a5cfdcb355afec05bcb3c0730df85c7f29a5bec884ee228
+  data.tar.gz: cbd963f8a2b48ec52fe2763ff966f14fd110335d6f64d5a537761a755c5a4a4be31143cf74b5d745c2a0a8078006998c35b628c0abb7402d50114aaaa017b6e4

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/).
 
+## [2.2.1] - 2017-04-08
+### Fixed
+- Make sure submodel instance changes are retained when calling `submodel_instance.acting_as.specific`
+
 ## [2.2.0] - 2017-04-08
 ### Added
 - Added support for calling superclass methods on the subclass or subclass relations
@@ -65,7 +69,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/krautcomputing/active_record-acts_as/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.2.1...HEAD
+[2.2.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/krautcomputing/active_record-acts_as/compare/v2.0.9...v2.1.0

data/lib/active_record/acts_as/instance_methods.rb

@@ -14,11 +14,9 @@ module ActiveRecord
       end
 
       def actable_must_be_valid
-        if validates_actable
-          unless acting_as.valid?
-            acting_as.errors.each do |att, message|
-              errors.add(att, message)
-            end
+        unless acting_as.valid?
+          acting_as.errors.each do |attribute, message|
+            errors.add(attribute, message) unless errors[attribute].include?(message)
           end
         end
       end
@@ -82,7 +80,9 @@ module ActiveRecord
       end
 
       def touch(*args)
-        acting_as.touch(*args) if acting_as.persisted?
+        self_args, acting_as_args = args.partition { |arg| has_attribute?(arg, true) }
+        super(*self_args) if self_args.any?
+        acting_as.touch(*acting_as_args) if acting_as.persisted?
       end
 
       def respond_to?(name, include_private = false, as_original_class = false)

data/lib/active_record/acts_as/relation.rb

@@ -6,14 +6,15 @@ module ActiveRecord
       module ClassMethods
         def acts_as(name, scope = nil, options = {})
           options, scope = scope, nil if Hash === scope
+
           association_method = options.delete(:association_method)
-          touch = options.delete(:touch)
-          as = options.delete(:as) || :actable
-          options = options.reverse_merge(as: as, validate: false, autosave: true, inverse_of: as)
+          touch              = options.delete(:touch)
+          as                 = options.delete(:as) || :actable
+          validates_actable  = !options.key?(:validates_actable) || options.delete(:validates_actable)
 
-          cattr_reader(:validates_actable) { options.delete(:validates_actable) == false ? false : true }
+          options = options.reverse_merge(as: as, validate: false, autosave: true, inverse_of: as)
 
-          reflections = has_one name, scope, options
+          reflections = has_one(name, scope, options)
           default_scope -> {
             case association_method
               when :eager_load
@@ -24,7 +25,7 @@ module ActiveRecord
                 includes(name)
             end
           }
-          validate :actable_must_be_valid
+          validate :actable_must_be_valid if validates_actable
 
           unless touch == false
             after_update :touch, if: :changed?
@@ -78,7 +79,7 @@ module ActiveRecord
         def actable(options = {})
           name = options.delete(:as) || :actable
 
-          reflections = belongs_to(name, options.reverse_merge(polymorphic: true, dependent: :destroy, autosave: true, inverse_of: to_s.underscore))
+          reflections = belongs_to(name, options.reverse_merge(validate: false, polymorphic: true, dependent: :destroy, autosave: true, inverse_of: to_s.underscore))
 
           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.2.1"
+    VERSION = "2.3.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -190,6 +190,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
           "pen_collection_id": null,
           "settings": {"global_option":"globalvalue", "option1":"value1"},
           "color": "red",
+          "designed_at": null,
           "created_at": ' + pen.created_at.to_json + ',
           "updated_at": ' + pen.updated_at.to_json + '
         }
@@ -218,46 +219,56 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       end
     end
 
-    context "touching" do
-      it "forwards arguments to #touch to the supermodel" do
-        pen.save!
-        expect(pen.product).to receive(:touch).with(:one, :two)
-        pen.touch(:one, :two)
-      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
-
-      it "touches supermodel only when attributes changed" do
-        pen.save
+    context 'touching' do
+      describe '#touch with arguments' do
+        it "forwards supermodel arguments tothe supermodel" do
+          pen.save!
+          expect(pen.product).to receive(:touch).with(:updated_at)
+          pen.touch(:updated_at, :designed_at)
+        end
 
-        expect { pen.save }.to_not change { pen.reload.product.updated_at }
+        it "updates submodel arguments" do
+          pen.save!
+          expect { pen.touch(:designed_at) }.to change { pen.designed_at }
+        end
       end
 
-      it "touches supermodel when #touch is called" do
-        pen.save
-
-        expect { pen.touch }.to change { pen.product.updated_at }
+      describe '#touch without arguments' do
+        it "touches the supermodel" do
+          pen.save!
+          expect(pen.product).to receive(:touch).with(no_args)
+          pen.touch
+        end
       end
 
-      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 }
+      describe 'saving' 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 "does not touch supermodel when no attributes changed" do
+          pen.save!
+          expect { pen.save! }.to_not change { pen.reload.product.updated_at }
+        end
+
+        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
     end
 
@@ -283,25 +294,42 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect { Product.find(product_id) }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
-    context "validates supermodel attributes" do
-      it "upon validate" do
-        p = Pen.new
-        expect(p).to be_invalid
-        expect(p.errors.keys).to include(:name, :price, :color)
-        p.name = 'testing'
-        expect(p).to be_invalid
-        p.color = 'red'
-        expect(p).to be_invalid
-        p.price = 0.8
-        expect(p).to be_valid
+    context "errors" do
+      context 'when validates_actable is set to true' do
+        it "combines supermodel and submodel errors" do
+          pen = Pen.new
+          expect(pen).to be_invalid
+          expect(pen.errors.to_h).to eq(
+            name:  "can't be blank",
+            price: "can't be blank",
+            color: "can't be blank"
+          )
+          pen.name = 'testing'
+          expect(pen).to be_invalid
+          expect(pen.errors.to_h).to eq(
+            price: "can't be blank",
+            color: "can't be blank"
+          )
+          pen.color = 'red'
+          expect(pen).to be_invalid
+          expect(pen.errors.to_h).to eq(
+            price: "can't be blank"
+          )
+          pen.price = 0.8
+          expect(pen).to be_valid
+        end
       end
 
-      it "unless validates_actable is set to false" do
-        p = IsolatedPen.new
-        expect(p).to be_invalid
-        expect(p.errors.keys).to include(:color)
-        p.color = 'red'
-        expect(p).to be_valid
+      context 'when validates_actable is set to false' do
+        it "unless validates_actable is set to false" do
+          pen = IsolatedPen.new
+          expect(pen).to be_invalid
+          expect(pen.errors.to_h).to eq(
+            color: "can't be blank"
+          )
+          pen.color = 'red'
+          expect(pen).to be_valid
+        end
       end
     end
 
@@ -346,6 +374,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
         "store_id"          => nil,
         "settings"          => {},
         "created_at"        => nil,
+        "designed_at"       => nil,
         "updated_at"        => nil,
         "color"             => "red",
         "pen_collection_id" => nil
@@ -355,7 +384,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
 
   describe "#attribute_names" do
     it "returns the attribute names of the supermodel and submodel" do
-      expect(pen.attribute_names).to eq(["id", "color", "pen_collection_id", "name", "price", "store_id", "settings", "created_at", "updated_at"])
+      expect(pen.attribute_names).to eq(["id", "color", "designed_at", "pen_collection_id", "name", "price", "store_id", "settings", "created_at", "updated_at"])
     end
   end
 

data/spec/models.rb

@@ -95,6 +95,7 @@ def initialize_schema
 
     create_table :pens do |t|
       t.string :color
+      t.datetime :designed_at
       t.integer :pen_collection_id
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-08 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3