omniauth-multipassword 0.1.1 → 0.2.0

data/lib/omniauth/multipassword/base.rb

@@ -19,11 +19,13 @@ module OmniAuth
       end
 
       def username
-        request[username_id]
+        @username || request[username_id].to_s
       end
 
-      def request=(request)
-        @request = request
+      def init_authenticator(request, env, username)
+        @request  = request
+        @env      = env
+        @username = username
       end
 
       def callback_phase

data/lib/omniauth/multipassword/version.rb

@@ -2,8 +2,8 @@ module Omniauth
   module Multipassword
     module VERSION
       MAJOR = 0
-      MINOR = 1
-      PATCH = 1
+      MINOR = 2
+      PATCH = 0
       STAGE = nil
 
       def self.to_s

data/lib/omniauth/strategies/multi_password.rb

@@ -32,8 +32,9 @@ module OmniAuth
           end
         end
 
+        args << block if block
         @authenticators ||= []
-        @authenticators  << [ klass, args, block ]
+        @authenticators  << [ klass, args ]
       end
 
       def callback_phase
@@ -49,12 +50,8 @@ module OmniAuth
       def authenticate(username, password)
         @authenticators.each do |auth|
           begin
-            if auth[2]
-              @authenticator = auth[0].new @app, *auth[1], auth[2]
-            else
-              @authenticator = auth[0].new @app, *auth[1]
-            end
-            @authenticator.request = self.request
+            @authenticator = auth[0].new @app, *auth[1]
+            @authenticator.init_authenticator(@request, @env, username)
             return true if @authenticator.authenticate(username, password)
           rescue Error => e
             OmniAuth.logger.warn "OmniAuth ERR >>> " + e
@@ -65,11 +62,9 @@ module OmniAuth
       end
 
       info do
-        if @authenticator and @authenticator.info.is_a?(Hash)
-          @authenticator.info
-        else
-          {}
-        end
+        info = @authenticator.info if @authenticator
+        info = {} unless info.is_a?(Hash)
+        info
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-multipassword
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &14724960 !ruby/object:Gem::Requirement
+  requirement: &18337760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *14724960
+  version_requirements: *18337760
 description: A OmniAuth strategy to authenticate using different passwort strategies.
 email:
 - jan.graichen@altimos.de