devise_pam_authenticatable2 5.0.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22c9c86b812e73b5efe16be144551c4f34dba934
-  data.tar.gz: 03b52c2e065b3fe66560f94f37b05748663ba141
+  metadata.gz: 9612c985b409e41235b25bff4a0c9110aab3f632
+  data.tar.gz: 9e2a2918a8de29a63d495efb211ce46074086767
 SHA512:
-  metadata.gz: 2773b5e5274c948b1b561cf12bf17de1ea6a3ec7c73d2ddaa72d3ef71404ca9ce193933a5351788db4808541c0786ac726f3b9963813073bf6aee84ddcbb21fd
-  data.tar.gz: 812642d18bee988da2ff95ae5ef26b1aecebf0cfae123dafde6e819e96b55b130e3673ba65e7623717493ad8d0dbed3c931019b83286cd5764b672bc05583426
+  metadata.gz: 55ec5e1245044b87712279ce487134b5d17e71efe802f6f30301b067e997a2674b520fc6d7391bec42e4cb0246a194bd008ce01c3f3b6ca08684c708018cd6c7
+  data.tar.gz: 7df42cbbc2df9263b44c829f784a4c6f5aa177841b5d8bd0b7014e9574db1583a1dc8b4eaf0cfd6d41a46db020f39351110262566f64475b10f97164b8b766e2

data/README.md

@@ -29,7 +29,7 @@ Important changes
 Versions before 4.0.0 are limitted compatible with database_authenticatable.
 Some removed code may can clash in earlier versions.
 
-Version 5.0.0 change method names. Check if everything is correct.
+Version 6.0.0 (and 5.0.0) change method names. Check if everything is correct.
 
 Setup
 -----

data/VERSION

@@ -1 +1 @@
-5.0.1
+6.0.0

data/devise_pam_authenticatable2.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: devise_pam_authenticatable2 5.0.1 ruby lib
+# stub: devise_pam_authenticatable2 6.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "5.0.1"
+  s.version = "6.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/lib/devise_pam_authenticatable/model.rb

@@ -14,18 +14,20 @@ module Devise
         ::Devise.pam_default_suffix
       end
 
-      def on_pam_conflict(_attributes)
+      def pam_conflict(_attributes)
+        # solve conflict between other and pam related user accounts
         # to disable login with pam return nil elsewise return a (different?) user object
-        # as default assume there is never a conflict and return user object
+        # as default assume there is never a conflict and return user object unchanged
         self
       end
 
-      def is_pam_conflict
+      def pam_conflict?
+        # detect a conflict
         # use blank password as discriminator between traditional login and pam login
-        resource.respond_to?('password') && resource.password.present? && is_pam_account
+        resource.respond_to?('password') && resource.password.present? && is_pam_account?
       end
 
-      def is_pam_account
+      def is_pam_account?
         return false unless get_pam_name
         Rpam2.account(get_service, get_pam_name)
       end
@@ -87,7 +89,7 @@ module Devise
           end
 
           # potential conflict detected
-          resource = resource.on_pam_conflict(attributes) if resource.is_pam_conflict
+          resource = resource.pam_conflict(attributes) if resource.pam_conflict?
 
           return nil unless resource && resource.try(:valid_pam_authentication?, attributes[:password])
           if resource.new_record?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_pam_authenticatable2
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 6.0.0
 platform: ruby
 authors:
 - James Wilson