maglevcms 3.0.0.beta3 → 3.0.1

data/config/routes.rb

@@ -1,58 +1,19 @@
 # frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength
 Maglev::Engine.routes.draw do
-  # convenient route to create the site in development mode from the Maglev UI
-  resource :site, only: %i[create], controller: :site if Rails.env.local?
-
   # Editor
   namespace :editor do
-    root to: 'home#index'
-
-    get 'leave', to: 'home#destroy', as: :leave
-
-    resources :assets, only: %i[index create destroy]
-    resources :icons, only: %i[index]
-    resource :link, only: %i[edit update]
-
-    # combobox routes
-    namespace :combobox do
-      resources :pages, only: :index
-      resources :collection_items, only: :index
-    end
-
-    # always keep the scope of the current page and locale in the url
-    scope ':locale/:page_id' do
-      root to: 'home#index', as: :real_root
-
-      resources :pages do
-        resource :clone, controller: :page_clone, only: :create
-      end
-
-      resources :sections do
-        put :sort, on: :collection
-        resources :blocks, controller: :section_blocks do
-          put :sort, on: :collection
-        end
-      end
-
-      resource :style, controller: :style, only: %i[edit update]
-
-      resource :publication, controller: :publication, only: :create
-    end
+    draw 'maglev/editor'
   end
 
-  root to: 'editor/home#index'
-
   # Preview
-  get 'preview/(*path)', to: 'page_preview#index',
-                         defaults: { path: 'index', rendering_mode: :editor },
-                         constraints: Maglev::PreviewConstraint.new,
-                         as: :site_preview
-  post 'preview/(*path)', to: 'page_preview#create', defaults: { path: 'index', rendering_mode: :editor }
+  draw 'maglev/preview'
 
   # Public Assets
-  get 'assets/:id(/:filename)', to: "#{Maglev.uploader_proxy_controller_name}#show",
-                                as: :public_asset
+  draw 'maglev/assets'
+
+  # convenient route to create the site in development mode from the Maglev UI
+  resource :site, only: %i[create], controller: :site if Rails.env.local?
+
+  root to: 'editor/home#index'
 end
-# rubocop:enable Metrics/BlockLength

data/db/migrate/20211013210954_translate_section_content.rb

@@ -1,4 +1,5 @@
 class TranslateSectionContent < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
   def change
     remove_column :maglev_sites, :sections, :jsonb, default: [] if column_exists?(:maglev_sites, :sections)
     remove_column :maglev_pages, :sections, :jsonb, default: [] if column_exists?(:maglev_pages, :sections)

data/db/migrate/20260114112058_add_published_payload_to_pages.rb

@@ -0,0 +1,14 @@
+class AddPublishedPayloadToPages < ActiveRecord::Migration[6.0]
+  include Maglev::Migration
+  def change
+    change_table :maglev_pages do |t|
+      if t.respond_to? :jsonb
+        t.jsonb :published_payload, default: {}
+      elsif mysql?
+        t.json :published_payload # MySQL doesn't support default values for json columns
+      else
+        t.json :published_payload, default: {}
+      end
+    end
+  end
+end

data/exe/tailwind-cli

@@ -8,7 +8,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'tailwindcss-ruby', '4.1.11'
+  gem 'tailwindcss-ruby', '4.1.18'
 end
 
 require 'tailwindcss/ruby'

data/lib/generators/maglev/install_generator.rb

@@ -23,9 +23,11 @@ module Maglev
     def mount_engine
       inject_into_file 'config/routes.rb', before: /^end/ do
         <<-CODE
+  # Mount Maglev engine (mainly used for the content editor)
   mount Maglev::Engine => '/maglev'
-  get '/sitemap', to: 'maglev/sitemap#index', defaults: { format: 'xml' }
-  get '(*path)', to: 'maglev/published_page_preview#index', defaults: { path: 'index' }, constraints: Maglev::PreviewConstraint.new
+
+  # Handle "/:path" + "/sitemap" requests by Maglev engine
+  draw 'maglev/public_preview'
         CODE
       end
     end
