simple-authorisation 0.0.8 → 0.0.9

data/Gemfile.lock

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

data/lib/simple-authorisation/authorisation.rb

@@ -1,5 +1,11 @@
+require File.join(File.dirname(__FILE__), 'route_rule_finder')
+require File.join(File.dirname(__FILE__), 'exact_route_rule_finder')
+require File.join(File.dirname(__FILE__), 'no_rules_for_method')
+
 module Simple
   module Authorisation
+    @@match_style = :default
+
     def self.post(name, options)
       options[:method] = :post
       self.route(name, options)
@@ -22,12 +28,14 @@ module Simple
       @@routes = {}
     end
 
-    def self.is_allowed?(route_name, options)
-      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?
+    def self.is_allowed?(route_name, options)
+      match_styles = {
+          :default  => RouteRuleFinder,
+          :exact    => ExactRouteRuleFinder
+      }
+      route_matcher = match_styles[match_style].new(@@routes)
+      route_settings = route_matcher.find(route_name)
 
       method = options.fetch(:method, :any)
       route_rules = route_settings[method] || route_settings[:any]
@@ -37,7 +45,6 @@ module Simple
       deny = route_rules.fetch(:deny, [])
       user = options.fetch(:user, nil)
 
-
       anonymous_user_class = options.fetch(:anonymous_user_class, NilClass)
 
       return true   if allow.index('?')
@@ -50,25 +57,12 @@ 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
+    def self.match_style=(style)
+      @@match_style = style
     end
 
-    class NoSettingsForRoute < Exception
-      def initialize(route_name)
-        @route_name = route_name
-      end
-
-      def message
-        "No settings for route #{@route_name}"
-      end
+    def self.match_style
+      @@match_style
     end
   end
 end

data/lib/simple-authorisation/exact_route_rule_finder.rb

@@ -0,0 +1,19 @@
+require 'uri'
+
+module Simple
+  module Authorisation
+    class ExactRouteRuleFinder < RouteRuleFinder
+      def initialize(routes)
+        super(routes)
+        @find_by = [:route_by_wild_card, :route_matches]
+        p @find_by
+      end
+
+      def route_matches(route_name)
+        p "using route match"
+        route_name = URI.parse(route_name).path.gsub(/\/$/, '')
+        (@routes.keys.sort.reverse.select { |route| route =~ /#{route_name}\/?/ }).first
+      end
+    end
+  end
+end

data/lib/simple-authorisation/no_rules_for_method.rb

@@ -0,0 +1,14 @@
+module Simple
+  module Authorisation
+    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
+  end
+end

data/lib/simple-authorisation/no_setting_for_route.rb

@@ -0,0 +1,13 @@
+module Simple
+  module Authorisation
+    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/route_rule_finder.rb

@@ -0,0 +1,32 @@
+require File.join(File.dirname(__FILE__), 'no_setting_for_route')
+module Simple
+  module Authorisation
+    class RouteRuleFinder
+      def initialize(routes)
+        @routes = routes
+        @find_by = [:route_by_wild_card, :route_starts_with]
+      end
+
+      def route_by_wild_card(route_name)
+        (@routes.keys.sort.reverse.select{|route | route_name =~ /^#{route.gsub('*', '.+')}$/}).first
+      end
+
+      def route_starts_with(route_name)
+        (@routes.keys.sort.reverse.select { |route| route_name.start_with?(route) }).first
+      end
+
+      def find(route_name)
+        matching_route = nil
+        @find_by.each do |method|
+          matching_route = send(method, route_name)
+          break unless matching_route.nil?
+        end
+
+        route_settings = @routes[matching_route]
+        raise NoSettingsForRoute.new(route_name) if route_settings.nil?
+
+        route_settings
+      end
+    end
+  end
+end

data/lib/simple-authorisation.rb

@@ -1,2 +1,3 @@
+require 'simple-authorisation/route_rule_finder'
 require 'simple-authorisation/authorisation'
 require 'simple-authorisation/sinatra'

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

data/spec/simple-authorisation/authorisation_spec.rb

@@ -85,5 +85,11 @@ module Simple
       Simple::Authorisation.route '/test/*/blah', :allow => ['test-action']
       Simple::Authorisation.is_allowed?('/test/something/blah', :method => :get, :user => user).should be_true
     end
+
+    it "should only match routes exactly when configured to do so" do
+      Simple::Authorisation.match_style = :exact
+      Simple::Authorisation.route '/test', :allow => ['?']
+      lambda{ Simple::Authorisation.is_allowed?('/test/page', :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.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-09 00:00:00.000000000Z
+date: 2011-09-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16703140 !ruby/object:Gem::Requirement
+  requirement: &10301960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *16703140
+  version_requirements: *10301960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16702500 !ruby/object:Gem::Requirement
+  requirement: &10301360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *16702500
+  version_requirements: *10301360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16701880 !ruby/object:Gem::Requirement
+  requirement: &10300840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *16701880
+  version_requirements: *10300840
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &16701380 !ruby/object:Gem::Requirement
+  requirement: &10297800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.6
   type: :development
   prerelease: false
-  version_requirements: *16701380
+  version_requirements: *10297800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &16682260 !ruby/object:Gem::Requirement
+  requirement: &10297100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *16682260
+  version_requirements: *10297100
 description: Handles authorisation only
 email: derek@spathi.com
 executables: []
@@ -78,6 +78,10 @@ files:
 - Rakefile
 - lib/simple-authorisation.rb
 - lib/simple-authorisation/authorisation.rb
+- lib/simple-authorisation/exact_route_rule_finder.rb
+- lib/simple-authorisation/no_rules_for_method.rb
+- lib/simple-authorisation/no_setting_for_route.rb
+- lib/simple-authorisation/route_rule_finder.rb
 - lib/simple-authorisation/sinatra.rb
 - simple-authorisation.gemspec
 - spec/simple-authorisation/authorisation_spec.rb
@@ -117,7 +121,7 @@ rubyforge_project:
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: simple-authorisation-0.0.8
+summary: simple-authorisation-0.0.9
 test_files:
 - spec/simple-authorisation/authorisation_spec.rb
 - spec/simple-authorisation/sinatra_integration_spec.rb