react-rails-hot-loader 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e6ee8a9957ce7f6e9df6b341dfa21e5b49f10ec
-  data.tar.gz: 6d466122e147e872cad1669c81b19714bc2cf2d3
+  metadata.gz: 6e83238b5557bc6c6decdb17fd085f2de6417ea7
+  data.tar.gz: cd502ba5a6f1628240806b4e87e2d9e6c6053769
 SHA512:
-  metadata.gz: 848a2c1cafc5069bc511ae833a9a53c925b1eb896dea8c957b245bb71e1d6746a06b61d2edc7eaf24a50167f62c84fbbdb0930bbe72798671c7cd60cd7f59c1f
-  data.tar.gz: 597fee6dc283a11a85752f981aa6fc724361140fc8c4afa454efdbd0f32223135b2f88cf59945336c6603040011683baa1c6585943e7a5f4e82208a4dc5edbfb
+  metadata.gz: 37f574e95527201e7a5ba90ec339867c6e925d6678d3c45eb80f341ba34dcec1240ce7f8b1b3b30d7d761ce3ab0d270acbe7861c112070fdee3e1eed5c7ed5e8
+  data.tar.gz: c7b8887ae4e57aa06e00be047b413630ebb7572362d3b3678af33bc70e358a88ce96c05f4a817f1a7ed9e438b2fd1c1628b32ef619af8774a043e722e51b715c

data/lib/hot_loader/railtie.rb

@@ -9,10 +9,17 @@ module React
 
         config.after_initialize do |app|
           ActionDispatch::Reloader.to_prepare do
-            begin
-              React::Rails::HotLoader.restart
-            rescue StandardError => err
-              React::Rails::HotLoader.error(err)
+            React::Rails::HotLoader.restart
+          end
+
+          if defined?(PhusionPassenger)
+            PhusionPassenger.on_event(:starting_worker_process) do |forked|
+              if forked
+                # We're in smart spawning mode.
+                React::Rails::HotLoader.restart
+              else
+                # We're in direct spawning mode. We don't need to do anything.
+              end
             end
           end
         end

data/lib/hot_loader/server.rb

@@ -14,7 +14,6 @@ module React
 
         # Restarts the server _if_ it has stopped
         def restart
-          return if running?
           start
         rescue StandardError => err
           React::Rails::HotLoader.error(err)
@@ -22,10 +21,6 @@ module React
 
         private
 
-        def running?
-          @server_thread && @server_thread.alive?
-        end
-
         def start
           @server_thread = Thread.new do
             begin
@@ -36,18 +31,14 @@ module React
           end
         end
 
+        # If the Rails server runs event machine already,
+        # don't run EventMachine again, instead hook in with `next_tick`
         def serve
-          EM.run {
-            React::Rails::HotLoader.log("starting WS server: ws://#{host}:#{port}")
-
-            EM::WebSocket.run(host: host, port: port) do |ws|
-              ws.onopen     { React::Rails::HotLoader.log("opened a connection") }
-              ws.onmessage  { |msg| handle_message(ws, msg) }
-              ws.onclose    { React::Rails::HotLoader.log("closed a connection") }
-            end
-
-            React::Rails::HotLoader.log("started WS server")
-          }
+          if already_has_event_machine_server?
+            EM.next_tick { run_websocket_server }
+          else
+            EM.run { run_websocket_server }
+          end
         end
 
         # Check for any changes since `msg`, respond if there are any changes
@@ -62,6 +53,22 @@ module React
         rescue StandardError => err
           React::Rails::HotLoader.error(err)
         end
+
+        def run_websocket_server
+          React::Rails::HotLoader.log("starting WS server: ws://#{host}:#{port}")
+
+          EM::WebSocket.run(host: host, port: port) do |ws|
+            ws.onopen     { React::Rails::HotLoader.log("opened a connection") }
+            ws.onmessage  { |msg| handle_message(ws, msg) }
+            ws.onclose    { React::Rails::HotLoader.log("closed a connection") }
+          end
+
+          React::Rails::HotLoader.log("started WS server")
+        end
+
+        def already_has_event_machine_server?
+          defined?(Thin)
+        end
       end
     end
   end

data/lib/hot_loader/version.rb

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

data/react-rails-hot-loader.gemspec

@@ -31,5 +31,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "thin"
   spec.add_development_dependency "websocket-client-simple"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails-hot-loader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thin
+  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: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement