hotwire-livereload 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e80daa28376d668cb49288182ab69de36a544c0367deab64359e99d1b1c5cb8e
-  data.tar.gz: ba7057fa9ce97ea7801b5c993ff3172ff0fb0ba7820474fb0be467c01900d333
+  metadata.gz: 3f8001c1b5e1ae699af050da2c601fd29ee3242cdcdd87f1487b38d18a395978
+  data.tar.gz: 0fa2a43353fceb7e14908d1130cb7fcea7c71b59846888c3845e91922b5ac833
 SHA512:
-  metadata.gz: 4eb10a968fa542b584bdd0184be9ecf6740b2633d2481f61df65681b7e476ae8273770d58b9a3a56d05baf6c2773d9fb9e9508263e179f3954d9fe86604b7d18
-  data.tar.gz: 34a454aa9316357d37b89754394457b06ad5c3cf4b694bee5ce0e954d072b8f535341811c3d613a0f4f5114463e9e0239a6c2db98c3005eedb47db96af4ec803
+  metadata.gz: 7202fa592b12ab9ef913d0fc62979b998a53357f9d74731df1fe1990ebe1f358a628509ae4a6010ee8dec1fbcadb60281bf9e62def1e829da728af9eeb211684
+  data.tar.gz: 7b3b8dd4a60f103f2f2b9c673ceab137855a9ceaf583a6ed564384d1e1f617a80b06c7e751d09cdf801d583c7bea9ed60801accce6cd0c11203a1f0b9e996922

data/app/assets/javascripts/hotwire-livereload.js

@@ -600,20 +600,18 @@
   // app/javascript/hotwire-livereload.js
   var import_actioncable = __toModule(require_action_cable());
   var import_debounce = __toModule(require_debounce());
-  var endpoint = "/hotwire-livereload/cable";
-  var uid = (Date.now() + (Math.random() * 100 | 0)).toString();
-  var consumer = (0, import_actioncable.createConsumer)(`${endpoint}?uid=${uid}`);
+  var consumer = (0, import_actioncable.createConsumer)();
   var received = (0, import_debounce.default)(() => {
-    console.log("Hotwire::Livereload files changed");
+    console.log("[Hotwire::Livereload] Files changed");
     Turbo.visit(window.location.href);
   }, 300);
   consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
     received,
     connected() {
-      console.log("Hotwire::Livereload websocket connected");
+      console.log("[Hotwire::Livereload] Websocket connected");
     },
     disconnected() {
-      console.log("Hotwire::Livereload websocket disconnected");
+      console.log("[Hotwire::Livereload] Websocket disconnected");
     }
   });
 })();

data/app/channels/hotwire/livereload/reload_channel.rb

@@ -1,5 +1,5 @@
 class Hotwire::Livereload::ReloadChannel < ActionCable::Channel::Base
   def subscribed
-    stream_from "reload"
+    stream_from "hotwire-reload"
   end
 end

data/app/javascript/hotwire-livereload.js

@@ -1,20 +1,20 @@
 import { createConsumer } from "@rails/actioncable"
 import debounce from "debounce"
 
-const endpoint = "/hotwire-livereload/cable"
-const uid = (Date.now() + ((Math.random() * 100) | 0)).toString()
-const consumer = createConsumer(`${endpoint}?uid=${uid}`)
+const consumer = createConsumer()
 const received = debounce(() => {
-  console.log("Hotwire::Livereload files changed")
+  console.log("[Hotwire::Livereload] Files changed")
   Turbo.visit(window.location.href)
 }, 300)
 
 consumer.subscriptions.create("Hotwire::Livereload::ReloadChannel", {
   received,
+
   connected() {
-    console.log("Hotwire::Livereload websocket connected")
+    console.log("[Hotwire::Livereload] Websocket connected")
   },
+
   disconnected() {
-    console.log("Hotwire::Livereload websocket disconnected")
+    console.log("[Hotwire::Livereload] Websocket disconnected")
   },
 })

data/lib/hotwire/livereload/engine.rb

@@ -28,46 +28,28 @@ module Hotwire
       initializer "hotwire_livereload.set_configs" do |app|
         options = app.config.hotwire_livereload
         options.listen_paths = options.listen_paths.map(&:to_s)
-        options.listen_paths << Rails.root.join("app", "views")
-      end
-
-      initializer "hotwire_livereload.cable.config" do |app|
-        config_path = Hotwire::Livereload::Engine.root.join("config", "livereload_cable.yml")
-        cable = Hotwire::Livereload::Engine.cable
-
-        cable.cable = app.config_for(config_path).with_indifferent_access
-        cable.mount_path = "/cable"
-        cable.connection_class = -> { Hotwire::Livereload::Connection }
-        cable.logger ||= Rails.logger
+        options.listen_paths << Rails.root.join("app/views")
+        options.listen_paths << Rails.root.join("app/helpers")
+        if Dir.exist?(Rails.root.join("app/javascript"))
+          options.listen_paths << Rails.root.join("app/javascript")
+        end
       end
 
       config.after_initialize do |app|
