role_based_authorization 0.1.13 → 0.1.14

data/Rakefile

@@ -34,6 +34,7 @@ begin
     gemspec.email = "boborbt@gmail.com"
     gemspec.homepage = "http://github.com/boborbt/role_based_authorization"
     gemspec.authors = ["Roberto Esposito"]
+    gemspec.add_dependency('rails', '>= 2.2')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/lib/role_based_authorization/class_additions.rb

@@ -35,8 +35,7 @@ module RoleBasedAuthorization
    #   specifies that :product_id should be used instead of :id.
    
    def permit options 
-     options[:controller] ||= controller_name
-     controller = options[:controller]
+     controller = options[:controller] || controller_name
      actions    = [*options[:actions]]  # create an array if options[:actions] is not already an array
      
      role_auth_rules[controller] ||= {}      
@@ -44,7 +43,7 @@ module RoleBasedAuthorization
      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])
+       role_auth_rules[controller][action] << RoleBasedAuthorization::Rule.new(*options.values_at(:to,:if,:object_id))
      end
    end  
  end

data/lib/role_based_authorization/role_based_authorization.rb

@@ -33,7 +33,7 @@ module RoleBasedAuthorization
   
   # 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)
+  def RoleBasedAuthorization.path_or_options_to_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,''))
@@ -112,7 +112,7 @@ module RoleBasedAuthorization
   #   if_authorized?( edit_item_path ) { |opts| link_to('yyy', opts) }
   
   def if_authorized? opts, &block
-    block.call(opts) if authorize_action?(RoleBasedAuthorization.cleanup_options(opts))
+    block.call(opts) if authorize_action?(RoleBasedAuthorization.path_or_options_to_options(opts))
   end
   
   # Returns true if the current user is authorized to perform the current action

data/role_based_authorization.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_based_authorization}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roberto Esposito"]
-  s.date = %q{2010-02-18}
+  s.date = %q{2010-02-19}
   s.description = %q{Provides a simple DSL for specifying the authorization logic of your application. Install the gem, add a role attribute to your user model and your almost ready to go.}
   s.email = %q{boborbt@gmail.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/role_based_authorization/rule.rb",
      "rails/init.rb",
      "role_based_authorization.gemspec",
+     "test/authorization_logger_test.rb",
      "test/role_based_authorization_test.rb",
      "test/test_helper.rb"
   ]
@@ -37,7 +38,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Basic authorization module for rails}
   s.test_files = [
-    "test/role_based_authorization_test.rb",
+    "test/authorization_logger_test.rb",
+     "test/role_based_authorization_test.rb",
      "test/test_helper.rb"
   ]
 
@@ -46,9 +48,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 2.2"])
     else
+      s.add_dependency(%q<rails>, [">= 2.2"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 2.2"])
   end
 end
 

data/test/authorization_logger_test.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'role_based_authorization'
+
+class AuthorizationLoggerTest < ActiveSupport::TestCase
+  def setup
+    @logger = AuthorizationLogger.new(nil)
+  end
+  
+  
+  test "Should include the log prefix string to each log entry" do
+    assert_match /#{AuthorizationLogger::AUTHORIZATION_SYSTEM_LOG_MSG_PREFIX}/, @logger.format_message(:info, Time.now, "progname", "msg")
+  end
+
+  test "Should include the current time in the db format" do
+    time = Time.now
+    assert_match /#{time.to_s(:db)}/, @logger.format_message(:info, time, "progname", "msg")
+  end
+  
+  test "Should include the log level" do
+    assert_match /INFO/, @logger.format_message('INFO', Time.now, "progname", "msg")    
+  end
+
+
+  test "Should include the output msg" do
+    assert_match /msg/, @logger.format_message('INFO', Time.now, "progname", "msg")    
+  end
+  
+  test "Should not include the program name" do
+    assert ! /progname/.match(@logger.format_message('INFO', Time.now, "progname", "msg"))
+  end
+  
+end

data/test/role_based_authorization_test.rb

@@ -51,7 +51,6 @@ class DummyController < ApplicationController
   
 end
 
-
 class RoleBasedAuthorizationTest < ActiveSupport::TestCase
   def setup
     @controller = DummyController.new
@@ -131,6 +130,50 @@ class RoleBasedAuthorizationTest < ActiveSupport::TestCase
     
     assert got_inside
   end
+  
+  test "path_or_options_to_options should leave untouched the options if they are already there" do
+    options = RoleBasedAuthorization.path_or_options_to_options({:controller => 'dummy', :action => 'very_low_security'})
+    assert_equal 'dummy', options[:controller]
+    assert_equal 'very_low_security', options[:action]
+  end
 
+  test "path_or_options_to_options should work also when paths contain the relative_url_root" do
+    ActionController::Base.relative_url_root = '/test'
+    options = RoleBasedAuthorization.path_or_options_to_options('/test/dummy/very_low_security')
+    assert_equal 'dummy', options[:controller]
+    assert_equal 'very_low_security', options[:action]
+  end
+  
+  test "path_or_options_to_options should work with paths" do
+    options = RoleBasedAuthorization.path_or_options_to_options('/dummy/very_low_security')
+    assert_equal 'dummy', options[:controller]
+    assert_equal 'very_low_security', options[:action]
+  end
+  
+  
+  test "RoleBasedAuthorization.find_matching_rule should return nil if no rule matches"  do
+    rules = { :action1 => mocked_rules([false]*4), 
+              :action2 => mocked_rules([false]*2) }
+    
+    assert_equal nil, RoleBasedAuthorization.find_matching_rule(rules, {:actions => [:action1, :action2, :action3, :action4]})
+  end
+  
+  
+  test "RoleBasedAuthorization.find_matching_rule should not return nil if some rule matches"  do
+    rules = { :action1 => mocked_rules([false]*4), 
+              :action2 => mocked_rules([true, false]) }
+    
+    assert RoleBasedAuthorization.find_matching_rule(rules, {:actions => [:action1, :action2, :action3, :action4]})
+  end
+  
+  
+  private
+  
+  def mocked_rules(values)
+    result = Array.new(values.size) { mock() }
+    result.each_with_index { |rule, index| rule.stubs(:match).returns(values[index]) }
+    result
+  end
+  
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: role_based_authorization
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Roberto Esposito
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 +01:00
+date: 2010-02-19 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "2.2"
+    version: 
 description: Provides a simple DSL for specifying the authorization logic of your application. Install the gem, add a role attribute to your user model and your almost ready to go.
 email: boborbt@gmail.com
 executables: []
@@ -34,6 +43,7 @@ files:
 - lib/role_based_authorization/rule.rb
 - rails/init.rb
 - role_based_authorization.gemspec
+- test/authorization_logger_test.rb
 - test/role_based_authorization_test.rb
 - test/test_helper.rb
 has_rdoc: true
@@ -65,5 +75,6 @@ signing_key:
 specification_version: 3
 summary: Basic authorization module for rails
 test_files: 
+- test/authorization_logger_test.rb
 - test/role_based_authorization_test.rb
 - test/test_helper.rb