acl9 2.1.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 42197ff7517796cb0d549260db507f532ff38abd
-  data.tar.gz: 5a1950ee49a8c32612af387eb6cfa0a9ab3ae2ec
+SHA256:
+  metadata.gz: 105b1a050bdefc20d0671c4035500f9abd99f8f588b69ed3ceb3357f61ea01e1
+  data.tar.gz: 2e5f73791a47de3e9fe4148c81868d6befcda7075163813eb86877c7e21084a5
 SHA512:
-  metadata.gz: 90cdebd216f60a35fed030a1fdf924c41f17af17b7994d1dd30671495ab3b1d941196b30873d4340e05b50971e5efb5fd8d16688d3a9e30e0b0c081694cd3741
-  data.tar.gz: c62f318d3aab6e16966d2143eb8e30f9635dbc7f668ea16c5fb382fb54887b32e873abcd15ccd77637b63ffb01af608b280a1fbad48eb5fbfca7f4465d26f56b
+  metadata.gz: 9caadac85342a7885a46581b4a60fc7c83d51b23c50f85e0e2121fa2d15fd4ab0383984f5f7b48076f18dd49409ad40e5292f9d8a2615aced3088f0f004c28b0
+  data.tar.gz: edec0e425c0dfaf67f934b9a79ae37e3fad11baeedb605c04ccf0533bc59d1e3c4851f41f2d909cec855310fe69f811f0ff9aec78755ee3fb8a52c61e47a698d

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.5.0

data/.travis.yml

@@ -1,22 +1,15 @@
 cache: bundler
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.3
-  - 2.3.0
+  - 2.4.3
+  - 2.5.0
   - ruby-head
 
 gemfile:
-  - gemfiles/rails_4.0.gemfile
-  - gemfiles/rails_4.1.gemfile
-  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+  - gemfiles/rails_5.1.gemfile
 
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-
-addons:
-  code_climate:
-    repo_token: 6701faf591ff926cd9b3ea7f07c5e72984d2b1e26b33caba26114a6bfe859a11

data/Appraisals

@@ -1,11 +1,7 @@
-appraise "rails-4.0" do
-  gem "rails", "~> 4.0.0"
+appraise "rails-5.0" do
+  gem 'rails', '~> 5.0.0'
 end
 
-appraise "rails-4.1" do
-  gem "rails", "~> 4.1.0"
-end
-
-appraise "rails-4.2" do
-  gem 'rails', '~> 4.2.0'
+appraise "rails-5.1" do
+  gem 'rails', '~> 5.1.0'
 end

data/Gemfile

@@ -4,6 +4,4 @@ source "http://rubygems.org"
 gemspec
 
 gem 'appraisal'
-gem 'tapout'
-gem 'minitap'
 gem 'byebug'

data/Gemfile.lock

@@ -1,128 +1,118 @@
 PATH
   remote: .
   specs:
-    acl9 (2.1.1)
-      rails (~> 4.0)
+    acl9 (2.1.2)
+      rails (>= 4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      arel (~> 6.0)
-    activesupport (4.2.5.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)
+      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)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    ansi (1.5.0)
-    appraisal (2.1.0)
+    appraisal (2.2.0)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (6.0.3)
-    builder (3.2.2)
-    byebug (8.2.2)
-    codeclimate-test-reporter (0.4.8)
-      simplecov (>= 0.7.1, < 1.0.0)
-    concurrent-ruby (1.0.1)
-    docile (1.1.5)
-    erubis (2.7.0)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    loofah (2.0.3)
+    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)
+      activesupport (>= 4.2.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    loofah (2.2.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.99.1)
-    mini_portile2 (2.0.0)
-    minitap (0.5.3)
-      minitest (~> 5.0)
-      minitest-reporter-api (>= 0.0.2)
-      tapout (>= 0.3.0)
-    minitest (5.8.4)
-    minitest-reporter-api (0.0.5)
-      minitest (~> 5.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.5.1)
-      actionmailer (= 4.2.5.1)
-      actionpack (= 4.2.5.1)
-      actionview (= 4.2.5.1)
-      activejob (= 4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activerecord (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.5.1)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.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)
+      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)
+      bundler (>= 1.3.0)
+      railties (= 5.1.5)
+      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 (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
-    simplecov (0.11.2)
-      docile (~> 1.1.0)
-      json (~> 1.8)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    sprockets (3.5.2)
+    rake (12.3.0)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.0.3)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.11)
-    tapout (0.4.5)
-      ansi
-      json
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    yard (0.8.7.6)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -131,11 +121,8 @@ DEPENDENCIES
   acl9!
   appraisal
   byebug
