clearwater-hot_loader 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 333c55823d1f8bf36570a9c7bc530669c4c0ebbe
-  data.tar.gz: 980439c4b1b380b0d3842967fed45521e4ba1d5a
+SHA256:
+  metadata.gz: 88069316bdc48d8c2d56ae1af915ff36127831e25c3b884e5ec59bebd730428f
+  data.tar.gz: 96ebbfda995dcf51cfb523eaeefa3d861c087367522db6a46619bc7bc85be8fa
 SHA512:
-  metadata.gz: 2c16c3a63ba346cbb7c55e3680966c3d4a166c934de41a7db7635062f8a1fb2b85f83a4a796586dd07bd5651d3beb33ba7fdf0cd619c5edda12625e6ea982eca
-  data.tar.gz: 7472c8d1a662ced9691399abdd481a5a007a1bba8e94bfa142ed9f7107bc3b9628d4d48e457547ef9795ffd8b483013f90f5557a90b4badf7fef33fc81bd50d1
+  metadata.gz: 2aa35a5fa937a07754305a46097f3aa9e24771cc369477beece437cd7156dc774a565658624d72fee52b89ac2ebf5bbbcb54bd23c2ea8da1c68ad1dee9fd92a6
+  data.tar.gz: 8df849b68d530b6bf8bfb43943a7901890b42c51717ffbcfa62c35a1a2ab9ff8370b4fe6c883b5437ad5b667cc5150ff6df66be9baced83c5d5546c533b386d4

data/lib/clearwater/hot_loader/version.rb

@@ -1,5 +1,5 @@
 module Clearwater
   module HotLoader
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/opal/clearwater/hot_loader.rb

@@ -6,11 +6,15 @@ module Clearwater
   class HotLoader
     attr_reader :port, :path
 
-    def self.connect port=3000, path='/clearwater_hot_loader'
-      new(port, path).connect
+    def self.connect port=nil, deprecated_path=nil, path: '/clearwater_hot_loader'
+      if deprecated_path
+        warn "[Clearwater::HotLoader] Passing the path as a positional argument is deprecated. Please pass the path as a keyword argument."
+      end
+
+      new(port, path: deprecated_path || path).connect
     end
 
-    def initialize port, path='/clearwater_hot_loader'
+    def initialize port=nil, path: '/clearwater_hot_loader'
       @port = port
       @path = path
       Bowser.window.animation_frame do
@@ -25,7 +29,10 @@ module Clearwater
     end
 
     def connect
-      @socket = Bowser::WebSocket.new("ws://localhost:#{port}#{path}")
+      match, scheme, host, port, = *Bowser.window.location.href.match(%r{(https?)://([^:/]+)(?:\:(\d+))?/?([^\?]*)})
+      port = @port if @port
+      socket_url = "ws#{'s' if scheme == 'https'}://#{host}#{":#{port}" if port}#{path}"
+      @socket = Bowser::WebSocket.new(socket_url)
 
       @socket.on :open do
         @app.render
@@ -34,11 +41,17 @@ module Clearwater
       @socket.on :message do |msg|
         begin
           %x{ eval(msg.native.data) }
+
+          # We need to perform the renders synchronously so we can rescue
+          # exceptions, but the app registry doesn't give us a way to do that,
+          # so we reach in and do this manually. Don't try this at home.
+          Clearwater::Application::AppRegistry
+            .instance_exec { @apps }
+            .each { |app| app.perform_render }
         rescue => e
           error_message = "[Clearwater::HotLoader] Error #{e.class}: #{e.message}"
           `console.error(error_message)`
         end
-        Clearwater::Application.render
       end
 
       @socket.on :close do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater-hot_loader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clearwater
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.2
 signing_key: 
 specification_version: 4
 summary: Reload your Clearwater app without refreshing the browser