acl9 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d257d3fbf2e9facce72082825fae4bf4ab77245c
-  data.tar.gz: bb2d0e3c004d4c426f55893adf342abaa28f822c
+  metadata.gz: f5811b1b61ac97d9081b9786e8dc361c93ff7b35
+  data.tar.gz: f1df54b8e0902d8b6d45928f2d6e2a2303bafae1
 SHA512:
-  metadata.gz: 67dbfd73321644d1a4758100ca477233f4c07eee3f0e3c0effc02be909c166d62f2a763e8b68e12d04e9c1d64b9bbe93b1d588960a45a3fad0e5667395ac72c3
-  data.tar.gz: 165cf932d81dd5fbf2d37499f6a43429a118285d0fd3e91db72f253ec603279cf35f92764a944f2816f88265258e2db86d459db7e0ed1137e32d7845a54ae92a
+  metadata.gz: 275e6d8c27b7c520b52f943621f61f4507f88b55b2a75650583c6f1a572c8396d933fecb3e3eb7fdbfb32d8f9db22c3ddec06d084e752c66b776d9d8dd5595f9
+  data.tar.gz: 78de89953adc12b839df2791eae3d07d896d197f5df92ff8986dc4813a6484a3cd56ab5c00d58247ee1672afdd8e67e0b9ee0fccbf44685338fc379e7212649d

data/.ruby-version

@@ -0,0 +1 @@
+2.1.5

data/.travis.yml

@@ -2,12 +2,13 @@ cache: bundler
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.2
+  - 2.1.5
   - ruby-head
 
 gemfile:
   - gemfiles/rails_4.0.gemfile
   - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.rc1.gemfile
 
 matrix:
   fast_finish: true

data/Appraisals

@@ -6,3 +6,7 @@ appraise "rails-4.1" do
   gem "rails", "~> 4.1.0"
 end
 
+appraise "rails-4.2" do
+  gem 'rails', '~> 4.2.0.rc3'
+end
+

data/CONTRIBUTING.md

@@ -26,6 +26,10 @@ and submit a pull request.
 
 ### Setup
 
+We have a `.ruby-version` file, so if you use a ruby manager that
+understands that then you might need to install that version of ruby, but you
+should know how to do that yourself.
+
 You should be able to just fork the repo and run `bundle && rake` to see the
 tests running.
 

data/Gemfile

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

data/Gemfile.lock

@@ -1,38 +1,39 @@
 PATH
   remote: .
   specs:
-    acl9 (1.0.0)
+    acl9 (1.1.0)
       rails (~> 4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
       builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
       arel (~> 5.0.0)
-    activesupport (4.1.7)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
+    ansi (1.4.3)
     appraisal (1.0.2)
       bundler
       rake
@@ -49,24 +50,30 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
+    minitap (0.5.3)
+      minitest (~> 5.0)
+      minitest-reporter-api (>= 0.0.2)
+      tapout (>= 0.3.0)
     minitest (5.4.3)
+    minitest-reporter-api (0.0.5)
+      minitest (~> 5.0)
     multi_json (1.10.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -80,11 +87,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.0)
+    sprockets-rails (2.2.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
+    tapout (0.4.5)
+      ansi
+      json
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
@@ -99,5 +109,7 @@ DEPENDENCIES
   acl9!
   appraisal
   codeclimate-test-reporter
+  minitap
   sqlite3
+  tapout
   yard

data/README.md

@@ -19,6 +19,8 @@ Acl9 is [Semantically Versioned](http://semver.org/), so just add this to your
 gem 'acl9', '~> 1.0'
 ```
 
+You will need Ruby 2.x
+
 We dropped support for Rails < 4 in the 1.x releases, so if you're still using
 Rails 2.x or 3.x then you'll want this:
 
@@ -38,7 +40,7 @@ obvious for any developer looking at the controller:
 ```ruby
 class Admin::SchoolsController < ApplicationController
   access_control do
-    allow :support, School
+    allow :support, :of => School
     allow :admins, :managers, :teachers, :of => :school
     deny :teachers, :to => :destroy
 
@@ -97,6 +99,73 @@ user.has_no_role! :support, School
 You can see more about all this stuff in the wiki under [Role
 Subsystem](//github.com/be9/acl9/wiki/Role-Subsystem)
 
+## Configuration
+
+There are five configurable settings. These all have sensible defaults which can
+be easily overridden by merging into the `Acl9::config` hash. You can also
+override each of the `:default_*` settings (dropping the "default_" prefix) in
+your models/controllers - see below for more detail:
+
+### :default_role_class_name
+
+Set to `'Role'` and can be overridden in your "user" model, [see the wiki for more](//github.com/be9/acl9/wiki/Role-Subsystem#custom-class-names).
+ 
+### :default_association_name
+
+Set to `:role_objects` and can be overridden in
+your "user" model, [see the wiki for more](//github.com/be9/acl9/wiki/Role-Subsystem#subject-model).
+We chose a name for this association that was unlikely to conflict with
+existing models but a lot of people override this to be just `:roles`
+
+### :default_subject_class_name
+
+Set to `'User'` and can be overridden in your
+"role" model, [see the wiki for more](//github.com/be9/acl9/wiki/Role-Subsystem#custom-class-names).
+
+### :default_subject_method
+
+Set to `:current_user` and can be overridden in
+your controllers, [see the wiki for more](//github.com/be9/acl9/wiki/Access-Control-Subsystem#subject_method).
+
+### :protect_global_roles
+
+Set to `true` (see "Upgrade Notes" below if you're upgrading) and can only be
+changed by merging into `Acl9::config`.  This setting changes how global roles
+(ie. roles with no object) are treated.
+
+Say we set a role like so:
+
+```ruby
+user.has_role! :admin, school
+```
+
+When `:protect_global_roles` is `true` (as is the default) then `user.has_role?
+:admin` is `false`. Ie. changing the role on a specific instance doesn't impact
+the global role (hence the name).
+
+When `:protect_global_roles` is `false` then `user.has_role? :admin` is `true`.
+Ie. setting a role on a specific instance makes that person a global one of
+those roles.
+
+Basically these are just two different ways of working with roles, if you're
+protecting your global roles then you can use them as sort of a superuser
+version of a given role. So you can have an admin of a school **and** a global
+admin with different privileges.
+
+If you don't protect your global roles then you can use them as a catch-all for
+any specific roles, so then the admins of schools, classrooms and students can
+all be granted a privilege by allowing the global `:admin` role.
+
+### Example
+
+```ruby
+# config/initializers/acl9.rb
+Acl9::config.merge! :default_association_name => :roles
+
+# or...
+Acl9::config[:default_association_name] = :roles
+```
+
 ## Upgrade Notes
 
 Please, PLEASE, **PLEASE** note. If you're upgrading from the `0.x` series of acl9

data/Rakefile

@@ -11,6 +11,7 @@ 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/bin/appraisal

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'appraisal' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('appraisal', 'appraisal')

data/bin/bundler

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'bundler' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('bundler', 'bundler')

data/bin/cc-tddium-post-worker

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'cc-tddium-post-worker' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('codeclimate-test-reporter', 'cc-tddium-post-worker')

data/bin/erubis

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'erubis' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('erubis', 'erubis')

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/bin/rails

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('railties', 'rails')

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/sprockets

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'sprockets' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('sprockets', 'sprockets')

data/bin/tapout

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tapout' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tapout', 'tapout')

data/bin/thor

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'thor' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('thor', 'thor')

data/bin/tilt

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'tilt' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('tilt', 'tilt')

data/bin/yard

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yard' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yard')

data/bin/yardoc

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yardoc' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yardoc')

data/bin/yri

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'yri' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('yard', 'yri')

data/gemfiles/rails_4.0.gemfile

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

data/gemfiles/rails_4.1.gemfile

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

data/gemfiles/rails_4.2.gemfile

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

data/lib/acl9/model_extensions/for_subject.rb

@@ -164,10 +164,12 @@ module Acl9
 
       def delete_role(role)
         if role
-          self._role_objects.delete role
-          if role.send(self._auth_subject_class_name.demodulize.tableize).empty?
-            role.destroy unless role.respond_to?(:system?) && role.system?
+          if ret = self._role_objects.delete(role)
+            if role.send(self._auth_subject_class_name.demodulize.tableize).empty?
+              ret &&= role.destroy unless role.respond_to?(:system?) && role.system?
+            end
           end
+          ret
         end
       end
 

data/lib/acl9/model_extensions.rb

@@ -24,7 +24,7 @@ module Acl9
       #   end
       #
       #   user = User.new
-      #   user.roles             #=> returns Role objects, associated with the user
+      #   user.role_objects      #=> returns Role objects, associated with the user
       #   user.has_role!(...)
       #   user.has_no_role!(...)
       #
@@ -39,6 +39,8 @@ module Acl9
 
         has_and_belongs_to_many assoc.to_sym, :class_name => role, :join_table => join_table
 
+        before_destroy :has_no_roles!
+
         cattr_accessor :_auth_role_class_name, :_auth_subject_class_name,
                        :_auth_role_assoc_name
 

data/lib/acl9/version.rb

@@ -1,3 +1,3 @@
 module Acl9
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/controller_extensions/actions_test.rb

@@ -163,5 +163,37 @@ module ControllerExtensions
       permit_some member, %w(index show)
       permit_some nil, %w(index show)
     end
+
+    test "multiple allows in an action" do
+      assert ( special = User.create ).has_role! :special
+      assert ( viewer = User.create ).has_role! :viewer
+
+      @tester.acl_block! do
+        action :show do
+          allow all
+          allow :viewer
+        end
+      end
+
+      assert set_all_actions
+      permit_some special, %w(show)
+      permit_some viewer, %w(show)
+    end
+
+    test "multiple allows with logged_in" do
+      assert ( normal = User.create )
+      assert ( viewer = User.create ).has_role! :viewer
+
+      @tester.acl_block! do
+        action :index do
+          allow logged_in
+          allow :viewer
+        end
+      end
+
+      assert set_all_actions
+      permit_some normal, %w(index)
+      permit_some viewer, %w(index)
+    end
   end
 end

data/test/controllers/acl_query_mixin.rb

@@ -4,9 +4,9 @@ module ACLQueryMixin
   def self.included base
     base.class_eval do
       setup do
-        ( @editor = User.create ).has_role! :editor
-        ( @viewer = User.create ).has_role! :viewer
-        ( @owneroffoo = User.create ).has_role! :owner, Foo.first_or_create
+        assert ( @editor = User.create ).has_role! :editor
+        assert ( @viewer = User.create ).has_role! :viewer
+        assert ( @owneroffoo = User.create ).has_role! :owner, Foo.first_or_create
       end
 
       %i[edit update destroy].each do |meth|

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

@@ -5,7 +5,7 @@ class CreateTables < ActiveRecord::Migration
       t.boolean  :system
       t.string   :authorizable_type, :limit => 40
       t.integer  :authorizable_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :roles, [:authorizable_type, :authorizable_id]
@@ -13,7 +13,6 @@ class CreateTables < ActiveRecord::Migration
     create_table :roles_users, id: false do |t|
       t.references  :user
       t.references  :role
-      t.timestamps
     end
 
     add_index :roles_users, :user_id
@@ -21,28 +20,28 @@ class CreateTables < ActiveRecord::Migration
     
     create_table :users do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :foos do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :bars do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :uuids, id: false do |t|
       t.string :uuid, primary_key: true
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :accounts do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :accesses do |t|
@@ -50,7 +49,7 @@ class CreateTables < ActiveRecord::Migration
       t.boolean  :system
       t.string   :authorizable_type, :limit => 40
       t.integer  :authorizable_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :accesses, [:authorizable_type, :authorizable_id]
@@ -58,7 +57,6 @@ class CreateTables < ActiveRecord::Migration
     create_table :accesses_accounts, id: false do |t|
       t.references  :account
       t.references  :access
-      t.timestamps
     end
 
     add_index :accesses_accounts, :access_id
@@ -66,7 +64,7 @@ class CreateTables < ActiveRecord::Migration
 
     create_table :foo_bars do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
 
@@ -75,7 +73,7 @@ class CreateTables < ActiveRecord::Migration
       t.boolean  :system
       t.string   :authorizable_type, :limit => 40
       t.integer  :authorizable_id
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :other_roles, [:authorizable_type, :authorizable_id]
@@ -83,7 +81,6 @@ class CreateTables < ActiveRecord::Migration
     create_table :other_roles_users, id: false do |t|
       t.references  :user
       t.references  :role
-      t.timestamps
     end
 
     add_index :other_roles_users, :user_id
@@ -91,12 +88,12 @@ class CreateTables < ActiveRecord::Migration
     
     create_table :other_users do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :other_foos do |t|
       t.string :name
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

data/test/models/roles_test.rb

@@ -190,16 +190,23 @@ class RolesTest < ActiveSupport::TestCase
     assert_equal 0, @user.role_objects.count
   end
 
+  test "role setters true even with multiple roles" do
+    assert @user.has_role! :owner, @bar
+    assert @user2.has_role! :owner, @bar
+
+    assert @user.has_no_role! :owner, @bar
+  end
+
   test "should delete unused roles from table" do
     assert @user.has_role! :owner, @bar
     assert @user2.has_role! :owner, @bar
 
     assert_equal 1, Role.count
 
-    @bar.accepts_no_role! :owner, @user2
+    assert @bar.accepts_no_role! :owner, @user2
     assert_equal 1, Role.count
 
-    @bar.accepts_no_role! :owner, @user
+    assert @bar.accepts_no_role! :owner, @user
 
     assert_equal 0, Role.count
   end
@@ -236,6 +243,34 @@ class RolesTest < ActiveSupport::TestCase
     assert @user.has_role?(:manager, @foo)
   end
 
+  test "remove access for destroyed object" do
+    assert_empty @user.role_objects
+    assert @user.has_role! :admin, @foo
+    refute_empty @user.role_objects
+    assert @user.has_role? :admin, @foo
+
+    assert @foo.destroy
+    refute @foo.accepts_role? :admin, @user
+
+    assert @user.reload
+    assert_empty @user.role_objects
+    refute @user.has_role? :admin, @foo
+  end
+
+  test "remove access for destroyed subject" do
+    assert_empty @foo.accepted_roles
+    assert @foo.accepts_role! :admin, @user
+    refute_empty @foo.accepted_roles
+    assert @foo.accepts_role? :admin, @user
+
+    assert @user.destroy
+    refute @user.has_role? :admin, @foo
+
+    assert @foo.reload
+    assert_empty @foo.accepted_roles
+    refute @foo.accepts_role? :admin, @user
+  end
+
   private
 
   def set_some_roles

data/test/models/system_roles_test.rb

@@ -7,10 +7,16 @@ class SystemRolesTest < ActiveSupport::TestCase
     assert_equal 1, Role.count
 
     assert user = User.create
-    assert user.has_role! :admin
-    assert_equal 1, Role.count
+    assert_difference -> { Role.count }, 0 do
+      assert user.has_role! :admin
+    end
 
-    refute user.has_no_role! :admin
-    assert_equal 1, Role.count
+    assert user.has_role? :admin
+
+    assert_difference -> { Role.count }, 0 do
+      assert user.has_no_role! :admin
+    end
+
+    refute user.has_role? :admin
   end
 end

data/test/test_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - oleg dashevskii
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -79,6 +79,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.textile
@@ -91,8 +92,23 @@ files:
 - Rakefile
 - TODO
 - acl9.gemspec
+- bin/appraisal
+- bin/bundler
+- bin/cc-tddium-post-worker
+- bin/erubis
+- bin/rackup
+- bin/rails
+- bin/rake
+- bin/sprockets
+- bin/tapout
+- bin/thor
+- bin/tilt
+- bin/yard
+- bin/yardoc
+- bin/yri
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
 - lib/acl9.rb
 - lib/acl9/controller_extensions.rb
 - lib/acl9/controller_extensions/dsl_base.rb