tarsolya-declarative_authorization 0.4.1 → 0.4.1.2

data/app/controllers/authorization_rules_controller.rb

@@ -18,7 +18,7 @@ class AuthorizationRulesController < ApplicationController
   def index
     respond_to do |format|
       format.html do
-        @auth_rules_script = File.read("#{RAILS_ROOT}/config/authorization_rules.rb")
+        @auth_rules_script = File.read("#{Rails.root}/config/authorization_rules.rb")
       end
     end
   end

data/lib/declarative_authorization/authorization.rb

@@ -1,4 +1,5 @@
 # Authorization
+require File.dirname(__FILE__) + '/railsengine' if defined?(::Rails::Engine)
 require File.dirname(__FILE__) + '/reader.rb'
 require "set"
 
@@ -25,7 +26,7 @@ module Authorization
     end
   end
   
-  AUTH_DSL_FILES = ["#{Rails.root}/config/authorization_rules.rb"] unless defined? AUTH_DSL_FILES
+  AUTH_DSL_FILES = ["config/authorization_rules.rb"] unless defined? AUTH_DSL_FILES
   
   # Controller-independent method for retrieving the current user.
   # Needed for model security where the current controller is not available.
@@ -159,7 +160,8 @@ module Authorization
       
       user, roles, privileges = user_roles_privleges_from_options(privilege, options)
 
-      return true unless (roles & @omnipotent_roles).empty?
+      return true if roles.is_a?(Array) and not (roles & @omnipotent_roles).empty?
+
       # find a authorization rule that matches for at least one of the roles and 
       # at least one of the given privileges
       attr_validator = AttributeValidator.new(self, user, options[:object], privilege, options[:context])

data/lib/declarative_authorization/maintenance.rb

@@ -55,9 +55,9 @@ module Authorization
       def self.usages_by_controller
         # load each application controller
         begin
-          Dir.foreach(File.join(RAILS_ROOT, %w{app controllers})) do |entry|
+          Dir.foreach(File.join(Rails.root, %w{app controllers})) do |entry|
             if entry =~ /^\w+_controller\.rb$/
-              require File.join(RAILS_ROOT, %w{app controllers}, entry)
+              require File.join(Rails.root, %w{app controllers}, entry)
             end
           end
         rescue Errno::ENOENT

data/lib/declarative_authorization/obligation_scope.rb

@@ -42,10 +42,22 @@ module Authorization
   # +@proxy_options[:joins] = { :bar => { :baz => :foo } }
   # @proxy_options[:conditions] = [ 'foos_bazzes.attr = :foos_bazzes__id_0', { :foos_bazzes__id_0 => 1 } ]+
   #
-  class ObligationScope < ActiveRecord::Relation
+  if defined?(::ActiveRecord::Relation)
+    class ObligationScope < ActiveRecord::Relation
+    end
+  else
+    class ObligationScope < ActiveRecord::NamedScope::Scope
+    end
+  end
+  
+  class ObligationScope
     def initialize (model, options)
       @finder_options = {}
-      super(model, options)
+      if Rails.version < "3"
+        super(model, options)
+      else
+	super(model, model.table_name)
+      end
     end
 
     def scope

data/lib/declarative_authorization/reader.rb

@@ -89,7 +89,12 @@ module Authorization
           begin
             reader.parse(File.read(file), file)
           rescue SystemCallError
-            raise ::Authorization::Reader::DSLFileNotFoundError, "Error reading authorization rules file with path '#{file}'!  Please ensure it exists and that it is accessible."
+            # Try finding the file in the rails root
+            begin
+              reader.parse(File.read(File.join(Rails.root, file)), file)
+            rescue SystemCallError
+              raise ::Authorization::Reader::DSLFileNotFoundError, "Error reading authorization rules file with path '#{file}'!  Please ensure it exists and that it is accessible."
+            end
           end
         end
         reader

data/test/helper_test.rb

@@ -99,6 +99,7 @@ class HelperTest < ActionController::TestCase
     
     assert has_role?(:test_role)
     assert !has_role?(:test_role2)
+    assert !has_role?(:test_role, :test_role2)
     
     block_evaled = false
     has_role?(:test_role) do

data/test/test_helper.rb

@@ -7,13 +7,6 @@ unless defined?(RAILS_ROOT)
       File.join(File.dirname(__FILE__), %w{.. .. .. ..})
 end
 
-DA_ROOT = Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
-
-require DA_ROOT + File.join(%w{lib declarative_authorization rails_legacy})
-require DA_ROOT + File.join(%w{lib declarative_authorization authorization})
-require DA_ROOT + File.join(%w{lib declarative_authorization in_controller})
-require DA_ROOT + File.join(%w{lib declarative_authorization maintenance})
-
 unless defined?(ActiveRecord)
   if File.directory? RAILS_ROOT + '/config'
     puts 'Using config/boot.rb'
@@ -34,6 +27,13 @@ unless defined?(ActiveRecord)
   end
 end
 
+DA_ROOT = Pathname.new(File.expand_path("..", File.dirname(__FILE__)))
+
+require DA_ROOT + File.join(%w{lib declarative_authorization rails_legacy})
+require DA_ROOT + File.join(%w{lib declarative_authorization authorization})
+require DA_ROOT + File.join(%w{lib declarative_authorization in_controller})
+require DA_ROOT + File.join(%w{lib declarative_authorization maintenance})
+
 begin
   require 'ruby-debug'
 rescue MissingSourceFile; end
@@ -113,9 +113,18 @@ class MocksController < ActionController::Base
   end
 end
 
-ActionController::Routing::Routes.draw do |map|
-  map.connect ':controller/:action/:id'
+if Rails.version < "3"
+  ActionController::Routing::Routes.draw do |map|
+    map.connect ':controller/:action/:id'
+  end
+else
+  Rails::Application.routes.draw do
+    match '/name/spaced_things(/:action)' => 'name/spaced_things'
+    match '/deep/name_spaced/things(/:action)' => 'deep/name_spaced/things'
+    match '/:controller(/:action(/:id))'
+  end
 end
+
 ActionController::Base.send :include, Authorization::AuthorizationInController
 if Rails.version < "3"
   require "action_controller/test_process"
@@ -134,4 +143,10 @@ class Test::Unit::TestCase
     end
     get action, params
   end
+
+  unless Rails.version < "3"
+    def setup
+      @routes = Rails::Application.routes
+    end
+  end
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.1.2
 platform: ruby
 authors: 
 - Steffen Bartsch
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +02:00
+date: 2010-04-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,36 +52,36 @@ files:
 - app/controllers/authorization_rules_controller.rb
 - app/controllers/authorization_usages_controller.rb
 - app/helpers/authorization_rules_helper.rb
-- app/views/authorization_rules/_change.erb
+- app/views/authorization_usages/index.html.erb
+- app/views/authorization_rules/index.html.erb
 - app/views/authorization_rules/_show_graph.erb
+- app/views/authorization_rules/_change.erb
 - app/views/authorization_rules/_suggestions.erb
-- app/views/authorization_rules/change.html.erb
 - app/views/authorization_rules/graph.dot.erb
+- app/views/authorization_rules/change.html.erb
 - app/views/authorization_rules/graph.html.erb
-- app/views/authorization_rules/index.html.erb
-- app/views/authorization_usages/index.html.erb
 - config/routes.rb
 - lib/declarative_authorization.rb
-- lib/declarative_authorization/authorization.rb
+- lib/declarative_authorization/in_controller.rb
+- lib/declarative_authorization/reader.rb
+- lib/declarative_authorization/rails_legacy.rb
+- lib/declarative_authorization/obligation_scope.rb
+- lib/declarative_authorization/in_model.rb
+- lib/declarative_authorization/helper.rb
 - lib/declarative_authorization/development_support/analyzer.rb
 - lib/declarative_authorization/development_support/change_analyzer.rb
 - lib/declarative_authorization/development_support/change_supporter.rb
 - lib/declarative_authorization/development_support/development_support.rb
-- lib/declarative_authorization/helper.rb
-- lib/declarative_authorization/in_controller.rb
-- lib/declarative_authorization/in_model.rb
+- lib/declarative_authorization/authorization.rb
 - lib/declarative_authorization/maintenance.rb
-- lib/declarative_authorization/obligation_scope.rb
-- lib/declarative_authorization/rails_legacy.rb
-- lib/declarative_authorization/reader.rb
 - test/authorization_test.rb
-- test/controller_filter_resource_access_test.rb
-- test/controller_test.rb
-- test/dsl_reader_test.rb
-- test/helper_test.rb
+- test/schema.sql
 - test/maintenance_test.rb
 - test/model_test.rb
-- test/schema.sql
+- test/controller_test.rb
+- test/helper_test.rb
+- test/dsl_reader_test.rb
+- test/controller_filter_resource_access_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/stffn/declarative_authorization