aegis 2.5.2 → 2.5.3

data/Gemfile

@@ -2,6 +2,6 @@ source 'http://rubygems.org'
 
 gem 'rails', '=2.3.8'
 gem "aegis", :path => '.'
-gem 'rspec', '=1.2.9'
-gem 'rspec-rails', '=1.2.9'
+gem 'rspec', '=1.3.1'
+gem 'rspec-rails', '=1.3.3'
 gem 'ruby-debug'

data/VERSION

@@ -1 +1 @@
-2.5.2
+2.5.3

data/aegis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.5.2"
+  s.version = "2.5.3"
 
   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-11-06}
+  s.date = %q{2010-11-10}
   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 = [

data/lib/aegis/spec/matchers.rb

@@ -44,15 +44,40 @@ module Aegis
         CheckPermissions.new(*args)
       end
 
-      def be_allowed_to(*args)
-        simple_matcher do |user, matcher|
-          action, *action_args = args
-          target = action.to_s + (action_args.present? ? " given #{action_args.inspect}" : "")
-          matcher.description = "be allowed to " + target
-          matcher.failure_message = "expected #{user.inspect} to be allowed to #{target}"
-          matcher.negative_failure_message = "expected #{user.inspect} to be denied to #{target}"
-          user.send("may_#{action}?", *action_args)
+      class BeAllowedTo
+
+        def initialize(expected_action, *expected_args)
+          @expected_action = expected_action
+          @expected_args = expected_args
+        end
+
+        def matches?(user)
+          @actual_user = user
+          @actual_user.send("may_#{@expected_action}?", *@expected_args)
+        end
+
+        def description
+          "be allowed to #{action_as_prose}"
+        end
+
+        def failure_message
+          "expected #{@actual_user.inspect} to be allowed to #{action_as_prose}"
         end
+
+        def negative_failure_message
+          "expected #{@actual_user.inspect} to be denied to #{action_as_prose}"
+        end
+
+        private
+
+        def action_as_prose
+          @expected_action.to_s + (@expected_args.present? ? " given #{@expected_args.inspect}" : "")
+        end
+
+      end
+
+      def be_allowed_to(*args)
+        BeAllowedTo.new(*args)
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aegis
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 2
   - 5
-  - 2
-  version: 2.5.2
+  - 3
+  version: 2.5.3
 platform: ruby
 authors: 
 - Henning Koch
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 +01:00
+date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: []