acl9 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c96a3e331bb553a202d5002bc13de3d6660fe417ff48c20174715dfdb09e96f
-  data.tar.gz: 105c1c70b580c5a7cd49105e04d6f6f4acba5c8182fedc9ea9995dcb83050e71
+  metadata.gz: f2cd552d7b00fccd354a3a743c47a2d7535e3dc3eadb07aab6a8bc6f253641fd
+  data.tar.gz: d89fd39e8359d1adff923f2aaa28b5dde2105c5d393fe5f18d456870af6bf1d5
 SHA512:
-  metadata.gz: 5c79f61b3da512da237806b469f5f24051b9b845424be81d08b52188ab4597acb71aa4ecb5047d211701d8324d438c83996052a5bc243f333cf967bf1517bebc
-  data.tar.gz: 8a218af5d9e00f16c9d7e5162ad973c7386d1c4c4b8801c541bd767caccdfecfb9b85fa342dfcfa46c727e49ef17d1432c55761629994135c5ce7542b9fe8826
+  metadata.gz: 68cf84c3c290ffd56d3766a121b5d5aa7b44b23681f07734153504de5ec8a514a326f5199179d70522dd0c2fb47b4732e0eb0161944997739510ebf9ef0155b1
+  data.tar.gz: b3e95854606d6dfc311bb98827b1811e9a24728a2eaaac5cf064c904eafcf10c510f81529b809a9bb43bf368f9da8dcab264c728ed954b29b495e091db4ba63e

data/.github/workflows/acl9.yml

@@ -0,0 +1,44 @@
+# 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: Acl9
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rails-version: [ '7.0', '7.1', '7.2', '8.0', head ]
+        ruby-version: ['3.1', '3.2', '3.3', '3.4']
+        exclude:
+          - rails-version: '8.0'
+            ruby-version: '3.1'
+          - rails-version: head
+            ruby-version: '3.1'
+
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      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

