role_based_authorization 0.1.12 → 0.1.13

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.1.13

data/lib/role_based_authorization/class_additions.rb

@@ -5,22 +5,7 @@ module RoleBasedAuthorization
    def role_auth_rules
      @@rules||={}
      @@rules
-   end
-   
-   # Returns true if one of the given rules  matches the
-   # given options. rules must be an hash with a list of rules for
-   # each action
-   def find_matching_rule rules, options
-     user,actions,ids = *options.values_at(:user, :actions, :ids)
-
-     return actions.find do |action|
-       AUTHORIZATION_LOGGER.debug('current action: %s' % [action])      
-       action = action.to_sym
-       rules_for_action = rules[action]
-       rules_for_action && rules_for_action.find { |rule| rule.match(user, ids) }
-     end
-   end
-   
+   end   
    
    # Defines the DSL for the authorization system. The syntax is:
    #   permit  :actions => [list of actions], 

data/lib/role_based_authorization/role_based_authorization.rb

@@ -2,7 +2,7 @@
 module RoleBasedAuthorization
   # AuthorizationLogger instance that is used throughout the plugin for logging
   # events.
-  AUTHORIZATION_LOGGER = AuthorizationLogger.new(File.join(RAILS_ROOT,'log','authorization.log'))
+  AUTHORIZATION_LOGGER = AuthorizationLogger.new(File.join(RAILS_ROOT,'log','authorization.log'))  
     
   # Fires when the module is included into the controllers. It adds all class methods
   # defined in the ClassAdditions sub-module and the authorize_action? and if_authorized?
@@ -15,6 +15,33 @@ module RoleBasedAuthorization
      helper_method :if_authorized?
    end
   end
+  
+  # Returns true if one of the given rules  matches the
+  # given options. rules must be an hash with a list of rules for
+  # each action
+  def RoleBasedAuthorization.find_matching_rule rules, options
+    user,actions,ids = *options.values_at(:user, :actions, :ids)
+
+    return actions.find do |action|
+      AUTHORIZATION_LOGGER.debug('current action: %s' % [action])      
+      action = action.to_sym
+      rules_for_action = rules[action]
+      rules_for_action && rules_for_action.find { |rule| rule.match(user, ids) }
+    end
+  end
+  
+  
+  # Returns an hash options amenable to be passed to authorize_action?. It takes either
+  # an option hash, or a path string
+  def RoleBasedAuthorization.cleanup_options(opts)
+    path_cleanup_regexp = %r{(#{ActionController::Base.relative_url_root})?}
+       
+    url_options = (opts.class == String) && ActionController::Routing::Routes.recognize_path(opts.gsub(path_cleanup_regexp,''))
+    url_options ||= opts.dup
+    
+    url_options
+  end
+  
       
   # Returns true if one of the rules defined for this controller matches
   # the given options
@@ -33,7 +60,7 @@ module RoleBasedAuthorization
       (controller.to_s+'_controller').camelize.constantize if( !controller.blank? && rules_for_controller.nil? )
     
 
-      rules_for_controller && self.class.find_matching_rule(rules_for_controller, options)
+      rules_for_controller && RoleBasedAuthorization.find_matching_rule(rules_for_controller, options)
     end
   end
     
@@ -85,21 +112,7 @@ module RoleBasedAuthorization
   #   if_authorized?( edit_item_path ) { |opts| link_to('yyy', opts) }
   
   def if_authorized? opts, &block
-    cleanup_url_regexp = %r{(#{ActionController::Base.relative_url_root})?}
-    
-    url_options = nil
-    if opts.class == String
-      path = opts
-      
-
-      url_options = ActionController::Routing::Routes.recognize_path(path.gsub(cleanup_url_regexp,''))
-    else
-      url_options = opts.dup
-    end
-    
-    if authorize_action? url_options
-      block.call(opts)
-    end
+    block.call(opts) if authorize_action?(RoleBasedAuthorization.cleanup_options(opts))
   end
   
   # Returns true if the current user is authorized to perform the current action

data/role_based_authorization.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_based_authorization}
-  s.version = "0.1.12"
+  s.version = "0.1.13"
 
   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.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Roberto Esposito