devise_pam_authenticatable2 6.1.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f55e4967e974aa8516eb7b204f8c407a9d5b7989e3227103d0463e1b2055f58e
-  data.tar.gz: b079c8ac2d4f75a84f3422464f50f318dbf3049214b075c999158804c3acffcf
+  metadata.gz: 966160894cd8d15cd2e1bc0ebcb139cd278a37711920678a5b9d8502abaea7ca
+  data.tar.gz: 6b200c6f8a5c925b43b3a1b5de7a217ae916c56a42329847cdbf91058e0e66cf
 SHA512:
-  metadata.gz: 4ae221343f7f695c24ea84bd29b5df81a757a2127d28342a9f3f54472bdf18d3a2415bceb5a5a8b37b9786ce35d1716a8b6f481e5f299ac482da075178ad0b2c
-  data.tar.gz: 9d7a541ebd10f391a423f2124a23869eadb41f4bae46aa0a633badb97671c953e5d862fc90c91f117d161c36b1bf05c016f93f097a6656ca1e08b1fcd405f9ba
+  metadata.gz: 8ac0af36a708b480290686ffba144019c27dcc130a9ceb67d964bba768aba20cf7f9095ff850081dccc0c08b0fa36a37dac7e5efa05b3b1b3b43286525dd1b54
+  data.tar.gz: 55b4a51494f4e595c76d63bbc063dcd279741bf84ecb76a6d764b21b161cdea2d01db62e8270f81b7fd40a961d145bfb852bfd689a28ec836e10f24ecd3fae26

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 6.0.0 (and 5.0.0) change method names. Check if everything is correct.
+Version 7.0.0 (and 5, 6) change method names. Check if everything is correct.
 
 Setup
 -----

data/VERSION

@@ -1 +1 @@
-6.1.1
+7.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 6.1.1 ruby lib
+# stub: devise_pam_authenticatable2 7.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "devise_pam_authenticatable2".freeze
-  s.version = "6.1.1"
+  s.version = "7.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

@@ -4,12 +4,12 @@ module Devise
   module Models
     module PamAuthenticatable
 
-      def get_service
+      def get_pam_service
         return self.class.pam_service if self.class.instance_variable_defined?('@pam_service')
         ::Devise.pam_default_service
       end
 
-      def get_suffix
+      def get_pam_suffix
         return self.class.pam_suffix if self.class.instance_variable_defined?('@pam_suffix')
         ::Devise.pam_default_suffix
       end
@@ -29,24 +29,19 @@ module Devise
 
       def is_pam_account?
         return false unless get_pam_name
-        Rpam2.account(get_service, get_pam_name)
+        Rpam2.account(get_pam_service, get_pam_name)
       end
 
       def pam_setup(attributes)
         return unless ::Devise.emailfield && ::Devise.usernamefield
-        self[::Devise.emailfield] = Rpam2.getenv(get_service, get_pam_name, attributes[:password], 'email', false)
+        self[::Devise.emailfield] = Rpam2.getenv(get_pam_service, get_pam_name, attributes[:password], 'email', false)
         self[::Devise.emailfield] = attributes[::Devise.emailfield] if self[::Devise.emailfield].nil?
-        self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{get_suffix}" if self[::Devise.emailfield].nil? && get_suffix
-      end
-
-      def password_required?
-        false
+        self[::Devise.emailfield] = "#{self[::Devise.usernamefield]}@#{get_pam_suffix}" if self[::Devise.emailfield].nil? && get_pam_suffix
       end
 
       def get_pam_name
         return self[::Devise.usernamefield] if ::Devise.usernamefield && self[::Devise.usernamefield]
-        suffix = get_suffix
-        return nil unless suffix && ::Devise.emailfield
+        return nil unless ::Devise.emailfield && (suffix = get_pam_suffix)
         email = "#{self[::Devise.emailfield]}\n"
         pos = email.index("@#{suffix}\n")
         return nil unless pos
@@ -56,7 +51,7 @@ module Devise
       # Checks if a resource is valid upon authentication.
       def valid_pam_authentication?(pw)
         return nil unless get_pam_name
-        Rpam2.auth(get_service, get_pam_name, pw)
+        Rpam2.auth(get_pam_service, get_pam_name, pw)
       end
 
       module ClassMethods

metadata

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