@@ -34,13 +36,13 @@ module Maglev
       $stdout.puts <<~INFO
         Done! 🎉
 
-        You can now tweak config/initializers/maglev.rb
-        You can also modify your theme (in app/theme and app/views/theme)
-        and generate new sections with rails g maglev:section.
+        You can now tweak the settings in `config/initializers/maglev.rb`.
+        You can also modify your theme (`app/theme` and `app/views/theme`)
+        and generate new sections with `rails g maglev:section`.
 
-        👉 The next step is to create a site using `rails maglev:create_site`.
+        👉 The next step is to create a site with `rails maglev:create_site`.
 
-        🚨 Don't forget to do it in production as well!
+        🚨 Don't forget to run the last command in production as well!
       INFO
     end
   end

data/lib/generators/maglev/templates/install/config/initializers/maglev.rb

@@ -47,9 +47,10 @@ Maglev.configure do |config|
   # config.is_authenticated = :editor_allowed? # name of any protected method from your Rails application controller
   # config.is_authenticated = ->(site) { current_user&.role == 'editor' }
 
-  # Admin UI authentication (https://docs.maglev.dev/guides/setup-authentication)
-  config.admin_username = Rails.env.production? ? ENV.fetch('MAGLEV_ADMIN_USERNAME') : nil
-  config.admin_password = Rails.env.production? ? ENV.fetch('MAGLEV_ADMIN_PASSWORD') : nil
+  # Base class for Maglev::ApplicationController (inherit auth, layout, etc. from your app).
+  # Set this in an initializer that runs before Maglev controllers are loaded
+  # if you use something other than ApplicationController.
+  # config.parent_controller = 'ApplicationController'
 
   # Uploader engine (:active_storage is the default one)
   # Checkout https://github.com/MarsBased/maglevcms-shrine for an example of a custom uploader
@@ -67,6 +68,12 @@ Maglev.configure do |config|
   #   }
   # }
 
+  # Pagination configuration
+  # config.pagination = {
+  #   pages: -1 # -1 means no pagination
+  #   assets: 16 # number of assets displayed per page in the assets modal
+  # }
+
   # Let your content editors references existing pages of your application but
   # not served/rendered by Maglev.
   # config.static_pages = [

data/lib/maglev/active_storage/serving_blob.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Maglev
+  module ActiveStorage
+    # Since assets are uploaed by editors, we can assume they are always safe to serve.
+    # Wraps ActiveStorage::Blob only for Maglev's proxy: Active Storage maps image/svg+xml to
+    # application/octet-stream globally; we serve SVG as image/svg+xml without changing the host app's config.
+    class ServingBlob < SimpleDelegator
+      def content_type_for_serving
+        return 'image/svg+xml' if svg?
+
+        __getobj__.content_type_for_serving
+      end
+
+      def forced_disposition_for_serving
+        return nil if svg?
+
+        __getobj__.forced_disposition_for_serving
+      end
+
+      private
+
+      def svg?
+        filename.to_s.downcase.end_with?('.svg') ||
+          content_type.to_s == 'image/svg+xml'
+      end
+    end
+  end
+end

data/lib/maglev/active_storage.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'active_storage/serving_blob'
+
 module Maglev
   module ActiveStorage
     extend ActiveSupport::Concern

data/lib/maglev/config.rb

@@ -1,10 +1,29 @@
 # frozen_string_literal: true
 
 module Maglev
+  DEFAULT_PAGINATION = { pages: -1, assets: 16 }.freeze
+
   Config = Struct.new(:primary_color, :title, :favicon, :logo, :back_action,
                       :site_publishable, :uploader, :preview_host, :asset_host, :services,
                       :collections, :is_authenticated, :ui_locale, :default_site_locales,
-                      :static_pages, :reserved_paths,
-                      :admin_username, :admin_password,
-                      :tailwindcss_folders)
+                      :static_pages, :reserved_paths, :parent_controller,
+                      :admin_username, :admin_password, # legacy config
+                      :tailwindcss_folders, :pagination) do
+    # custom setter + helpers for the pagination config
+    def pagination=(value)
+      self[:pagination] = if value.is_a?(Hash)
+                            ::Maglev::DEFAULT_PAGINATION.merge(value)
+                          else
+                            value
+                          end
+    end
+
+    def pagination?(key)
+      self[:pagination][key].present? && self[:pagination][key] != -1
+    end
+
+    def per_page(key)
+      self[:pagination][key]
+    end
+  end
 end

data/lib/maglev/engine.rb

@@ -15,7 +15,13 @@ module Maglev
       g.factory_bot dir: 'spec/factories'
     end
 
+    initializer 'maglev.i18n' do |_app|
+      Rails.application.config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
+    end
+
     initializer 'maglev.theme_reloader' do |app|
+      next unless Maglev.theme_reloader_enabled?
+
       require_relative './theme_filesystem_loader'
       theme_path = Rails.root.join('app/theme')
       theme_reloader = app.config.file_watcher.new([], { theme_path.to_s => ['.yml', 'yml'] }) do
@@ -37,10 +43,6 @@ module Maglev
       end
     end
 
