panda-cms 0.10.0 → 0.10.2

data/lib/panda/cms/engine.rb

@@ -9,243 +9,55 @@ require "panda/cms/railtie"
 
 require "invisible_captcha"
 
+# Load engine configuration modules
+require_relative "engine/autoload_config"
+require_relative "engine/asset_config"
+require_relative "engine/route_config"
+require_relative "engine/core_config"
+require_relative "engine/helper_config"
+require_relative "engine/backtrace_config"
+
 module Panda
   module CMS
     class Engine < ::Rails::Engine
       isolate_namespace Panda::CMS
 
-      # Add services directory to autoload paths
-      config.autoload_paths += %W[
-        #{root}/app/services
-      ]
+      # Include shared configuration modules from panda-core
+      include Panda::Core::Shared::InflectionsConfig
+      include Panda::Core::Shared::GeneratorConfig
+
+      # Include CMS-specific configuration modules
+      include AutoloadConfig
+      include AssetConfig
+      include RouteConfig
+      include CoreConfig
+      include HelperConfig
+      include BacktraceConfig
 
       # Session configuration is left to the consuming application
       # The CMS engine does not impose session store requirements
 
-      config.to_prepare do
-        ApplicationController.helper(::ApplicationHelper)
-        ApplicationController.helper(Panda::CMS::AssetHelper)
-      end
-
-      # Set our generators
-      config.generators do |g|
-        g.orm :active_record, primary_key_type: :uuid
-        g.test_framework :rspec, fixture: true
-        g.fixture_replacement nil
-        g.view_specs false
-        g.templates.unshift File.expand_path("../templates", __dir__)
-      end
-
-      # Make files in public available to the main app (e.g. /panda_cms-assets/favicon.ico)
-      config.middleware.use Rack::Static,
-        urls: ["/panda-cms-assets"],
-        root: Panda::CMS::Engine.root.join("public")
-
-      # Make JavaScript files available for importmap
-      # Serve from app/javascript with proper MIME types
-      config.middleware.use Rack::Static,
-        urls: ["/panda/cms"],
-        root: Panda::CMS::Engine.root.join("app/javascript"),
-        header_rules: [
-          [:all, {"Cache-Control" => Rails.env.development? ? "no-cache, no-store, must-revalidate" : "public, max-age=31536000",
-                  "Content-Type" => "text/javascript; charset=utf-8"}]
-        ]
-
       # Custom error handling
       # config.exceptions_app = Panda::CMS::ExceptionsApp.new(exceptions_app: routes)
 
