panda-core 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08a72a419dd702e8cc8cde2bfea476a283a17280499bb16de53b554ebaf7406c'
-  data.tar.gz: 4cf2468a51ed77691ab280b2cfb4b0345a2449e4bb61a36560b286cecb311cac
+  metadata.gz: 3e7863be64e4e612a42759b596547772fdc8ea9f50d85dc57b6c879328cbb8fa
+  data.tar.gz: 14c99c7ad8e4dd48c69aecf9b958ab9201e77e5159affcdc3bba8bb5a6608998
 SHA512:
-  metadata.gz: d8ebe8e076e53a063dc0f7ab565c6b12c299a6765cdd7e9c446716a5de191070ea2da46a75167f384ab4ee5c2fa91753543625e2cbc64f58a9f962725be39042
-  data.tar.gz: c7d7d8932c8eea8b767343e27a4ce23ac0206c40df9acd6557b5734b2684f16080a2586fc99a63d62b0b548427dd35cf4603219e2d9938f3d704d873da818a39
+  metadata.gz: 337d68b1a7c03cedfdcea65f5978d13dc3cd6692d79188dc0132e4fb55a781d3b4c0991a23582e9fae585c88fa58ea314401f1a0cc5a9bc5059617d385536753
+  data.tar.gz: 5be39c37ddf7d54f51071bc2486fd33b81e1be1bc1176358c890180de86676ce7848d89b426ecad80663e7a72e371de164fb71b1a3bd82c44e6decd09519bf57

data/lib/panda/core/engine.rb

@@ -58,9 +58,10 @@ module Panda
       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,
+      # Must run before Propshaft to intercept /panda/* requests
+      initializer "panda.core.static_assets" do |app|
+        # Serve public assets (CSS, images, etc.)
+        app.config.middleware.insert_before Propshaft::Server, Rack::Static,
           urls: ["/panda-core-assets"],
           root: Panda::Core::Engine.root.join("public"),
           header_rules: [
@@ -68,14 +69,9 @@ module Panda
             [: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"}]
-          ]
+        # Use ModuleRegistry's custom middleware to serve JavaScript from all registered modules
+        # This middleware checks all modules and serves from the first matching location
+        app.config.middleware.insert_before Propshaft::Server, Panda::Core::ModuleRegistry::JavaScriptMiddleware
       end
 
       # Auto-compile CSS for test/development environments
@@ -125,3 +121,14 @@ module Panda
     end
   end
 end
+
+# Register Core module with ModuleRegistry for JavaScript serving
+Panda::Core::ModuleRegistry.register(
+  gem_name: "panda-core",
+  engine: "Panda::Core::Engine",
+  paths: {
+    views: "app/views/panda/core/**/*.erb",
+    components: "app/components/panda/core/**/*.rb"
+    # JavaScript paths are auto-discovered from config/importmap.rb
+  }
+)

data/lib/panda/core/module_registry.rb

@@ -277,6 +277,99 @@ module Panda
           nil
         end
       end
+
+      # Custom Rack middleware to serve JavaScript modules from all registered Panda modules
+      #
+      # This middleware checks all registered modules' app/javascript/panda directories
+      # and serves the first matching file. This solves the problem of multiple Rack::Static
+      # instances blocking each other.
+      #
+      class JavaScriptMiddleware
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          request = Rack::Request.new(env)
+          path = request.path_info
+
+          # Only handle /panda/core/* and /panda/cms/* style JavaScript module requests
+          # Skip paths like /panda-core-assets/* (public assets handled by Rack::Static)
+          return @app.call(env) unless path.start_with?("/panda/")
+
+          # Strip /panda/ prefix to get relative path
+          # e.g., "/panda/cms/application.js" -> "cms/application.js"
+          relative_path = path.sub(%r{^/panda/}, "")
+          return @app.call(env) if relative_path.empty?
+
+          # Try to find the file in registered modules
+          file_path = find_javascript_file(relative_path)
+
+          if file_path && File.file?(file_path)
+            puts "[JavaScriptMiddleware] Serving: #{path} from #{file_path}"
+            serve_file(file_path, env)
+          else
+            puts "[JavaScriptMiddleware] Not found: #{path} (tried #{relative_path})"
+            @app.call(env)
+          end
+        rescue => e
+          # On error, log and pass to next middleware
+          puts "[JavaScriptMiddleware] Error: #{e.message}"
+          Rails.logger.error("[ModuleRegistry::JavaScriptMiddleware] Error: #{e.message}\n#{e.backtrace.join("\n")}") if defined?(Rails.logger)
+          @app.call(env)
+        end
+
+        private
+
+        def find_javascript_file(relative_path)
+          # Check each registered module's JavaScript directory
+          ModuleRegistry.modules.each do |gem_name, info|
+            next unless ModuleRegistry.send(:engine_available?, info[:engine])
+
+            root = ModuleRegistry.send(:engine_root, info[:engine])
+            next unless root
+
+            # Check in app/javascript/panda/
+            candidate = root.join("app/javascript/panda", relative_path)
+            return candidate.to_s if candidate.exist? && candidate.file?
+          end
+
+          nil
+        end
+
+        def serve_file(file_path, env)
+          # Read file content
+          content = File.read(file_path)
+
+          # Determine content type
+          content_type = case File.extname(file_path)
+          when ".js"
+            "application/javascript; charset=utf-8"
+          when ".json"
+            "application/json; charset=utf-8"
+          else
+            "text/plain; charset=utf-8"
+          end
+
+          # Determine cache control
+          cache_control = if Rails.env.development? || Rails.env.test?
+            "no-cache, no-store, must-revalidate"
+          else
+            "public, max-age=31536000"
+          end
+
+          # Return response
+          [
+            200,
+            {
+              "Content-Type" => content_type,
+              "Content-Length" => content.bytesize.to_s,
+              "Cache-Control" => cache_control
+            },
+            [content]
+          ]
+        end
+      end
     end
   end
 end

data/lib/panda/core/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: panda-core
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Otaina Limited
 - James Inman
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_processing
@@ -529,6 +530,7 @@ metadata:
   homepage_uri: https://github.com/tastybamboo/panda-core
   source_code_uri: https://github.com/tastybamboo/panda-core
   changelog_uri: https://github.com/tastybamboo/panda-core/blob/main/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -543,7 +545,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Core libraries and development tools for Tasty Bamboo projects
 test_files: []