declarative_authorization 0.4.1 → 0.5

data/test/test_helper.rb

@@ -1,25 +1,39 @@
 require 'test/unit'
-RAILS_ROOT = File.join(File.dirname(__FILE__), %w{.. .. .. ..})
-require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization rails_legacy})
-require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization authorization})
-require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization in_controller})
-require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization maintenance})
+require 'pathname'
+
+unless defined?(RAILS_ROOT)
+  RAILS_ROOT = ENV['RAILS_ROOT'] ?
+      ENV['RAILS_ROOT'] + "" :
+      File.join(File.dirname(__FILE__), %w{.. .. .. ..})
+end
 
 unless defined?(ActiveRecord)
   if File.directory? RAILS_ROOT + '/config'
-    puts 'using config/boot.rb'
+    puts 'Using config/boot.rb'
     ENV['RAILS_ENV'] = 'test'
-    require File.join(RAILS_ROOT, 'config', 'boot.rb')
+    require File.join(RAILS_ROOT, 'config', 'environment.rb')
   else
     # simply use installed gems if available
-    puts 'using rubygems'
+    version_requirement = ENV['RAILS_VERSION'] ? "= #{ENV['RAILS_VERSION']}" : "> 2.1.0"
+    puts "Using Rails from RubyGems (#{version_requirement || "default"})"
     require 'rubygems'
-    gem 'actionpack'; gem 'activerecord'; gem 'activesupport'; gem 'rails'
+    %w{actionpack activerecord activesupport rails}.each do |gem_name|
+      gem gem_name, version_requirement
+    end
   end
 
-  %w(action_pack action_controller active_record active_support initializer).each {|f| require f}
+  unless defined?(Rails)  # needs to be explicit in Rails < 3
+    %w(action_pack action_controller active_record active_support initializer).each {|f| require f}
+  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
@@ -99,11 +113,22 @@ 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
-require "action_controller/test_process"
+if Rails.version < "3"
+  require "action_controller/test_process"
+end
 
 class Test::Unit::TestCase
   include Authorization::TestHelper
@@ -118,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

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: declarative_authorization
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Steffen Bartsch
@@ -9,19 +13,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-21 00:00:00 +01:00
+date: 2010-07-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 0
         version: 2.1.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: sbartsch@tzi.org
 executables: []
@@ -56,6 +64,7 @@ files:
 - lib/declarative_authorization/reader.rb
 - lib/declarative_authorization/rails_legacy.rb
 - lib/declarative_authorization/obligation_scope.rb
+- lib/declarative_authorization/railsengine.rb
 - lib/declarative_authorization/in_model.rb
 - lib/declarative_authorization/helper.rb
 - lib/declarative_authorization/development_support/analyzer.rb
@@ -64,6 +73,7 @@ files:
 - lib/declarative_authorization/development_support/development_support.rb
 - lib/declarative_authorization/authorization.rb
 - lib/declarative_authorization/maintenance.rb
+- lib/tasks/authorization_tasks.rake
 - test/authorization_test.rb
 - test/schema.sql
 - test/maintenance_test.rb
@@ -86,18 +96,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: declarative_authorization is a Rails plugin for authorization based on readable authorization rules.