-      initializer "panda.cms.assets" do |app|
-        if Rails.configuration.respond_to?(:assets)
-          # Add JavaScript paths
-          app.config.assets.paths << root.join("app/javascript")
-          app.config.assets.paths << root.join("app/javascript/panda")
-          app.config.assets.paths << root.join("app/javascript/panda/cms")
-          app.config.assets.paths << root.join("app/javascript/panda/cms/controllers")
-
-          # Make sure these files are precompiled
-          app.config.assets.precompile += %w[
-            panda_cms_manifest.js
-            panda/cms/controllers/**/*.js
-            panda/cms/application_panda_cms.js
-          ]
-        end
-      end
-
-      # Add importmap paths from the engine
-      initializer "panda.cms.importmap", before: "importmap" do |app|
-        if app.config.respond_to?(:importmap)
-          # Create a new array if frozen
-          app.config.importmap.paths = app.config.importmap.paths.dup if app.config.importmap.paths.frozen?
-
-          # Add our paths
-          app.config.importmap.paths << root.join("config/importmap.rb")
-
-          # Handle cache sweepers similarly
-          if app.config.importmap.cache_sweepers.frozen?
-            app.config.importmap.cache_sweepers = app.config.importmap.cache_sweepers.dup
-          end
-          app.config.importmap.cache_sweepers << root.join("app/javascript")
-        end
-      end
-
-      # Auto-mount CMS routes
-      config.after_initialize do |app|
-        # Append routes to the routes file
-        app.routes.append do
-          mount Panda::CMS::Engine => "/", :as => "panda_cms"
-          post "/_forms/:id", to: "panda/cms/form_submissions#create", as: :panda_cms_form_submit
-          get "/_maintenance", to: "panda/cms/errors#error_503", as: :panda_cms_maintenance
-
-          # Catch-all route for CMS pages, but exclude admin paths and assets
-          admin_path = Panda::Core.config.admin_path.delete_prefix("/")
-          constraints = ->(request) {
-            !request.path.start_with?("/#{admin_path}") &&
-              !request.path.start_with?("/panda-cms-assets/")
-          }
-          get "/*path", to: "panda/cms/pages#show", as: :panda_cms_page, constraints: constraints
-
-          root to: "panda/cms/pages#root"
-        end
-      end
-
-      initializer "#{engine_name}.backtrace_cleaner" do |_app|
-        engine_root_regex = Regexp.escape(root.to_s + File::SEPARATOR)
-
-        # Clean those ERB lines, we don't need the internal autogenerated
-        # ERB method, what we do need (line number in ERB file) is already there
-        Rails.backtrace_cleaner.add_filter do |line|
-          line.sub(/(\.erb:\d+):in `__.*$/, '\\1')
-        end
-
-        # Remove our own engine's path prefix, even if it's
-        # being used from a local path rather than the gem directory.
-        Rails.backtrace_cleaner.add_filter do |line|
-          line.sub(/^#{engine_root_regex}/, "#{engine_name} ")
-        end
-
-        # Keep Umlaut's own stacktrace in the backtrace -- we have to remove Rails
-        # silencers and re-add them how we want.
-        Rails.backtrace_cleaner.remove_silencers!
+      # Authentication is now handled by Panda::Core::Engine
 
-        # Silence what Rails silenced, UNLESS it looks like
-        # it's from Umlaut engine
-        Rails.backtrace_cleaner.add_silencer do |line|
-          (line !~ Rails::BacktraceCleaner::APP_DIRS_PATTERN) &&
-            (line !~ /^#{engine_root_regex}/) &&
-            (line !~ /^#{engine_name} /)
+      # Load the engine's importmap
+      # This keeps the engine's JavaScript separate from the app's importmap
+      initializer "panda_cms.importmap", before: "importmap" do |app|
+        Panda::CMS.importmap = Importmap::Map.new.tap do |map|
+          map.draw(Panda::CMS::Engine.root.join("config/importmap.rb"))
         end
       end
 
-      # Set up ViewComponent
-      initializer "panda.cms.view_component" do |app|
-        app.config.view_component.preview_paths ||= []
-        app.config.view_component.preview_paths << root.join("spec/components/previews")
-        app.config.view_component.generate.sidecar = true
-        app.config.view_component.generate.preview = true
-
-        # Add preview directories to autoload paths in development
-        if Rails.env.development?
-          # Handle frozen autoload_paths array
-          if app.config.autoload_paths.frozen?
-            app.config.autoload_paths = app.config.autoload_paths.dup
-          end
-          app.config.autoload_paths << root.join("spec/components/previews")
-        end
-      end
-
-      # Authentication is now handled by Panda::Core::Engine
-
-      # Configure Core for CMS (runs before app initializers so apps can override)
-      initializer "panda.cms.configure_core", before: :load_config_initializers do |app|
-        Panda::Core.configure do |config|
-          # Core now provides the admin interface foundation
-          # Apps using CMS can customize login_logo_path, login_page_title, etc. in their own initializers
-
-          # Register CMS navigation items
-          config.admin_navigation_items = ->(user) {
-            items = []
-
-            # Dashboard
-            items << {
-              path: "#{config.admin_path}/cms",
-              label: "Dashboard",
-              icon: "fa-solid fa-house"
-            }
-
-            # Pages
-            items << {
-              path: "#{config.admin_path}/cms/pages",
-              label: "Pages",
-              icon: "fa-solid fa-file"
-            }
-
-            # Collections (if enabled)
-            if Panda::CMS::Features.enabled?(:collections)
-              items << {
-                path: "#{config.admin_path}/cms/collections",
-                label: "Collections",
-                icon: "fa-solid fa-table-cells"
-              }
-            end
-
-            # Posts
-            items << {
-              path: "#{config.admin_path}/cms/posts",
-              label: "Posts",
-              icon: "fa-solid fa-newspaper"
-            }
-
-            # Forms
-            items << {
-              path: "#{config.admin_path}/cms/forms",
-              label: "Forms",
-              icon: "fa-solid fa-inbox"
-            }
-
-            # Files
-            items << {
-              path: "#{config.admin_path}/cms/files",
-              label: "Files",
-              icon: "fa-solid fa-image"
-            }
-
-            # Menus
-            items << {
-              path: "#{config.admin_path}/cms/menus",
-              label: "Menus",
-              icon: "fa-solid fa-bars"
-            }
-
-            # Settings
-            items << {
-              path: "#{config.admin_path}/cms/settings",
-              label: "Settings",
-              icon: "fa-solid fa-gear"
-            }
-
-            items
-          }
-
-          # Redirect to CMS dashboard after login
-          # Apps can override this if they want different behavior
-          config.dashboard_redirect_path = -> { "#{Panda::Core.config.admin_path}/cms" }
-
-          # Customize initial breadcrumb
-          config.initial_admin_breadcrumb = ->(controller) {
-            # Use CMS dashboard path - just use the string path
-            ["Admin", "#{config.admin_path}/cms"]
-          }
-
-          # Dashboard widgets
-          config.admin_dashboard_widgets = ->(user) {
-            widgets = []
-
-            # TODO: Add CMS statistics widgets when StatisticsComponent is implemented
-            # This was removed along with Pro code migration
-
-            widgets
-          }
-        end
+      # Static asset middleware for serving public files
+      # JavaScript serving is handled by Panda::Core::ModuleRegistry::JavaScriptMiddleware
+      initializer "panda.cms.static_assets" do |app|
+        # Serve public assets (CSS, images, etc.)
+        # JavaScript is served by ModuleRegistry's JavaScriptMiddleware in panda-core
+        app.config.middleware.use Rack::Static,
+          urls: ["/panda-cms-assets"],
+          root: Panda::CMS::Engine.root.join("public")
       end
     end
 
@@ -254,3 +66,14 @@ module Panda
     class BlockError < StandardError; end
   end
 end
+
+# Register CMS module with ModuleRegistry for JavaScript serving
+Panda::Core::ModuleRegistry.register(
+  gem_name: "panda-cms",
+  engine: "Panda::CMS::Engine",
+  paths: {
+    views: "app/views/panda/cms/**/*.erb",
+    components: "app/components/panda/cms/**/*.rb"
+    # JavaScript paths are auto-discovered from config/importmap.rb
+  }
+)

data/lib/panda/cms.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require "panda/cms/engine"
+
+module Panda
+  module CMS
+    # Store the engine's importmap separately from the app's
+    mattr_accessor :importmap
+  end
+end

data/lib/panda-cms/version.rb

@@ -2,6 +2,6 @@
 
 module Panda
   module CMS
-    VERSION = "0.10.0"
+    VERSION = "0.10.2"
   end
 end

data/lib/panda-cms.rb

@@ -3,13 +3,12 @@
 require "rubygems"
 require "panda/core"
 require "panda/cms/railtie"
-require "view_component"
 
 module Panda
   module CMS
     class Configuration
       attr_accessor :title, :require_login_to_view, :authentication,
-        :posts, :url, :instagram, :analytics
+        :posts, :url, :instagram, :analytics, :performance
 
       def initialize
         @title = "Demo Site"
@@ -28,6 +27,21 @@ module Panda
             tracking_id: nil
           }
         }
+        @performance = {
+          http_caching: {
+            enabled: true,
+            public: true
+          },
+          fragment_caching: {
+            enabled: true,
+            expires_in: 1.hour
+          },
+          cache_store: {
+            type: :memory_store, # :memory_store, :redis_cache_store, :file_store
+            redis_url: ENV.fetch("REDIS_URL", "redis://localhost:6379/0"),
+            namespace: "panda_cms"
+          }
+        }
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda-cms
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Otaina Limited
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
@@ -248,20 +248,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: view_component
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 email:
 - james@otaina.co.uk
 executables: []
@@ -302,28 +288,31 @@ files:
 - app/helpers/panda/cms/admin/posts_helper.rb
 - app/helpers/panda/cms/application_helper.rb
 - app/helpers/panda/cms/asset_helper.rb
+- app/helpers/panda/cms/forms_helper.rb
 - app/helpers/panda/cms/pages_helper.rb
 - app/helpers/panda/cms/posts_helper.rb
+- app/helpers/panda/cms/seo_helper.rb
 - app/helpers/panda/cms/theme_helper.rb
 - app/javascript/panda/cms/@editorjs--editorjs.js
 - app/javascript/panda/cms/@hotwired--stimulus.js
 - app/javascript/panda/cms/@hotwired--turbo.js
 - app/javascript/panda/cms/@rails--actioncable--src.js
-- app/javascript/panda/cms/application_panda_cms.js
+- app/javascript/panda/cms/application.js
 - app/javascript/panda/cms/controllers/code_editor_controller.js
 - app/javascript/panda/cms/controllers/dashboard_controller.js
 - app/javascript/panda/cms/controllers/editor_form_controller.js
 - app/javascript/panda/cms/controllers/editor_iframe_controller.js
 - app/javascript/panda/cms/controllers/file_gallery_controller.js
+- app/javascript/panda/cms/controllers/file_upload_controller.js
 - app/javascript/panda/cms/controllers/index.js
 - app/javascript/panda/cms/controllers/inline_code_editor_controller.js
 - app/javascript/panda/cms/controllers/menu_form_controller.js
 - app/javascript/panda/cms/controllers/nested_form_controller.js
+- app/javascript/panda/cms/controllers/page_form_controller.js
 - app/javascript/panda/cms/controllers/slug_controller.js
 - app/javascript/panda/cms/controllers/tree_controller.js
 - app/javascript/panda/cms/stimulus-loading.js
 - app/javascript/panda/cms/tailwindcss-stimulus-components.js
-- app/javascript/panda_cms/stimulus-loading.js
 - app/jobs/panda/cms/application_job.rb
 - app/jobs/panda/cms/record_visit_job.rb
 - app/mailers/panda/cms/application_mailer.rb
@@ -375,11 +364,10 @@ files:
 - app/views/panda/cms/form_mailer/notification_email.html.erb
 - app/views/panda/cms/shared/_editor.html.erb
 - app/views/panda/cms/shared/_favicons.html.erb
-- app/views/panda/cms/shared/_importmap.html.erb
 - app/views/shared/_footer.html.erb
 - app/views/shared/_header.html.erb
+- config/brakeman.ignore
 - config/importmap.rb
-- config/initializers/inflections.rb
 - config/initializers/panda/cms.rb
 - config/initializers/panda/cms/form_errors.rb
 - config/initializers/panda/cms/healthcheck_log_silencer.rb.disabled
@@ -437,6 +425,10 @@ files:
 - db/migrate/20251104172242_add_page_type_to_panda_cms_pages.rb
 - db/migrate/20251104172638_set_page_types_for_existing_pages.rb
 - db/migrate/20251105000001_add_pending_review_status_to_pages_and_posts.panda_cms.rb
+- db/migrate/20251109131150_add_seo_fields_to_pages.rb
+- db/migrate/20251109131205_add_seo_fields_to_posts.rb
+- db/migrate/20251110114258_add_spam_tracking_to_form_submissions.rb
+- db/migrate/20251110122812_add_performance_indexes_to_pages_and_redirects.rb
 - db/migrate/migrate
 - db/seeds.rb
 - lib/generators/panda/cms/install_generator.rb
@@ -448,11 +440,17 @@ files:
 - lib/panda/cms/debug.rb
 - lib/panda/cms/demo_site_generator.rb
 - lib/panda/cms/engine.rb
+- lib/panda/cms/engine/asset_config.rb
+- lib/panda/cms/engine/autoload_config.rb
+- lib/panda/cms/engine/backtrace_config.rb
+- lib/panda/cms/engine/core_config.rb
+- lib/panda/cms/engine/helper_config.rb
+- lib/panda/cms/engine/route_config.rb
+- lib/panda/cms/engine/view_component_config.rb
 - lib/panda/cms/exceptions_app.rb
 - lib/panda/cms/features.rb
 - lib/panda/cms/railtie.rb
 - lib/panda/cms/slug.rb
-- lib/tasks/assets.rake
 - lib/tasks/panda/cms/install.rake
 - lib/tasks/panda/cms/migrations.rake
 - lib/tasks/panda/social/instagram.rake

data/app/javascript/panda_cms/stimulus-loading.js

@@ -1,39 +0,0 @@
-// Stimulus loading utilities for Panda CMS
-// This provides the loading functionality that would normally come from stimulus-rails
-
-import { Application } from "@hotwired/stimulus"
-
-const application = Application.start()
-
-// Configure debug mode based on environment
-const railsEnv = document.body?.dataset?.environment || "production";
-application.debug = railsEnv === "development"
-window.Stimulus = application
-
-// Auto-registration functionality
-function eagerLoadControllersFrom(context) {
-  const definitions = []
-  for (const path of context.keys()) {
-    const module = context(path)
-    const controller = module.default
-    if (controller && path.match(/[_-]controller\.(js|ts)$/)) {
-      const name = path
-        .replace(/^.*\//, "")
-        .replace(/[_-]controller\.(js|ts)$/, "")
-        .replace(/_/g, "-")
-      definitions.push({ name, module: controller, filename: path })
-    }
-  }
-  return definitions
-}
-
-function lazyLoadControllersFrom(context) {
-  return eagerLoadControllersFrom(context)
-}
-
-// Export the functions that stimulus-loading typically provides
-export {
-  application,
-  eagerLoadControllersFrom,
-  lazyLoadControllersFrom
-}

data/app/views/panda/cms/shared/_importmap.html.erb

@@ -1,34 +0,0 @@
-<script type="importmap" data-turbo-track="reload">
-  <%=
-    # This ended up being the best solution to not drag in the importmap from the host app when we're editing the site
-    JSON.pretty_generate({
-      imports: {
-        # Main loader
-        "application_panda_cms": asset_path("panda/cms/application_panda_cms.js"),
-        # Vendored
-        "@hotwired/turbo": asset_path("panda/cms/@hotwired--turbo.js"),
-        "@hotwired/stimulus": asset_path("panda/cms/@hotwired--stimulus.js"),
-        "@hotwired/stimulus-loading": asset_path("panda_cms/stimulus-loading.js"),
-        "@editorjs/editorjs": asset_path("panda/cms/@editorjs--editorjs.js"),
-        "tailwindcss-stimulus-components": asset_path("panda/cms/tailwindcss-stimulus-components.js"),
-        # Our page editor
-        "panda/cms/editor/plain_text_editor": asset_path("panda/cms/editor/plain_text_editor.js"),
-        "panda/cms/editor/resource_loader": asset_path("panda/cms/editor/resource_loader.js"),
-        "panda/cms/editor/editor_js_initializer": asset_path("panda/cms/editor/editor_js_initializer.js"),
-        "panda/cms/editor/editor_js_config": asset_path("panda/cms/editor/editor_js_config.js"),
-        "panda/cms/editor/css_extractor": asset_path("panda/cms/editor/css_extractor.js"),
-        # Our controllers
-        "panda/cms/controllers/dashboard_controller": asset_path("panda/cms/controllers/dashboard_controller.js"),
-        "panda/cms/controllers/slug_controller": asset_path("panda/cms/controllers/slug_controller.js"),
-        "panda/cms/controllers/editor_form_controller": asset_path("panda/cms/controllers/editor_form_controller.js"),
-        "panda/cms/controllers/editor_iframe_controller": asset_path("panda/cms/controllers/editor_iframe_controller.js"),
-        "panda/cms/controllers/theme_form_controller": asset_path("panda/cms/controllers/theme_form_controller.js"),
-        # Main controller loader
-        "controllers": asset_path("panda/cms/controllers/index.js"),
-      }
-    }).html_safe
-  %>
-</script>
-<script type="module">
-  import "application_panda_cms"
-</script>

data/config/initializers/inflections.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-ActiveSupport::Inflector.inflections(:en) do |inflect|
-  inflect.acronym "CMS"
-end