AtHeartEngineer/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-09 07:38:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring the code a little bit

Browse Source 
* Rename #get_constraints_given_method to #constraints_for to make the
  method clear.

* The method name now is required.

* Use symbols instead of strings.

* Make #constraints_for a protected method.
This commit is contained in:
Rafael Mendonça França
2013-05-04 14:31:24 -03:00
parent 662f0e76d8
commit 63627d1439
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/devise/rails/routes.rb
View File

@@ -237,16 +237,6 @@ module ActionDispatch::Routing
end
end
def get_constraints_given_method(scope=nil, block=nil, method_to_apply='authenticate!')
constraint = lambda do |request|
request.env['warden'].send(method_to_apply, {:scope => scope}) && (block.nil? || block.call(request.env["warden"].user(scope)))
end
constraints(constraint) do
yield
end
end
# Allow you to add authentication request from the router.
# Takes an optional scope and block to provide constraints
# on the model instance itself.
@@ -264,7 +254,7 @@ module ActionDispatch::Routing
# end
#
def authenticate(scope=nil, block=nil)
get_constraints_given_method(scope, block, 'authenticate!') do
constraints_for(:authenticate!, scope, block) do
yield
end
end
@@ -288,7 +278,7 @@ module ActionDispatch::Routing
# root :to => 'landing#show'
#
def authenticated(scope=nil, block=nil)
get_constraints_given_method(scope, block, 'authenticate?') do
constraints_for(:authenticate?, scope, block) do
yield
end
end
@@ -430,6 +420,17 @@ module ActionDispatch::Routing
@scope.merge!(old)
end
def constraints_for(method_to_apply, scope=nil, block=nil)
constraint = lambda do |request|
request.env['warden'].send(method_to_apply, :scope => scope) &&
(block.nil? || block.call(request.env["warden"].user(scope)))
end
constraints(constraint) do
yield
end
end
def set_omniauth_path_prefix!(path_prefix) #:nodoc:
if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
raise "Wrong OmniAuth configuration. If you are getting this exception, it means that either:\n\n" \