alchemy-devise 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f58d46b9126aecea12b501b449de4effd33b1c5eccf18f82937a5662c35469a4
-  data.tar.gz: 46bf5120a6e8d2dcb536ba407d6bfcf1572164833b789752d9f58e8c84713914
+  metadata.gz: 037e618a3f66b84599f6e3dd9c9ee7ac2b5eccafad82df24e7a2deac4e277cfc
+  data.tar.gz: 8bc2d3e03a28e5a570aace97412aae02055f6ba2fdfa3730598749081bcac8d8
 SHA512:
-  metadata.gz: 101acd9fa3dde21bf274bf493e6b9f9e801d47d7e988e01f3cef86fd813951cb291268f9690e06c89a9c1d881a625e9306fd0fc8d1f3b5e485479dcbbe12852f
-  data.tar.gz: 033a6f2df8c32e7281c0b5dd55309947cf0400cfd87ba1703a43c5ab25b098c82ef65edd739750c9fabbf499765d487d7663068fd69a95fbc4fc6a2430f49580
+  metadata.gz: c577818f7db36c4a5bd4147f878ef8a63d511fdd42573e97b54212742e6aaafe960ad039b8cfb7ce90683f240c385508b881d070240c70e1bb1704b7ad754725
+  data.tar.gz: db8f25a255b6b700b414d7ca0b154f3fd35de04941e5e286cfee2069c2630670532aab28e56d6a925427fe3ce8f0d55ba5faa265d7815e5a00b989e98e933fd6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 6.2.0 (2023-04-01)
+
+- Add Alchemy 7 support [#164](https://github.com/AlchemyCMS/alchemy-devise/pull/164) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade rspec-rails to version 6.0.1 [#153](https://github.com/AlchemyCMS/alchemy-devise/pull/153) ([depfu](https://github.com/apps/depfu))
+
 ## 6.1.0 (2023-01-20)
 
 - Remove Alchemy 5.3 support [#158](https://github.com/AlchemyCMS/alchemy-devise/pull/158) ([tvdeyen](https://github.com/tvdeyen))

data/app/controllers/alchemy/admin/passwords_controller.rb

@@ -7,10 +7,6 @@ module Alchemy
     class PasswordsController < ::Devise::PasswordsController
       include Alchemy::Admin::Locale
 
-      if Alchemy.gem_version <= Gem::Version.new("4.9")
-        before_action { enforce_ssl if ssl_required? && !request.ssl? }
-      end
-
       helper "Alchemy::Admin::Base"
 
       layout "alchemy/admin"

data/app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -9,11 +9,6 @@ module Alchemy
 
       protect_from_forgery prepend: true
 
-      if Alchemy.gem_version <= Gem::Version.new("4.9")
-        before_action except: "destroy" do
-          enforce_ssl if ssl_required? && !request.ssl?
-        end
-      end
       before_action :check_user_count, :only => :new
 
       helper "Alchemy::Admin::Base"

data/app/models/alchemy/user.rb

@@ -1,5 +1,7 @@
-require 'devise/orm/active_record'
-require 'userstamp'
+# frozen_string_literal: true
+
+require "devise/orm/active_record"
+require "userstamp"
 
 module Alchemy
   class User < ActiveRecord::Base
@@ -12,7 +14,7 @@ module Alchemy
       :password,
       :password_confirmation,
       :send_credentials,
-      :tag_list
+      :tag_list,
     ]
 
     devise *Alchemy.devise_modules
@@ -29,13 +31,31 @@ module Alchemy
     # Unlock all locked pages before destroy.
     before_destroy :unlock_pages!
 
-    scope :admins,     -> { where(arel_table[:alchemy_roles].matches('%admin%')) }
-    scope :logged_in,  -> { where('last_request_at > ?', logged_in_timeout.seconds.ago) }
-    scope :logged_out, -> { where('last_request_at is NULL or last_request_at <= ?', logged_in_timeout.seconds.ago) }
+    scope :admins, -> { where(arel_table[:alchemy_roles].matches("%admin%")) }
+    scope :logged_in, -> { where("last_request_at > ?", logged_in_timeout.seconds.ago) }
+    scope :logged_out, -> { where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago) }
 
     ROLES = Config.get(:user_roles)
 
     class << self
+      def ransackable_attributes(_auth_object = nil)
+        %w[
+          email
+          firstname
+          lastname
+          login
+        ]
+      end
+
+      alias_method :searchable_alchemy_resource_attributes, :ransackable_attributes
+
+      def ransackable_associations(_auth_object = nil)
+        %w[
+          taggings
+          tags
+        ]
+      end
+
       def human_rolename(role)
         Alchemy.t("user_roles.#{role}")
       end
@@ -43,19 +63,6 @@ module Alchemy
       def logged_in_timeout
         Config.get(:auto_logout_time).minutes.to_i
       end
-
-      # Search users that match query
-      #
-      # Attributes searched are: login, email, firstname, lastname
-      #
-      def search(query)
-        query = "%#{query.downcase}%"
-
-        where arel_table[:login].lower.matches(query)
-          .or arel_table[:email].lower.matches(query)
-          .or arel_table[:firstname].lower.matches(query)
-          .or arel_table[:lastname].lower.matches(query)
-      end
     end
 
     def role_symbols
@@ -67,12 +74,12 @@ module Alchemy
     end
 
     def alchemy_roles
-      read_attribute(:alchemy_roles).split(' ')
+      read_attribute(:alchemy_roles).split(" ")
     end
 
     def alchemy_roles=(roles_string)
       if roles_string.is_a? Array
-        write_attribute(:alchemy_roles, roles_string.join(' '))
+        write_attribute(:alchemy_roles, roles_string.join(" "))
       elsif roles_string.is_a? String
         write_attribute(:alchemy_roles, roles_string)
       end
@@ -84,8 +91,9 @@ module Alchemy
 
     # Returns true if the user ahs admin role
     def is_admin?
-      has_role? 'admin'
+      has_role? "admin"
     end
+
     alias_method :admin?, :is_admin?
 
     # Returns true if the user has the given role.
@@ -105,6 +113,7 @@ module Alchemy
     def pages_locked_by_me
       Page.locked_by(self).order(:updated_at)
     end
+
     alias_method :locked_pages, :pages_locked_by_me
 
     # Returns the firstname and lastname as a string
@@ -118,11 +127,12 @@ module Alchemy
       if lastname.blank? && firstname.blank?
         login
       else
-        options = {:flipped => false}.merge(options)
+        options = { flipped: false }.merge(options)
         fullname = options[:flipped] ? "#{lastname}, #{firstname}" : "#{firstname} #{lastname}"
         fullname.squeeze(" ").strip
       end
     end
+
     alias_method :name, :fullname
     alias_method :alchemy_display_name, :fullname
 
@@ -150,7 +160,7 @@ module Alchemy
     # Delivers a welcome mail depending from user's role.
     #
     def deliver_welcome_mail
-      if has_role?('author') || has_role?('editor') || has_role?('admin')
+      if has_role?("author") || has_role?("editor") || has_role?("admin")
         Notifications.alchemy_user_created(self).deliver_later
       else
         Notifications.member_created(self).deliver_later

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "6.1.0"
+    VERSION = "6.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -19,7 +19,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.