simple-authorisation 0.0.14 → 0.0.15

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-authorisation (0.0.14)
+    simple-authorisation (0.0.15)
       builder (~> 3.0)
       sinatra (~> 1.2.6)
 

data/lib/simple-authorisation/authorisation.rb

@@ -48,6 +48,8 @@ module Simple
       anonymous_user_class = options.fetch(:anonymous_user_class, NilClass)
 
       return true   if allow.index('?')
+
+      user = user.call if user.is_a? Proc
       return false  if deny.index('?')  and     user.is_a? anonymous_user_class
       return true   if allow.index('*') and not user.is_a? anonymous_user_class
       allow.each do | allowed |

data/lib/simple-authorisation/sinatra.rb

@@ -10,14 +10,17 @@ module Sinatra
 
       app.before do
         route_name = request.path
-        user = send(options.authorisation_current_user)
+        request_user = Proc.new { send(options.authorisation_current_user) }
+
         unless Simple::Authorisation.is_allowed?(
             route_name,
-            :user => user,
+            :user => request_user,
             :anonymous_user_class => options.authorisation_anonymous_user_class,
             :method => request.request_method.downcase.to_sym)
           session[:return_to] = request.fullpath unless request.fullpath.include?('favicon.ico')
 
+          user = request_user.call
+
           if user.is_a? options.authorisation_anonymous_user_class
             redirect options.authorisation_login
           else

data/simple-authorisation.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'simple-authorisation'
-  s.version     = '0.0.14'
+  s.version     = '0.0.15'
   s.authors     = ["Derek Ekins"]
   s.description = 'Handles authorisation only'
   s.summary     = "simple-authorisation-#{s.version}"

data/spec/simple-authorisation/sinatra_integration_spec.rb

@@ -10,7 +10,7 @@ module Sinatra
     end
 
     it "asks Simple::Authorisation if access is allowed" do
-      Simple::Authorisation.should_receive(:is_allowed?).with("/", {:user=>nil, :anonymous_user_class => NilClass, :method => :get})
+      Simple::Authorisation.should_receive(:is_allowed?).with("/", hash_including(:anonymous_user_class => NilClass, :method => :get))
 
       Simple::Authorisation.route '/', :allow => ['?']
       @session.get '/'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-authorisation
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-18 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14577840 !ruby/object:Gem::Requirement
+  requirement: &24334320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *14577840
+  version_requirements: *24334320
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &14577240 !ruby/object:Gem::Requirement
+  requirement: &24333840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14577240
+  version_requirements: *24333840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &14576640 !ruby/object:Gem::Requirement
+  requirement: &24333380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *14576640
+  version_requirements: *24333380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14576060 !ruby/object:Gem::Requirement
+  requirement: &24332920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *14576060
+  version_requirements: *24332920
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &14575480 !ruby/object:Gem::Requirement
+  requirement: &24332460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *14575480
+  version_requirements: *24332460
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &14570880 !ruby/object:Gem::Requirement
+  requirement: &24332000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *14570880
+  version_requirements: *24332000
 description: Handles authorisation only
 email: derek@spathi.com
 executables: []
@@ -123,18 +123,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4190960896511039998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4190960896511039998
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: simple-authorisation-0.0.14
+summary: simple-authorisation-0.0.15
 test_files:
 - spec/simple-authorisation/authorisation_helper_spec.rb
 - spec/simple-authorisation/authorisation_spec.rb