panda-core 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52d28416fc7360a3f5cc27ec2ad1f332a61426a8279853461dfe7398f180213a
-  data.tar.gz: f68cd0fbaf803d80a3549f67485328c80850e3d035d42f7c89eb1b15a80f6b64
+  metadata.gz: '08a72a419dd702e8cc8cde2bfea476a283a17280499bb16de53b554ebaf7406c'
+  data.tar.gz: 4cf2468a51ed77691ab280b2cfb4b0345a2449e4bb61a36560b286cecb311cac
 SHA512:
-  metadata.gz: d71325c49673982b5ae74107eb7e05cb0bd04b12bc64262284392df691b142953fb6f5a25385c4795d605ec243e972ac30cd8688fb4e7f95ebc43e360b7ba5e1
-  data.tar.gz: b0391beb484a72298375547b4d526e73ce47ea18a1d73864e6e2ef226e25fef961d83c268a5cdab12b5dbc1c08c984696f344bfe0e974d0e9c1a37badafdb035
+  metadata.gz: d8ebe8e076e53a063dc0f7ab565c6b12c299a6765cdd7e9c446716a5de191070ea2da46a75167f384ab4ee5c2fa91753543625e2cbc64f58a9f962725be39042
+  data.tar.gz: c7d7d8932c8eea8b767343e27a4ce23ac0206c40df9acd6557b5734b2684f16080a2586fc99a63d62b0b548427dd35cf4603219e2d9938f3d704d873da818a39

data/app/controllers/panda/core/admin/settings_controller.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Panda
+  module Core
+    module Admin
+      class SettingsController < AdminController
+        def show
+          # Placeholder for site settings page
+        end
+      end
+    end
+  end
+end

data/app/helpers/panda/core/asset_helper.rb

@@ -9,6 +9,10 @@ module Panda
       end
 
       # Include only Core JavaScript
+      #
+      # This is the single entry point for all Panda JavaScript loading.
+      # It automatically includes JavaScript from Core and all registered modules
+      # via ModuleRegistry.
       def panda_core_javascript
         # Use asset_tags for development mode (importmap) compatibility
         # In development, this will use importmap; in production/test, compiled bundles
@@ -22,20 +26,34 @@ module Panda
             javascript_include_tag(js_url, type: "module")
           end
         else
-          # Development mode - Use the engine's importmap (loaded in initializer)
-          # This keeps the engine's JavaScript separate from the app's importmap
-          # Build the importmap JSON manually since paths are already absolute
-          imports = {}
-          Panda::Core.importmap.instance_variable_get(:@packages).each do |name, package|
-            imports[name] = package[:path]
-          end
+          # Development mode - Use ModuleRegistry to combine all Panda module importmaps
+          imports = Panda::Core::ModuleRegistry.combined_importmap
 
           importmap_json = JSON.generate({"imports" => imports})
 
+          # Generate entry point script tags for Core and all registered modules
+          entry_points = []
+
+          # Core entry points (always included)
+          entry_points << '<script type="module">import "panda/core/application"</script>'
+          entry_points << '<script type="module">import "panda/core/controllers/index"</script>'
+
+          # Add entry points for each registered module
+          Panda::Core::ModuleRegistry.modules.each do |gem_name, info|
+            # Extract module namespace from gem name (e.g., "panda-cms" -> "cms")
+            module_slug = gem_name.sub(/^panda-/, "")
+
+            # Check if the module is actually loaded
+            module_name = info[:engine].sub(/::Engine$/, "")
+            next unless Object.const_defined?(module_name)
+
+            entry_points << %(<script type="module">import "panda/#{module_slug}/application"</script>)
+            entry_points << %(<script type="module">import "panda/#{module_slug}/controllers/index"</script>)
+          end
+
           <<~HTML.html_safe
             <script type="importmap">#{importmap_json}</script>
-            <script type="module">import "panda/core/application"</script>
-            <script type="module">import "panda/core/controllers/index"</script>
+            #{entry_points.join("\n")}
           HTML
         end
       end

data/app/views/panda/core/admin/settings/show.html.erb

@@ -0,0 +1,10 @@
+<%= render Panda::Core::Admin::ContainerComponent.new do %>
+  <%= render Panda::Core::Admin::HeadingComponent.new(level: 1, text: "Settings") %>
+
+  <div class="mt-6 space-y-6">
+    <%= render Panda::Core::Admin::PanelComponent.new do %>
+      <%= render Panda::Core::Admin::HeadingComponent.new(level: 2, text: "Site Settings") %>
+      <p class="text-sm text-gray-600 mt-2">Configure your site settings here.</p>
+    <% end %>
+  </div>
+<% end %>

data/app/views/panda/core/shared/_header.html.erb

@@ -6,11 +6,14 @@
     <%= csp_meta_tag %>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@7.1.0/css/all.min.css">
     <%= panda_core_stylesheet %>
