humid 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6b6ec66d3f61678381e5f6733db579618f56460a4aefc297219428ec6a112b
-  data.tar.gz: 7581d1a9107fa247494f185116e0ee5773ed0dc3e79cefaca7ff771a6ed9be12
+  metadata.gz: 64ab68e5648b4211e7d39b272da5f94e1aaf3bfcdf625db30ee5f6c72a7dc529
+  data.tar.gz: 251e41301a91ea534547caa84b76ffef68b463299fd012c39b2b26e4626b6d13
 SHA512:
-  metadata.gz: ec2d956eb06a761e5bb23563165500f014e86cb64a6ef0be9d816c4a5f3f4faeea7f9c9860ac10acc571ca1c355270f62ff578165b5a546e9413dfe41dcc92e3
-  data.tar.gz: 7593b70d6e439688002385bba8c555f7f12876f107cd982df26617f753afb4fb55d22e12aa0ec1d169876245bd44fe101a54767ec999e98413bc6f3c9c59377c
+  metadata.gz: f97030ff349d70d7b4605969953194c34b8012dc12f477aa8c5f6f1ccdfee88be2ccb5c495fc880378be03c381ed88e11c8453abd1d8a92ad3621aad34a0b553
+  data.tar.gz: 23f59abc3c56fe9d11b6084e89b0c02a3b11c4e12175bcab6ea4a641630616950b6943a9948c64be270173461f383a540fd570fdb69fd439cfcd7007d6e542ea

data/README.md

@@ -46,13 +46,19 @@ Humid.configure do |config|
   config.logger = Rails.logger
 
   # context_options. Options passed to mini_racer. Defaults to
-  # config.context_options = {
-  #   timeout: 1000,
-  #   ensure_gc_after_idle: 2000
-  # }
+  # empty.
+  # config.context_options = {}
+  config.context_options = {
+    timeout: 1000,
+    ensure_gc_after_idle: 2000
+  }
 end
 
