acl9 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ee10c2f6e3894b825f17a575524a0343dcdf16217a3049b665e04da980bce1c
-  data.tar.gz: cd72c5c1e1983b28e8799c9792e5fa843f89415e104588feaf2dbeb72fd1f651
+  metadata.gz: 7c96a3e331bb553a202d5002bc13de3d6660fe417ff48c20174715dfdb09e96f
+  data.tar.gz: 105c1c70b580c5a7cd49105e04d6f6f4acba5c8182fedc9ea9995dcb83050e71
 SHA512:
-  metadata.gz: dca2492214e239e447b4de8f1874be52c617ca361fdcbc79ac5f4c58782ff92449e29db54f9618356680c96e55023412a6206e1f9b3ec9d7f20074d7cb89d76d
-  data.tar.gz: 0a8963681d65a13fd39e3d4e46d75be288fda1a3ce1a8bb05c1e6264da2e1601c0abb698dbbfd9abe10e965bd6c0491acab62131852f508ad3c2b1d852f3cdc8
+  metadata.gz: 5c79f61b3da512da237806b469f5f24051b9b845424be81d08b52188ab4597acb71aa4ecb5047d211701d8324d438c83996052a5bc243f333cf967bf1517bebc
+  data.tar.gz: 8a218af5d9e00f16c9d7e5162ad973c7386d1c4c4b8801c541bd767caccdfecfb9b85fa342dfcfa46c727e49ef17d1432c55761629994135c5ce7542b9fe8826

data/.gitignore

@@ -19,3 +19,6 @@
 
 /doc
 /.yardoc
+
+/acl9-*.gem
+/gemfiles/*.lock

data/.ruby-version

@@ -1 +1 @@
-2.5.0
+2.7.2

data/.travis.yml

@@ -1,17 +1,37 @@
 cache: bundler
 language: ruby
 rvm:
-  - 2.4.3
-  - 2.5.0
+  - 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
 
-matrix:
+jobs:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-    - gemfile: gemfiles/rails_5.2.gemfile
+  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/Appraisals

@@ -7,5 +7,13 @@ appraise "rails-5.1" do
 end
 
 appraise "rails-5.2" do
-  gem 'rails', '~> 5.2.0.rc1'
+  gem 'rails', '~> 5.2.0'
+end
+
+appraise "rails-6.0" do
+  gem 'rails', '~> 6.0.0'
+end
+
+appraise "rails-6.1" do
+  gem 'rails', '~> 6.1.0'
 end

data/Gemfile.lock

@@ -2,117 +2,141 @@ PATH
   remote: .
   specs:
     acl9 (3.1.0)
-      rails (~> 5.0)
+      rails (> 5.0, < 7.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.1.5)
-      actionpack (= 5.1.5)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
+      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 (5.1.5)
-      actionview (= 5.1.5)
-      activesupport (= 5.1.5)
+    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.0.2)
-    actionview (5.1.5)
-      activesupport (= 5.1.5)
+      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.0, >= 1.0.3)
-    activejob (5.1.5)
-      activesupport (= 5.1.5)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.1.5)
-      activesupport (= 5.1.5)
-    activerecord (5.1.5)
-      activemodel (= 5.1.5)
-      activesupport (= 5.1.5)
-      arel (~> 8.0)
-    activesupport (5.1.5)
+    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)
+      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)
-    arel (8.0.0)
     builder (3.2.3)
-    byebug (10.0.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    erubi (1.7.1)
-    globalid (0.4.1)
+    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 (0.9.5)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.0)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
-    method_source (0.9.0)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
+    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.2.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    rack (2.0.4)
-    rack-test (0.8.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 (5.1.5)
-      actioncable (= 5.1.5)
-      actionmailer (= 5.1.5)
-      actionpack (= 5.1.5)
-      actionview (= 5.1.5)
-      activejob (= 5.1.5)
-      activemodel (= 5.1.5)
-      activerecord (= 5.1.5)
-      activesupport (= 5.1.5)
+    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 (= 5.1.5)
+      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.0.3)
-      loofah (~> 2.0)
-    railties (5.1.5)
-      actionpack (= 5.1.5)
-      activesupport (= 5.1.5)
+    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.18.1, < 2.0)
-    rake (12.3.0)
-    sprockets (3.7.1)
+      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.3.13)
-    thor (0.20.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.6.5)
+    websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    yard (0.9.12)
+    websocket-extensions (0.1.4)
+    yard (0.9.20)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby
@@ -125,4 +149,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.1
+   2.2.10

data/README.md

@@ -16,10 +16,10 @@ Acl9 is [Semantically Versioned](http://semver.org/), so just add this to your
 `Gemfile`:
 
 ```ruby
-gem 'acl9', '~> 3.0'
+gem 'acl9', '~> 3.2'
 ```
 
-You will need Ruby 2.x
+You will need Ruby > 2.0
 
 ### Rails 4 - stick with 2.x
 

data/acl9.gemspec

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

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

@@ -5,5 +5,6 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "byebug"
 gem "rails", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.6", :group => :development
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

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

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "byebug"
+gem "rails", "~> 6.0.0"
+
+gemspec path: "../"

data/gemfiles/rails_6.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal"
+gem "byebug"
+gem "rails", "~> 6.1.0"
+
+gemspec path: "../"

data/lib/acl9/version.rb

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

data/test/dummy/db/migrate/20141117132218_create_tables.rb

@@ -32,7 +32,7 @@ class CreateTables < ActiveRecord::Migration[ActiveRecord::Migration.current_ver
       add_index :roles_users, :user_id
       add_index :roles_users, :role_id
     end
-    
+
     create_table :users do |t|
       t.string :name
       t.timestamps null: false
@@ -135,7 +135,7 @@ class CreateTables < ActiveRecord::Migration[ActiveRecord::Migration.current_ver
       add_index :other_roles_users, :user_id
       add_index :other_roles_users, :role_id
     end
-    
+
     create_table :other_users do |t|
       t.string :name
       t.timestamps null: false

data/test/test_helper.rb

@@ -9,7 +9,13 @@ Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
 
 ActiveRecord::Migration.verbose = false
 
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+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
 

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - oleg dashevskii
 - Jason King
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !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
@@ -96,6 +102,8 @@ files:
 - 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
 - lib/acl9.rb
 - lib/acl9/controller_extensions.rb
 - lib/acl9/controller_extensions/dsl_base.rb
@@ -137,6 +145,7 @@ files:
 - test/controllers/acl_query_mixin.rb
 - test/controllers/acl_subject_method_test.rb
 - test/controllers/arguments_checking_test.rb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/acl_action_override.rb
 - test/dummy/app/controllers/acl_arguments.rb
 - test/dummy/app/controllers/acl_block.rb
@@ -200,7 +209,7 @@ homepage: http://github.com/be9/acl9
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -216,9 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Role-based authorization system for Rails with a concise DSL for securing
   your Rails application.
@@ -250,6 +258,7 @@ test_files:
 - test/controllers/acl_query_mixin.rb
 - test/controllers/acl_subject_method_test.rb
 - test/controllers/arguments_checking_test.rb
+- test/dummy/app/assets/config/manifest.js
 - test/dummy/app/controllers/acl_action_override.rb
 - test/dummy/app/controllers/acl_arguments.rb
 - test/dummy/app/controllers/acl_block.rb