-  codeclimate-test-reporter
-  minitap
   sqlite3
-  tapout
   yard
 
 BUNDLED WITH
-   1.11.2
+   1.16.1

data/Rakefile

@@ -10,8 +10,6 @@ require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
-  test.verbose = false
-  test.options = " | tapout runtime"
 end
 
 require 'yard'

data/acl9.gemspec

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

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

@@ -3,8 +3,6 @@
 source "http://rubygems.org"
 
 gem "appraisal"
-gem "tapout"
-gem "minitap"
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.0.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/{rails_4.1.gemfile → rails_5.1.gemfile}

@@ -3,8 +3,6 @@
 source "http://rubygems.org"
 
 gem "appraisal"
-gem "tapout"
-gem "minitap"
-gem "rails", "~> 4.1.0"
+gem "rails", "~> 5.1.0"
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/acl9/controller_extensions/generators.rb

@@ -93,7 +93,7 @@ module Acl9
         def install_on(controller_class, options)
           super
 
-          controller_class.send(:before_filter, options, &self.to_proc)
+          controller_class.send(:before_action, options, &self.to_proc)
         end
 
         def to_proc
@@ -124,7 +124,7 @@ module Acl9
         def install_on(controller_class, options)
           super
           _add_method(controller_class)
-          controller_class.send(:before_filter, @method_name, options)
+          controller_class.send(:before_action, @method_name, options)
         end
 
         protected

data/lib/acl9/model_extensions.rb

@@ -129,7 +129,7 @@ module Acl9
           :class_name => subject,
           :join_table => join_table
 
-        belongs_to :authorizable, :polymorphic => true
+        belongs_to :authorizable, polymorphic: true, optional: true
       end
     end
   end

data/lib/acl9/version.rb

@@ -1,3 +1,3 @@
 module Acl9
-  VERSION = "2.1.2"
+  VERSION = "3.0.0"
 end

data/lib/generators/acl9/setup/setup_generator.rb

@@ -10,9 +10,8 @@ module Acl9
     argument :arg_role, type: :string, default: 'role', banner: "role"
     argument :arg_objects, type: :array, default: [], banner: "objects..."
 
-    def create_migration
-      next_migration_number = self.class.next_migration_number( File.expand_path( '../db/migrate', __FILE__))
-      template "create_role_tables.rb", "db/migrate/#{next_migration_number}_create_#{role_name}_tables.rb"
+    def create_migration_file
+      migration_template "create_role_tables.rb", File.join(db_migrate_path, "create_#{role_name}_tables.rb")
     end
 
     def create_models
@@ -56,6 +55,14 @@ module Acl9
       role_name.classify
     end
 
+    def model_base_name
+      r5? ? ApplicationRecord : ActiveRecord::Base
+    end
+
+    def r5?
+      Rails.gem_version >= Gem::Version.new(5)
+    end
+
     def habtm_table
       Acl9.config.default_join_table_name || [ subject_name, role_name ].map(&:pluralize).sort.join('_')
     end

data/lib/generators/acl9/setup/templates/create_role_tables.rb

@@ -1,22 +1,31 @@
-class Create<%= role_class_name %>Tables < ActiveRecord::Migration
+class Create<%= role_class_name %>Tables < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :<%= role_table_name %> do |t|
       t.string   :name,                   null: false
