active_manageable 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e6916eea9e70cfa5c04813328b8e1cb21e93f3f2638705b2ec0b37748de51c
-  data.tar.gz: 37122950ad83b210bd043ce2fc556032451df60deef18dc4f58cead9917f1f1f
+  metadata.gz: 1e8924b12e5d39614a69f6a379c3adeab0c807cf3b744b8bf85d71e4c7d63eb2
+  data.tar.gz: 3a392f5c53de2a9bd312cc4fc764adab45bc83919a61ebdecb60a99fdcfb7794
 SHA512:
-  metadata.gz: d2afeaad9032f497b31208e0e4c8b21e209b40d81346dc1468a3eefdb251e1d6c5c01f6759d58e2cab99782116920845077fd62bcb90a54e20ac7c322c556647
-  data.tar.gz: 608affa3ab36c003c03c0af6f27d09b404cfd6e8b987bd6ec57b3605b7f93910b95409073afda386f1e4fb33998cb07bdcc1428ddcf23ae3bac5eb2e2b0eefb7
+  metadata.gz: bdc4aab9ce97595eb76c25e7fb7bdd777d0310b7161855046b7240fd36066d3adb5bad77a69fe0d552546862544133895e8aa642ca5b16f2e835affd32e80824
+  data.tar.gz: 9babc1cbafc079eaac9520b3ac25ad5a4eece500ec1770b01a730307475309ef50242a89e953147f5bb182ab891159bb10f4c39f953a0e330ae07d36dd227f86

data/.github/workflows/ci.yml

@@ -17,23 +17,35 @@ jobs:
     strategy:
       fail-fast: false # should GitHub cancel all in-progress jobs if any matrix job fails
       matrix:
-        ruby-version: ['2.7']
-        gemfile: ['rails_6_0']
+        ruby-version: ['3.0']
+        gemfile: ['rails_7_0']
         include:
-          - ruby-version: '2.7'
-            gemfile: 'rails_6_1'
-          - ruby-version: '2.7'
-            gemfile: 'rails_7_0'
-          - ruby-version: '3.0'
-            gemfile: 'rails_6_0'
-          - ruby-version: '3.0'
-            gemfile: 'rails_6_1'
           - ruby-version: '3.0'
+            gemfile: 'rails_7_1'
+          - ruby-version: '3.1'
             gemfile: 'rails_7_0'
           - ruby-version: '3.1'
-            gemfile: 'rails_6_1'
+            gemfile: 'rails_7_1'
           - ruby-version: '3.1'
+            gemfile: 'rails_7_2'
+          - ruby-version: '3.2'
+            gemfile: 'rails_7_0'
+          - ruby-version: '3.2'
+            gemfile: 'rails_7_1'
+          - ruby-version: '3.2'
+            gemfile: 'rails_7_2'
+          - ruby-version: '3.3'
+            gemfile: 'rails_7_0'
+          - ruby-version: '3.3'
+            gemfile: 'rails_7_1'
+          - ruby-version: '3.3'
+            gemfile: 'rails_7_2'
+          - ruby-version: '3.4'
             gemfile: 'rails_7_0'
+          - ruby-version: '3.4'
+            gemfile: 'rails_7_1'
+          - ruby-version: '3.4'
+            gemfile: 'rails_7_2'
 
     env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

data/.gitignore

@@ -11,7 +11,7 @@
 .rspec_status
 
 # dummy application
