acl9 2.1.0 → 3.2.0

data/test/models/roles_test.rb

@@ -13,6 +13,14 @@ class RolesTest < ActiveSupport::TestCase
     Acl9.config[:protect_global_roles] = true
   end
 
+  test "should not set global role with nil object" do
+
+    assert_raise Acl9::NilObjectError do
+      assert @user.has_role! :admin, nil
+    end
+    refute @user.has_role? :admin
+  end
+
   test "should not have any roles by default" do
     %w(user manager admin owner).each do |role|
       refute @user.has_role? role
@@ -243,12 +251,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"
@@ -18,29 +8,42 @@ require "rails/test_help"
 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
 
 class ActionController::TestCase
+  setup do
+    assert Foo.create
+  end
+
   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 +60,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,44 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - oleg dashevskii
 - Jason King
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-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: '4.0'
+        version: '7.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:
-    - - ">="
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +98,12 @@ files:
 - bin/yard
 - bin/yardoc
 - bin/yri
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
+- 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
 - lib/acl9.rb
 - lib/acl9/controller_extensions.rb
 - lib/acl9/controller_extensions/dsl_base.rb
@@ -150,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
@@ -178,6 +174,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 +184,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
@@ -212,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:
@@ -228,9 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-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.
@@ -262,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
@@ -290,6 +287,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 +297,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 +318,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/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