rails_live_reload 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe3a0f4113f0b1bab7c56e466d40a55e4d6c730a1a5403a81b395c4acec6851b
-  data.tar.gz: 46b451a628be2d0d4c653aed136b93b855259ae897e696e5b85964f4b9338677
+  metadata.gz: db5db77fb55392f4a13cc966e01f4b083d9cf4188a2d5b3452f830b1e9c3aa00
+  data.tar.gz: e9a07dca4b7af7468fbb0916edc670e68fe9385b2fe1e16913620f4189f44fea
 SHA512:
-  metadata.gz: 17c3e1f2ad82ba341f7aaa5b447bb0857e325e07ad1b9076685349a5183811830c398cdac54f35aa29a734cdbe0c1f43f06f608001dffef8ed97a4b48f3bbdf2
-  data.tar.gz: '0585b2eddb81b8aec7510eed21a080ef97daf21300ed64cac6c8e9b5ffaa5b8df2e6c98564a49cd5eec990882a95e31e4866c5e82816fd22a65f109eecad2f79'
+  metadata.gz: '0975db6d0b09d8857f0915827bba985b9898a202c409b03c987c1cd070946173e910ea448ccee47237ddbdc1c29e3ecf4f9c821b452ce62e564724510870cdff'
+  data.tar.gz: 18760d509b20520babd42d501bf80c8a5411038e60e1a915e37faeda79c837b489a9823288c21a181d5fcfdf50fc61473361adabb652d767e83ccf2b14616ddb

data/lib/rails_live_reload/engine.rb

@@ -1,7 +1,11 @@
 module RailsLiveReload
   class Railtie < ::Rails::Engine
-    if RailsLiveReload.enabled? && (defined?(::Rails::Server) || ENV['SERVER_PROCESS'])
-      initializer "rails_live_reload.middleware" do |app|
+    def enabled?
+      RailsLiveReload.enabled? && (defined?(::Rails::Server) || ENV['SERVER_PROCESS'])
+    end
+
+    initializer "rails_live_reload.middleware" do |app|
+      if enabled?
         if ::Rails::VERSION::MAJOR.to_i >= 5
           app.middleware.insert_after ActionDispatch::Executor, RailsLiveReload::Middleware::Base
         else
@@ -12,25 +16,33 @@ module RailsLiveReload
           end
         end
       end
+    end
 
-      initializer "rails_live_reload.watcher" do
+    initializer "rails_live_reload.watcher" do
+      if enabled?
         RailsLiveReload::Watcher.init
       end
+    end
 
-      initializer "rails_live_reload.configure_metrics", after: :initialize_logger do
+    initializer "rails_live_reload.configure_metrics", after: :initialize_logger do
+      if enabled?
         ActiveSupport::Notifications.subscribe(
           /\.action_view/,
           RailsLiveReload::Instrument::MetricsCollector.new
         )
       end
+    end
 
-      initializer "rails_live_reload.reset_current_request", after: :initialize_logger do |app|
+    initializer "rails_live_reload.reset_current_request", after: :initialize_logger do |app|
+      if enabled?
         app.executor.to_run      { CurrentRequest.cleanup }
         app.executor.to_complete { CurrentRequest.cleanup }
       end
+    end
 
-      initializer "rails_live_reload.routes" do
-        config.after_initialize do |app|
+    initializer "rails_live_reload.routes" do
+      config.after_initialize do |app|
+        if enabled?
           app.routes.prepend do
             mount RailsLiveReload.server => RailsLiveReload.config.url, internal: true
           end
@@ -38,4 +50,4 @@ module RailsLiveReload
       end
     end
   end
-end
+end

data/lib/rails_live_reload/middleware/base.rb

@@ -15,11 +15,11 @@ module RailsLiveReload
             @app.call(env)
           end
         else
-          request = Rack::Request.new(env)
+          request = ActionDispatch::Request.new(env)
           status, headers, body = @app.call(env)
 
-          if html?(headers) && (status == 500 || (status.to_s =~ /20./ && request.get?))
-            return inject_rails_live_reload(status, headers, body)
+          if html?(headers) && (status == 500 || status == 422 || (status.to_s =~ /20./ && request.get?))
+            return inject_rails_live_reload(request, status, headers, body)
           end
 
           [status, headers, body]
@@ -28,25 +28,26 @@ module RailsLiveReload
 
       private
 
-      def inject_rails_live_reload(status, headers, body)
+      def inject_rails_live_reload(request, status, headers, body)
         response = Rack::Response.new([], status, headers)
-
+        
+        nonce = request&.content_security_policy_nonce
         if String === body
-          response.write make_new_response(body)
+          response.write make_new_response(body, nonce)
         else
-          body.each { |fragment| response.write make_new_response(fragment) }
+          body.each { |fragment| response.write make_new_response(fragment, nonce) }
         end
         body.close if body.respond_to?(:close)
         response.finish
       end
 
-      def make_new_response(body)
+      def make_new_response(body, nonce)
         index = body.rindex(/<\/body>/i) || body.rindex(/<\/html>/i)
         return body if index.nil?
 
         body.insert(index, <<~HTML.html_safe)
           <script defer type="text/javascript" src="#{RailsLiveReload.config.url}/script"></script>
-          <script id="rails-live-reload-options" type="application/json">
+          <script id="rails-live-reload-options" type="application/json" nonce="#{nonce}">
             #{{
               files: CurrentRequest.current.data.to_a,
               time: Time.now.to_i,
@@ -57,7 +58,7 @@ module RailsLiveReload
       end
 
       def html?(headers)
-        headers["Content-Type"].to_s.include?("text/html")
+        headers["content-type"].to_s.include?("text/html")
       end
     end
   end

data/lib/rails_live_reload/version.rb

@@ -1,3 +1,3 @@
 module RailsLiveReload
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_live_reload
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Igor Kasyanchuk
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-04 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.4
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Ruby on Rails Live Reload