active_record-acts_as 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 532e3effe05da886dea3162ea29263ecce12c459e321bcd4fb870554a0227053
-  data.tar.gz: 0e0a4d871dd0bd2be5e2521ddd36abbe9d8038b1bc3c046401abf6ac1c727bbd
+  metadata.gz: 2ed68e0f493ab0bca2e81e2a1f0fc1a37a9b97b125336e74f76c1a773794b6bc
+  data.tar.gz: 18934a6d17d87d3f5befeb57acdd11cbfbf0771e80ad95fafdb87819d0c1152a
 SHA512:
-  metadata.gz: 0477314dde10d98e065be763b4555c3f9915909f129be5b53e5385d41c739dc3482ad4ee4ddc504b60d1e69fd57f36326a995d7cc3d3ab9a86a9a7b4d32ecb25
-  data.tar.gz: 3607a37917ee5fcd6eca4f0a3df7f14a55252e4777faeadb736bb76312bfe0c2dd372779ccf353d8f883472d41504917ce6c1d95deaf20998763db28fe41f1a8
+  metadata.gz: '009d65fc100af5440fb62c5a9caefeaeda1c5473676d3d2a30c81450ae015780d7ad74226c3b76a0ab7b1c08b18db54edf092519a49a2cc507dc0a617cc2a093'
+  data.tar.gz: 9bacb126798c42cdada4db64e958425db014bbe59c9f5c3fd088472a70222b98afa20cd77816e622b8dacac61901680cb083975acfe422713d4771a0b0dada66

data/CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] -
+## [5.2.0] - 2023-09-03
+
+### Added
+- Add `.exists?` support to seamlessly check in both the model and super model
+  (@chaadow)
+
+### Fixed
+- Fix `.actables` to restrict based on type. (@Taeir)
+
 ## [5.1.0] - 2023-06-29
 - Use Github actions instead of travis.yml
 - Add support for ruby 2.7 3.0 and 3.1

data/lib/active_record/acts_as/class_methods.rb

@@ -16,7 +16,7 @@ module ActiveRecord
       end
 
       def actables
-        acting_as_model.where(actable_id: select(:id))
+        acting_as_model.where(actable_id: select(:id), actable_type: model_name.name)
       end
 
       def respond_to_missing?(method, include_private = false)

data/lib/active_record/acts_as/querying.rb

@@ -26,6 +26,23 @@ module ActiveRecord
       end
     end
 
+    module ExistsConcern
+      extend ActiveSupport::Concern
+
+      included do
+        alias :_original_exists? :exists?
+
+        # We redefine the method only when this module is included
+        # to have acces to the original exists? method
+        def exists?(...)
+          return super unless acting_as?
+
+          joins(acting_as_name.to_sym)._original_exists?(...)
+        end
+      end
+
+    end
+
     module ScopeForCreate
       def scope_for_create(attributes = nil)
         return super() unless acting_as?
@@ -41,3 +58,7 @@ module ActiveRecord
   Relation.send(:prepend, ActsAs::QueryMethods)
   Relation.send(:prepend, ActsAs::ScopeForCreate)
 end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Relation.include(ActiveRecord::ActsAs::ExistsConcern)
+end

data/lib/active_record/acts_as/version.rb

@@ -1,6 +1,6 @@
 module ActiveRecord
   module ActsAs
-    VERSION = "5.1.0"
+    VERSION = "5.2.0"
   end
 end
 

data/spec/acts_as_spec.rb

@@ -300,25 +300,27 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
     end
 
     context "errors" do
+      let(:error_message) { ActiveRecord.version >=  Gem::Version.new('7.1.0.alpha') ? "can’t be blank" : "can't be blank"}
+
       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_hash).to eq(
-            name:  ["can't be blank"],
-            price: ["can't be blank"],
-            color: ["can't be blank"]
+            name:  [error_message],
+            price: [error_message],
+            color: [error_message]
           )
           pen.name = 'testing'
           expect(pen).to be_invalid
           expect(pen.errors.to_hash).to eq(
-            price: ["can't be blank"],
-            color: ["can't be blank"]
+            price: [error_message],
+            color: [error_message]
           )
           pen.color = 'red'
           expect(pen).to be_invalid
           expect(pen.errors.to_hash).to eq(
-            price: ["can't be blank"]
+            price: [error_message]
           )
           pen.price = 0.8
           expect(pen).to be_valid
@@ -329,9 +331,7 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
         it "unless validates_actable is set to false" do
           pen = IsolatedPen.new
           expect(pen).to be_invalid
-          expect(pen.errors.to_hash).to eq(
-            color: ["can't be blank"]
-          )
+          expect(pen.errors.to_hash).to eq( { color: [error_message] })
           pen.color = 'red'
           expect(pen).to be_valid
         end
@@ -487,6 +487,13 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       @black_pen.buyers.create! name: 'John'
     end
 
+    describe 'exists?' do
+      it 'checks on both model and supermodel' do
+        expect(Pen.exists?(name: 'red pen')).to be_truthy
+        expect(Pen.exists?(name: 'red pen', price: 0.8)).to be_truthy
+      end
+    end
+
     describe '.where and .where!' do
       it 'respects supermodel attributes' do
         conditions = { price: 0.8 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3