adsf-live 1.4.8 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22260827dac0fa2e063046eb2d0d78b64f78bba72761767d7826103297d12527
-  data.tar.gz: 148c44fef55c2d156b7afd083f8d40b3e8c72c1500f16ddd76147ddbe427c524
+  metadata.gz: 59551ad64538b33765bcaf107d804454b5d4d2c70fec971b75673ea70a4a3de2
+  data.tar.gz: 4b0e62038081c3112adfbb7a3c5743987d85ed3627e62cd70539fd966a5c1de2
 SHA512:
-  metadata.gz: 82474d14c4b551f37b775b22140c25bbfbef1fe5819e67ada5f24f82ad22695dd49333268387345370d08da482ff6bf86d59e46d38c9e503e98d570e95b21371
-  data.tar.gz: d6ff0e97bfaeeff4441f5fadda6275e6c2543a5b7597e62d025cb98100f77980b4ac7ac5888c1260c9bdda7b06f35f56e5d3082dfad9438c25e8c929dec803db
+  metadata.gz: 25148455618848a6247a941d2b56bc58b63e0c8803677ac7908e4c89cde8b17585c53e0f80c20205ca9577e6c24b78f250e2a641016c45af6329a3f8566c0927
+  data.tar.gz: 6432a179cbbf306a707c63b0ddd9735a17b86979d74c24c0ff409ccbf11a2d6f00a142877aa9a5c69d3b917839820770e11026734ffab946b974ad96f1659317

data/lib/adsf/live/rack_livereload.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Rack
+  class LiveReload
+    LIVERELOAD_JS_PATH = '/__rack/livereload.js'
+    VENDORED_JS_PATH = "#{__dir__}/../../../vendor/livereload.js"
+    HEAD_TAG_REGEX = /<head( [^<]+)?>/.freeze
+    LIVERELOAD_PORT = 35_729
+    LIVERELOAD_SCHEME = 'ws'
+
+    def initialize(app, options = {})
+      @app = app
+      @options = options
+    end
+
+    def call(env)
+      return deliver_file(VENDORED_JS_PATH) if env['PATH_INFO']&.end_with? LIVERELOAD_JS_PATH
+
+      status, headers, body = result = @app.call(env)
+
+      if env['REQUEST_METHOD'] != 'GET' ||
+         headers['content-type'] !~ %r{text/html} ||
+         headers['transfer-encoding'] == 'chunked' ||
+         headers['content-disposition'] =~ /^inline/
+        return result
+      end
+
+      body.close if body.respond_to?(:close)
+      new_body = []
+      livereload_added = false
+      @env = env
+      body.each do |line|
+        if !livereload_added && line =~ HEAD_TAG_REGEX
+          new_body << line.sub(HEAD_TAG_REGEX) { |match| %(#{match}#{template}) }
+          livereload_added = true
+        else
+          new_body << line
+        end
+      end
+      headers['content-length'] = new_body.sum(&:bytesize).to_s
+      headers['x-rack-livereload'] = '1' if livereload_added
+
+      [status, headers, new_body]
+    end
+
+    private
+
+    def deliver_file(file)
+      [200, { 'content-type' => 'text/javascript', 'content-length' => ::File.size(file).to_s }, [::File.read(file)]]
+    end
+
+    def template
+      <<~HTML
+        <script>
+          RACK_LIVERELOAD_PORT = #{@options[:live_reload_port] || LIVERELOAD_PORT}
+          RACK_LIVERELOAD_SCHEME = "#{@options[:live_reload_scheme] || LIVERELOAD_SCHEME}"
+        </script>
+        <script src="#{livereload_source}?host=#{host_to_use}"></script>
+      HTML
+    end
+
+    def livereload_source
+      if @options[:source] == :vendored
+        LIVERELOAD_JS_PATH
+      else
+        "#{@options[:protocol] || 'http'}://#{host_to_use}/livereload.js"
+      end
+    end
+
+    def host_to_use
+      (@options[:host] || @env['HTTP_HOST'] || 'localhost').sub(/:.*/, '')
+    end
+  end
+end

data/lib/adsf/live/version.rb

@@ -2,6 +2,6 @@
 
 module Adsf
   module Live
-    VERSION = '1.4.8'
+    VERSION = '1.5.1'
   end
 end

data/lib/adsf/live/web_socket_server.rb

@@ -23,7 +23,7 @@ module Adsf
           data =
             JSON.dump(
               command: 'reload',
-              path: "#{Dir.pwd}#{path}",
+              path: path,
             )
 
           @sockets.each { |ws| ws.send(data) }

data/lib/adsf/live.rb

@@ -5,7 +5,6 @@ require 'eventmachine'
 require 'em-websocket'
 require 'json'
 require 'listen'
-require 'rack-livereload'
 
 module Adsf
   module Live
@@ -13,5 +12,6 @@ module Adsf
 end
 
 require_relative 'live/version'
+require_relative 'live/rack_livereload'
 require_relative 'live/web_socket_server'
 require_relative 'live/watcher'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adsf-live
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.5.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2024-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adsf
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rack-livereload
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
 description: Automatically reloads when changes are detected.
 email: denis.defreyne@stoneship.org
 executables: []
@@ -89,6 +75,7 @@ files:
 - NEWS.md
 - README.md
 - lib/adsf/live.rb
+- lib/adsf/live/rack_livereload.rb
 - lib/adsf/live/version.rb
 - lib/adsf/live/watcher.rb
 - lib/adsf/live/web_socket_server.rb
@@ -112,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: livereload support for adsf