@@ -22,3 +22,4 @@
 
 /acl9-*.gem
 /gemfiles/*.lock
+/Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.1.7

data/Appraisals

@@ -1,19 +1,19 @@
-appraise "rails-5.0" do
-  gem 'rails', '~> 5.0.0'
+appraise "rails-7.0" do
+  gem 'rails', '~> 7.0.0'
 end
 
-appraise "rails-5.1" do
-  gem 'rails', '~> 5.1.0'
+appraise "rails-7.1" do
+  gem 'rails', '~> 7.1.0'
 end
 
-appraise "rails-5.2" do
-  gem 'rails', '~> 5.2.0'
+appraise "rails-7.2" do
+  gem 'rails', '~> 7.2.0'
 end
 
-appraise "rails-6.0" do
-  gem 'rails', '~> 6.0.0'
+appraise "rails-8.0" do
+  gem 'rails', '~> 8.0.0'
 end
 
-appraise "rails-6.1" do
-  gem 'rails', '~> 6.1.0'
+appraise "rails-head" do
+  gem "rails", github: "rails"
 end

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 
 gem 'appraisal'
 gem 'byebug'
+gem 'sqlite3'

data/README.md

@@ -1,6 +1,6 @@
 # acl9
 
-[![Travis-CI](https://travis-ci.org/be9/acl9.svg?branch=master)](https://travis-ci.org/be9/acl9)
+![Workflow Status](https://github.com/be9/acl9/actions/workflows/acl9.yml/badge.svg)
 
 Acl9 is a role-based authorization system that provides a concise DSL for
 securing your Rails application.
@@ -13,13 +13,13 @@ permissions correct.
 ## Installation
 
 Acl9 is [Semantically Versioned](http://semver.org/), so just add this to your
-`Gemfile`:
+`Gemfile` (note that you need 3.2 for Rails 6+ support):
 
 ```ruby
 gem 'acl9', '~> 3.2'
 ```
 
-You will need Ruby > 2.0
+We're only testing with Ruby >= 3.1 so YMMV for less than that
 
 ### Rails 4 - stick with 2.x
 

data/acl9.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
 
   s.rdoc_options      = ["--charset=UTF-8"]
 
-  s.add_dependency "rails", '>= 5.0', '< 7.0'
+  s.add_dependency "rails", '>= 5.0'
 
   s.add_development_dependency "yard"
-  s.add_development_dependency 'sqlite3'
 end

data/bin/rails

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #
@@ -6,11 +8,20 @@
 # this file is here to facilitate running it.
 #
 
-require 'pathname'
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
-  Pathname.new(__FILE__).realpath)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
 
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-load Gem.bin_path('railties', 'rails')
+load Gem.bin_path("railties", "rails")

data/gemfiles/{rails_5.1.gemfile → rails_7.0.gemfile}

@@ -4,7 +4,10 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "byebug"
-gem "rails", "~> 5.1.0"
-gem "sqlite3", "~> 1.3.6", :group => :development
+gem "drb"
+gem "mutex_m"
+gem "bigdecimal"
+gem "sqlite3", "~> 1.6"
+gem "rails", "~> 7.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.1.gemfile → rails_7.1.gemfile}

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "byebug"
-gem "rails", "~> 6.1.0"
+gem "sqlite3"
+gem "rails", "~> 7.1.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.2.gemfile → rails_7.2.gemfile}

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "byebug"
-gem "rails", "~> 5.2.0"
+gem "sqlite3"
+gem "rails", "~> 7.2.0"
 
 gemspec path: "../"

data/gemfiles/{rails_6.0.gemfile → rails_8.0.gemfile}

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "byebug"
-gem "rails", "~> 6.0.0"
+gem "sqlite3"
+gem "rails", "~> 8.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.0.gemfile → rails_head.gemfile}

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "appraisal"
 gem "byebug"
-gem "rails", "~> 5.0.0"
-gem "sqlite3", "~> 1.3.6", :group => :development
+gem "sqlite3"
+gem "rails", github: "rails/rails"
 
 gemspec path: "../"

data/lib/acl9/version.rb

@@ -1,3 +1,3 @@
 module Acl9
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/test/controller_extensions/conditions_test.rb

@@ -1,3 +1,4 @@
+require 'ostruct'
 require_relative 'base'
 
 module ControllerExtensions

data/test/dummy/config/application.rb

@@ -19,5 +19,9 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+
+    if Rails.version.start_with? '7.0'
+      config.active_record.legacy_connection_handling = false
+    end
   end
 end

data/test/dummy/config/initializers/inflections.rb

@@ -11,6 +11,6 @@
 # end
 
 # These inflection rules are supported but not enabled by default:
-# ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
-# end
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'ACL'
+end

data/test/test_helper.rb

@@ -2,6 +2,9 @@ ENV["RAILS_ENV"] = "test"
 
 require 'minitest/autorun'
 
+$VERBOSE = nil
+
+require "logger"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
@@ -9,15 +12,7 @@ Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
 
 ActiveRecord::Migration.verbose = false
 
-if Rails.gem_version >= Gem::Version.new('6.0')
-  ActiveRecord::MigrationContext.new(File.expand_path('../dummy/db/migrate', __FILE__), ActiveRecord::SchemaMigration).migrate
-elsif Rails.gem_version >= Gem::Version.new('5.2.0')
-  ActiveRecord::MigrationContext.new(File.expand_path('../dummy/db/migrate', __FILE__)).migrate
-else
-  ActiveRecord::Migrator.migrate(File.expand_path('../dummy/db/migrate', __FILE__))
-end
-
-$VERBOSE = nil
+ActiveRecord::MigrationContext.new(File.expand_path('../dummy/db/migrate', __FILE__)).migrate
 
 class ActionController::TestCase
   setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - oleg dashevskii
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2025-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -45,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  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'
 description: Role-based authorization system for Rails with a concise DSL for securing
   your Rails application. Acl9 makes it easy to get security right for your app, the
   access control code sits right in your controller, the syntax is very easy to understand,
@@ -70,14 +50,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/acl9.yml"
 - ".gitignore"
 - ".ruby-version"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - MIT-LICENSE
 - README.md
@@ -98,12 +77,11 @@ files:
 - bin/yard
 - bin/yardoc
 - bin/yri
-- gemfiles/.bundle/config
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
-- gemfiles/rails_5.2.gemfile
-- 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
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_head.gemfile
 - lib/acl9.rb
 - lib/acl9/controller_extensions.rb
 - lib/acl9/controller_extensions/dsl_base.rb
@@ -185,7 +163,6 @@ files:
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
@@ -225,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Role-based authorization system for Rails with a concise DSL for securing
@@ -298,7 +275,6 @@ test_files:
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb

data/.travis.yml

@@ -1,37 +0,0 @@
-cache: bundler
-language: ruby
-rvm:
-  - 2.5.8
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
-  - ruby-head
-
-gemfile:
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-  - gemfiles/rails_5.2.gemfile
-  - gemfiles/rails_6.0.gemfile
-  - gemfiles/rails_6.1.gemfile
-
-jobs:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-  exclude:
-    - rvm: 2.5.8
-      gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: 2.5.8
-      gemfile: gemfiles/rails_6.1.gemfile
-    - rvm: 2.7.2
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.7.2
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.7.2
-      gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 3.0.0
-      gemfile: gemfiles/rails_5.2.gemfile

data/Gemfile.lock

@@ -1,152 +0,0 @@
-PATH
-  remote: .
-  specs:
-    acl9 (3.1.0)
-      rails (> 5.0, < 7.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
-      mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
-      nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
-      globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      marcel (~> 0.3.1)
-    activesupport (6.0.0)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    appraisal (2.2.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
-    builder (3.2.3)
-    byebug (11.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    erubi (1.8.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.5.1)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
-      bundler (>= 1.3.0)
-      railties (= 6.0.0)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (12.3.3)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    websocket-driver (0.7.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    yard (0.9.20)
-    zeitwerk (2.1.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  acl9!
-  appraisal
-  byebug
-  sqlite3
-  yard
-
-BUNDLED WITH
-   2.2.10

data/gemfiles/.bundle/config

@@ -1,2 +0,0 @@
----
-BUNDLE_RETRY: "1"

data/test/dummy/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-Dummy::Application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )