Merge pull request #225 from AlchemyCMS/alchemy-8

Add support for Alchemy 8.0

Author: tvdeyen

.github/workflows/ci.yml

@@ -9,32 +9,17 @@ jobs:
       fail-fast: false
       matrix:
         alchemy_branch:
-          - "7.1-stable"
-          - "7.2-stable"
-          - "7.3-stable"
-          - "7.4-stable"
+          - "main"
         ruby:
           - "3.2"
           - "3.3"
           - "3.4"
         rails:
-          - "7.1"
           - "7.2"
         database:
           - mysql
           - postgresql
           - sqlite
-        exclude:
-          - alchemy_branch: "7.1-stable"
-            rails: "7.2"
-          - alchemy_branch: "7.2-stable"
-            rails: "7.2"
-          - alchemy_branch: "7.1-stable"
-            ruby: "3.4"
-          - alchemy_branch: "7.2-stable"
-            ruby: "3.4"
-          - rails: "7.1"
-            ruby: "3.4"
 
     env:
       DB: ${{ matrix.database }}
@@ -107,8 +92,6 @@ jobs:
 
   Lint:
     runs-on: ubuntu-22.04
-    env:
-      ALCHEMY_BRANCH: 7.3-stable
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "7.4-stable")
+alchemy_branch = ENV.fetch("ALCHEMY_BRANCH", "main")
 gem "alchemy_cms", github: "AlchemyCMS/alchemy_cms", branch: alchemy_branch
 
 rails_version = ENV.fetch("RAILS_VERSION", "7.2")
@@ -22,3 +22,5 @@ end
 gem "github_fast_changelog", require: false
 
 gem "standardrb", "~> 1.0", require: false
+
+gem "propshaft", "~> 1.1"

alchemy-devise.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "CHANGELOG.md", "README.md"]
 
-  s.add_dependency "alchemy_cms", ["~> 7.0"]
+  s.add_dependency "alchemy_cms", [">= 8.0.0.a", "< 9.0"]
   s.add_dependency "devise", ["~> 4.9"]
 
   s.add_development_dependency "capybara"

app/mailers/alchemy/notifications.rb

@@ -1,6 +1,6 @@
 module Alchemy
   class Notifications < ActionMailer::Base
-    default(from: Config.get(:mailer)["mail_from"])
+    default(from: Alchemy.config.get(:mailer)["mail_from"])
 
     def member_created(user)
       @user = user

app/models/alchemy/user.rb

@@ -35,7 +35,7 @@ class User < ActiveRecord::Base
     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)
+    ROLES = Alchemy.config.user_roles
 
     class << self
       def ransackable_attributes(_auth_object = nil)
@@ -65,7 +65,7 @@ def human_rolename(role)
       end
 
       def logged_in_timeout
-        Config.get(:auto_logout_time).minutes.to_i
+        Alchemy.config.get(:auto_logout_time).minutes.to_i
       end
     end
 

app/views/alchemy/admin/users/index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= content_for :toolbar do %>
-  <%= toolbar_button(
+  <%= render Alchemy::Admin::ToolbarButton.new(
     icon: :plus,
     label: Alchemy.t(:create_user),
     url: alchemy.new_admin_user_path,

config/initializers/alchemy.rb

@@ -3,16 +3,6 @@
 Rails.application.config.to_prepare do
   require "alchemy/devise/ability"
 
-  alchemy_7_4 = Gem::Version.new("7.4.0.a")
-
-  icon = if Alchemy.gem_version.between? Gem::Version.new("7.1.0-b1"), alchemy_7_4
-    "group-line"
-  elsif Alchemy.gem_version > alchemy_7_4
-    "group"
-  else
-    "users"
-  end
-
   Alchemy.register_ability(Alchemy::Devise::Ability)
 
   Alchemy::Modules.register_module({
@@ -23,7 +13,7 @@
       name: "modules.users",
       controller: "/alchemy/admin/users",
       action: "index",
-      icon: icon
+      icon: "group"
     }
   })
 

lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "7.4.1"
+    VERSION = "8.0.0.a"
   end
 end

lib/generators/alchemy/devise/install/templates/devise.rb.tt

@@ -24,7 +24,7 @@ Devise.setup do |config|
   # Configure the e-mail address which will be shown in Devise::Mailer,
   # note that it will be overwritten if you use your own mailer class
   # with default "from" parameter.
-  config.mailer_sender = Alchemy::Config.get(:mailer)['mail_from']
+  config.mailer_sender = Alchemy.config.mailer.mail_from
 
   # Configure the class responsible to send e-mails.
   config.mailer = "Alchemy::Notifications"
@@ -188,7 +188,7 @@ Devise.setup do |config|
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
-  config.timeout_in = Rails.env.development? ? nil : Alchemy::Config.get(:auto_logout_time).minutes
+  config.timeout_in = Rails.env.development? ? nil : Alchemy.config.auto_logout_time.minutes
 
   # ==> Configuration for :lockable
   # Defines which strategy will be used to lock an account.