removed deprecated method calls

dereke · Dec 6, 2011 · e936204 · e936204
1 parent 74c478c
commit e936204
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple-authorisation (0.0.17)
+    simple-authorisation (0.0.18)
       builder (~> 2.0)
       sinatra (~> 1.3.0)
 

diff --git a/lib/simple-authorisation/sinatra.rb b/lib/simple-authorisation/sinatra.rb
@@ -10,21 +10,21 @@ def self.registered(app)
 
       app.before do
         route_name = request.path
-        request_user = Proc.new { send(options.authorisation_current_user) }
+        request_user = Proc.new { send(settings.authorisation_current_user) }
 
         unless Simple::Authorisation.is_allowed?(
             route_name,
             :user => request_user,
-            :anonymous_user_class => options.authorisation_anonymous_user_class,
+            :anonymous_user_class => settings.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
+          if user.is_a? settings.authorisation_anonymous_user_class
+            redirect settings.authorisation_login
           else
-            redirect options.authorisation_permission_denied
+            redirect settings.authorisation_permission_denied
           end
         end
       end

diff --git a/simple-authorisation.gemspec b/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.17'
+  s.version     = '0.0.18'
   s.authors     = ["Derek Ekins"]
   s.description = 'Handles authorisation only'
   s.summary     = "simple-authorisation-#{s.version}"