acl9 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44c10dcc68d41635dfb0c5239aa9fb7cd720eaf4
-  data.tar.gz: 821d4948d72b7fbd274037d336d39989102c56b9
+  metadata.gz: c453f2d63455ec9792617d8436fdf11069dc843d
+  data.tar.gz: 20ae0c3d277ac3b8393b5a63e04a2b4c3e8c2576
 SHA512:
-  metadata.gz: 45511d2a77a9ad88253e1ca32e0ef50485d6d610507033514d0025865ac84ea5b228a2b4f9b83c16503c78f4e5df9eb4f88e32ef5ad82f3b7239db2c442f2e63
-  data.tar.gz: 1f79e486fcee9ed273a8dcbd0980dfd7dc4241897b67bd9579da6226cd4832d883dc47cdc641787313245354f1183062a771a4322d462d43779214fb7cc3260f
+  metadata.gz: 3ea8427b7aac68a931a94c5cdefd3c5f82560130efd528bc46f260f55595044a4b425b3ee24bd22adf80a03b6fc57156142aee0d66b80b50703dcfae55245f0a
+  data.tar.gz: 07e1e06046612cad72fcbb37b8070b5c76d554b6f5168aeaa5eeec733696e639cde81cea13fecb19d2f5440245dcf83d69330038c32b01d68839358118424f07

data/.ruby-version

@@ -1 +1 @@
-2.2.1
+2.2.2

data/.travis.yml

@@ -2,8 +2,8 @@ cache: bundler
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.5
-  - 2.2.1
+  - 2.1.6
+  - 2.2.2
   - ruby-head
 
 gemfile:

data/Gemfile.lock

@@ -1,42 +1,42 @@
 PATH
   remote: .
   specs:
-    acl9 (1.2.1)
+    acl9 (1.3.0)
       rails (~> 4.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.1)
+      actionview (= 4.2.1)
+      activesupport (= 4.2.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+    actionview (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+    activejob (4.2.1)
+      activesupport (= 4.2.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.1)
+      activesupport (= 4.2.1)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.1)
+      activemodel (= 4.2.1)
+      activesupport (= 4.2.1)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -53,16 +53,15 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     docile (1.1.5)
     erubis (2.7.0)
-    globalid (0.3.0)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
     json (1.8.1)
-    loofah (2.0.1)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
+    mime-types (2.5)
     mini_portile (0.6.2)
     minitap (0.5.3)
       minitest (~> 5.0)
@@ -74,31 +73,31 @@ GEM
     multi_json (1.10.1)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    rack (1.6.0)
+    rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.1)
+      actionmailer (= 4.2.1)
+      actionpack (= 4.2.1)
+      actionview (= 4.2.1)
+      activejob (= 4.2.1)
+      activemodel (= 4.2.1)
+      activerecord (= 4.2.1)
+      activesupport (= 4.2.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.1)
+      actionpack (= 4.2.1)
+      activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -107,12 +106,9 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.1.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -121,8 +117,7 @@ GEM
       ansi
       json
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yard (0.8.7.6)

data/README.md

@@ -75,6 +75,7 @@ the admin for a particular school:
 
 ```ruby
 user.has_role! :admin, school
+user.has_role! :admin, of: school
 ```
 
 Then let's say we have some support people in our organization who are dedicated
@@ -84,6 +85,7 @@ assign roles to any object, including a class, and do this:
 
 ```ruby
 user.has_role! :support, School
+user.has_role! :support, for: School
 ```
 
 You can see the `allow` line in our `access_control` block that this corresponds
