clearwater-hot_loader 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5d107c5ec54c7e5e0589812fbfbcf318126e3b5758a0e24a6f27bdf9469a62
-  data.tar.gz: 04e047ae417e91e91685a2f25a3591b523ec1160458ace6e4f1ba91c6b1c6e0e
+  metadata.gz: '09405aae0dd6f8b113f7a03cebc18b60a46f776450444c0575edb41e5e14f12d'
+  data.tar.gz: 4e1e0a0a7e981a1fc6795e2613ac4c819083d1b09a0ade53f4b8c011d7ce4fc8
 SHA512:
-  metadata.gz: 2f64e7c10fc4ef4599d04d356020804fb7939a12f9309ea16394e90029e216318e9f171f9eaf88faee7820b2285654650d5288d95391cca94c2a82103bc90e8e
-  data.tar.gz: d819b6704345c1fd635d2d51e0fa60e13605ffe723d7d96359768115f671bd105b9a598d56724c6867a0e8cc7de1427ae48eb6c52a2468842afb6ae2457de96d
+  metadata.gz: 6b7b9f5bbdd4d958c83249617ccd5946933ba147a981d13a54259de44d61434c378c996ed4a0eaa52d9d76b3eee993375431475b08f56e2f8967ecb808a82b42
+  data.tar.gz: 7018ba87929270f6c6bd24edfd74f9e53528961f66613238bf3b60106b4e31b46f933943dbe33842da2f8968e1606a12d18cc4c6723dd149f5b1163be22488fe

data/lib/clearwater/hot_loader/configuration.rb

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

data/lib/clearwater/hot_loader/server.rb

@@ -34,14 +34,17 @@ module Clearwater
         code = File.read(filename)
 
         if filename.end_with? '.rb'
-          Opal.compile(code)
+          { js: Opal.compile(code) }
         elsif filename.end_with? '.js'
-          code
+          { js: code }
+        elsif filename.end_with? '.scss'
+          { css: { filename: filename, body: Sass.compile(code.gsub(/^\s*@import.*$/, '')) } }
         else
-          ''
+          {}
         end
       rescue => e
-        ''
+        warn "[Clearwater::HotLoader] #{e}"
+        {}
       end
     end
   end

data/lib/clearwater/hot_loader/version.rb

@@ -1,5 +1,5 @@
 module Clearwater
   module HotLoader
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/lib/clearwater/hot_loader.rb

@@ -3,6 +3,7 @@ require 'clearwater/hot_loader/server'
 require 'clearwater/hot_loader/file_listener'
 require 'clearwater/hot_loader/configuration'
 require 'set'
+require 'json'
 
 module Clearwater
   module HotLoader
@@ -33,11 +34,12 @@ module Clearwater
             code = server.compile_file(filename)
           rescue SyntaxError => e
             puts "ONOES! #{e.class} - #{e.message}"
+            code = {}
           end
 
           puts "[Clearwater::HotLoader] Hot-loading #{filename}..."
           sockets.each do |ws|
-            ws.send code
+            ws.send code.to_json
           end
         end
       }

data/opal/clearwater/hot_loader.rb

@@ -40,18 +40,29 @@ module Clearwater
       end
 
       @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)`
+        data = msg.data
+        if data.key? :js
+          begin
+            %x{ eval(#{data[:js]}) }
+
+            # 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
+        elsif data.key? :css
+          id = "clearwater-hot-loader-style-#{data[:css][:filename].gsub(/\W/, '-')}"
+          style = Bowser.document["##{id}"] || Bowser.document.create_element(:style)
+          new_element = style.id.empty?
+          style.id = id
+          style.text_content = data[:css][:body]
+
+          Bowser.document.head.append style if new_element
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater-hot_loader
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-06-25 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.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reload your Clearwater app without refreshing the browser