minimalist_authentication 2.2.1 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7393c90dec001c1a5cc41a7671335a14525c2df82b5b1ef6f09695d0f5eb618d
-  data.tar.gz: 5938f2b31f6139096fd59b4c2257d6056b216d276e4d4cfbad5c67edd34cbed5
+  metadata.gz: b86110ca5e209864047e3c499a09401a264019ea2bd4311d3eb11e02ac95c29c
+  data.tar.gz: '0493e05bb52e0090890c785149bfb237309b2ad6e81988258f5fda308f8bf8bf'
 SHA512:
-  metadata.gz: f84a1b08c525c57f5974d7d73f7eba50835952ea29ff8f9336d2e31af53a92074f59cb319002ab6647dddeab6cb126077cb92a01c5349a6ad5a1980e4c4c75d4
-  data.tar.gz: 75636fe9e427511d02809c232fd6bb6692fa5bdad2db564391ce5e97a4d8cecee149f836330849f006c8d470509f283b6c641812967dbedac058464ead0d47c5
+  metadata.gz: eade9a93179f92c337ed21258d438861fbe70210d1a252dab6998fe10f49d18e0b6ddf250bef8bc6ebae69aa068e44bf00e366d4aeae4e9c4c55775402c21a8f
+  data.tar.gz: b1fcc6eb5d0dcd5bfcb8e1e740a72faff20c397f8ed9bc216a0eba343cddbd36457e2bf03aa09ec1fee51c6f82f429c97b7dfc6becdf4562b555d744074f5d21

data/lib/minimalist_authentication/controller.rb

@@ -17,7 +17,8 @@ module MinimalistAuthentication
     end
 
     def get_user_from_session
-      MinimalistAuthentication.configuration.user_model.find_by_id(session_user_id) if session_user_id
+      return unless session_user_id
+      MinimalistAuthentication.configuration.user_model.active.find_by(id: session_user_id)
     end
 
     def session_user_id

data/lib/minimalist_authentication/user.rb

@@ -5,7 +5,6 @@ module MinimalistAuthentication
     extend ActiveSupport::Concern
 
     GUEST_USER_EMAIL  = 'guest'
-    EMAIL_REGEX       = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
     PASSWORD_MIN      = 8
     PASSWORD_MAX      = 40
 
@@ -20,26 +19,35 @@ module MinimalistAuthentication
       before_save :hash_password
 
       # Email validations
-      validates_presence_of     :email,                                           if: :validate_email_presence?
-      validates_uniqueness_of   :email, allow_blank: true, case_sensitive: false, if: :validate_email?
-      validates_format_of       :email, allow_blank: true, with: EMAIL_REGEX,     if: :validate_email?
+      validates(
+        :email,
+        format:     { allow_blank: true, with: URI::MailTo::EMAIL_REGEXP },
+        uniqueness: { allow_blank: true, case_sensitive: false, scope: :active },
+        if:         :validate_email?
+      )
+      validates(:email, presence: true, if: :validate_email_presence?)
 
       # Password validations
-      validates_presence_of     :password,                                      if: :validate_password?
-      validates_confirmation_of :password,                                      if: :validate_password?
-      validates_length_of       :password, within: PASSWORD_MIN..PASSWORD_MAX,  if: :validate_password?
+      validates(
+        :password,
+        confirmation: true,
+        length:       { within: PASSWORD_MIN..PASSWORD_MAX },
+        presence:     true,
+        if:           :validate_password?
+      )
 
       # Active scope
-      scope :active, ->(active = true) { where active: active }
+      scope :active,    ->(state = true)  { where(active: state) }
+      scope :inactive,  ->                { active(false) }
     end
 
     module ClassMethods
       # Authenticates a user form the params provided. Expects a params hash with
-      # email or username and passwod keys.
+      # email or username and password keys.
       # Params examples:
       # { email: 'user@example.com', password: 'abc123' }
       # { username: 'user', password: 'abc123' }
-      # Returns user upon successful authentcation.
+      # Returns user upon successful authentication.
       # Otherwise returns nil.
       def authenticate(params)
         # extract email or username and the associated value
@@ -65,6 +73,11 @@ module MinimalistAuthentication
       active
     end
 
+    # Returns true if the user is not active.
+    def inactive?
+      !active
+    end
+
     # Return true if password matches the hashed_password.
     # If successful checks for an outdated password_hash and updates if
     # necessary.
@@ -107,7 +120,7 @@ module MinimalistAuthentication
       Password.new(password_hash)
     end
 
-    # Requre password for active users that either do no have a password hash
+    # Require password for active users that either do no have a password hash
     # stored OR are attempting to set a new password. Set **password_required**
     # to true to force validations even when the password field is blank.
     def validate_password?
@@ -122,7 +135,7 @@ module MinimalistAuthentication
     end
 
     # Validate email presence for active users.
-    # Applications can turn offf email presence validation by setting
+    # Applications can turn off email presence validation by setting
     # validate_email_presence configuration attribute to false.
     def validate_email_presence?
       MinimalistAuthentication.configuration.validate_email_presence && validate_email?

data/lib/minimalist_authentication/version.rb

@@ -1,3 +1,3 @@
 module MinimalistAuthentication
-  VERSION = '2.2.1'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimalist_authentication
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.4
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-28 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,20 +45,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.3
-- !ruby/object:Gem::Dependency
-  name: loofah
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: A Rails authentication plugin that takes a minimalist approach.