-        return unless Rails.env.development?
-
-        @listener = Listen.to(*app.config.hotwire_livereload.listen_paths) do |modified, added, removed|
-          if modified.any? || removed.any? || added.any?
-            Hotwire::Livereload::Engine.websocket.broadcast(
-              "reload",
-              { modified: modified, removed: removed, added: added }
-            )
+        if Rails.env.development?
+          @listener = Listen.to(*app.config.hotwire_livereload.listen_paths) do |modified, added, removed|
+            if modified.any? || removed.any? || added.any?
+              content = { modified: modified, removed: removed, added: added }
+              ActionCable.server.broadcast("hotwire-reload", content)
+            end
           end
+          @listener.start
         end
-        @listener.start
       end
 
       at_exit do
-        return unless Rails.env.development?
-
-        @listener&.stop
-      end
-
-      class << self
-        def websocket
-          @websocket ||= ActionCable::Server::Base.new(config: Hotwire::Livereload::Engine.cable)
-        end
-
-        def cable
-          @cable ||= ActionCable::Server::Configuration.new
+        if Rails.env.development?
+          @listener&.stop
         end
       end
     end

data/lib/hotwire/livereload/version.rb

@@ -1,5 +1,5 @@
 module Hotwire
   module Livereload
-    VERSION = "0.1.0"
+    VERSION = "0.1.4"
   end
 end

data/lib/install/install.rb

@@ -1,12 +1,23 @@
-route("mount Hotwire::Livereload::Engine, at: '/hotwire-livereload'")
+APP_LAYOUT_PATH = Rails.root.join("app/views/layouts/application.html.erb")
+CABLE_CONFIG_PATH = Rails.root.join("config/cable.yml")
 
-if (app_layout_path = Rails.root.join("app/views/layouts/application.html.erb")).exist?
-  say "Add Hotwire::Livereload tag in application layout"
-  insert_into_file app_layout_path.to_s, before: /\s*<\/head>/ do <<-HTML
+if APP_LAYOUT_PATH.exist?
+  say "Add Hotwire Livereload tag in application layout"
+  insert_into_file APP_LAYOUT_PATH, before: /\s*<\/head>/ do <<-HTML
 \n    <%= hotwire_livereload_tags %>
 HTML
   end
 else
   say "Default application.html.erb is missing!", :red
-  say %(        Add <%= hotwire_livereload_tags %> within the <head> tag in your custom layout.)
+  say %(  Add <%= hotwire_livereload_tags %> within the <head> tag in your custom layout.)
+end
+
+if CABLE_CONFIG_PATH.exist?
+  say "Enable redis in bundle"
+  uncomment_lines "Gemfile", %(gem 'redis')
+
+  say "Switch development cable to use redis"
+  gsub_file CABLE_CONFIG_PATH.to_s, /development:\n\s+adapter: async/, "development:\n  adapter: redis\n  url: redis://localhost:6379/1"
+else
+  say 'ActionCable config file (config/cable.yml) is missing. Uncomment "gem \'redis\'" in your Gemfile and create config/cable.yml to use Hotwire Livereload.'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwire-livereload
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Kirill Platonov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-03 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -48,12 +48,9 @@ files:
 - MIT-LICENSE
 - README.md
 - app/assets/javascripts/hotwire-livereload.js
-- app/channels/hotwire/livereload/connection.rb
 - app/channels/hotwire/livereload/reload_channel.rb
 - app/helpers/hotwire/livereload/livereload_tags_helper.rb
 - app/javascript/hotwire-livereload.js
-- config/livereload_cable.yml
-- config/routes.rb
 - lib/hotwire/livereload.rb
 - lib/hotwire/livereload/engine.rb
 - lib/hotwire/livereload/version.rb

data/app/channels/hotwire/livereload/connection.rb

@@ -1,9 +0,0 @@
-class Hotwire::Livereload::Connection < ActionCable::Connection::Base
-  identified_by :uid
-
-  def connect
-    self.uid = request.params[:uid]
-    logger.add_tags(uid)
-    logger.info "connected to Hotwire::Livereload"
-  end
-end

data/config/livereload_cable.yml

@@ -1,2 +0,0 @@
-development:
-  adapter: async

data/config/routes.rb

@@ -1,5 +0,0 @@
-Hotwire::Livereload::Engine.routes.draw do
-  if Rails.env.development?
-    mount Hotwire::Livereload::Engine.websocket => Hotwire::Livereload::Engine.cable.mount_path
-  end
-end