active_record-acts_as 5.0.3 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecd8cd75c441652a7719cc0b040d77a84a95f30b1ea8b19c02aa35fb6bdcd425
-  data.tar.gz: a94c71a0cc0dec6e7468cc3949260ee521320a15ab09d433a7c6323aa8b2114d
+  metadata.gz: 2ed68e0f493ab0bca2e81e2a1f0fc1a37a9b97b125336e74f76c1a773794b6bc
+  data.tar.gz: 18934a6d17d87d3f5befeb57acdd11cbfbf0771e80ad95fafdb87819d0c1152a
 SHA512:
-  metadata.gz: ea6d3e0caa50e3a5e39543684bf372e4d64d5b8adfeb29686523b6674d7d1f4d42449b924f657814cd2c14894068a019d8a8796c45efcc1a76bc1c8cac0ea886
-  data.tar.gz: 9d12820c023f3c0f9d11594b17c904da1ece86fa4381a791cb84f086cde101078140ab9219dfee08185c7e90143d3ae1cffe7abe4f829e427fce002da72c8366
+  metadata.gz: '009d65fc100af5440fb62c5a9caefeaeda1c5473676d3d2a30c81450ae015780d7ad74226c3b76a0ab7b1c08b18db54edf092519a49a2cc507dc0a617cc2a093'
+  data.tar.gz: 9bacb126798c42cdada4db64e958425db014bbe59c9f5c3fd088472a70222b98afa20cd77816e622b8dacac61901680cb083975acfe422713d4771a0b0dada66

data/.github/workflows/ruby.yml

@@ -0,0 +1,40 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1']
+        activerecord: ['6.0', '6.1', '7.0', 'master']
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.activerecord }}.gemfile
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@0a29871fe2b0200a17a4497bae54fe5df0d973aa # v1.115.3
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -7,6 +7,7 @@ Gemfile.lock
 InstalledFiles
 _yardoc
 coverage
+/tags
 doc/
 lib/bundler/man
 pkg

data/Appraisals

@@ -6,6 +6,10 @@ appraise "rails-6.1" do
   gem 'rails', '~> 6.1'
 end
 
+appraise "rails-7.0" do
+  gem 'rails', '~> 7.0'
+end
+
 appraise "rails-master" do
-  gem 'rails', github: 'rails/rails'
+  gem 'rails', github: 'rails/rails', branch: 'main'
 end

data/CHANGELOG.md

@@ -5,6 +5,19 @@ 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
+- Add support for rails 7
 
 ## [5.0.2] - 2021-07-27
 

data/README.md

@@ -1,9 +1,6 @@
-[![Gem Version](https://badge.fury.io/rb/active_record-acts_as.svg)](http://badge.fury.io/rb/active_record-acts_as)
-[![Build Status](https://travis-ci.org/chaadow/active_record-acts_as.svg)](https://travis-ci.org/chaadow/active_record-acts_as)
-
 # ActiveRecord::ActsAs
-
-This is a refactor of [`acts_as_relation`](https://github.com/hzamani/acts_as_relation)
+![Gem](https://img.shields.io/gem/v/active_record-acts_as?style=for-the-badge)
+![Build Status](https://img.shields.io/github/actions/workflow/status/chaadow/active_record-acts_as/ruby.yml?style=for-the-badge)
 
 Simulates multiple-table-inheritance (MTI) for ActiveRecord models.
 By default, ActiveRecord only supports single-table inheritance (STI).
@@ -21,8 +18,6 @@ a separate table for each product type, i.e. a `pens` table with `color` column.
 * Ruby >= `2.5`
 * ActiveSupport >= `6.0`
 * ActiveRecord >= `6.0`
-* Regarding ActiveRecord `5.2.x` please use version `4.0.3` of this gem. If you encounter any bug you can open an issue.
-Maintenance will be stopped after the release of ActiveRecord `6.2`
 
 ## Installation
 
@@ -129,6 +124,12 @@ Pen.first.acting_as
   # => #<Product ...>
 ```
 
+Likewise, `actables` converts a relation of specific objects to their parent objects:
+```ruby
+Pen.where(...).actables
+# => [#<Product ...>, ...]
+```
+
 In `has_many` case you can use subclasses:
 
 ```Ruby
@@ -174,7 +175,7 @@ Make sure you know what you are doing when overwriting `polymorphic` option.
 
 If your `actable` and `acts_as` models are namespaced, you need to configure them like this:
 
-```
+```Ruby
 class MyApp::Product < ApplicationRecord
   actable inverse_of: :product
 end
@@ -187,14 +188,10 @@ end
 ## Caveats
 
 Multiple `acts_as` in the same class are not supported!
-
-
 ## Migrating from acts_as_relation
 
 Replace `acts_as_superclass` in models with `actable` and if you where using
 `:as_relation_superclass` option on `create_table` remove it and use `t.actable` on column definitions.
-
-
 ## RSpec custom matchers
 
 To use this library custom RSpec matchers, you must require the `rspec/acts_as_matchers` file.

data/active_record-acts_as.gemspec

@@ -24,7 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rspec", "~> 3"
-  spec.add_development_dependency "rake", "~> 10"
+  spec.add_development_dependency "psych", "3.3.2"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "appraisal", "~> 2.1"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
 

data/gemfiles/rails_6.0.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "coveralls", require: false
-gem "rails", "~> 6.0.0"
+gem "rails", "~> 6.0"
 
 gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "coveralls", require: false
-gem "rails", "~> 6.1.0"
+gem "rails", "~> 6.1"
 
 gemspec path: "../"

data/gemfiles/rails_7.0.gemfile

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

data/gemfiles/rails_master.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "coveralls", require: false
-gem "rails", github: 'rails'
+gem "rails", github: "rails/rails", branch: "main"
 
 gemspec path: "../"

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.0.3"
+    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 }

data/spec/spec_helper.rb

@@ -11,3 +11,8 @@ require 'active_record'
 if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
   ActiveRecord::Base.raise_in_transactional_callbacks = true
 end
+if ActiveRecord.version > Gem::Version.new('6.2')
+  ActiveRecord.use_yaml_unsafe_load = true
+else
+  ActiveRecord::Base.use_yaml_unsafe_load = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record-acts_as
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.2.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-27 00:00:00.000000000 Z
+date: 2023-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -54,20 +54,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -149,9 +163,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -164,6 +178,7 @@ files:
 - bin/console
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - gemfiles/rails_master.gemfile
 - lib/active_record/acts_as.rb
 - lib/active_record/acts_as/class_methods.rb
@@ -202,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Simulate multi-table inheritance for activerecord models

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-sudo: false
-rvm:
-  - 2.6
-  - 2.7
-  - 3.0
-before_install:
-  - gem update --system
-gemfile:
-  - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_6.1.gemfile
-  - gemfiles/rails_master.gemfile
-jobs:
-  exclude:
-    - rvm: 2.6
-      gemfile: gemfiles/rails_master.gemfile