active_record-acts_as 5.0.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d4f9697fffd355665d4fbfec8e95d3df7e4a7f079c1075ec02433003088028
-  data.tar.gz: 90991fdb687a92ea19ef8c3d1f86f8940079e8adc31a715b0c81a0c64cde8159
+  metadata.gz: 532e3effe05da886dea3162ea29263ecce12c459e321bcd4fb870554a0227053
+  data.tar.gz: 0e0a4d871dd0bd2be5e2521ddd36abbe9d8038b1bc3c046401abf6ac1c727bbd
 SHA512:
-  metadata.gz: 7f387a9c486ad279c7c978bdd58136f34a0b74438d757be8d507c0817da2d7c51f95bfac00223f375942ae511124d63dcfc77970901481d6671d92559166dbfa
-  data.tar.gz: 17cb390291b18ca97a7778177407694f300dc45fb5717d76410b859018339bf71988fb88c430355aa21ad3910d726f97d5e9f19139c5f86aa8b039d1957876db
+  metadata.gz: 0477314dde10d98e065be763b4555c3f9915909f129be5b53e5385d41c739dc3482ad4ee4ddc504b60d1e69fd57f36326a995d7cc3d3ab9a86a9a7b4d32ecb25
+  data.tar.gz: 3607a37917ee5fcd6eca4f0a3df7f14a55252e4777faeadb736bb76312bfe0c2dd372779ccf353d8f883472d41504917ce6c1d95deaf20998763db28fe41f1a8

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,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] -
+## [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
+
+### Fixed
+- Handle kwargs in ruby 3 in methods delegated to supermodel (@tindron)
 
 ## [5.0.1] - 2021-01-28
 

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,11 +24,13 @@ 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"
 
   spec.add_dependency "activesupport", ">= 6.0"
   spec.add_dependency "activerecord", ">= 6.0"
+  spec.add_dependency "ruby2_keywords"
 
 end

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

@@ -23,7 +23,7 @@ module ActiveRecord
         acting_as_model.methods_callable_by_submodel.include?(method) || super
       end
 
-      def method_missing(method, *args, &block)
+      ruby2_keywords def method_missing(method, *args, &block)
         if acting_as_model.methods_callable_by_submodel.include?(method)
           result = acting_as_model.public_send(method, *args, &block)
           if result.is_a?(ActiveRecord::Relation)

data/lib/active_record/acts_as/instance_methods.rb

@@ -117,7 +117,7 @@ module ActiveRecord
         duplicate
       end
 
-      def method_missing(method, *args, &block)
+      ruby2_keywords def method_missing(method, *args, &block)
         if !self_respond_to?(method) && acting_as.respond_to?(method)
           acting_as.send(method, *args, &block)
         else

data/lib/active_record/acts_as/version.rb

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

data/lib/active_record/acts_as.rb

@@ -1,3 +1,4 @@
+require 'ruby2_keywords'
 require 'active_support'
 require 'active_record'
 require 'active_record/acts_as/version'

data/spec/acts_as_spec.rb

@@ -157,6 +157,10 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
       expect(pen.present).to eq("pen - $0.8")
     end
 
+    it "responds to supermodel methods with keyword arguments" do
+      expect(pen.keyword_method(one: 3, two: 4)).to eq [3,4]
+    end
+
     it 'responds to serialized attribute' do
       expect(pen).to respond_to('option1')
       expect(isolated_pen).to respond_to('option2')
@@ -452,6 +456,10 @@ RSpec.describe "ActiveRecord::Base model with #acts_as called" do
         expect(Product.class_method_callable_by_submodel).to eq('class_method_callable_by_submodel')
         expect(Pen.class_method_callable_by_submodel).to eq('class_method_callable_by_submodel')
       end
+
+      it 'with keyword arguments can be called from the submodel' do
+        expect(Pen.class_keyword_method_callable_by_submodel(one: 3, two: 4)).to eq([3,4])
+      end
     end
 
     context 'when they are neither defined via `scope` nor made callable by submodel' do

data/spec/models.rb

@@ -16,6 +16,10 @@ class Product < ActiveRecord::Base
     'class_method'
   end
 
+  callable_by_submodel def self.class_keyword_method_callable_by_submodel(one: 1, two: 2)
+    [one, two]
+  end
+
   callable_by_submodel def self.class_method_callable_by_submodel
     'class_method_callable_by_submodel'
   end
@@ -27,6 +31,10 @@ class Product < ActiveRecord::Base
   def raise_error
     specific.non_existant_method
   end
+
+  def keyword_method(one: 1, two: 2)
+    [one, two]
+  end
 end
 
 class Payment < ActiveRecord::Base

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.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Hassan Zamani
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2023-06-29 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
@@ -124,6 +138,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: ruby2_keywords
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simulate multi-table inheritance for activerecord models using a polymorphic
   association
 email:
@@ -135,9 +163,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -150,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
@@ -188,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,12 +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