role_based_authorization 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/role_based_authorization/role_based_authorization.rb

@@ -55,16 +55,12 @@ module RoleBasedAuthorization
     def permit options 
       options[:controller] ||= controller_name
       controller = options[:controller]
-      role_auth_rules[controller] ||= {}
+      actions    = [*options[:actions]]  # create an array if options[:actions] is not already an array
       
-      if options[:actions] == :all
-        role_auth_rules[controller][:all] ||= []
-        role_auth_rules[controller][:all] << RoleBasedAuthorization::Rule.new(options[:to], options[:if], options[:object_id])
-        return
-      end
-    
-      options[:actions].each do |action|
-        action = action.to_s  # this allows for both symbols and strings to be used for action names
+      role_auth_rules[controller] ||= {}      
+      
+      actions.each do |action|
+        action = action.to_sym  # this allows for both symbols and strings to be used for action names
         role_auth_rules[controller][action] ||= []
         role_auth_rules[controller][action] << RoleBasedAuthorization::Rule.new(options[:to], options[:if], options[:object_id])
       end
@@ -153,8 +149,8 @@ module RoleBasedAuthorization
     
       [:all, opts[:action]].each do |action|
         AUTHORIZATION_LOGGER.debug('current action: %s' % [action])
-        
-        raise "Action should be a string -- not a #{action.class.name}!" if action!=:all && action.class!=String
+        action = action.to_sym
+        raise "Action should be a symbol -- not a #{action.class.name}!" if action!=:all && action.class!=Symbol
         
         next if rules[controller].nil? || rules[controller][action].nil?            
         if rules[controller][action].find { |rule| rule.match(opts[:user], opts[:ids]) }

data/role_based_authorization.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_based_authorization}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roberto Esposito"]

data/test/role_based_authorization_test.rb

@@ -21,6 +21,10 @@ class DummyController < ActionController::Base
   
   permit  :actions => 'very_low_security',
           :to => :all
+
+  permit  :actions => :very_low_security_symbol_version,
+          :to => :all
+
           
   permit :actions => 'high_security',
          :to => 3
@@ -54,6 +58,20 @@ class RoleBasedAuthorizationTest < ActiveSupport::TestCase
   test "Should permit action very_low_security to everyone" do
     assert_equal true, @controller.authorize_action?(:action => 'very_low_security')
   end
+
+  test "Should permit action very_low_security to everyone even if it is given as a symbol" do
+    assert_equal true, @controller.authorize_action?(:action => :very_low_security)
+  end
+  
+  test "Should permit action very_low_security_symbol_version to everyone" do
+    assert_equal true, @controller.authorize_action?(:action => :very_low_security_symbol_version)    
+  end
+
+
+  test "Should permit action very_low_security_symbol_version to everyone even if it is given as a string" do
+    assert_equal true, @controller.authorize_action?(:action => 'very_low_security_symbol_version')    
+  end
+
   
   test "Should permit action high_security only to root (role 3)" do
     assert_equal false, @controller.authorize_action?(:action => 'high_security')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: role_based_authorization
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Roberto Esposito