-/spec/dummy/db/*.sqlite3
+/spec/dummy/db/*.sqlite3*
 /spec/dummy/log/*.log
 /spec/dummy/storage/
 /spec/dummy/tmp/

data/.rubocop.yml

@@ -1,9 +1,7 @@
-# .rubocop.yml
-
-# Based article from Evil Martians
-# https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard
-# referenced in standard readme relating to use of Standard with Rubocop extensions
-# https://github.com/testdouble/standard
+# Inherit Standard's configuration
+inherit_gem:
+  standard: config/base.yml
+  standard-rails: config/base.yml
 
 # We want Exclude directives from different
 # config files to get merged, not overwritten
@@ -11,23 +9,13 @@ inherit_mode:
   merge:
     - Exclude
 
-require:
-  # Performance cops are bundled with Standard
+plugins:
+  - rubocop-rails
   - rubocop-performance
-  # Standard's config uses this custom cop,
-  # so it must be loaded
-  - standard/cop/block_single_line_braces
-
-inherit_gem:
-  standard: config/base.yml
-
-inherit_from:
-  - .rubocop_rails.yml
-  - .rubocop_rspec.yml
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.4.5
   Exclude:
     - "spec/dummy/config/*"
     - "spec/dummy/config/environments/*"
@@ -40,3 +28,8 @@ Style/ClassEqualityComparison:
   Enabled: true
   Exclude:
     - "lib/active_manageable/base.rb"
+
+Style/RedundantParentheses:
+  Enabled: true
+  Exclude:
+    - "lib/active_manageable/methods/auxiliary/model_attributes.rb"

data/Appraisals

@@ -10,18 +10,27 @@
 #
 # Run each appraisal in turn or a single appraisal:-
 # $ bundle exec appraisal rspec
-# $ bundle exec appraisal rails-6-1 rspec
-appraise "rails-7-0" do
-  gem "activerecord", "~> 7.0"
-  gem "activesupport", "~> 7.0"
+# $ bundle exec appraisal rails-7-2 rspec
+appraise "rails-7-2" do
+  gem "activerecord", "~> 7.2.0"
+  gem "activesupport", "~> 7.2.0"
 end
 
-appraise "rails-6-1" do
-  gem "activerecord", "~> 6.1"
-  gem "activesupport", "~> 6.1"
+appraise "rails-7-1" do
+  gem "activerecord", "~> 7.1.0"
+  gem "activesupport", "~> 7.1.0"
 end
 
-appraise "rails-6-0" do
-  gem "activerecord", "~> 6.0.1"
-  gem "activesupport", "~> 6.0.1"
+appraise "rails-7-0" do
+  gem "activerecord", "~> 7.0.0"
+  gem "activesupport", "~> 7.0.0"
+  gem "sqlite3", "~> 1.4"
+  # cater for gems not shipped as default with Ruby 3.4
+  # but required by ActiveSupport
+  gem "logger"
+  gem "base64"
+  gem "bigdecimal"
+  gem "mutex_m"
+  gem "drb"
+  gem "benchmark"
 end

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 0.3.0 - 2025-08-28
+
+* Add support and test coverage for all minor versions of Rails 7 and Ruby 3
+* Drop support for Rails 6 and Ruby 2.7
+* Use base_label in calling_method method for Ruby 3.4.x compatibility
+
 ## 0.2.0 - 2022-09-27
 
 * Allow the configuration library options to accept a module

data/Gemfile.lock

@@ -1,59 +1,84 @@
 PATH
   remote: .
   specs:
-    active_manageable (0.2.0)
-      activerecord (>= 6.0)
-      activesupport (>= 6.0)
+    active_manageable (0.3.0)
+      activerecord (>= 7.0)
+      activesupport (>= 7.0)
       flexitime (~> 1.0)
       rails-i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.3.1)
-      actionview (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      rack (~> 2.0, >= 2.2.0)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      nokogiri (>= 1.8.5)
+      racc
+      rack (>= 2.2.4, < 3.2)
+      rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (7.0.3.1)
-      activesupport (= 7.0.3.1)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activerecord (7.0.3.1)
-      activemodel (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-    activesupport (7.0.3.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      timeout (>= 0.4.0)
+    activesupport (7.2.2.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    appraisal (2.4.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    appraisal (2.5.0)
       bundler
       rake
       thor (>= 0.14.0)
-    ast (2.4.2)
-    builder (3.2.4)
-    cancancan (3.4.0)
-    concurrent-ruby (1.1.10)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.4.1)
+    bigdecimal (3.2.2)
+    builder (3.3.0)
+    cancancan (3.6.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     crass (1.0.6)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    erubi (1.11.0)
-    factory_bot (6.2.1)
-      activesupport (>= 5.0.0)
-    factory_bot_rails (6.2.0)
-      factory_bot (~> 6.2.0)
-      railties (>= 5.0.0)
+    date (3.4.1)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    erb (5.0.2)
+    erubi (1.13.1)
+    factory_bot (6.5.5)
+      activesupport (>= 6.1.0)
+    factory_bot_rails (6.5.0)
+      factory_bot (~> 6.5)
+      railties (>= 6.1.0)
     flexitime (1.0.0)
       activesupport (>= 4.0)
-    i18n (1.12.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
+    io-console (0.8.1)
+    irb (1.15.2)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.13.2)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -66,109 +91,154 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    loofah (2.18.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    loofah (2.24.1)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    method_source (1.0.0)
-    minitest (5.16.3)
-    nokogiri (1.13.8-arm64-darwin)
+      nokogiri (>= 1.12.0)
+    minitest (5.25.5)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.8-x86_64-linux)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
-    pundit (2.2.0)
+      racc
+    pp (0.6.2)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.4.0)
+    psych (5.2.6)
+      date
+      stringio
+    pundit (2.5.0)
       activesupport (>= 3.0.0)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.8.1)
+    rack (3.1.16)
+    rack-session (2.1.1)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0)
+    rack-test (2.2.0)
       rack (>= 1.3)
+    rackup (2.2.1)
+      rack (>= 3)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.3.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    rails-i18n (7.0.5)
+    rails-html-sanitizer (1.6.2)
+      loofah (~> 2.21)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
+    rails-i18n (7.0.10)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.0.3.1)
-      actionpack (= 7.0.3.1)
-      activesupport (= 7.0.3.1)
-      method_source
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
       rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.0.6)
-    ransack (3.2.1)
+    rake (13.3.0)
+    ransack (4.3.0)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    regexp_parser (2.5.0)
-    rexml (3.2.5)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rdoc (6.14.2)
+      erb
+      psych (>= 4.0.0)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
+      io-console (~> 0.5)
+    rspec-core (3.13.5)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-rails (5.1.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      railties (>= 5.2)
-      rspec-core (~> 3.10)
-      rspec-expectations (~> 3.10)
-      rspec-mocks (~> 3.10)
-      rspec-support (~> 3.10)
-    rspec-support (3.11.0)
-    rubocop (1.23.0)
+      rspec-support (~> 3.13.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
+    rspec-support (3.13.5)
+    rubocop (1.75.8)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.12.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.21.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.12.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.15.2)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.31.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rspec (2.11.1)
       rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    shoulda-matchers (5.1.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    sqlite3 (1.4.4)
-    standard (1.5.0)
-      rubocop (= 1.23.0)
-      rubocop-performance (= 1.12.0)
-    thor (1.2.1)
-    tzinfo (2.0.5)
+    sqlite3 (2.7.3-arm64-darwin)
+    sqlite3 (2.7.3-x86_64-linux-gnu)
+    standard (1.50.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.75.5)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.8.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.25.0)
+    standard-rails (1.4.0)
+      lint_roller (~> 1.0)
+      rubocop-rails (~> 2.31.0)
+    stringio (3.1.7)
+    thor (1.4.0)
+    timeout (0.4.3)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.2.0)
-    zeitwerk (2.6.0)
+    unicode-display_width (2.6.0)
+    useragent (0.16.11)
+    zeitwerk (2.7.3)
 
 PLATFORMS
-  arm64-darwin-21
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
@@ -179,16 +249,17 @@ DEPENDENCIES
   kaminari
   pundit
   rails-controller-testing
-  rake (~> 13.0)
+  rake
   ransack
   rspec-rails
-  rubocop (= 1.23.0)
+  rubocop
   rubocop-rails
   rubocop-rspec
   shoulda-matchers
   simplecov
-  sqlite3 (~> 1.4.0)
+  sqlite3
   standard
+  standard-rails
 
 BUNDLED WITH
-   2.2.22
+   2.7.1

data/active_manageable.gemspec

@@ -14,8 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/CircleSD/active_manageable"
   spec.license = "MIT"
 
-  # Minimum version of Ruby compatible with Rails 7.0
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   # Metadata used on gem’s profile page on rubygems.org
   spec.metadata["homepage_uri"] = spec.homepage
@@ -41,17 +40,17 @@ Gem::Specification.new do |spec|
   # including gems that are essential to test and build this gem
 
   # rails dependencies
-  spec.add_dependency "activerecord", ">= 6.0"
-  spec.add_dependency "activesupport", ">= 6.0"
+  spec.add_dependency "activerecord", ">= 7.0"
+  spec.add_dependency "activesupport", ">= 7.0"
 
   # gem dependencies
   spec.add_dependency "rails-i18n"
   spec.add_dependency "flexitime", "~> 1.0"
 
   # test dependencies
-  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "appraisal"
-  spec.add_development_dependency "sqlite3", "~> 1.4.0"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rspec-rails"
   spec.add_development_dependency "rails-controller-testing"
   spec.add_development_dependency "factory_bot_rails"
@@ -65,8 +64,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "kaminari"
 
   # linter dependencies
-  spec.add_development_dependency "rubocop", "1.23.0"
+  spec.add_development_dependency "rubocop"
   spec.add_development_dependency "standard"
+  spec.add_development_dependency "standard-rails"
   spec.add_development_dependency "rubocop-rails"
   spec.add_development_dependency "rubocop-rspec"
 

data/gemfiles/rails_7_0.gemfile

@@ -2,7 +2,14 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 7.0"
-gem "activesupport", "~> 7.0"
+gem "activerecord", "~> 7.0.0"
+gem "activesupport", "~> 7.0.0"
+gem "sqlite3", "~> 1.4"
+gem "logger"
+gem "base64"
+gem "bigdecimal"
+gem "mutex_m"
+gem "drb"
+gem "benchmark"
 
 gemspec path: "../"

data/gemfiles/{rails_6_1.gemfile → rails_7_1.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1"
-gem "activesupport", "~> 6.1"
+gem "activerecord", "~> 7.1.0"
+gem "activesupport", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6_0.gemfile → rails_7_2.gemfile}

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.0.1"
-gem "activesupport", "~> 6.0.1"
+gem "activerecord", "~> 7.2.0"
+gem "activesupport", "~> 7.2.0"
 
 gemspec path: "../"

data/lib/active_manageable/authorization/pundit.rb

@@ -19,7 +19,7 @@ module ActiveManageable
       end
 
       def authorize_action
-        "#{@current_method}?".to_sym
+        :"#{@current_method}?"
       end
     end
   end

data/lib/active_manageable/base.rb

@@ -137,8 +137,8 @@ module ActiveManageable
     # when the ransack module is included as it has its own definition of the method that calls super
     # https://www.lucascaton.com.br/2016/11/04/ruby-how-to-get-the-name-of-the-calling-method
     def calling_method
-      my_caller = caller_locations(1..1).first.label
-      caller_locations[1..].find { |location| location.label != my_caller }.label.to_sym
+      my_caller = caller_locations(1..1).first.base_label
+      caller_locations[1..].find { |location| location.base_label != my_caller }.base_label.to_sym
     end
 
     # Converts a state argument to a ActiveSupport::HashWithIndifferentAccess.

data/lib/active_manageable/methods/auxiliary/scopes.rb

@@ -44,7 +44,7 @@ module ActiveManageable
         def get_scopes(scopes = nil)
           scopes ||= defaults[:scopes]
 
-          Array.wrap(scopes).map do |scope|
+          Array.wrap(scopes).filter_map do |scope|
             case scope
             when Symbol, String
               {scope => []}
@@ -57,7 +57,7 @@ module ActiveManageable
               p_scopes = instance_exec(&scope)
               get_scopes(p_scopes) if p_scopes.present?
             end
-          end.compact.reduce({}, :merge)
+          end.reduce({}, :merge)
         end
       end
     end

data/lib/active_manageable/methods/auxiliary/unique_search.rb

@@ -42,7 +42,7 @@ module ActiveManageable
           when Proc
             instance_exec(&method)
           end
-          condition == :if ? result : !result
+          (condition == :if) ? result : !result
         end
       end
     end

data/lib/active_manageable/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveManageable
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_manageable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Hilton
 - Chris Branson
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +98,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -239,16 +238,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +262,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -303,9 +316,6 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".rubocop_rails.yml"
-- ".rubocop_rspec.yml"
-- ".standard.yml"
 - Appraisals
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -318,9 +328,9 @@ files:
 - bin/console
 - bin/setup
 - gemfiles/.bundle/config
-- gemfiles/rails_6_0.gemfile
-- gemfiles/rails_6_1.gemfile
 - gemfiles/rails_7_0.gemfile
+- gemfiles/rails_7_1.gemfile
+- gemfiles/rails_7_2.gemfile
 - lib/active_manageable.rb
 - lib/active_manageable/authorization/cancancan.rb
 - lib/active_manageable/authorization/pundit.rb
@@ -351,7 +361,6 @@ metadata:
   changelog_uri: https://github.com/CircleSD/active_manageable/blob/main/CHANGELOG.md
   bug_tracker_uri: https://github.com/CircleSD/active_manageable/issues
   documentation_uri: https://github.com/CircleSD/active_manageable
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -359,15 +368,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Business logic framework for Ruby on Rails
 test_files: []

data/.rubocop_rails.yml

@@ -1,201 +0,0 @@
-# Copy of Evil Martians config file
-# https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard
-# https://gist.github.com/palkan/24869b835c45e89116b9727b534e579e
-# Based on removed standard configuration:
-# https://github.com/testdouble/standard/commit/94d133f477a5694084ac974d5ee01e8a66ce777e#diff-65478e10d5b2ef41c7293a110c0e6b7c
-
-require:
-  - rubocop-rails
-
-Rails/ActionFilter:
-  Enabled: true
-  EnforcedStyle: action
-  Include:
-    - app/controllers/**/*.rb
-
-Rails/ActiveRecordAliases:
-  Enabled: true
-
-Rails/ActiveSupportAliases:
-  Enabled: true
-
-Rails/ApplicationJob:
-  Enabled: true
-
-Rails/ApplicationRecord:
-  Enabled: true
-
-Rails/AssertNot:
-  Enabled: true
-  Include:
-    - '**/test/**/*'
-
-Rails/Blank:
-  Enabled: true
-  # Convert usages of `nil? || empty?` to `blank?`
-  NilOrEmpty: true
-  # Convert usages of `!present?` to `blank?`
-  NotPresent: true
-  # Convert usages of `unless present?` to `if blank?`
-  UnlessPresent: true
-
-Rails/BulkChangeTable:
-  Enabled: true
-  Database: null
-  Include:
-    - db/migrate/*.rb
-
-Rails/CreateTableWithTimestamps:
-  Enabled: true
-  Include:
-    - db/migrate/*.rb
-
-Rails/Date:
-  Enabled: true
-  EnforcedStyle: flexible
-
-Rails/Delegate:
-  Enabled: true
-  EnforceForPrefixed: true
-
-Rails/DelegateAllowBlank:
-  Enabled: true
-
-Rails/DynamicFindBy:
-  Enabled: true
-  Whitelist:
-    - find_by_sql
-
-Rails/EnumUniqueness:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/EnvironmentComparison:
-  Enabled: true
-
-Rails/Exit:
-  Enabled: true
-  Include:
-    - app/**/*.rb
-    - config/**/*.rb
-    - lib/**/*.rb
-  Exclude:
-    - lib/**/*.rake
-
-Rails/FilePath:
-  Enabled: true
-  EnforcedStyle: arguments
-
-Rails/FindBy:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/FindEach:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/HasAndBelongsToMany:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/HttpPositionalArguments:
-  Enabled: true
-  Include:
-    - 'spec/**/*'
-    - 'test/**/*'
-
-Rails/HttpStatus:
-  Enabled: true
-  EnforcedStyle: symbolic
-
-Rails/InverseOf:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/LexicallyScopedActionFilter:
-  Enabled: true
-  Safe: false
-  Include:
-    - app/controllers/**/*.rb
-
-Rails/NotNullColumn:
-  Enabled: true
-  Include:
-    - db/migrate/*.rb
-
-Rails/Output:
-  Enabled: true
-  Include:
-    - app/**/*.rb
-    - config/**/*.rb
-    - db/**/*.rb
-    - lib/**/*.rb
-
-Rails/OutputSafety:
-  Enabled: true
-
-Rails/PluralizationGrammar:
-  Enabled: true
-
-Rails/Presence:
-  Enabled: true
-
-Rails/Present:
-  Enabled: true
-  NotNilAndNotEmpty: true
-  NotBlank: true
-  UnlessBlank: true
-
-Rails/ReadWriteAttribute:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/RedundantReceiverInWithOptions:
-  Enabled: true
-
-Rails/RefuteMethods:
-  Enabled: true
-  Include:
-    - '**/test/**/*'
-
-Rails/RelativeDateConstant:
-  Enabled: true
-  AutoCorrect: false
-
-Rails/RequestReferer:
-  Enabled: true
-  EnforcedStyle: referer
-
-Rails/ReversibleMigration:
-  Enabled: true
-  Include:
-    - db/migrate/*.rb
-
-Rails/SafeNavigation:
-  Enabled: true
-  ConvertTry: false
-
-Rails/ScopeArgs:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb
-
-Rails/TimeZone:
-  Enabled: true
-  EnforcedStyle: flexible
-
-Rails/UniqBeforePluck:
-  Enabled: true
-  EnforcedStyle: conservative
-  AutoCorrect: false
-
-Rails/Validation:
-  Enabled: true
-  Include:
-    - app/models/**/*.rb