+      <% if r5? %>
+      t.references :authorizable, polymorphic: true
+      <% else %>
       t.string   :authorizable_type,      null: true
       t.integer  :authorizable_id,        null: true
+      <% end %>
       t.boolean  :system, default: false, null: false
       t.timestamps                        null: false
     end
 
     add_index :<%= role_table_name %>, :name
+
+    <% unless r5? %>
     add_index :<%= role_table_name %>, [:authorizable_type, :authorizable_id]
+    <% end -%>
 
     create_table :<%= habtm_table %>, id: false do |t|
       t.references  :<%= subject_name %>, null: false
       t.references  :<%= role_name %>, null: false
     end
 
+    <% unless r5? %>
     add_index :<%= habtm_table %>, :<%= subject_name %>_id
     add_index :<%= habtm_table %>, :<%= role_name %>_id
+    <% end %>
   end
 end

data/lib/generators/acl9/setup/templates/role.rb

@@ -1,3 +1,3 @@
-class <%= role_class_name %> < ActiveRecord::Base
+class <%= role_class_name %> < <%= model_base_name %>
   <%= role_helper %>
 end

data/test/controllers/acl_action_override_test.rb

@@ -2,23 +2,23 @@ require 'test_helper'
 
 class ACLActionOverrideTest < ActionController::TestCase
   test "anon can index" do
-    assert get :check_allow, :_action => :index
+    assert get :check_allow, params: { _action: :index }
     assert_response :ok
   end
 
   test "anon can't show" do
-    assert get :check_allow, :_action => :show
+    assert get :check_allow, params: { _action: :show }
     assert_response :unauthorized
   end
 
   test "normal user can't edit" do
-    assert get :check_allow_with_foo, :_action => :edit, :user_id => User.create.id
+    assert get :check_allow_with_foo, params: { _action: :edit, user_id: User.create.id }
     assert_response :unauthorized
   end
 
   test "foo owner can edit" do
     assert ( user = User.create ).has_role! :owner, Foo.first_or_create
-    assert get :check_allow_with_foo, :_action => :edit, :user_id => user.id
+    assert get :check_allow_with_foo, params: { _action: :edit, user_id: user.id }
     assert_response :ok
   end
 end

data/test/controllers/acl_helper_method_test.rb

@@ -8,14 +8,14 @@ class ACLHelperMethodTest < ActionController::TestCase
   test "foo owner allowed" do
     assert @user.has_role! :owner, Foo.first_or_create
 
-    assert get :allow, :user_id => @user.id
+    assert get :allow, params: { user_id: @user.id }
     assert_select 'div', 'OK'
   end
 
   test "another user denied" do
     assert @user.has_role! :owner
 
-    assert get :allow, :user_id => @user.id
+    assert get :allow, params: { user_id: @user.id }
     assert_select 'div', 'OK'
   end
 

data/test/controllers/acl_ivars_test.rb

@@ -3,13 +3,13 @@ require 'test_helper'
 class ACLIvarsTest < ActionController::TestCase
   test "owner of foo destroys" do
     assert ( user = User.create ).has_role! :owner, Bar
-    assert delete :destroy, :id => 1, :user_id => user.id
+    assert delete :destroy, params: { id: 1, user_id: user.id }
     assert_response :ok
   end
 
   test "bartender at Foo destroys" do
     assert ( user = User.create ).has_role! :bartender, Foo
-    assert delete :destroy, :id => 1, :user_id => user.id
+    assert delete :destroy, params: { id: 1, user_id: user.id }
     assert_response :ok
   end
 end

data/test/controllers/acl_object_hash_test.rb

@@ -7,7 +7,7 @@ class ACLObjectsHashTest < ActionController::TestCase
   end
 
   test "objects hash preferred to @ivar" do
-    assert get :allow, :user_id => @user.id
+    assert get :allow, params: { user_id: @user.id }
     assert_response :ok
   end
 

data/test/controllers/acl_query_mixin.rb

