clearwater-hot_loader 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62c2fa540fc31b83554e87857a0fa030fb28fd5f
-  data.tar.gz: 48acf0cb240586d81b00f681810731c149eaf75a
+  metadata.gz: 333c55823d1f8bf36570a9c7bc530669c4c0ebbe
+  data.tar.gz: 980439c4b1b380b0d3842967fed45521e4ba1d5a
 SHA512:
-  metadata.gz: 5eb6383c99d0897ba6f5dc9cd910c5657866d7bae1c9672b1e2d7b6091802b22eda30004d3fd22411e0da6b2c332c63bbf5c8f093fe311682c7946c5f25c088d
-  data.tar.gz: 549ef88113da09433a95cdc7b6a0cd0d2402550994dde6ab4d70ee39c14b3c18e26b6c4b139bbee7764755a6c93514ffe3134e751de2ea292ce85c612ae8cfaa
+  metadata.gz: 2c16c3a63ba346cbb7c55e3680966c3d4a166c934de41a7db7635062f8a1fb2b85f83a4a796586dd07bd5651d3beb33ba7fdf0cd619c5edda12625e6ea982eca
+  data.tar.gz: 7472c8d1a662ced9691399abdd481a5a007a1bba8e94bfa142ed9f7107bc3b9628d4d48e457547ef9795ffd8b483013f90f5557a90b4badf7fef33fc81bd50d1

data/clearwater-hot_loader.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'clearwater'
+  spec.add_runtime_dependency 'clearwater', '~> 1.0.0.rc1'
   spec.add_runtime_dependency 'listen'
   spec.add_runtime_dependency 'faye-websocket'
 

data/lib/clearwater/hot_loader.rb

@@ -31,14 +31,14 @@ module Clearwater
           begin
             puts "[Clearwater::HotLoader] Compiling #{filename}..."
             code = server.compile_file(filename)
-            puts "[Clearwater::HotLoader] Hot-loading #{filename}..."
-
-            sockets.each do |ws|
-              ws.send code
-            end
-          rescue => e
+          rescue SyntaxError => e
             puts "ONOES! #{e.class} - #{e.message}"
           end
+
+          puts "[Clearwater::HotLoader] Hot-loading #{filename}..."
+          sockets.each do |ws|
+            ws.send code
+          end
         end
       }
       @listeners.each(&:start)

data/lib/clearwater/hot_loader/configuration.rb

@@ -7,9 +7,7 @@ module Clearwater
         candidate_directories = Dir[
           *%w(
             app/assets/javascripts
-            app/assets/javascripts/**/*
-            assets
-            assets/**/*
+            assets/js
           )
         ]
         self.directories = candidate_directories

data/lib/clearwater/hot_loader/file_listener.rb

@@ -7,7 +7,7 @@ module Clearwater
         @directory = directory
 
         @listener = Listen.to(directory) do |modified, added, removed|
-          (modified + added).each do |file|
+          (modified + added).uniq.each do |file|
             block.call(file)
           end
         end

data/lib/clearwater/hot_loader/server.rb

@@ -16,12 +16,14 @@ module Clearwater
         if WebSocket.websocket? env
           ws = WebSocket.new(env)
 
+          ws.on :open do
+            hot_loader.add_socket ws
+          end
+
           ws.on :close do
             hot_loader.remove_socket ws
           end
 
-          hot_loader.add_socket ws
-
           ws.rack_response
         else
           [200, { 'Content-Type' => 'text/plain' }, ['Websockets only, please.']]

data/lib/clearwater/hot_loader/version.rb

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

data/opal/clearwater/hot_loader.rb

@@ -13,23 +13,78 @@ module Clearwater
     def initialize port, path='/clearwater_hot_loader'
       @port = port
       @path = path
+      Bowser.window.animation_frame do
+        div = Bowser.document.create_element('div')
+        Bowser.document.body.append div
+        @app = Clearwater::Application.new(
+          component: ConnectionIndicator.new(self),
+          element: div,
+        )
+        @app.call
+      end
     end
 
     def connect
       @socket = Bowser::WebSocket.new("ws://localhost:#{port}#{path}")
 
+      @socket.on :open do
+        @app.render
+      end
+
       @socket.on :message do |msg|
-        %x{ eval(msg.native.data) }
+        begin
+          %x{ eval(msg.native.data) }
+        rescue => e
+          error_message = "[Clearwater::HotLoader] Error #{e.class}: #{e.message}"
+          `console.error(error_message)`
+        end
         Clearwater::Application.render
       end
 
       @socket.on :close do
-        Bowser.window.delay 1 do
+        @app.render
+        Bowser.window.delay 0.5 do
           connect
         end
       end
 
       self
     end
+
+    def connected?
+      @socket.connected?
+    end
+
+    class ConnectionIndicator
+      include Clearwater::Component
+
+      def initialize loader
+        @loader = loader
+      end
+
+      def render
+        div({ style: style }, [
+          connection_status,
+        ])
+      end
+
+      def connection_status
+        span([
+          "Hot Loader: ",
+          @loader.connected? ? 'Connected' : 'Disconnected',
+        ])
+      end
+
+      def style
+        connected = @loader.connected?
+        {
+          position: :fixed,
+          bottom: 0,
+          right: 0,
+          background_color: connected ? :green : :red,
+          color: :white,
+        }
+      end
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: clearwater-hot_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clearwater
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Reload your Clearwater app without refreshing the browser