+
+    <!-- ES Module Shims polyfill - must load BEFORE importmap (blocking, not async) -->
+    <script src="https://ga.jspm.io/npm:[email protected]/dist/es-module-shims.js" crossorigin="anonymous"></script>
+
+    <!-- Panda JavaScript (Core + all registered modules via ModuleRegistry) -->
     <%= panda_core_javascript %>
 
     <% if defined?(Panda::CMS) && controller.class.name.start_with?("Panda::CMS") %>
-      <!-- CMS Assets -->
-      <%= panda_cms_javascript %>
       <%= render "panda/cms/shared/favicons" %>
     <% end %>
 

data/config/routes.rb

@@ -19,6 +19,9 @@ Panda::Core::Engine.routes.draw do
     # Profile management
     resource :my_profile, only: %i[show edit update], controller: "admin/my_profile", path: "my_profile"
 
+    # Settings
+    resource :settings, only: [:show], controller: "admin/settings"
+
     # Test-only authentication endpoint (available in development and test environments)
     # This bypasses OAuth for faster, more reliable test execution
     # Development: Used by Capybara system tests which run Rails server in development mode

data/lib/panda/core/asset_loader.rb

@@ -151,8 +151,9 @@ module Panda
             version = asset_version
             "/panda-core-assets/panda-core-#{version}.js"
           else
-            # Return importmap path
-            "/assets/panda/core/application.js"
+            # Return path for development/test mode
+            # JavaScript is served via importmap from app/javascript
+            "/panda/core/application.js"
           end
         end
 

data/lib/panda/core/engine/middleware_config.rb

@@ -4,29 +4,13 @@ module Panda
   module Core
     class Engine < ::Rails::Engine
       # Middleware configuration for static assets
+      # Note: Actual middleware is registered in engine.rb initializer
+      # This module is kept for organizational purposes
       module MiddlewareConfig
         extend ActiveSupport::Concern
 
-        included do
-          # Make files in public available to the main app (e.g. /panda-core-assets/panda-logo.png)
-          config.middleware.use Rack::Static,
-            urls: ["/panda-core-assets"],
-            root: Panda::Core::Engine.root.join("public"),
-            header_rules: [
-              # Disable caching in development for instant CSS updates
-              [:all, {"Cache-Control" => Rails.env.development? ? "no-cache, no-store, must-revalidate" : "public, max-age=31536000"}]
-            ]
-
-          # Make JavaScript files available for importmap
-          # Serve from app/javascript with proper MIME types
-          config.middleware.use Rack::Static,
-            urls: ["/panda", "/panda/core"],
-            root: Panda::Core::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"}]
-            ]
-        end
+        # Middleware configuration moved to engine.rb initializer
+        # See lib/panda/core/engine.rb - initializer "panda.core.static_assets"
       end
     end
   end

data/lib/panda/core/engine.rb

@@ -57,6 +57,27 @@ module Panda
         # Configuration is already initialized with defaults in Configuration class
       end
 
+      # Static asset middleware for serving public files and JavaScript modules
+      initializer "panda.core.static_assets", before: :build_middleware_stack do |app|
+        # Make files in public available to the main app (e.g. /panda-core-assets/panda-logo.png)
+        app.config.middleware.use Rack::Static,
+          urls: ["/panda-core-assets"],
+          root: Panda::Core::Engine.root.join("public"),
+          header_rules: [
+            # Disable caching in development for instant CSS updates
+            [:all, {"Cache-Control" => Rails.env.development? ? "no-cache, no-store, must-revalidate" : "public, max-age=31536000"}]
+          ]
+
+        # Make JavaScript files available for importmap
+        # Serve from app/javascript with proper MIME types
+        app.config.middleware.use Rack::Static,
+          urls: ["/panda/core"],
+          root: Panda::Core::Engine.root.join("app/javascript"),
+          header_rules: [
+            [:all, {"Cache-Control" => Rails.env.development? ? "no-cache, no-store, must-revalidate" : "public, max-age=31536000"}]
+          ]
+      end
+
       # Auto-compile CSS for test/development environments
       initializer "panda_core.auto_compile_assets", after: :load_config_initializers do |app|
         # Only auto-compile in test or when explicitly requested

data/lib/panda/core/module_registry.rb

@@ -144,8 +144,62 @@ module Panda
           @modules.key?(gem_name)
         end
 
+        # Returns a combined importmap for all registered modules
+        #
+        # This merges importmaps from Core and all registered modules (CMS, CMS Pro, etc.)
+        # into a single hash suitable for <script type="importmap"> generation.
+        #
+        # Order matters: Core imports are added first, then modules in registration order.
+        # If there are conflicts, later modules override earlier ones.
+        #
+        # @return [Hash] Combined imports hash {"module/name" => "/path/to/file.js"}
+        def combined_importmap
+          imports = {}
+
+          # Add Panda Core imports first (if Core has an importmap)
+          if defined?(Panda::Core.importmap)
+            Panda::Core.importmap.instance_variable_get(:@packages).each do |name, package|
+              imports[name] = package.path
+            end
+          end
+
+          # Add registered modules' importmaps in registration order
+          @modules.each do |gem_name, info|
+            next unless engine_available?(info[:engine])
+
+            # Get the module's importmap constant (e.g., Panda::CMS.importmap)
+            module_importmap = module_importmap_for(info[:engine])
+            next unless module_importmap
+
+            module_importmap.instance_variable_get(:@packages).each do |name, package|
+              imports[name] = package.path
+            end
+          end
+
+          imports
+        end
+
         private
 
+        # Get the importmap for a module
+        #
+        # @param engine_name [String] Engine constant name (e.g., "Panda::CMS::Engine")
+        # @return [Importmap::Map, nil] Module's importmap or nil if not available
+        def module_importmap_for(engine_name)
+          # Extract module namespace from engine name (e.g., "Panda::CMS::Engine" -> "Panda::CMS")
+          module_name = engine_name.sub(/::Engine$/, "")
+          return nil unless Object.const_defined?(module_name)
+
+          mod = Object.const_get(module_name)
+          return nil unless mod.respond_to?(:importmap)
+
+          mod.importmap
+        rescue NoMethodError
+          nil
+        rescue NameError
+          nil
+        end
+
         # Check if an engine constant is defined and available
         #
         # @param engine_name [String] Engine constant name

data/lib/panda/core/testing/support/system/ci_capybara_config.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+# CI-specific Capybara configuration
+# This file configures Capybara for GitHub Actions and other CI environments
+# It uses a more robust Puma setup with compatibility for Puma 6 and 7+
+
+return unless defined?(Capybara)
+
+ci_mode = ENV["GITHUB_ACTIONS"] == "true" || ENV["CI_SYSTEM_SPECS"] == "true"
+return unless ci_mode
+
+require "rack/handler/puma"
+
+RSpec.configure do |config|
+  config.before(:suite) do
+    Capybara.server = :puma_ci
+    Capybara.default_max_wait_time = Integer(ENV.fetch("CAPYBARA_MAX_WAIT_TIME", 5))
+    Capybara.server_host = "127.0.0.1"
+    Capybara.always_include_port = true
+
+    puts "[CI Config] Capybara.server      = #{Capybara.server.inspect}"
+    puts "[CI Config] Capybara.server_host = #{Capybara.server_host.inspect}"
+    puts "[CI Config] Capybara.max_wait    = #{Capybara.default_max_wait_time}s"
+  end
+end
+
+Capybara.register_server :puma_ci do |app, port, host|
+  puts "[CI Config] Starting Puma (single mode) on #{host}:#{port}"
+
+  min_threads = Integer(ENV.fetch("PUMA_MIN_THREADS", "2"))
+  max_threads = Integer(ENV.fetch("PUMA_MAX_THREADS", "2"))
+
+  options = {
+    Host: host,
+    Port: port,
+    Threads: "#{min_threads}:#{max_threads}",
+    Workers: 0,
+    Silent: false,
+    Verbose: true,
+    PreloadApp: false
+  }
+
+  # --- Puma Compatibility Layer (supports Puma 6 AND Puma 7+) ---
+  puma_run = Rack::Handler::Puma.method(:run)
+
+  if puma_run.arity == 2
+    # Puma <= 6.x signature:
+    #   run(app, options_hash)
+    puts "[CI Config] Using Puma <= 6 API (arity 2)"
+    Rack::Handler::Puma.run(app, options)
+  else
+    # Puma >= 7.x signature:
+    #   run(app, **options)
+    puts "[CI Config] Using Puma >= 7 API (keyword args)"
+    Rack::Handler::Puma.run(app, **options)
+  end
+end

data/lib/panda/core/version.rb

@@ -2,6 +2,6 @@
 
 module Panda
   module Core
-    VERSION = "0.9.1"
+    VERSION = "0.9.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: panda-core
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Otaina Limited
@@ -429,6 +429,7 @@ files:
 - app/controllers/panda/core/admin/dashboard_controller.rb
 - app/controllers/panda/core/admin/my_profile_controller.rb
 - app/controllers/panda/core/admin/sessions_controller.rb
+- app/controllers/panda/core/admin/settings_controller.rb
 - app/controllers/panda/core/admin/test_sessions_controller.rb
 - app/controllers/panda/core/application_controller.rb
 - app/helpers/panda/core/asset_helper.rb
@@ -456,6 +457,7 @@ files:
 - app/views/panda/core/admin/dashboard/show.html.erb
 - app/views/panda/core/admin/my_profile/edit.html.erb
 - app/views/panda/core/admin/sessions/new.html.erb
+- app/views/panda/core/admin/settings/show.html.erb
 - app/views/panda/core/admin/shared/_breadcrumbs.html.erb
 - app/views/panda/core/admin/shared/_flash.html.erb
 - app/views/panda/core/admin/shared/_sidebar.html.erb
@@ -506,6 +508,7 @@ files:
 - lib/panda/core/testing/support/setup.rb
 - lib/panda/core/testing/support/system/better_system_tests.rb
 - lib/panda/core/testing/support/system/capybara_setup.rb
+- lib/panda/core/testing/support/system/ci_capybara_config.rb
 - lib/panda/core/testing/support/system/cuprite_helpers.rb
 - lib/panda/core/testing/support/system/cuprite_setup.rb
 - lib/panda/core/testing/support/system/database_connection_helpers.rb