simple-authorisation 0.0.3 → 0.0.4

data/Gemfile.lock

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

data/lib/simple-authorisation/authorisation.rb

@@ -15,18 +15,22 @@ module Simple
       @@routes[name] = {} unless @@routes.has_key?(name)
 
       route_settings  = @@routes[name]
-      route_settings[options.delete(:method) || :default] = options
+      route_settings[options.delete(:method) || :any] = options
+    end
+
+    def self.clear
+      @@routes = {}
     end
 
     def self.is_allowed?(route_name, options)
       matching_route = (@@routes.keys.sort.reverse.select{|route | route_name.start_with?(route) }).first
 
       route_settings = @@routes[matching_route]
-      raise "no settings found for #{route_name}" if route_settings.nil?
+      raise NoSettingsForRoute.new(route_name) if route_settings.nil?
 
-      method = options.fetch(:method, :default)
-      route_rules = route_settings[method] || route_settings[:default]
-      raise "no rules found for #{route_name} method #{method}" if route_rules.nil?
+      method = options.fetch(:method, :any)
+      route_rules = route_settings[method] || route_settings[:any]
+      raise NoRulesForMethod.new(route_name, method) if route_rules.nil?
 
       allow = route_rules.fetch(:allow, [])
       deny = route_rules.fetch(:deny, [])
@@ -41,5 +45,26 @@ module Simple
 
       false
     end
+
+    class NoRulesForMethod < Exception
+      def initialize(route_name, method)
+        @route_name = route_name
+        @method = method
+      end
+
+      def message
+        "no rules found for #{@route_name} method #{@method}"
+      end
+    end
+
+    class NoSettingsForRoute < Exception
+      def initialize(route_name)
+        @route_name = route_name
+      end
+
+      def message
+        "No settings for route #{@route_name}"
+      end
+    end
   end
 end

data/lib/simple-authorisation/sinatra.rb

@@ -9,7 +9,8 @@ module Sinatra
 
       app.before do
         route_name = request.path
-        unless Simple::Authorisation.is_allowed?(route_name, :user => current_user, :anonymous_user_class => options.authorisation_anonymous_user_class)
+        user = send(options.authorisation_current_user)
+        unless Simple::Authorisation.is_allowed?(route_name, :user => 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')
           redirect options.authorisation_login
           return false

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

data/spec/simple-authorisation/authorisation_spec.rb

@@ -2,6 +2,9 @@ require 'simple-authorisation/authorisation'
 
 module Simple
   describe Authorisation do
+    before do
+      Simple::Authorisation.clear
+    end
     it "should allow requests to anonymous users" do
       Simple::Authorisation.route '/test', :allow => ['?']
       Simple::Authorisation.is_allowed?('/test', :user => nil).should be_true
@@ -41,5 +44,15 @@ module Simple
       Simple::Authorisation.is_allowed?('/test', :method => :post, :user => nil).should be_false
       Simple::Authorisation.is_allowed?('/test', :method => :get, :user => nil).should be_true
     end
+
+    it "should apply rule to any method when none specified" do
+      Simple::Authorisation.route '/test', :allow => ['?']
+      Simple::Authorisation.is_allowed?('/test', :method => :get, :user => nil).should be_true
+      Simple::Authorisation.is_allowed?('/test', :method => :post, :user => nil).should be_true
+    end
+
+    it "should raise an exception when checking is_allowed for a route with no rules" do
+      lambda {Simple::Authorisation.is_allowed?('/test', :method => :get, :user => nil)}.should raise_error(Simple::Authorisation::NoSettingsForRoute)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-authorisation
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-27 00:00:00.000000000Z
+date: 2011-07-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &11063860 !ruby/object:Gem::Requirement
+  requirement: &15242400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *11063860
+  version_requirements: *15242400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &11063380 !ruby/object:Gem::Requirement
+  requirement: &15241800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *11063380
+  version_requirements: *15241800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11060200 !ruby/object:Gem::Requirement
+  requirement: &15241240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *11060200
+  version_requirements: *15241240
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &11059740 !ruby/object:Gem::Requirement
+  requirement: &15240680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *11059740
+  version_requirements: *15240680
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &11059280 !ruby/object:Gem::Requirement
+  requirement: &15240120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *11059280
+  version_requirements: *15240120
 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.3
+summary: simple-authorisation-0.0.4
 test_files:
 - spec/simple-authorisation/authorisation_spec.rb
 - spec/simple-authorisation/sinatra_integration_spec.rb