role_based_authorization 0.1.7 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.9

data/lib/role_based_authorization/role_based_authorization.rb

@@ -89,7 +89,7 @@ module RoleBasedAuthorization
       matching = @roles.include?(:all)
       
       # checking for right role (no need to check them if already matching)
-      matching = !@roles.find { |role| role == user.role }.nil? if !matching
+      matching = !@roles.find { |role| !user.nil? && role == user.role }.nil? if !matching
       
       if @cond.nil?
         return matching
@@ -149,6 +149,7 @@ module RoleBasedAuthorization
   def authorize_action? opts = {}  
     # Option handling
     user, ids, controller, action = *opts.values_at(:user, :ids, :controller, :action)
+    user ||= current_user
 
     if respond_to?(:logged_in?) && !logged_in?
       AUTHORIZATION_LOGGER.info("returning false (not logged in)")
@@ -162,7 +163,7 @@ module RoleBasedAuthorization
     controller = controller_name  if controller.nil?  && respond_to?(:controller_name)
     
     AUTHORIZATION_LOGGER.info("user %s requested access to method %s:%s using ids:%s" %
-        [ user && user.inspect + "(id:#{user.id} role:#{user.role})" || 'none',
+        [ user && (user.inspect + "(id:#{user.id} role:#{user.role})") || 'none',
           controller,
           action,
           ids.inspect])
@@ -217,7 +218,6 @@ module RoleBasedAuthorization
   def authorized?
     authorize_action?     :controller => controller_name,  
                           :action => action_name, 
-                          :ids => params.reject { |key,value| key.to_s !~ /(_id\Z)|(\Aid\Z)/ }, 
-                          :user => current_user
+                          :ids => params.reject { |key,value| key.to_s !~ /(_id\Z)|(\Aid\Z)/ }
   end
 end

data/role_based_authorization.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_based_authorization}
-  s.version = "0.1.7"
+  s.version = "0.1.9"
 
   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

@@ -98,6 +98,13 @@ class RoleBasedAuthorizationTest < ActiveSupport::TestCase
     assert_equal true, @controller.authorize_action?(:action => 'low_security_with_param_identified_by_other_id', 
                                                      :other_id => 'object_id')
   end  
+  
+  
+  test "helper method should work" do 
+    @controller.if_authorized?(:action => 'very_low_security') {
+      assert true
+    }
+  end
 
   
 end

metadata

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