@@ -44,7 +44,7 @@ module ACLQueryMixin
 
       test "should return true for foo owner" do
         assert @controller.current_user = @owneroffoo
-        assert @controller.acl? :fooize, :foo => Foo.first
+        assert @controller.acl? :fooize, foo: Foo.first
       end
     end
   end

data/test/controllers/acl_subject_method_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class ACLSubjectMethodTest < ActionController::TestCase
   test "allow the only user to index" do
     assert ( user = User.create ).has_role! :the_only_one
-    assert get :index, :user_id => user.id
+    assert get :index, params: { user_id: user.id }
     assert_response :ok
   end
 

data/test/controllers/arguments_checking_test.rb

@@ -25,18 +25,18 @@ class ArgumentsCheckingTest < ActionController::TestCase
     end
   end
 
-  test "raise ArgumentError with :helper => true and no method name" do
+  test "raise ArgumentError with helper: true and no method name" do
     assert_raise ArgumentError do
       class FailureController < ApplicationController
-        access_control :helper => true do end
+        access_control helper: true do end
       end
     end
   end
 
-  test "raise ArgumentError with :helper => :method and a method name" do
+  test "raise ArgumentError with helper: :method and a method name" do
     assert_raise ArgumentError do
       class FailureController < ApplicationController
-        access_control :meth, :helper => :another_meth do end
+        access_control :meth, helper: :another_meth do end
       end
     end
   end

data/test/dummy/app/controllers/acl_action_override.rb

@@ -1,8 +1,8 @@
 class ACLActionOverride < ApplicationController
-  access_control :allowed?, :filter => false do
-    allow all, :to => :index
-    deny all, :to => :show
-    allow :owner, :of => :foo, :to => :edit
+  access_control :allowed?, filter: false do
+    allow all, to: :index
+    deny all, to: :show
+    allow :owner, of: :foo, to: :edit
   end
 
   def check_allow
@@ -10,6 +10,6 @@ class ACLActionOverride < ApplicationController
   end
 
   def check_allow_with_foo
-    head allowed?(params[:_action], :foo => Foo.first) ? :ok : :unauthorized
+    head allowed?(params[:_action], foo: Foo.first) ? :ok : :unauthorized
   end
 end

data/test/dummy/app/controllers/acl_boolean_method.rb

@@ -1,12 +1,12 @@
 class ACLBooleanMethod < EmptyController
-  access_control :acl, :filter => false do
-    allow all, :to => [:index, :show], :if => :true_meth
-    allow :admin,                      :unless => :false_meth
-    allow all,                         :if => :false_meth
-    allow all,                         :unless => :true_meth
+  access_control :acl, filter: false do
+    allow all, to: [:index, :show], if: :true_meth
+    allow :admin,               unless: :false_meth
+    allow all,                      if: :false_meth
+    allow all,                  unless: :true_meth
   end
 
-  before_filter :check_acl
+  before_action :check_acl
 
   def check_acl
     if self.acl

data/test/dummy/app/controllers/acl_ivars.rb

@@ -1,11 +1,11 @@
 class ACLIvars < EmptyController
 
-  before_filter :set_ivars
+  before_action :set_ivars
 
   access_control do
     action :destroy do
-      allow :owner, :of => :foo
-      allow :bartender, :at => Foo
+      allow :owner, of: :foo
+      allow :bartender, at: Foo
     end
   end
 

data/test/dummy/app/controllers/empty_controller.rb

@@ -1,5 +1,5 @@
 class EmptyController < ApplicationController
   %i[index show new edit create update destroy].each do |action|
-    define_method(action) { render :text => 'OK' }
+    define_method(action) { render plain: 'OK' }
   end
 end

data/test/dummy/app/models/string_object_role.rb

@@ -0,0 +1,3 @@
+class StringObjectRole < ActiveRecord::Base
+  acts_as_authorization_role subject_class_name: "StringUser"
+end

data/test/dummy/app/models/string_user.rb

