hotwire-livereload 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bcabf2d518f67b06afa47b3b462f6d190b35ee3cfe2690148b599a0c28ba94e
-  data.tar.gz: 87d3401bddb1a879fb40b73aaef596ff0f17ba019e421411e9a0a3ce4b6562a2
+  metadata.gz: 5df2481e44b656c233a0088024d87bc11fcc54ba3fd469bc5c5ef6b5ff69225f
+  data.tar.gz: 6550a575e2cb6d601e2b516106a155fd7805fdecb4b25a89137c56fadd78a291
 SHA512:
-  metadata.gz: a517e60ba65450c6346e6c574ff047f12a8dd09c1b8ebaed16cb393ddaba254490869c829f022c7cc929b6d00c4c32bf0f86c3d2b0e986ac608fcad471107995
-  data.tar.gz: 544f51ca80f96bd73d30ee582acaecf1e734e44d4132d5a1a415bb11b1f87dbc969e0885663c961554e3635a2c72080e03a6952b6abdf4f6f4e435e075f472e5
+  metadata.gz: 40269aa33f0c249354eb64f688461bcfde1956b0727e183c80c7c70d277040195e235110eeef12ec81a47f1261317a2a2096f4e605aa04e68c76d9ae140ca290
+  data.tar.gz: e792c0b4fcc371ef4c9fbb87bb7766516a4b93e54a69574c1e9fc320cbb594c06e09cf731afc2cdbdb12bebbaca7bcb8dc84ecb2c129ad41f71e79d8e8ef0aa0

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,29 +28,15 @@ 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
-
-        if Rails.env.development?
-          cable.cable = app.config_for(config_path).with_indifferent_access
-          cable.mount_path = "/cable"
-          cable.connection_class = -> { Hotwire::Livereload::Connection }
-          cable.logger ||= Rails.logger
-        end
+        options.listen_paths << Rails.root.join("app/views")
       end
 
       config.after_initialize do |app|
         if 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 }
-              )
+              content = { modified: modified, removed: removed, added: added }
+              ActionCable.server.broadcast("hotwire-reload", content)
             end
           end
           @listener.start
@@ -62,16 +48,6 @@ module Hotwire
           @listener&.stop
         end
       end
-
-      class << self
-        def websocket
-          @websocket ||= ActionCable::Server::Base.new(config: Hotwire::Livereload::Engine.cable)
-        end
-
-        def cable
-          @cable ||= ActionCable::Server::Configuration.new
-        end
-      end
     end
   end
 end

data/lib/hotwire/livereload/version.rb

@@ -1,5 +1,5 @@
 module Hotwire
   module Livereload
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotwire-livereload
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Kirill Platonov
@@ -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