aegis 2.5.0 → 2.5.1

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+gem 'rails', '=2.3.8'
+gem "aegis", :path => '.'
+gem 'rspec', '=1.2.9'
+gem 'rspec-rails', '=1.2.9'
+gem 'ruby-debug'

data/Gemfile.lock

@@ -0,0 +1,48 @@
+PATH
+  remote: .
+  specs:
+    aegis (2.5.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.8)
+      actionpack (= 2.3.8)
+    actionpack (2.3.8)
+      activesupport (= 2.3.8)
+      rack (~> 1.1.0)
+    activerecord (2.3.8)
+      activesupport (= 2.3.8)
+    activeresource (2.3.8)
+      activesupport (= 2.3.8)
+    activesupport (2.3.8)
+    columnize (0.3.1)
+    linecache (0.43)
+    rack (1.1.0)
+    rails (2.3.8)
+      actionmailer (= 2.3.8)
+      actionpack (= 2.3.8)
+      activerecord (= 2.3.8)
+      activeresource (= 2.3.8)
+      activesupport (= 2.3.8)
+      rake (>= 0.8.3)
+    rake (0.8.7)
+    rspec (1.2.9)
+    rspec-rails (1.2.9)
+      rack (>= 1.0.0)
+      rspec (>= 1.2.9)
+    ruby-debug (0.10.3)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.3.0)
+    ruby-debug-base (0.10.3)
+      linecache (>= 0.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aegis!
+  rails (= 2.3.8)
+  rspec (= 1.2.9)
+  rspec-rails (= 1.2.9)
+  ruby-debug

data/VERSION

@@ -1 +1 @@
-2.5.0
+2.5.1

data/aegis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.5.0"
+  s.version = "2.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch", "Tobias Kraze"]
-  s.date = %q{2010-10-07}
+  s.date = %q{2010-11-02}
   s.description = %q{Aegis is an authorization solution for Ruby on Rails that supports roles and a RESTish, resource-style declaration of permission rules.}
   s.email = %q{henning.koch@makandra.de}
   s.extra_rdoc_files = [
@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -45,7 +47,6 @@ Gem::Specification.new do |s|
      "spec/aegis/spec/matchers_spec.rb",
      "spec/app_root/app/controllers/application_controller.rb",
      "spec/app_root/app/controllers/reviews_controller.rb",
-     "spec/app_root/app/controllers/songs_controller.rb",
      "spec/app_root/app/models/permissions.rb",
      "spec/app_root/app/models/property.rb",
      "spec/app_root/app/models/review.rb",
@@ -82,7 +83,6 @@ Also see http://wiki.github.com/makandra/aegis/controller-integration
   s.test_files = [
     "spec/app_root/app/controllers/application_controller.rb",
      "spec/app_root/app/controllers/reviews_controller.rb",
-     "spec/app_root/app/controllers/songs_controller.rb",
      "spec/app_root/app/models/permissions.rb",
      "spec/app_root/app/models/property.rb",
      "spec/app_root/app/models/review.rb",

data/lib/aegis/controller.rb

@@ -47,7 +47,7 @@ module Aegis
               actions_map
             )
             args = []
-            args << send(user_method)
+            args << permissions.call.send(:handle_missing_user, send(user_method))
             args << send(parent_object_method) if action.takes_parent_object
             args << send(object_method) if action.takes_object
             action.may!(*args)

data/lib/aegis/permissions.rb

@@ -12,9 +12,9 @@ module Aegis
         @missing_action_strategy = strategy
       end
 
-      def missing_user_means(&strategy)
+      def missing_user_means(strategy_symbol = nil, &strategy_block)
         prepare
-        @missing_user_strategy = strategy
+        @missing_user_strategy = strategy_symbol || strategy_block
       end
 
       def alias_action(aliases)

data/spec/aegis/controller_spec.rb

@@ -69,9 +69,9 @@ describe Aegis::Controller do
       end
       controller = @controller_class.new
       permissions_class.stub(:guess_action => stub('action', :takes_object => true, :takes_parent_object => true).as_null_object)
-      controller.should_receive(:object)
-      controller.should_receive(:parent_object)
-      controller.should_receive(:current_user)
+      controller.should_receive(:object).and_return('the object')
+      controller.should_receive(:parent_object).and_return('the parent object')
+      controller.should_receive(:current_user).and_return('the user')
       controller.send(:check_permissions)
     end
 
@@ -82,9 +82,9 @@ describe Aegis::Controller do
       end
       controller = @controller_class.new
       permissions_class.stub(:guess_action => stub('action', :takes_object => true, :takes_parent_object => true).as_null_object)
-      controller.should_receive(:my_object)
-      controller.should_receive(:my_parent)
-      controller.should_receive(:my_user)
+      controller.should_receive(:my_object).and_return('the object')
+      controller.should_receive(:my_parent).and_return('the parent object')
+      controller.should_receive(:my_user).and_return('the user')
       controller.send(:check_permissions)
     end
 

data/spec/aegis/permissions_spec.rb

@@ -579,7 +579,14 @@ describe Aegis::Permissions do
 
   describe 'behavior when checking permissions without a user' do
 
-    it "should raise an error if the user is nil" do
+    it "should raise an error if no missing user strategy is defined" do
+      expect { @permissions.may?(nil, :some_action) }.to raise_error(Aegis::MissingUser)
+    end
+
+    it 'should raise an error if the missing user strategy is :error' do
+      @permissions.class_eval do
+        missing_user_means :error
+      end
       expect { @permissions.may?(nil, :some_action) }.to raise_error(Aegis::MissingUser)
     end
 

data/spec/app_root/app/controllers/application_controller.rb

@@ -4,7 +4,7 @@ class ApplicationController < ActionController::Base
   require_permissions
 
   def current_user
-    User.new(:role_name => 'user')
+    nil # test missing_user_means
   end
 
 end

data/spec/app_root/app/models/permissions.rb

@@ -2,6 +2,8 @@ class Permissions < Aegis::Permissions
 
   role :user
 
+  missing_user_means { User.new(:role_name => 'user') }
+
   resources :properties do
     resources :reviews do
       reading do
@@ -10,9 +12,5 @@ class Permissions < Aegis::Permissions
     end
   end
 
-  resources :maps do
-    action :with_permission, :collection => true
-  end
-
 end
 

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ ENV['RAILS_ENV'] ||= 'in_memory'
 
 # Load the Rails environment and testing framework
 require "#{File.dirname(__FILE__)}/app_root/config/environment"
-require "#{File.dirname(__FILE__)}/../lib/aegis"
+# require "#{File.dirname(__FILE__)}/../lib/aegis"
 require 'spec/rails'
 
 # Undo changes to RAILS_ENV

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aegis
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -58,7 +60,6 @@ files:
 - spec/aegis/spec/matchers_spec.rb
 - spec/app_root/app/controllers/application_controller.rb
 - spec/app_root/app/controllers/reviews_controller.rb
-- spec/app_root/app/controllers/songs_controller.rb
 - spec/app_root/app/models/permissions.rb
 - spec/app_root/app/models/property.rb
 - spec/app_root/app/models/review.rb
@@ -123,7 +124,6 @@ summary: Complete authorization solution for Rails
 test_files: 
 - spec/app_root/app/controllers/application_controller.rb
 - spec/app_root/app/controllers/reviews_controller.rb
-- spec/app_root/app/controllers/songs_controller.rb
 - spec/app_root/app/models/permissions.rb
 - spec/app_root/app/models/property.rb
 - spec/app_root/app/models/review.rb

data/spec/app_root/app/controllers/songs_controller.rb

@@ -1,8 +0,0 @@
-class SongsController
-
-  require_permissions
-
-  skip_permissions :only => :index
-  permissions :songs, :only => :new
-
-end