@@ -94,6 +96,7 @@ Now, when a support person leaves that team, we need to remove that role:
 
 ```ruby
 user.has_no_role! :support, School
+user.has_no_role! :support, at: School
 ```
 
 You can see more about all this stuff in the wiki under [Role
@@ -229,6 +232,7 @@ We all know that this means:
 
 ```ruby
 user.has_role? :manager, department    # => true
+user.has_role? :manager, in: department    # => true
 ```
 
 With `:protect_global_roles` set to `false`, as it was in `0.x` then the above

data/lib/acl9/controller_extensions/dsl_base.rb

@@ -1,6 +1,10 @@
+require File.expand_path '../../prepositions', __FILE__
+
 module Acl9
   module Dsl
     class Base
+      include Prepositions
+
       attr_reader :allows, :denys
 
       def initialize(*args)
@@ -164,18 +168,8 @@ module Acl9
         end
       end
 
-      VALID_PREPOSITIONS = %w(of for in on at by).freeze unless defined? VALID_PREPOSITIONS
-
       def _role_object(options)
-        object = nil
-
-        VALID_PREPOSITIONS.each do |prep|
-          if options[prep.to_sym]
-            raise ArgumentError, "You may only use one preposition to specify object" if object
-
-            object = options[prep.to_sym]
-          end
-        end
+        object = _by_preposition options
 
         case object
         when Class  then object.to_s

data/lib/acl9/model_extensions/for_subject.rb

@@ -1,6 +1,10 @@
+require File.expand_path '../../prepositions', __FILE__
+
 module Acl9
   module ModelExtensions
     module ForSubject
+      include Prepositions
+
       ##
       # Role check.
       #
@@ -36,6 +40,8 @@ module Acl9
       # @see Acl9::ModelExtensions::Object#accepts_role?
       def has_role?(role_name, object = nil)
         role_name = normalize role_name
+        object = _by_preposition object
+
         !! if object.nil? && !::Acl9.config[:protect_global_roles]
           self._role_objects.find_by_name(role_name.to_s) ||
           self._role_objects.member?(get_role(role_name, nil))
@@ -53,6 +59,8 @@ module Acl9
       # @see Acl9::ModelExtensions::Object#accepts_role!
       def has_role!(role_name, object = nil)
         role_name = normalize role_name
+        object = _by_preposition object
+
         role = get_role(role_name, object)
 
         if role.nil?
@@ -76,6 +84,7 @@ module Acl9
       # @see Acl9::ModelExtensions::Object#accepts_no_role!
       def has_no_role!(role_name, object = nil)
         role_name = normalize role_name
+        object = _by_preposition object
         delete_role(get_role(role_name, object))
       end
 
@@ -182,6 +191,10 @@ module Acl9
 
       protected
 
+      def _by_preposition object
+        object.is_a?(Hash) ? super : object
+      end
+
       def _auth_role_class
         self.class._auth_role_class_name.constantize
       end

data/lib/acl9/prepositions.rb

@@ -0,0 +1,18 @@
+module Acl9
+  module Prepositions
+    VALID_PREPOSITIONS = %w(of for in on at by).freeze unless defined? VALID_PREPOSITIONS
+
+    def _by_preposition options
+      object = nil
+
+      VALID_PREPOSITIONS.each do |prep|
+        if options[prep.to_sym]
+          raise ArgumentError, "You may only use one preposition to specify object" if object
+
+          object = options[prep.to_sym]
+        end
+      end
+      object
+    end
+  end
+end

data/lib/acl9/version.rb

@@ -1,3 +1,3 @@
 module Acl9
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/models/roles_test.rb

@@ -62,6 +62,16 @@ class RolesTest < ActiveSupport::TestCase
     assert @foo.accepts_roles_by? @user
   end
 
+  test "#has_role! with preposition" do
+    assert @user.has_role! :manager, of: @foo
+    assert @user.has_role? :manager, @foo
+  end
+
+  test "#has_role? with preposition" do
+    assert @user.has_role! :manager, @foo
+    assert @user.has_role? :manager, of: @foo
+  end
+
   test "should count object role also as global role when :protect_global_roles == false" do
     Acl9.config[:protect_global_roles] = false
 
@@ -138,6 +148,17 @@ class RolesTest < ActiveSupport::TestCase
     assert @user.has_role? :user, @foo      # another role on the same object
   end
 
+  test "#has_no_role! should unassign an object role from user with preposition" do
+    set_some_roles
+
+    assert_difference -> { @user.role_objects.count }, -1 do
+      assert @user.has_no_role! :manager, at: @foo
+    end
+
+    refute @user.has_role? :manager, @foo
+    assert @user.has_role? :user, @foo      # another role on the same object
+  end
+
   test "#has_no_role! should unassign a class role from user" do
     set_some_roles
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acl9
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - oleg dashevskii
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,6 +117,7 @@ files:
 - lib/acl9/model_extensions.rb
 - lib/acl9/model_extensions/for_object.rb
 - lib/acl9/model_extensions/for_subject.rb
+- lib/acl9/prepositions.rb
 - lib/acl9/version.rb
 - lib/generators/acl9/setup/USAGE
 - lib/generators/acl9/setup/setup_generator.rb