-    initializer 'maglev.i18n' do |_app|
-      Rails.application.config.i18n.load_path += Dir["#{config.root}/config/locales/**/*.yml"]
-    end
-
     def self.importmaps
       @importmaps ||= {
         editor: ::Importmap::Map.new,
@@ -49,13 +51,15 @@ module Maglev
     end
 
     initializer 'maglev.assets' do |app|
-      app.config.assets.paths << Engine.root.join('app/assets/builds')
-      app.config.assets.paths << Engine.root.join('app/components')
-      app.config.assets.paths << Engine.root.join('app/assets/javascripts')
-      app.config.assets.paths << Engine.root.join('vendor/javascript')
+      if app.config.respond_to?(:assets) && app.config.assets.respond_to?(:paths)
+        app.config.assets.paths << Engine.root.join('app/assets/builds')
+        app.config.assets.paths << Engine.root.join('app/components')
+        app.config.assets.paths << Engine.root.join('app/assets/javascripts')
+        app.config.assets.paths << Engine.root.join('vendor/javascript')
 
-      # required by Sprockets (if used by the main app)
-      app.config.assets.precompile += %w[maglev_manifest]
+        # required by Sprockets (if used by the main app)
+        app.config.assets.precompile += %w[maglev_manifest] if defined?(Sprockets)
+      end
     end
 
     initializer 'maglev.importmap', after: 'importmap' do |app|

data/lib/maglev/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Maglev
-  VERSION = '3.0.0.beta3'
+  VERSION = '3.0.1'
 end

data/lib/maglev.rb

@@ -18,7 +18,7 @@ module Maglev
   ServiceContext = Struct.new(:rendering_mode, :controller, :site, keyword_init: true)
 
   class << self
-    attr_accessor :local_themes
+    attr_accessor :local_themes, :theme_reloader_disabled
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def config
@@ -36,11 +36,13 @@ module Maglev
         c.services = {}
         c.default_site_locales = [{ label: 'English', prefix: 'en' }]
         c.is_authenticated = ->(_site) { !Rails.env.production? }
-        c.admin_username = nil
-        c.admin_password = nil
+        c.admin_username = nil # legacy config
+        c.admin_password = nil # legacy config
         c.static_pages = []
         c.reserved_paths = []
+        c.parent_controller = 'ApplicationController'
         c.tailwindcss_folders = []
+        c.pagination = ::Maglev::DEFAULT_PAGINATION.dup
       end
     end
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
@@ -53,6 +55,10 @@ module Maglev
       end
     end
 
+    def parent_controller_class
+      (config.parent_controller.presence || 'ApplicationController').constantize
+    end
+
     def uploader
       case config.uploader
       when Symbol then const_get("::Maglev::#{config.uploader.to_s.classify}")
@@ -78,6 +84,15 @@ module Maglev
       @uuid_as_primary_key = config.options[config.orm][:primary_key_type] == :uuid
     end
 
+    # disable the theme reloader which is required by the Maglev SaaS plugin
+    def disable_theme_reloader
+      @theme_reloader_disabled = true
+    end
+
+    def theme_reloader_enabled?
+      !@theme_reloader_disabled
+    end
+
     def config_klass
       ::Maglev::Config
     end

data/lib/tasks/db_test_all.rake

@@ -0,0 +1,290 @@
+# frozen_string_literal: true
+
+# Database Migration Testing Automation
+#
+# This Rake task automates the process of testing migrations against multiple
+# databases and Rails versions, generating schema files for each combination.
+#
+# Usage:
+#   # Test all databases with all Rails versions
+#   bundle exec rake db:test_all
+#
+#   # Test all databases with current Gemfile
+#   bundle exec rake db:test:all
+#
+#   # Test specific database with current Gemfile
+#   bundle exec rake db:test:pg
+#   bundle exec rake db:test:sqlite
+#   bundle exec rake db:test:mysql
+#   bundle exec rake db:test:mariadb
+#
+#   # Test with specific Rails version
+#   BUNDLE_GEMFILE=Gemfile.rails_7_2 bundle exec rake db:test:all
+#
+# Environment variables:
+#   CONTINUE_ON_ERROR=1  - Continue testing other databases even if one fails
+#   DEBUG=1              - Show detailed error backtraces
+#
+# The task will:
+#   1. Backup schema.rb (PG schema) before switching databases
+#   2. Restore appropriate schema file for each database
+#   3. Run migrations
+#   4. Generate new schema files
+#   5. Save schemas with appropriate prefixes (schema.sqlite.rb, etc.)
+#   6. Run tests
+#   7. Restore schema.rb to PG version (for Git)
+
+require 'fileutils'
+require 'open3'
+
+# rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity, Naming/VariableNumber, Metrics/CyclomaticComplexity
+
+DATABASES = {
+  pg: {
+    env: {
+      MAGLEV_APP_DATABASE_USERNAME: ENV.fetch('MAGLEV_APP_DATABASE_USERNAME', ''),
+      MAGLEV_APP_DATABASE_PASSWORD: ENV.fetch('MAGLEV_APP_DATABASE_PASSWORD', '')
+    },
+    schema_file: 'schema.rb',
+    backup_file: 'schema.pg.rb'
+  },
+  sqlite: {
+    env: { USE_SQLITE: '1' },
+    schema_file: 'schema.sqlite.rb',
+    backup_file: 'schema.pg.rb'
+  },
+  mysql: {
+    env: {
+      USE_MYSQL: '1',
+      MAGLEV_APP_DATABASE_HOST: ENV.fetch('MAGLEV_APP_DATABASE_HOST', '127.0.0.1'),
+      MAGLEV_APP_DATABASE_USERNAME: ENV.fetch('MAGLEV_APP_DATABASE_USERNAME', 'start'),
+      MAGLEV_APP_DATABASE_PASSWORD: ENV.fetch('MAGLEV_APP_DATABASE_PASSWORD', 'start')
+    },
+    schema_file: 'schema.mysql.rb',
+    backup_file: 'schema.pg.rb'
+  },
+  mariadb: {
+    env: {
+      USE_MYSQL: '1',
+      MAGLEV_APP_DATABASE_HOST: ENV.fetch('MAGLEV_APP_DATABASE_HOST', '127.0.0.1'),
+      MAGLEV_APP_DATABASE_PORT: ENV.fetch('MAGLEV_APP_DATABASE_PORT', '3307'),
+      MAGLEV_APP_DATABASE_USERNAME: ENV.fetch('MAGLEV_APP_DATABASE_USERNAME', 'start'),
+      MAGLEV_APP_DATABASE_PASSWORD: ENV.fetch('MAGLEV_APP_DATABASE_PASSWORD', 'start')
+    },
+    schema_file: 'schema.mariadb.rb',
+    backup_file: 'schema.pg.rb'
+  }
+}.freeze
+
+GEMFILES = {
+  Gemfile: 'spec/dummy',
+  "Gemfile.rails_7_2": 'spec/legacy_dummy'
+}.with_indifferent_access.freeze
+
+namespace :db do
+  desc 'Test all databases with all Rails versions'
+  task test_all: :environment do
+    all_passed = true
+
+    GEMFILES.each do |gemfile, dummy_path|
+      next unless File.exist?(gemfile)
+
+      puts "\n#{'=' * 70}"
+      puts "Testing with #{gemfile} (#{dummy_path})"
+      puts '=' * 70
+
+      # Ensure bundle is installed for this Gemfile
+      unless ensure_bundle_installed(gemfile)
+        puts "❌ Failed to install bundle for #{gemfile}"
+        all_passed = false
+        next
+      end
+
+      DATABASES.each_key do |db_name|
+        success = test_database(db_name, gemfile, dummy_path)
+        all_passed = false unless success
+
+        abort "Failed testing #{db_name} with #{gemfile}" if !ENV['CONTINUE_ON_ERROR'] && !success
+      end
+    end
+
+    unless all_passed
+      puts "\n❌ Some tests failed. Use CONTINUE_ON_ERROR=1 to continue despite errors."
+      exit 1
+    end
+
+    puts "\n✅ All tests passed!"
+  end
+
+  namespace :test do
+    DATABASES.each_key do |db_name|
+      desc "Test #{db_name} database with current Gemfile"
+      task db_name.to_sym => :environment do
+        gemfile = File.basename(ENV['BUNDLE_GEMFILE'] || 'Gemfile')
+        dummy_path = GEMFILES[gemfile] || GEMFILES['Gemfile']
+        success = test_database(db_name, gemfile, dummy_path)
+        exit 1 unless success
+      end
+    end
+
+    desc 'Test all databases with current Gemfile'
+    task all: DATABASES.keys.map(&:to_sym) do
+      puts "\n✅ All database tests passed!"
+    end
+  end
+
+  def test_database(db_name, gemfile, dummy_path)
+    puts "\n#{'-' * 70}"
+    puts "Testing #{db_name} with #{gemfile}"
+    puts '-' * 70
+
+    db_config = DATABASES[db_name]
+
+    root_dir = File.expand_path('../..', __dir__)
+
+    db_dir = File.join(root_dir, dummy_path, 'db')
+    schema_rb = File.join(db_dir, 'schema.rb')
+    schema_backup = File.join(db_dir, db_config[:backup_file])
+    schema_target = File.join(db_dir, db_config[:schema_file])
+
+    # Setup environment
+    env = {
+      BUNDLE_GEMFILE: File.join(root_dir, gemfile),
+      RAILS_ENV: 'test'
+    }.merge(db_config[:env].reject { |_k, v| v.blank? })
+
+    begin
+      # Step 1: Backup current schema.rb (the PG schema) before switching databases
+      if File.exist?(schema_rb) && !File.exist?(schema_backup)
+        FileUtils.cp(schema_rb, schema_backup)
+        puts "✓ Backed up schema.rb to #{db_config[:backup_file]}"
+      end
+
+      # Step 2: Restore appropriate schema file
+      if db_name == :pg
+        # For PG, restore from backup if exists, otherwise keep current schema.rb
+        if File.exist?(schema_backup)
+          FileUtils.cp(schema_backup, schema_rb)
+          puts "✓ Restored schema from #{db_config[:backup_file]}"
+        end
+      elsif File.exist?(schema_target)
+        # For other DBs, copy the specific schema file to schema.rb (if it exists)
+        FileUtils.cp(schema_target, schema_rb)
+        puts "✓ Restored schema from #{db_config[:schema_file]}"
+      elsif File.exist?(schema_backup)
+        # Fallback to PG schema if specific schema doesn't exist
+        FileUtils.cp(schema_backup, schema_rb)
+        puts "✓ Restored schema from #{db_config[:backup_file]} (fallback)"
+      end
+
+      # Step 3: Run migrations
+      puts 'Running migrations...'
+      unless run_command('./bin/rails db:migrate', env, root_dir)
+        puts "❌ Migrations failed for #{db_name}"
+        return false
+      end
+
+      # Step 4: Generate schema
+      puts 'Generating schema...'
+      unless run_command('bin/rails db:schema:dump', env, root_dir)
+        puts "❌ Schema generation failed for #{db_name}"
+        return false
+      end
+
+      # Step 5: Save generated schema to the appropriate file
+      if db_name == :pg
+        # For PG, keep as schema.rb (the committed version) and also backup to schema.pg.rb
+        if File.exist?(schema_rb)
+          FileUtils.cp(schema_rb, schema_backup)
+          puts "✓ Saved schema to #{db_config[:backup_file]}"
+        end
+      elsif File.exist?(schema_rb)
+        # For other DBs, copy generated schema.rb to the specific schema file
+        FileUtils.cp(schema_rb, schema_target)
+        puts "✓ Saved schema to #{db_config[:schema_file]}"
+      end
+
+      # Step 6: Run tests
+      puts 'Running tests...'
+      unless run_command('bundle exec rspec', env, root_dir)
+        puts "❌ Tests failed for #{db_name}"
+        return false
+      end
+
+      puts "✅ #{db_name} tests passed!"
+      true
+    rescue StandardError => e
+      puts "❌ Error testing #{db_name}: #{e.message}"
+      puts e.backtrace.first(5).join("\n") if ENV['DEBUG']
+      false
+    ensure
+      # Step 7: Restore schema.rb from PG backup (for Git)
+      if db_name != 'pg' && File.exist?(schema_backup)
+        FileUtils.cp(schema_backup, schema_rb)
+        puts '✓ Restored schema.rb from PG backup (for Git)'
+      end
+    end
+  end
+
+  def ensure_bundle_installed(gemfile)
+    root_dir = File.expand_path('../..', __dir__)
+    gemfile_path = File.join(root_dir, gemfile)
+
+    env = {
+      BUNDLE_GEMFILE: gemfile_path
+    }
+    full_env = ENV.to_h.merge(env).deep_stringify_keys
+
+    puts "Checking bundle for #{gemfile}..."
+    stdout, stderr, status = Open3.capture3(full_env, 'bundle check', chdir: root_dir)
+
+    if status.success?
+      puts "✓ Bundle is up to date for #{gemfile}"
+      true
+    else
+      puts "Installing bundle for #{gemfile}..."
+      stdout, stderr, status = Open3.capture3(full_env, 'bundle install', chdir: root_dir)
+
+      if status.success?
+        puts "✓ Bundle installed for #{gemfile}"
+        true
+      else
+        puts "❌ Failed to install bundle for #{gemfile}"
+        puts stderr unless stderr.empty?
+        puts stdout unless stdout.empty?
+        false
+      end
+    end
+  end
+
+  def run_command(command, env, cwd)
+    full_env = ENV.to_h.merge(env).deep_stringify_keys
+
+    stdout, stderr, status = Open3.capture3(full_env, command, chdir: cwd)
+
+    unless status.success?
+      puts "\n#{'=' * 70}"
+      puts "Command failed: #{command}"
+      puts "Working directory: #{cwd}"
+      puts('=' * 70)
+
+      unless stdout.empty?
+        puts "\nSTDOUT:"
+        puts stdout
+      end
+
+      unless stderr.empty?
+        puts "\nSTDERR:"
+        puts stderr
+      end
+
+      puts "\nExit status: #{status.exitstatus}"
+      puts "#{'=' * 70}\n"
+      return false
+    end
+
+    true
+  end
+end
+
+# rubocop:enable Metrics/MethodLength, Metrics/AbcSize, Metrics/PerceivedComplexity, Naming/VariableNumber, Metrics/CyclomaticComplexity