data/.rubocop_rspec.yml

@@ -1,68 +0,0 @@
-# Copy of Evil Martians config file
-# https://evilmartians.com/chronicles/rubocoping-with-legacy-bring-your-ruby-code-up-to-standard
-# https://gist.github.com/palkan/623c0816b05ed246bfe0cb406050990a
-
-require:
-  - rubocop-rspec
-
-RSpec/Focus:
-  Enabled: true
-
-RSpec/EmptyExampleGroup:
-  Enabled: true
-
-RSpec/EmptyLineAfterExampleGroup:
-  Enabled: true
-
-RSpec/EmptyLineAfterFinalLet:
-  Enabled: true
-
-RSpec/EmptyLineAfterHook:
-  Enabled: true
-
-RSpec/EmptyLineAfterSubject:
-  Enabled: true
-
-RSpec/HookArgument:
-  Enabled: true
-
-RSpec/HooksBeforeExamples:
-  Enabled: true
-
-RSpec/ImplicitExpect:
-  Enabled: true
-
-RSpec/IteratedExpectation:
-  Enabled: true
-
-RSpec/LetBeforeExamples:
-  Enabled: true
-
-RSpec/MissingExampleGroupArgument:
-  Enabled: true
-
-RSpec/ReceiveCounts:
-  Enabled: true
-
-RSpec/Capybara:
-  Enabled: true
-
-RSpec/FactoryBot:
-  Enabled: true
-
-RSpec/NestedGroups:
-  Max: 5
-
-RSpec/ExampleLength:
-  Max: 20
-
-RSpec/MultipleExpectations:
-  Max: 10
-
-# disabled as using expect_any_instance_of(ActiveRecord::Relation)
-# to check for calls to :includes and :preload etc
-RSpec/AnyInstance:
-  Enabled: false
-
-RSpec/DescribedClass:
-  Enabled: false

data/.standard.yml

@@ -1,5 +0,0 @@
-# Standard ruby style guide, linter, and formatter https://github.com/testdouble/standard
-# to check the style of files run:-
-# $ bundle exec standardrb
-ignore:
-  - 'active_manageable.gemspec'