padrino-warden 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9b422afdc8f7b6a1c3977be0d498fcbf734ce6
-  data.tar.gz: 84796020957ca043466f3d99818e05ed4fa6e0c5
+  metadata.gz: ee593e6a245f5c03c36bb809d7f3189a88821fc4
+  data.tar.gz: 583fe62715c0ba71194dc6c42ac0fc6b923fc1ca
 SHA512:
-  metadata.gz: c84e76a573672d15ed6cf0ef581673913dab19fe10edf035468f0525c45e2f8f272e59c4e01d9309770c006c510429edb0baf21e0d56594714b822131f860f12
-  data.tar.gz: 11e020264e737d9bc3c88c8f0f2721894bd489d372c64e6fe9aeb93e78d717de48e630a8880c48888cae7e23935857360bd4a88cb591a6a3d2d61cbd0cf3c6d2
+  metadata.gz: f5729ac8622e272740ce8e26c1155ffc83dffec42c03ec6bf402eee878bf281e9c288ae93e8d2e1016423f806ae8c2f12d56a3184b3e651ddf64a423f6d264eb
+  data.tar.gz: 047e444a3011ac5e76384b393198e7beb73ab1ea104acdcfc5c6a401156db53fb50bfc099b92d8eb1f83e979e1865e0f8e079520380ae530c6362fa6864ebd16

data/README.md

@@ -4,6 +4,9 @@ A [Padrino](http://github.com/padrino/padrino-framework) module that provides au
 
 Most of the code was adapted from [sinatra\_warden](http://github.com/jsmestad/sinatra_warden).
 
+[![Gem
+Version](https://badge.fury.io/rb/padrino-warden.svg)](http://badge.fury.io/rb/padrino-warden)
+
 ## Usage
 
 Currently padrino-warden uses +password+ as default authentication strategy. If you wish to change that consult
@@ -55,7 +58,9 @@ After login you can fiddle with *current\_user* for anything you need.
 
 ## Multi Sub-Apps
 
-You UserApp(/user):
+padrino-warden can be used across multiple apps in one project. You need to have one UserApp which handles logins and logouts.
+
+Add this to your UserApp(/user):
 
 ```ruby
 register Padrino::Warden
@@ -71,7 +76,17 @@ You OtherApps:
 register Padrino::Warden::Helpers
 ```
 
-But you must apply the same options in your UserApp.
+Configure warden globally within config/apps.rb. Don't forget to tell warden about the UserApp:
+
+```ruby
+Padrino.configure_apps do
+  ...
+  set :warden_failure_app, UserApp
+end
+```
+
+Your UserApp needs to be mounted first in Padrino! Cascading routes from the UserApp can cause exceptions, so don't use an app mounted to the root path ('/') as UserApp.
+
 
 ## Overriding warden manager defaults
 
@@ -96,7 +111,7 @@ end
 ```
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a

data/lib/padrino/warden.rb

@@ -8,9 +8,9 @@ require 'padrino/warden/helpers'
 
 module Padrino
   module Warden
-    def self.registered(app)
+    def self.registered(app, register_controller = true)
       # Enable Sessions
-      app.set :sessions, true
+      app.set :sessions, true unless app.sessions
       app.set :auth_failure_path, '/'
       app.set :auth_success_path, '/'
 
@@ -31,7 +31,7 @@ module Padrino
       app.set :auth_use_oauth, false
       app.set :default_strategies, [:password] unless app.respond_to?(:default_strategies)
 
-      app.set :warden_failure_app, app
+      app.set :warden_failure_app, app unless app.respond_to?(:warden_failure_app)
       app.set :warden_default_scope, :session
       app.set(:warden_config) { |manager| nil }
       app.use ::Warden::Manager do |manager|
@@ -41,7 +41,9 @@ module Padrino
         app.warden_config manager
       end
 
-      Controller.registered app
+      if register_controller
+        Controller.registered app
+      end
       app.helpers Helpers
     end
   end

data/lib/padrino/warden/controller.rb

@@ -25,7 +25,7 @@ module Padrino
           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
 

data/lib/padrino/warden/helpers.rb

@@ -29,6 +29,7 @@ module Padrino
       #
       # @param [Symbol] the session scope to terminate
       def logout(scopes=nil)
+        authenticated?
         scopes ? warden.logout(scopes) : warden.logout
       end
 
@@ -50,6 +51,11 @@ module Padrino
         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

data/lib/padrino/warden/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Warden
-    VERSION = "0.20.0"
+    VERSION = "0.20.1"
   end
 end

data/padrino-warden.gemspec

@@ -6,8 +6,8 @@ require 'padrino/warden/version'
 Gem::Specification.new do |spec|
   spec.name          = "padrino-warden"
   spec.version       = Padrino::Warden::VERSION
-  spec.authors       = ["Dotan Nahum"]
-  spec.email         = ["dotan@paracode.com"]
+  spec.authors       = ["Dotan Nahum", "Michał Zając"]
+  spec.email         = ["dotan@paracode.com", "padrino-warden@quintasan.pl"]
   spec.description   = %q{basic helpers and authentication methods for using warden with padrino also providing some hooks into Rack::Flash}
   spec.summary       = %q{authentication system for using warden with Padrino, adopted from sinatra_warden}
   spec.homepage      = "https://github.com/jondot/padrino-warden"

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: padrino-warden
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Dotan Nahum
+- Michał Zając
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -56,6 +57,7 @@ description: basic helpers and authentication methods for using warden with padr
   also providing some hooks into Rack::Flash
 email:
 - dotan@paracode.com
+- padrino-warden@quintasan.pl
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: authentication system for using warden with Padrino, adopted from sinatra_warden