role_based_authorization 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/role_based_authorization/role_based_authorization.rb

@@ -42,13 +42,27 @@ module RoleBasedAuthorization
     url_options
   end
   
+  
+  # cleans options so that they are good to be passed to exists_matching_rule
+  def cleanup_options(opts)
+    opts.reverse_merge!( :user => current_user, :controller => controller_name, :ids => {} )
+    user, controller, action, ids = opts.values_at( :user, :controller, :action, :ids )
+    ids.reverse_merge!( opts.reject { |key,value| key.to_s !~ /(_id\Z)|(\Aid\Z)/ } )
+    
+    { :user         => user, 
+      :controllers  => [controller,'application'], 
+      :actions      => [:all,action], 
+      :ids          => ids }    
+  end
+  
       
   # Returns true if one of the rules defined for this controller matches
   # the given options
   def exists_matching_rule? options
     rules = self.class.role_auth_rules
     
-    return options[:controllers].find do |controller|    
+    # !! is an idiom for transforming any value in true/false (e.g., !!nil is exactly false)
+    !!options[:controllers].find do |controller|
       AUTHORIZATION_LOGGER.debug("current controller: %s" % [controller])
 
       rules_for_controller = rules[controller]
@@ -71,22 +85,13 @@ module RoleBasedAuthorization
     # exiting immediately if not logged in
     return false if respond_to?(:logged_in?) && !logged_in?
     
-    opts.reverse_merge!( :user => current_user, :controller => controller_name, :ids => {} )
-    user, controller, action, ids = opts.values_at( :user, :controller, :action, :ids )
-    ids.reverse_merge!( opts.reject { |key,value| key.to_s !~ /(_id\Z)|(\Aid\Z)/ } )
-    
-    new_options = { :user         => user, 
-                    :controllers  => [controller,'application'], 
-                    :actions      => [:all,action], 
-                    :ids          => ids }
-                    
-    return exists_matching_rule?( new_options ) != nil
+    exists_matching_rule?( cleanup_options(opts) )
   end
   
   # wraps some logging around do_authorize_action?.
   def authorize_action? opts = {}
     AUTHORIZATION_LOGGER.info("access request. options: %s" % [opts.inspect])
-    result = do_authorize_action? opts
+    result = do_authorize_action?(opts)
     AUTHORIZATION_LOGGER.info("returning #{result}")
     
     return result

data/role_based_authorization.gemspec

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

metadata

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