react-rails-hot-loader 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7984784ebf6f4c9bd1c59261311bc3bf2c30e37e
-  data.tar.gz: 4ab544abfee0ecd7fa15f80069ad08e36661f973
+  metadata.gz: ab9de518bb75c50cbeacaea338a7f88aab57810d
+  data.tar.gz: 416ae157991bbba3f40e672b1867509fe407e293
 SHA512:
-  metadata.gz: 3069d4c3f71c033bdc9f02cc1bf84aef91bde023c181e5e0c17261df3cd80f272631588b88b7c155cd50ce352ec43d01e7395e9eb70998df520a194c95279035
-  data.tar.gz: 306bd528fc9636645f0d67926e623b7859ed2cbe143eb73246a36b8c6a20285bda08cbb481da45d0eaaccef6b488631ff52bd0b85517bccb908bf0700df0c197
+  metadata.gz: 72353bf21ad48fe6dfbfc0a8b04f2f97ead8bf77c83e9d1ebd247e42b7e73ab4662d609f335b200110fbb9869cdc3d0a165cafdfaad29bc9c54c5c195211d4f5
+  data.tar.gz: 1357768dddb36e755a9bb920a1258ce2bd03146c464d92ffa57278075c7a4332ebb0178374755349f937c8120c63dc01449b476ca071ecb763cdcfb39f196670

data/README.md

@@ -45,7 +45,7 @@ If you notice that your assets are not being recompiled and hot loaded, it could
 
 ```ruby
 # config/initializers/react_rails_hot_loader.rb
-React::Rails::HotLoader::AssetChangeSet.asset_glob = "**/*.{js,rb}*" # I <3 Opal
+React::Rails::HotLoader::AssetChangeSet.asset_glob = "**/*.{css,sass,scss,js,rb}*" # I <3 Opal
 ```
 
 You can choose a port to start it on (default is `8082`):
@@ -60,10 +60,9 @@ React::Rails::HotLoader.port = 8088
 `react-rails-hot-loader` ...
 
 - __does__ set up a WebSocket server & client
-- __does__ reload JS assets when they change (from `/app/assets/javascripts/*.{js,coffee}*`)
+- __does__ reload JS assets when they change (from `/app/assets/javascripts/*.{css,js,coffee}*`)
 - __does__ remount components (via `ReactRailsUJS`) after reloading assets
 - __doesn't__ reload Rails view files (`html`, `erb`, `slim`, etc)
-- __doesn't__ reload CSS (although that could be fixed)
 
 ## TODO
 

data/lib/assets/react-rails-hot-loader.js.erb

@@ -52,11 +52,21 @@ var ReactRailsHotLoader = {
   _hotLoad: function(changes) {
     this.log("updating: " + changes.changed_file_names.join(", ") )
 
-    changes.changed_asset_contents.forEach(function(jsCode) {
-      try {
-        eval.call(window, jsCode)
-      } catch (err) {
-        _this.log(err)
+    changes.changed_file_names.forEach(function(fileName, i) {
+      var changedAssetContent = changes.changed_asset_contents[i]
+
+      if (fileName.indexOf(".js") > -1) {
+        // Reload JS
+        try {
+          eval.call(window, changedAssetContent)
+        } catch (err) {
+          _this.log(err)
+        }
+      } else {
+        // Reload CSS
+        var styleTag = document.createElement("style")
+        styleTag.textContent = changedAssetContent
+        document.head.appendChild(styleTag)
       }
     })
     ReactRailsUJS.mountComponents()

data/lib/hot_loader/asset_change_set.rb

@@ -5,17 +5,17 @@ module React
         attr_reader :since, :path, :changed_files, :changed_file_names
         class_attribute :asset_glob, :bankruptcy_count
         # Search for changes with this glob
-        self.asset_glob = "/**/*.{js,coffee}*"
+        self.asset_glob = "/**/*.{css,sass,scss,js,coffee}*"
         # If this many files change at once, give up hope! (Probably checked out a new branch)
         self.bankruptcy_count = 5
 
         # initialize with a path and time
         # to find files which changed since that time
-        def initialize(since:, path: ::Rails.root.join("app/assets/javascripts"))
+        def initialize(since:, path: ::Rails.root.join("app/assets"))
           @since = since
           @path = path.to_s
           asset_glob = File.join(path, AssetChangeSet.asset_glob)
-          @changed_files = Dir.glob(asset_glob).select { |f| File.mtime(f) >= since }
+          @changed_files = Dir.glob(asset_glob).select { |f| File.mtime(f) >= since }.uniq
           @changed_file_names = changed_files.map { |f| File.basename(f) }
         end
 
@@ -48,9 +48,11 @@ module React
 
         def to_logical_path(asset_path)
           asset_path
-            .sub(@path, "")       # remove the basepath
-            .sub(/^\//, '')       # remove any leading /
-            .sub(/\.js.*/, '.js') # replace any file extension with `.js`
+            .sub(@path, "")                     # remove the basepath
+            .sub(/(javascripts|stylesheets)\//, '') # remove the asset directory
+            .sub(/^\//, '')                         # remove any leading /
+            .sub(/\.js.*/, '.js')                   # uniform .js for js
+            .sub(/\.[sac]{1,2}ss.*/, '.css') # uniform .css for styles
         end
       end
     end

data/lib/hot_loader/server.rb

@@ -10,6 +10,7 @@ module React
           @host = host
           @port = port
           @change_set_class = change_set_class
+          @processed_msg = Hash.new
         end
 
         # Restarts the server _if_ it has stopped
@@ -37,9 +38,10 @@ module React
           end
         end
 
-        # Check for any changes since `msg`, respond if there are any changes
+        # Check for any changes since `msg`, respond if there are any changes, skip if msg was already processed (queue issue)
         def handle_message(ws, msg)
           # React::Rails::HotLoader.log("received message: #{msg}")
+          return true if @processed_msg[ws.signature] == msg
           since_time =  Time.at(msg.to_i)
           changes = change_set_class.new(since: since_time)
           if changes.bankrupt?
@@ -55,6 +57,7 @@ module React
           elsif changes.any?
             React::Rails::HotLoader.log("sent changes: #{changes.changed_file_names}")
             ws.send(changes.to_json)
+            @processed_msg[ws.signature] = msg
           end
         rescue StandardError => err
           React::Rails::HotLoader.error(err)

data/lib/hot_loader/version.rb

@@ -1,7 +1,7 @@
 module React
   module Rails
     module HotLoader
-      VERSION = "0.6.0"
+      VERSION = "0.7.0"
     end
   end
 end

data/react-rails-hot-loader.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-minitest"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "sass-rails"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "thin"
   spec.add_development_dependency "websocket-client-simple"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails-hot-loader
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement