alchemy-devise 6.0.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac9f1d9cb0e0ae6c8785fae335c084f35bc99fd57f0f0ecb8fbb69af31a0acf8
-  data.tar.gz: 7a25e4e8233588c7daaeded0550cfe16c01d529f32e8f20c5319afd62a8d2f3a
+  metadata.gz: 037e618a3f66b84599f6e3dd9c9ee7ac2b5eccafad82df24e7a2deac4e277cfc
+  data.tar.gz: 8bc2d3e03a28e5a570aace97412aae02055f6ba2fdfa3730598749081bcac8d8
 SHA512:
-  metadata.gz: aef2756070f8c8316ee71ff1d14c3c01f9d00864f4f57178bbf4261552cf69e95c9e3e453a4ae2841557a2c8633bdaf2979d9eaf9149bbaac341098be3e07a92
-  data.tar.gz: 2dc752cea79c75090d0bea21c409eba342e135a08a9f0d17bd547e12fdbc557b1e68b27379fd41130294f1bc83df738da13a9a02390a4b6d8d51eaf77ee87380
+  metadata.gz: c577818f7db36c4a5bd4147f878ef8a63d511fdd42573e97b54212742e6aaafe960ad039b8cfb7ce90683f240c385508b881d070240c70e1bb1704b7ad754725
+  data.tar.gz: db8f25a255b6b700b414d7ca0b154f3fd35de04941e5e286cfee2069c2630670532aab28e56d6a925427fe3ce8f0d55ba5faa265d7815e5a00b989e98e933fd6

data/CHANGELOG.md

@@ -0,0 +1,93 @@
+# 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))
+- Update gemspec to Alchemy below 7.0 [#156](https://github.com/AlchemyCMS/alchemy-devise/pull/156) ([kulturbande](https://github.com/kulturbande))
+- use code climate gh action [#147](https://github.com/AlchemyCMS/alchemy-devise/pull/147) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade rspec-rails to version 5.1.2 [#138](https://github.com/AlchemyCMS/alchemy-devise/pull/138) ([depfu](https://github.com/apps/depfu))
+
+## 6.0.0 (2022-04-24)
+
+- Alchemy 6 compatibility [#137](https://github.com/AlchemyCMS/alchemy-devise/pull/137) ([tvdeyen](https://github.com/tvdeyen))
+- Use minor versions for Ruby in CI [#131](https://github.com/AlchemyCMS/alchemy-devise/pull/131) ([mamhoff](https://github.com/mamhoff))
+- Migrate to GH actions as CI [#122](https://github.com/AlchemyCMS/alchemy-devise/pull/122) ([tvdeyen](https://github.com/tvdeyen))
+- Allow Alchemy 6 [#119](https://github.com/AlchemyCMS/alchemy-devise/pull/119) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.1.0 (2021-01-13)
+
+- Remove support for old Alchemy versions [#118](https://github.com/AlchemyCMS/alchemy-devise/pull/118) ([tvdeyen](https://github.com/tvdeyen))
+- Admin users list fixes [#117](https://github.com/AlchemyCMS/alchemy-devise/pull/117) ([tvdeyen](https://github.com/tvdeyen))
+- Use Alchemy::User as class in ability [#116](https://github.com/AlchemyCMS/alchemy-devise/pull/116) ([tvdeyen](https://github.com/tvdeyen))
+- Fixate sassc gem to 2.1.0 [#115](https://github.com/AlchemyCMS/alchemy-devise/pull/115) ([tvdeyen](https://github.com/tvdeyen))
+- Use content_for :toolbar instead of toolbar [#114](https://github.com/AlchemyCMS/alchemy-devise/pull/114) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.0.1 (2020-11-22)
+
+- Require alchemy/version in controllers using ssl_required [#113](https://github.com/AlchemyCMS/alchemy-devise/pull/113) ([tvdeyen](https://github.com/tvdeyen))
+- Use absolute paths in Alchemy module definition [#106](https://github.com/AlchemyCMS/alchemy-devise/pull/106) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.6.0 (2020-10-16)
+
+- Remove require_ssl from User Sessions Controller for Alchemy 5+ [#102](https://github.com/AlchemyCMS/alchemy-devise/pull/102) ([mamhoff](https://github.com/mamhoff))
+
+## 4.5.0 (2020-04-04)
+
+- Remove alchemy controller requests test helper [#100](https://github.com/AlchemyCMS/alchemy-devise/pull/100) ([tvdeyen](https://github.com/tvdeyen))
+- Move session controllers into admin module namespace [#97](https://github.com/AlchemyCMS/alchemy-devise/pull/97) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.4.0 (2019-01-09)
+
+- Set Alchemy.logout_method to Devise.sign_out_via [#96](https://github.com/AlchemyCMS/alchemy-devise/pull/96) ([tvdeyen](https://github.com/tvdeyen))
+- Allow Alchemy 5.0 [#95](https://github.com/AlchemyCMS/alchemy-devise/pull/95) ([tvdeyen](https://github.com/tvdeyen))
+- Remove gender [#94](https://github.com/AlchemyCMS/alchemy-devise/pull/94) ([rmparr](https://github.com/rmparr))
+
+## 4.3.1 (2019-11-28)
+
+- add config/manifest.js to dummy app [#93](https://github.com/AlchemyCMS/alchemy-devise/pull/93) ([rmparr](https://github.com/rmparr))
+- Use at least Devise 4.7.1 [#90](https://github.com/AlchemyCMS/alchemy-devise/pull/90) ([tvdeyen](https://github.com/tvdeyen))
+- Rename Alchemy::BaseController extension constant [#87](https://github.com/AlchemyCMS/alchemy-devise/pull/87) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.3.0 (2019-08-23)
+
+- Move test dependencies [#86](https://github.com/AlchemyCMS/alchemy-devise/pull/86) ([tvdeyen](https://github.com/tvdeyen))
+- Test with Rails 6 [#85](https://github.com/AlchemyCMS/alchemy-devise/pull/85) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.2.1 (2019-05-15)
+
+- Remove test files from built Ruby gem [#82](https://github.com/AlchemyCMS/alchemy-devise/pull/82) ([tvdeyen](https://github.com/tvdeyen))
+- Run CSRF protection before all other controller filters [#81](https://github.com/AlchemyCMS/alchemy-devise/pull/81) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.2.0 (2019-04-01)
+
+- Do not store screen size at login [#78](https://github.com/AlchemyCMS/alchemy-devise/pull/78) ([tvdeyen](https://github.com/tvdeyen))
+- Security: Use at least Devise 4.6 [#78](https://github.com/AlchemyCMS/alchemy-devise/pull/78) ([tvdeyen](https://github.com/tvdeyen))
+- Fix dummy app rails version [#76](https://github.com/AlchemyCMS/alchemy-devise/pull/76) ([tvdeyen](https://github.com/tvdeyen))
+- Fix translation key on user admin page [#75](https://github.com/AlchemyCMS/alchemy-devise/pull/75) ([mamhoff](https://github.com/mamhoff))
+
+
+## 4.1.0 (2018-09-22)
+
+- Only allow Alchemy > 4.1 [#72](https://github.com/AlchemyCMS/alchemy-devise/pull/72) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade dummy app rails version to 5.2.1 [#71](https://github.com/AlchemyCMS/alchemy-devise/pull/71) ([depfu](https://github.com/marketplace/depfu))
+- Build for Rails 5.1 [#70](https://github.com/AlchemyCMS/alchemy-devise/pull/70) ([tvdeyen](https://github.com/tvdeyen))
+- Fixes localization specs [#69](https://github.com/AlchemyCMS/alchemy-devise/pull/69) ([tvdeyen](https://github.com/tvdeyen))
+- Removes translations [#68](https://github.com/AlchemyCMS/alchemy-devise/pull/68) ([tvdeyen](https://github.com/tvdeyen))
+- New login screen that fit the new color theme [#67](https://github.com/AlchemyCMS/alchemy-devise/pull/67) ([tvdeyen](https://github.com/tvdeyen))
+- Use Alchemy's Taggable module [#66](https://github.com/AlchemyCMS/alchemy-devise/pull/66) ([tvdeyen](https://github.com/tvdeyen))
+- Upgrade pg to version 1.0.0 [#65](https://github.com/AlchemyCMS/alchemy-devise/pull/65) ([depfu](https://github.com/marketplace/depfu))
+- FontAwesome icons [#64](https://github.com/AlchemyCMS/alchemy-devise/pull/64) ([tvdeyen](https://github.com/tvdeyen))
+- Fix postgresql builds [#63](https://github.com/AlchemyCMS/alchemy-devise/pull/63) ([tvdeyen](https://github.com/tvdeyen))
+
+## 4.0.0 (2017-11-06)
+
+- Update dummy app layout for Alchemy 4.0 [#62](https://github.com/AlchemyCMS/alchemy-devise/pull/62) ([tvdeyen](https://github.com/tvdeyen))
+- Alchemy 4.0 [#61](https://github.com/AlchemyCMS/alchemy-devise/pull/61) ([tvdeyen](https://github.com/tvdeyen))
+- Send code coverage results after successful build [#60](https://github.com/AlchemyCMS/alchemy-devise/pull/60) ([tvdeyen](https://github.com/tvdeyen))
+- Allow to configure devise modules [#59](https://github.com/AlchemyCMS/alchemy-devise/pull/59) ([tvdeyen](https://github.com/tvdeyen))
+- Rails 5, Alchemy 4, Devise 4 [#58](https://github.com/AlchemyCMS/alchemy-devise/pull/58) ([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.0.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.0.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2023-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 6.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -141,9 +141,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - app/assets/stylesheets/alchemy-devise.scss
 - app/assets/stylesheets/alchemy-devise/login.scss
 - app/assets/stylesheets/alchemy-devise/users.scss
@@ -188,7 +188,7 @@ files:
 - lib/alchemy/devise/version.rb
 - lib/generators/alchemy/devise/install/install_generator.rb
 - lib/generators/alchemy/devise/install/templates/devise.rb.tt
-homepage: http://alchemy-cms.com
+homepage: https://alchemy-cms.com
 licenses: []
 metadata: {}
 post_install_message: |+
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.

data/Rakefile

@@ -1,64 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AlchemyDevise'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('app/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => ['alchemy:spec:prepare', :spec]
-
-Bundler::GemHelper.install_tasks
-
-namespace :alchemy do
-  namespace :spec do
-    desc "Prepares database for testing Alchemy"
-    task :prepare do
-      system <<-BASH
-cd spec/dummy
-export RAILS_ENV=test
-bin/rake railties:install:migrations
-bin/rake db:drop db:create db:migrate
-bin/rails g alchemy:install --force --auto-accept
-bin/rails g alchemy:devise:install --force
-cd -
-BASH
-    end
-  end
-
-  namespace :changelog do
-    desc "Update changelog"
-    task :update do
-      original_file = './CHANGELOG.md'
-      new_file = original_file + '.new'
-      backup = original_file + '.old'
-      changes = `git rev-list v#{ENV['PREVIOUS_VERSION']}...main | bundle exec github_fast_changelog AlchemyCMS/alchemy-devise`
-      File.open(new_file, 'w') do |fo|
-        fo.puts changes
-        File.foreach(original_file) do |li|
-          fo.puts li
-        end
-        fo.puts ""
-      end
-      File.rename(original_file, backup)
-      File.rename(new_file, original_file)
-      File.delete(backup)
-    end
-  end
-end