@@ -0,0 +1,3 @@
+class StringUser < ActiveRecord::Base
+  acts_as_authorization_subject role_class_name: "StringObjectRole"
+end

data/test/dummy/app/models/uuid.rb

@@ -1,4 +1,4 @@
 class Uuid < ActiveRecord::Base
   self.primary_key = "uuid"  
-  acts_as_authorization_object
+  acts_as_authorization_object role_class_name: "StringObjectRole", subject_class_name: "StringUser"
 end

data/test/dummy/config/environments/test.rb

@@ -13,8 +13,8 @@ Dummy::Application.configure do
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files  = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/test/dummy/config/routes.rb

@@ -1,3 +1,14 @@
 Dummy::Application.routes.draw do
-  get ':controller(/:action(/:id))'
+  resources :acl_action_override do
+    collection do
+      get :check_allow_with_foo
+      get :check_allow
+    end
+  end
+
+  resources :acl_boolean_method, :acl_block, :acl_ivars, :acl_method, :acl_method2, :acl_subject_method, :acl_arguments
+
+  get :acl_helper_method, to: "acl_helper_method#allow"
+  get :acl_objects_hash, to: "acl_objects_hash#allow"
+
 end

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

@@ -1,22 +1,37 @@
-class CreateTables < ActiveRecord::Migration
+class CreateTables < ActiveRecord::Migration[ActiveRecord::Migration.current_version]
+  def self.r5?
+    Rails.gem_version >= Gem::Version.new(5)
+  end
+  def r5?
+    self.class.r5?
+  end
+
   def change
     create_table :roles do |t|
       t.string   :name,              :limit => 40
       t.boolean  :system
-      t.string   :authorizable_type, :limit => 40
-      t.integer  :authorizable_id
+      if r5?
+        t.references :authorizable, polymorphic: true
+      else
+        t.string   :authorizable_type, :limit => 40
+        t.integer  :authorizable_id
+      end
       t.timestamps null: false
     end
 
-    add_index :roles, [:authorizable_type, :authorizable_id]
+    unless r5?
+      add_index :roles, [:authorizable_type, :authorizable_id]
+    end
 
     create_table :roles_users, id: false do |t|
       t.references  :user
       t.references  :role
     end
 
-    add_index :roles_users, :user_id
-    add_index :roles_users, :role_id
+    unless r5?
+      add_index :roles_users, :user_id
+      add_index :roles_users, :role_id
+    end
     
     create_table :users do |t|
       t.string :name
@@ -39,6 +54,25 @@ class CreateTables < ActiveRecord::Migration
       t.timestamps null: false
     end
 
+    create_table :string_object_roles do |t|
+      t.string :name
+      t.boolean  :system
+      t.string   :authorizable_type
+      t.string   :authorizable_id
+      t.timestamps null: false
+    end
+
+    create_table :string_object_roles_string_users, id: false do |t|
+      t.references  :string_user, index: { name: "susor" }
+      t.references  :string_object_role, index: { name: "sorsu" }
+    end
+
+    create_table :string_users do |t|
+      t.string :name
+      t.timestamps null: false
+    end
+
+
     create_table :accounts do |t|
       t.string :name
       t.timestamps null: false
@@ -47,20 +81,28 @@ class CreateTables < ActiveRecord::Migration
     create_table :accesses do |t|
       t.string :name
       t.boolean  :system
-      t.string   :authorizable_type, :limit => 40
-      t.integer  :authorizable_id
+      if r5?
+        t.references :authorizable, polymorphic: true
+      else
+        t.string   :authorizable_type, :limit => 40
+        t.integer  :authorizable_id
+      end
       t.timestamps null: false
     end
 
-    add_index :accesses, [:authorizable_type, :authorizable_id]
+    unless r5?
+      add_index :accesses, [:authorizable_type, :authorizable_id]
+    end
 
     create_table :accesses_accounts, id: false do |t|
       t.references  :account
       t.references  :access
     end
 
