devise_pam_authenticatable 1.0.0 → 1.0.2

data/README.md

@@ -17,6 +17,10 @@ Installation
 
 In the Gemfile for your application:
 
+    gem "devise_pam_authenticatable"
+
+Or, to use the latest from github:
+
     gem "devise_pam_authenticatable", :git => "git://github.com/jwilson511/devise_pam_authenticatable.git"
 
 Setup

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

data/devise_pam_authenticatable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_pam_authenticatable}
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Wilson"]

data/lib/devise_pam_authenticatable/model.rb

@@ -26,9 +26,12 @@ module Devise
        def authenticate_with_pam(attributes={})
          return nil unless attributes[:username].present?
 
-         resource = new
-         resource[:username] = attributes[:username]
-         resource[:password] = attributes[:password]
+         resource = scoped.where(:username => attributes[:username]).first
+         if resource.blank?
+           resource = new
+           resource[:username] = attributes[:username]
+           resource[:password] = attributes[:password]
+         end
 
          if resource.try(:valid_pam_authentication?, attributes[:password])
            resource.save if resource.new_record?

data/lib/devise_pam_authenticatable/strategy.rb

@@ -5,12 +5,10 @@ module Devise
     class PamAuthenticatable < Base
       
       def valid?
-        puts "Asked if valid"
         valid_controller? && valid_params? && mapping.to.respond_to?(:authenticate_with_pam)
       end
       
       def authenticate!
-        puts "Asked to authenticate"
         if resource = mapping.to.authenticate_with_pam(params[scope])
           success!(resource)
         else
@@ -21,12 +19,10 @@ module Devise
       protected
 
         def valid_controller?
-          puts "Controller is #{params[:controller]}"
           params[:controller] == 'devise/sessions'
         end
 
         def valid_params?
-          puts "Scope is #{params[scope]}"
           params[scope] && params[scope][:password].present?
         end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_pam_authenticatable
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - James Wilson