simple-authorisation 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-authorisation (0.0.4)
+    simple-authorisation (0.0.7)
       sinatra (~> 1.2.6)
 
 GEM

data/lib/simple-authorisation/authorisation.rb

@@ -23,7 +23,8 @@ module Simple
     end
 
     def self.is_allowed?(route_name, options)
-      matching_route = (@@routes.keys.sort.reverse.select{|route | route_name.start_with?(route) }).first
+      matching_route = (@@routes.keys.sort.reverse.select{|route | route_name =~ /#{route.gsub('*', '.+')}/}).first
+      matching_route = (@@routes.keys.sort.reverse.select{|route | route_name.start_with?(route) }).first if matching_route.nil?
 
       route_settings = @@routes[matching_route]
       raise NoSettingsForRoute.new(route_name) if route_settings.nil?

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.7'
+  s.version     = '0.0.8'
   s.authors     = ["Derek Ekins"]
   s.description = 'Handles authorisation only'
   s.summary     = "simple-authorisation-#{s.version}"

data/spec/simple-authorisation/authorisation_spec.rb

@@ -77,5 +77,13 @@ module Simple
       Simple::Authorisation.route '/test', :allow => ['test-action']
       lambda{ Simple::Authorisation.is_allowed?('/test', :method => :get, :user => user)}.should_not raise_error
     end
+
+    it "should allow wildcards in parts of the route" do
+      user = Object.new
+      user.stub!(:actions).and_return(['test-action'])
+
+      Simple::Authorisation.route '/test/*/blah', :allow => ['test-action']
+      Simple::Authorisation.is_allowed?('/test/something/blah', :method => :get, :user => user).should be_true
+    end
   end
 end

data/spec/simple-authorisation/sinatra_integration_spec.rb

@@ -10,11 +10,11 @@ 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.route '/', :allow => ['?']
       @session.get '/'
 
-      # this fails for some reason but I know that it does work - what is wrong???
-      Simple::Authorisation.should_receive(:is_allowed?).with("/", {:user=>nil})
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-authorisation
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000Z
+date: 2011-09-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &23630060 !ruby/object:Gem::Requirement
+  requirement: &16703140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *23630060
+  version_requirements: *16703140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23629580 !ruby/object:Gem::Requirement
+  requirement: &16702500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *23629580
+  version_requirements: *16702500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23629120 !ruby/object:Gem::Requirement
+  requirement: &16701880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *23629120
+  version_requirements: *16701880
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &23628660 !ruby/object:Gem::Requirement
+  requirement: &16701380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *23628660
+  version_requirements: *16701380
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &23628200 !ruby/object:Gem::Requirement
+  requirement: &16682260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *23628200
+  version_requirements: *16682260
 description: Handles authorisation only
 email: derek@spathi.com
 executables: []
@@ -117,7 +117,7 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: simple-authorisation-0.0.7
+summary: simple-authorisation-0.0.8
 test_files:
 - spec/simple-authorisation/authorisation_spec.rb
 - spec/simple-authorisation/sinatra_integration_spec.rb