-    add_index :accesses_accounts, :access_id
-    add_index :accesses_accounts, :account_id
+    unless r5?
+      add_index :accesses_accounts, :access_id
+      add_index :accesses_accounts, :account_id
+    end
 
     create_table :foo_bars do |t|
       t.string :name
@@ -71,20 +113,28 @@ class CreateTables < ActiveRecord::Migration
     create_table :other_roles do |t|
       t.string   :name,              :limit => 40
       t.boolean  :system
-      t.string   :authorizable_type, :limit => 40
-      t.integer  :authorizable_id
+      if r5?
+        t.references :authorizable, polymorphic: true
+      else
+        t.string   :authorizable_type, :limit => 40
+        t.integer  :authorizable_id
+      end
       t.timestamps null: false
     end
 
-    add_index :other_roles, [:authorizable_type, :authorizable_id]
+    unless r5?
+      add_index :other_roles, [:authorizable_type, :authorizable_id]
+    end
 
     create_table :other_roles_users, id: false do |t|
       t.references  :user
       t.references  :role
     end
 
-    add_index :other_roles_users, :user_id
-    add_index :other_roles_users, :role_id
+    unless r5?
+      add_index :other_roles_users, :user_id
+      add_index :other_roles_users, :role_id
+    end
     
     create_table :other_users do |t|
       t.string :name

data/test/models/roles_test.rb

@@ -243,12 +243,16 @@ class RolesTest < ActiveSupport::TestCase
   end
 
   test "should be able to get users that have a role on a authorized object with text primary key" do
+
+    assert @user = StringUser.create
+    assert @user2 = StringUser.create
+
     assert uuid = Uuid.create( id: "C41642EE-2780-0001-189F-17F3101B26E0" )
 
     assert @user.has_role! :owner, uuid
     assert @user2.has_role! :owner, uuid
 
-    assert_equal 2, uuid.users.count
+    assert_equal 2, uuid.string_users.count
   end
 
   test "should accept :symbols as role names" do

data/test/test_helper.rb

@@ -1,16 +1,6 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
-
 ENV["RAILS_ENV"] = "test"
 
 require 'minitest/autorun'
-require 'minitap'
-
-if defined? Minitap
-  Minitest.reporter = Minitap::TapY
-else
-  MiniTest::Unit.runner = MiniTest::TapY.new
-end
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
@@ -20,27 +10,29 @@ Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
 
+$VERBOSE = nil
+
 class ActionController::TestCase
   class << self
-    def test_allowed method, action, params=nil, cookies=nil
-      test "allowed #{action} #{method}" do
+    def test_allowed method, action, params={}
+      test "allowed #{method} #{action}" do
         if block_given?
           yield user = User.create
-          ( params ||= {} ).merge! :user_id => user.id
+          params.merge! user_id: user.id
         end
-        assert send( method, action, params, cookies )
+        assert send( method, action, params: params )
         assert_response :ok
       end
     end
 
-    def test_denied method, action, params=nil, cookies=nil
-      test "denied #{action} #{method}" do
+    def test_denied method, action, params={}
+      test "denied #{method} #{action}" do
         assert_raises Acl9::AccessDenied do
           if block_given?
             yield user = User.create
-            ( params ||= {} ).merge! :user_id => user.id
+            params.merge! user_id: user.id
           end
-          assert send( method, action, params, cookies )
+          assert send( method, action, params: params )
         end
       end
     end
@@ -57,21 +49,21 @@ module BaseTests
   def self.included(klass)
     klass.class_eval do
       test_allowed :get, :index
-      test_allowed :get, :show, :id => 1
+      test_allowed :get, :show, id: 1
       test_denied :get, :new
-      test_denied :get, :edit, :id => 1
+      test_denied :get, :edit, id: 1
       test_denied :post, :create
-      test_denied :put, :update, :id => 1
-      test_denied :patch, :update, :id => 1
-      test_denied :delete, :destroy, :id => 1
+      test_denied :put, :update, id: 1
+      test_denied :patch, :update, id: 1
+      test_denied :delete, :destroy, id: 1
 
       admin = -> (user) { user.has_role! :admin }
       test_allowed :get, :new, &admin
-      test_allowed :get, :edit, :id => 1, &admin
+      test_allowed :get, :edit, id: 1, &admin
       test_allowed :post, :create, &admin
-      test_allowed :put, :update, :id => 1, &admin
-      test_allowed :patch, :update, :id => 1, &admin
-      test_allowed :delete, :destroy, :id => 1, &admin
+      test_allowed :put, :update, id: 1, &admin
+      test_allowed :patch, :update, id: 1, &admin
+      test_allowed :delete, :destroy, id: 1, &admin
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 3.0.0
 platform: ruby
 authors:
 - oleg dashevskii
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,28 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  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'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +92,8 @@ files:
 - bin/yard
 - bin/yardoc
 - bin/yri
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
+- gemfiles/rails_5.1.gemfile
 - lib/acl9.rb
 - lib/acl9/controller_extensions.rb
 - lib/acl9/controller_extensions/dsl_base.rb
@@ -178,6 +163,8 @@ files:
 - test/dummy/app/models/other/role.rb
 - test/dummy/app/models/other/user.rb
 - test/dummy/app/models/role.rb
+- test/dummy/app/models/string_object_role.rb
+- test/dummy/app/models/string_user.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/models/uuid.rb
 - test/dummy/config.ru
@@ -186,7 +173,6 @@ files:
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
@@ -229,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Role-based authorization system for Rails with a concise DSL for securing
@@ -290,6 +276,8 @@ test_files:
 - test/dummy/app/models/other/role.rb
 - test/dummy/app/models/other/user.rb
 - test/dummy/app/models/role.rb
+- test/dummy/app/models/string_object_role.rb
+- test/dummy/app/models/string_user.rb
 - test/dummy/app/models/user.rb
 - test/dummy/app/models/uuid.rb
 - test/dummy/config.ru
@@ -298,7 +286,6 @@ test_files:
 - test/dummy/config/database.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
@@ -320,4 +307,3 @@ test_files:
 - test/models/users_roles_and_subjects_with_namespaced_class_names_test.rb
 - test/test_helper.rb
 - test/version_test.rb
-has_rdoc: 

data/gemfiles/rails_4.2.gemfile

@@ -1,10 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "appraisal"
-gem "tapout"
-gem "minitap"
-gem "rails", "~> 4.2.0"
-
-gemspec :path => "../"

data/test/dummy/config/environments/production.rb

@@ -1,78 +0,0 @@
-Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb.
-
-  # Code is not reloaded between requests.
-  config.cache_classes = true
-
-  # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both threaded web servers
-  # and those relying on copy on write to perform better.
-  # Rake tasks automatically ignore this option for performance.
-  config.eager_load = true
-
-  # Full error reports are disabled and caching is turned on.
-  config.consider_all_requests_local       = false
-  config.action_controller.perform_caching = true
-
-  # Enable Rack::Cache to put a simple HTTP cache in front of your application
-  # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
-  # config.action_dispatch.rack_cache = true
-
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_files = false
-
-  # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
-
-  # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
-
-  # Generate digests for assets URLs.
-  config.assets.digest = true
-
-  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
-
-  # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
-
-  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
-  # config.force_ssl = true
-
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
-
-  # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :uuid ]
-
-  # Use a different logger for distributed setups.
-  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
-
-  # Use a different cache store in production.
-  # config.cache_store = :mem_cache_store
-
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Ignore bad email addresses and do not raise email delivery errors.
-  # Set this to true and configure the email server for immediate delivery to raise delivery errors.
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation cannot be found).
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners.
-  config.active_support.deprecation = :notify
-
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
-  # Use default logging formatter so that PID and timestamp are not suppressed.
-  config.log_formatter = ::Logger::Formatter.new
-
-  # Do not dump schema after migrations.
-  config.active_record.dump_schema_after_migration = false
-end