hotwire-spark 0.1.7 → 0.1.9

data/app/javascript/hotwire/spark/channels/consumer.js

@@ -1,3 +1,3 @@
 import { createConsumer } from "@rails/actioncable"
 
-export default createConsumer()
+export default createConsumer("/hotwire-spark")

data/app/javascript/hotwire/spark/reloaders/stimulus_reloader.js

@@ -1,4 +1,3 @@
-import { Application } from "@hotwired/stimulus"
 import { log } from "../logger.js"
 import { cacheBustedUrl, reloadHtmlDocument } from "../helpers.js"
 
@@ -11,7 +10,7 @@ export class StimulusReloader {
   constructor(document, filePattern = /./) {
     this.document = document
     this.filePattern = filePattern
-    this.application = window.Stimulus || Application.start()
+    this.application = window.Stimulus
   }
 
   async reload() {

data/lib/hotwire/spark/action_cable/server.rb

@@ -0,0 +1,7 @@
+class Hotwire::Spark::ActionCable::Server < ActionCable::Server::Base
+  def initialize
+    config = ::ActionCable::Server::Base.config.dup
+    config.connection_class = -> { ::ActionCable::Connection::Base }
+    super(config: config)
+  end
+end

data/lib/hotwire/spark/engine.rb

@@ -7,17 +7,21 @@ module Hotwire::Spark
     config.hotwire = ActiveSupport::OrderedOptions.new unless config.respond_to?(:hotwire)
     config.hotwire.spark = ActiveSupport::OrderedOptions.new
     config.hotwire.spark.merge! \
-      enabled: Rails.env.development? && defined?(Rails::Server),
+      enabled: Rails.env.development?,
       css_paths: File.directory?("app/assets/builds") ? %w[ app/assets/builds ] : %w[ app/assets/stylesheets ],
       html_paths: %w[ app/controllers app/helpers app/models app/views ],
       stimulus_paths: %w[ app/javascript/controllers ]
 
-    initializer "hotwire_spark.config" do |app|
+    initializer "hotwire_spark.config" do |application|
       config.hotwire.spark.each do |key, value|
         Hotwire::Spark.send("#{key}=", value)
       end
     end
 
+    initializer "hotwire_spark.assets" do |application|
+      application.config.assets.precompile << "hotwire_spark.js"
+    end
+
     initializer "hotwire_spark.install" do |application|
       Hotwire::Spark.install_into application if Hotwire::Spark.enabled?
     end

data/lib/hotwire/spark/installer.rb

@@ -1,26 +1,28 @@
 class Hotwire::Spark::Installer
-  attr_reader :file_watcher
-
   def initialize(application)
     @application = application
   end
 
   def install
+    configure_cable_server
     configure_middleware
     monitor_paths
   end
 
-  def configure_middleware
-    ::ActionCable::Server::Base.prepend(Hotwire::Spark::ActionCable::PersistentCableServer)
-
-    middleware.insert_before ActionDispatch::Executor, Hotwire::Spark::ActionCable::PersistentCableMiddleware
-    middleware.use Hotwire::Spark::Middleware
-  end
-
   private
     attr_reader :application
     delegate :middleware, to: :application
 
+    def configure_cable_server
+      application.routes.prepend do
+        mount Hotwire::Spark.cable_server => "/hotwire-spark", internal: true, anchor: true
+      end
+    end
+
+    def configure_middleware
+      middleware.use Hotwire::Spark::Middleware
+    end
+
     def monitor_paths
       register_monitored_paths
       file_watcher.start
@@ -39,7 +41,7 @@ class Hotwire::Spark::Installer
     end
 
     def broadcast_reload_action(action, file_path)
-      ActionCable.server.broadcast "hotwire_spark", reload_message_for(action, file_path)
+      Hotwire::Spark.cable_server.broadcast "hotwire_spark", reload_message_for(action, file_path)
     end
 
     def reload_message_for(action, file_path)

data/lib/hotwire/spark/version.rb

@@ -1,5 +1,5 @@
 module Hotwire
   module Spark
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   end
 end

data/lib/hotwire-spark.rb

@@ -21,7 +21,11 @@ module Hotwire::Spark
     end
 
     def enabled?
-      enabled
+      enabled && defined?(Rails::Server)
+    end
+
+    def cable_server
+      @server ||= Hotwire::Spark::ActionCable::Server.new
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire-spark
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Jorge Manrubia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-20 00:00:00.000000000 Z
+date: 2024-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -135,21 +135,20 @@ files:
 - app/javascript/hotwire/spark/reloaders/stimulus_reloader.js
 - config/routes.rb
 - lib/hotwire-spark.rb
-- lib/hotwire/spark/action_cable/persistent_cable_middleware.rb
-- lib/hotwire/spark/action_cable/persistent_cable_server.rb
+- lib/hotwire/spark/action_cable/server.rb
 - lib/hotwire/spark/engine.rb
 - lib/hotwire/spark/file_watcher.rb
 - lib/hotwire/spark/installer.rb
 - lib/hotwire/spark/middleware.rb
 - lib/hotwire/spark/version.rb
 - lib/tasks/hotwire_spark_tasks.rake
-homepage: https://github.com/basecamp/hotwire_spark
+homepage: https://github.com/hotwired/spark
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/basecamp/hotwire_spark
-  source_code_uri: https://github.com/basecamp/hotwire_spark
-  changelog_uri: https://github.com/basecamp/hotwire_spark
+  homepage_uri: https://github.com/hotwired/spark
+  source_code_uri: https://github.com/hotwired/spark
+  changelog_uri: https://github.com/hotwired/spark
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/hotwire/spark/action_cable/persistent_cable_middleware.rb

@@ -1,43 +0,0 @@
-class Hotwire::Spark::ActionCable::PersistentCableMiddleware
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    request = Rack::Request.new(env)
-
-    if supress_action_cable_restarts?(request)
-      respond_suppressing_action_cable_restarts(env)
-    else
-      @app.call(env)
-    end
-  end
-
-  private
-    COOKIE_NAME = "hotwire_spark_disable_cable_restarts"
-    RESTARTS_SUPPRESSED_GRACE_PERIOD = 10.seconds
-
-    def supress_action_cable_restarts?(request)
-      request.params["hotwire_spark"] || request.cookies[COOKIE_NAME]
-    end
-
-    def respond_suppressing_action_cable_restarts(env)
-      status, headers, body = suppressing_action_cable_restarts { @app.call(env) }
-      headers["Set-Cookie"] = append_cookie_to_disable_cable_restarts(headers["Set-Cookie"])
-
-      [ status, headers, body ]
-    end
-
-    def suppressing_action_cable_restarts(&block)
-      ActionCable.server.without_restarting(&block)
-    end
-
-    def append_cookie_to_disable_cable_restarts(existing_cookies)
-      [ existing_cookies, cookie_to_disable_cable_restarts ].compact
-    end
-
-    def cookie_to_disable_cable_restarts
-      expiration = RESTARTS_SUPPRESSED_GRACE_PERIOD.from_now.utc
-      "#{COOKIE_NAME}=true; Path=/; Expires=#{expiration.httpdate}; HttpOnly"
-    end
-end

data/lib/hotwire/spark/action_cable/persistent_cable_server.rb

@@ -1,25 +0,0 @@
-module Hotwire::Spark::ActionCable::PersistentCableServer
-  def self.prepended(base)
-    base.class_eval do
-      thread_mattr_accessor :suppress_restarts
-    end
-  end
-
-  def restart
-    return if restarts_suppressed?
-
-    super
-  end
-
-  def without_restarting
-    old_suppress_restarts, self.suppress_restarts = self.suppress_restarts, true
-    yield
-  ensure
-    self.suppress_restarts = old_suppress_restarts
-  end
-
-  private
-    def restarts_suppressed?
-      suppress_restarts
-    end
-end