-# If using puma in single mode
+# Common development options
+# You may need to use single_threaded mode with Spring
+# MiniRacer::Platform.set_flags! :single_threaded
+#
+# If you're using Puma in single mode:
 # Humid.create_context
 ```
 

data/lib/humid.rb

@@ -11,6 +11,9 @@ module Humid
   extend self
   include ActiveSupport::Configurable
 
+  class RenderError < StandardError
+  end
+
   config_accessor :server_rendering_file do
     "server_rendering.js"
   end
@@ -24,10 +27,7 @@ module Humid
   end
 
   config_accessor :context_options do
-    {
-      timeout: 1000,
-      ensure_gc_after_idle: 2000
-    }
+    {}
   end
 
   def remove_functions
@@ -54,16 +54,30 @@ module Humid
     JS
   end
 
-  def context
-    if @@context && Webpacker.env.development? && Webpacker.compiler.stale?
+  def handle_stale_files
+    if Webpacker.compiler.stale?
       Webpacker.compiler.compile
+    end
+
+    public_path = Webpacker.config.public_path
+    server_rendering_file = config.server_rendering_file
+    source_path = public_path.join(Webpacker.manifest.lookup(server_rendering_file)[1..-1])
+    filename = File.basename(source_path.to_s)
+
+    if @@current_filename != filename
       dispose
       create_context
-    else
-      @@context
     end
   end
 
+  def context
+    if @@context && Webpacker.env.development?
+      handle_stale_files
+    end
+
+    @@context
+  end
+
   def dispose
     if @@context
       @@context.dispose
@@ -89,20 +103,23 @@ module Humid
 
     source_path = public_path.join(Webpacker.manifest.lookup(server_rendering_file)[1..-1])
     map_path = public_path.join(Webpacker.manifest.lookup(server_rendering_map)[1..-1])
-
-    filename = File.basename(source_path.to_s)
-    ctx.eval(File.read(source_path), filename: filename)
-
     if config.use_source_map
       ctx.attach("readSourceMap", proc { File.read(map_path) })
     end
 
+    filename = File.basename(source_path.to_s)
+    @@current_filename = filename
+    ctx.eval(File.read(source_path), filename: filename)
+
     @@context = ctx
   end
 
   def render(*args)
     ActiveSupport::Notifications.instrument("render.humid") do
-      @@context.call("__renderer", *args)
+      context.call("__renderer", *args)
+    rescue MiniRacer::RuntimeError => e
+      message = ([e.message] + e.backtrace.filter {|x| x.starts_with? "JavaScript"}).join("\n")
+      raise Humid::RenderError.new(message)
     end
   end
 end

data/lib/humid/version.rb

@@ -1,3 +1,3 @@
 module Humid
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 end

data/spec/render_spec.rb

@@ -79,8 +79,8 @@ RSpec.describe "Humid" do
       end
     end
 
-    context "when the js is stale and env is development" do
-      it "compiles the JS" do
+    context "when the env is development" do
+      it "compiles the JS when stale" do
         allow(Webpacker).to receive_message_chain("env.development?") { true }
         allow(Webpacker).to receive_message_chain("compiler.stale?") { true }
         allow(Webpacker).to receive_message_chain("compiler.compile")
@@ -91,12 +91,36 @@ RSpec.describe "Humid" do
         expect(prev_context).to be_kind_of(MiniRacer::Context)
 
         allow(Webpacker).to receive_message_chain("compiler.stale?") { true }
+        # This simulates a changing file
+        allow(Humid.config).to receive("server_rendering_file") { "simple_changed.js" }
 
         next_context = Humid.context
 
         expect(prev_context).to_not eql(next_context)
         expect(next_context).to be_kind_of(MiniRacer::Context)
       end
+
+      it "creates a new context when webpack-devserver already handled JS staleness" do
+        allow(Webpacker).to receive_message_chain("env.development?") { true }
+        allow(Webpacker).to receive_message_chain("compiler.stale?") { true }
+        allow(Webpacker).to receive_message_chain("compiler.compile")
+        allow(Humid.config).to receive("server_rendering_file") { "simple.js" }
+
+        Humid.create_context
+        prev_context = Humid.context
+        expect(Humid.render).to eql("hello")
+        expect(prev_context).to be_kind_of(MiniRacer::Context)
+
+        allow(Webpacker).to receive_message_chain("compiler.stale?") { false }
+        # This simulates a changing file
+        allow(Humid.config).to receive("server_rendering_file") { "simple_changed.js" }
+
+        next_context = Humid.context
+
+        expect(prev_context).to_not eql(next_context)
+        expect(next_context).to be_kind_of(MiniRacer::Context)
+        expect(Humid.render).to eql("hello changed")
+      end
     end
   end
 
@@ -126,11 +150,12 @@ RSpec.describe "Humid" do
       expect {
         Humid.render
       }.to raise_error { |error|
-        expect(error).to be_a(MiniRacer::RuntimeError)
-        expect(error.message).to eql("Error: ^^ Look! These stack traces map to the actual source code :)")
-        expect(error.backtrace[0]).to eql("JavaScript at throwSomeError (/webpack:/app/javascript/packs/components/error-causing-component.js:2:1)")
-        expect(error.backtrace[1]).to eql("JavaScript at ErrorCausingComponent (/webpack:/app/javascript/packs/components/error-causing-component.js:8:1)")
-        expect(error.backtrace[2]).to eql("JavaScript at /webpack:/app/javascript/packs/reporting.js:18:1")
+        expect(error).to be_a(Humid::RenderError)
+        message = error.message.split("\n")
+        expect(message[0]).to eql("Error: ^^ Look! These stack traces map to the actual source code :)")
+        expect(message[1]).to eql("JavaScript at throwSomeError (/webpack:/app/javascript/packs/components/error-causing-component.js:2:1)")
+        expect(message[2]).to eql("JavaScript at ErrorCausingComponent (/webpack:/app/javascript/packs/components/error-causing-component.js:8:1)")
+        expect(message[3]).to eql("JavaScript at /webpack:/app/javascript/packs/reporting.js:18:1")
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: humid
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Johny Ho
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-17 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webpacker