Skip to content

Commit

Permalink
Allow to register helpers and settings without controllers
Browse files Browse the repository at this point in the history
  • Loading branch information
FeeJai committed Feb 21, 2015
1 parent 111d9a0 commit 9d15b87
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
6 changes: 4 additions & 2 deletions lib/padrino/warden.rb
Expand Up @@ -8,7 +8,7 @@

module Padrino
module Warden
def self.registered(app)
def self.registered(app, register_controller = true)
# Enable Sessions
app.set :sessions, true unless app.sessions
app.set :auth_failure_path, '/'
Expand Down Expand Up @@ -41,7 +41,9 @@ def self.registered(app)
app.warden_config manager
end

Controller.registered app
if register_controller
Controller.registered app
end
app.helpers Helpers
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/padrino/warden/controller.rb
Expand Up @@ -25,7 +25,7 @@ def self.registered(app)
post :login , map: app.auth_login_path do
authenticate
flash[:success] = settings.auth_success_message if flash
redirect settings.auth_use_referrer && session[:return_to] ? session.delete(:return_to) :
redirect settings.auth_use_referrer && session[:return_to] ? session.delete(:return_to) :
settings.auth_success_path
end

Expand Down
5 changes: 5 additions & 0 deletions lib/padrino/warden/helpers.rb
Expand Up @@ -51,6 +51,11 @@ def user=(new_user, opts={})
warden.set_user(new_user, opts)
end
alias_method :current_user=, :user=

# Register the helpers directly without the controller (useful for MultiApp environments)
def self.registered(app)
Padrino::Warden.registered(app, false)
end
end # helpers
end # Warden
end # Padrino

0 comments on commit 9d15b87

Please sign in to comment.