@@ -53,54 +53,52 @@ module Zuul self.access_denied_message = options[:access_denied_message] || "You must be logged in to access this page" self.require_no_user_message = options[:require_no_user_message] || "You must be logged out to access this page" self.unauthorized_redirect_path = options[:unauthorized_redirect_path] || :unauthorized_path - include ApplicationController::InstanceMethods + include InstanceMethods end end - module ApplicationController - module InstanceMethods - def require_user(*roles) - roles.flatten! - return true if current_user && roles.empty? - deny_access unless roles.any? do |role| - method = (role.to_s + "?").to_sym - if current_user && current_user.respond_to?(method) - current_user.send(method) - else - false - end - end - end - private :require_user - - def require_no_user - if current_user - store_location - flash[:notice] = self.class.require_no_user_message - redirect_to send(self.class.unauthorized_redirect_path) - return false + module InstanceMethods + def require_user(*roles) + roles.flatten! + return true if current_user && roles.empty? + deny_access unless roles.any? do |role| + method = (role.to_s + "?").to_sym + if current_user && current_user.respond_to?(method) + current_user.send(method) + else + false end end - private :require_no_user + end + private :require_user - def deny_access + def require_no_user + if current_user store_location - flash[:notice] = self.class.access_denied_message + flash[:notice] = self.class.require_no_user_message redirect_to send(self.class.unauthorized_redirect_path) return false end - private :deny_access + end + private :require_no_user - def store_location - session[:return_to] = request.request_uri - end - private :store_location + def deny_access + store_location + flash[:notice] = self.class.access_denied_message + redirect_to send(self.class.unauthorized_redirect_path) + return false + end + private :deny_access - def unauthorized_path - "/" - end - private :unauthorized_path + def store_location + session[:return_to] = request.request_uri + end + private :store_location + + def unauthorized_path + "/" end + private :unauthorized_path end end end lib/zuul/restrict_access.rb @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{zuul} - s.version = "0.1.0" + s.version = "0.1.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Wes Gibbs"] - s.date = %q{2009-10-30} + s.date = %q{2009-11-04} s.description = %q{A simple authorization solution for Rails apps.} s.email = %q{wes@hashrocket.com} s.extra_rdoc_files = [ zuul.gemspec 93705b01db600004131c99d98516349929619867 Wes Gibbs wes@hashrocket.com http://github.com/wgibbs/zuul/commit/2619fcc2eed3334f88c3d7d96ddf81567bfa7900 2619fcc2eed3334f88c3d7d96ddf81567bfa7900 2009-11-04T12:51:00-08:00 2009-11-04T12:51:00-08:00 Change module namespacing ae7317fa96b8992f82e3b13bab455f364f7e153e Wes Gibbs wes@hashrocket.com