react-rails-hot-loader 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e83238b5557bc6c6decdb17fd085f2de6417ea7
-  data.tar.gz: cd502ba5a6f1628240806b4e87e2d9e6c6053769
+  metadata.gz: a8f8205a8fecc4ea01e396791be7634c7ccc10d3
+  data.tar.gz: 0f4723d12e64e9b90a3d661fb4790aad53541353
 SHA512:
-  metadata.gz: 37f574e95527201e7a5ba90ec339867c6e925d6678d3c45eb80f341ba34dcec1240ce7f8b1b3b30d7d761ce3ab0d270acbe7861c112070fdee3e1eed5c7ed5e8
-  data.tar.gz: c7b8887ae4e57aa06e00be047b413630ebb7572362d3b3678af33bc70e358a88ce96c05f4a817f1a7ed9e438b2fd1c1628b32ef619af8774a043e722e51b715c
+  metadata.gz: ca06352fe32da0f8bb4bd276768a30840d1fc0639f3041262063a7edfd35cf09d91dc2769808643205ec853e43cb926743537fecb45ddf2df444619866eb8cc7
+  data.tar.gz: 9e163bd9b45976a684f438a8674c303602f6cbffae2140b7729560cdaa1d88fbed9d3f7c176fa386c6c1a43e6b10f9a77bc13f37d61e1a1ae19d4dca8fa2bd14

data/README.md

@@ -1,10 +1,10 @@
-# React::Rails::HotLoader 
+# React::Rails::HotLoader
 
 Reload React.js components with Ruby on Rails & [`react-rails`](http://github.com/reactjs/react-rails).
 
 When you edit components, they'll be reloaded by the browser & re-mounted in the page.
 
-[![Gem Version](https://badge.fury.io/rb/react-rails-hot-loader.svg)](http://badge.fury.io/rb/react-rails-hot-loader) [![Build Status](https://travis-ci.org/rmosolgo/react-rails-hot-loader.svg)](https://travis-ci.org/rmosolgo/react-rails-hot-loader) [![Code Climate](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/badges/gpa.svg)](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader) [![Test Coverage](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/badges/coverage.svg)](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/coverage) 
+[![Gem Version](https://badge.fury.io/rb/react-rails-hot-loader.svg)](http://badge.fury.io/rb/react-rails-hot-loader) [![Build Status](https://travis-ci.org/rmosolgo/react-rails-hot-loader.svg)](https://travis-ci.org/rmosolgo/react-rails-hot-loader) [![Code Climate](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/badges/gpa.svg)](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader) [![Test Coverage](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/badges/coverage.svg)](https://codeclimate.com/github/rmosolgo/react-rails-hot-loader/coverage)
 
 ## Installation
 
@@ -46,12 +46,21 @@ Or install it yourself as:
 
 - Edit files in `/app/assets/javascripts` & save changes -- they'll be reloaded in the client and React components will be remounted.
 
+## Configuration
+
+If you notice that your assets are not being recompiled and hot loaded, it could be because they aren't being matched by the default asset glob used (`**/*.{js,coffee}*`).  You can modify this asset glob like so:
+
+```ruby
+# app/config/initializers/react_rails_hot_loader.rb
+React::Rails::HotLoader::AssetChangeSet.asset_glob = "**/*.{js,rb}*" # I <3 Opal
+```
+
 ## Doeses & Doesn'ts
 
 `react-rails-hot-loader` ...
 
 - __does__ set up a WebSocket server & client
-- __does__ reload JS assets when they change (from `/app/assets/javascripts/*.js*`)
+- __does__ reload JS assets when they change (from `/app/assets/javascripts/*.{js,coffee}*`)
 - __does__ remount components (via `ReactRailsUJS`) after reloading assets
 - __does__ preserve state & props (because `React.render` does that out of the box)
 - __doesn't__ reload Rails view files (`html`, `erb`, `slim`, etc)
@@ -59,9 +68,9 @@ Or install it yourself as:
 
 ## TODO
 
-- Handle Passenger occasionally killing background threads :(
-- Replace pinging with file watching
+- Replace pinging with file watching?
 - Add `rails g react-rails-hot-loader:install` to add initializer and JS
+- Remove need for initializer by automatically starting in `config.after_initialize`?
 
 ## License
 

data/lib/hot_loader/asset_change_set.rb

@@ -3,12 +3,15 @@ module React
     module HotLoader
       class AssetChangeSet
         attr_reader :since, :path, :changed_files, :changed_file_names, :changed_asset_contents
+        class_attribute :asset_glob
+        self.asset_glob = "/**/*.{js,coffee}*"
+
         # initialize with a path and time
         # to find files which changed since that time
         def initialize(since:, path: ::Rails.root.join("app/assets/javascripts"))
           @since = since
           @path = path.to_s
-          asset_glob = path.to_s + "/**/*.js*"
+          asset_glob = File.join(path, AssetChangeSet.asset_glob)
           @changed_files = Dir.glob(asset_glob).select { |f| File.mtime(f) >= since }
           @changed_file_names = changed_files.map { |f| f.split("/").last }
           @changed_asset_contents = changed_files.map do |f|

data/lib/hot_loader/railtie.rb

@@ -9,6 +9,9 @@ module React
 
         config.after_initialize do |app|
           ActionDispatch::Reloader.to_prepare do
+            # Seems like Passenger kills threads on the main process
+            # In that case, `starting_worker_process` isn't good enough
+            # because it doesn't run :(
             React::Rails::HotLoader.restart
           end
 

data/lib/hot_loader/server.rb

@@ -21,23 +21,15 @@ module React
 
         private
 
-        def start
-          @server_thread = Thread.new do
-            begin
-              serve
-            rescue StandardError => err
-              React::Rails::HotLoader.error(err)
-            end
-          end
-        end
-
         # If the Rails server runs event machine already,
         # don't run EventMachine again, instead hook in with `next_tick`
-        def serve
+        def start
           if already_has_event_machine_server?
             EM.next_tick { run_websocket_server }
           else
-            EM.run { run_websocket_server }
+            Thread.new do
+              EM.run { run_websocket_server }
+            end
           end
         end
 
@@ -55,15 +47,22 @@ module React
         end
 
         def run_websocket_server
-          React::Rails::HotLoader.log("starting WS server: ws://#{host}:#{port}")
+          ws_url =  "ws://#{host}:#{port}"
+          React::Rails::HotLoader.log("starting WS server (#{ws_url})")
 
           EM::WebSocket.run(host: host, port: port) do |ws|
-            ws.onopen     { React::Rails::HotLoader.log("opened a connection") }
+            ws.onopen     { React::Rails::HotLoader.log("opened a connection (#{ws_url})") }
             ws.onmessage  { |msg| handle_message(ws, msg) }
-            ws.onclose    { React::Rails::HotLoader.log("closed a connection") }
+            ws.onclose    { React::Rails::HotLoader.log("closed a connection (#{ws_url})") }
           end
 
-          React::Rails::HotLoader.log("started WS server")
+          React::Rails::HotLoader.log("started WS server (#{ws_url})")
+        rescue StandardError => err
+          if err.message =~ /no acceptor/
+            React::Rails::HotLoader.log("WS server is already running (#{ws_url})")
+          else
+            React::Rails::HotLoader.error(err)
+          end
         end
 
         def already_has_event_machine_server?

data/lib/hot_loader/version.rb

@@ -1,7 +1,7 @@
 module React
   module Rails
     module HotLoader
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails-hot-loader
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket