react-rails-hot-loader 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ccd666621d038150005b210e1780351a32c3869
-  data.tar.gz: 3b162749ab5c6fc4dddf9c9afec34f9cb0588b83
+  metadata.gz: 7984784ebf6f4c9bd1c59261311bc3bf2c30e37e
+  data.tar.gz: 4ab544abfee0ecd7fa15f80069ad08e36661f973
 SHA512:
-  metadata.gz: 7b73516078d8c51f6cb23ee7525e29f5e4adfccd35e23f449884a5b5c1d8bc0de3c6fa3e071f6bdbf82872a469a6e63c6b0d75d40032b1476d994e94e48cb735
-  data.tar.gz: 98500e70dfe7c7d137a995cb63ae65ac349a90ccb29d4d34892d49a02b3a201d9a87873e602a4f79fb9797b95df937d23b024d6a7b710ac15971530f34577535
+  metadata.gz: 3069d4c3f71c033bdc9f02cc1bf84aef91bde023c181e5e0c17261df3cd80f272631588b88b7c155cd50ce352ec43d01e7395e9eb70998df520a194c95279035
+  data.tar.gz: 306bd528fc9636645f0d67926e623b7859ed2cbe143eb73246a36b8c6a20285bda08cbb481da45d0eaaccef6b488631ff52bd0b85517bccb908bf0700df0c197

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
+cache: bundler
 rvm:
-  - 2.2.0
-before_install: gem install bundler -v 1.10.3
+  - 2.3.1
 addons:
   code_climate:
     repo_token: 89617e5ca8a5789349231b46f543b5666f139bfb23d5946bc4517609926071f9

data/README.md

@@ -24,15 +24,6 @@ Or install it yourself as:
 
 ## Usage
 
-- Add an initializer:
-
-  ```ruby
-  # config/initializers/react_rails_hot_loader.rb
-  if Rails.env.development?
-    React::Rails::HotLoader.start()
-  end
-  ```
-
 - Include the JavaScript:
 
   ```js
@@ -46,6 +37,8 @@ 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.
 
+(This gem includes an initializer to start a change notification server in development _only_.)
+
 ## 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:
@@ -55,6 +48,13 @@ If you notice that your assets are not being recompiled and hot loaded, it could
 React::Rails::HotLoader::AssetChangeSet.asset_glob = "**/*.{js,rb}*" # I <3 Opal
 ```
 
+You can choose a port to start it on (default is `8082`):
+
+```ruby
+# config/initializers/react_rails_hot_loader.rb
+React::Rails::HotLoader.port = 8088
+```
+
 ## Doeses & Doesn'ts
 
 `react-rails-hot-loader` ...
@@ -67,9 +67,8 @@ React::Rails::HotLoader::AssetChangeSet.asset_glob = "**/*.{js,rb}*" # I <3 Opal
 
 ## TODO
 
-- 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`?
+- Figure out how the "real" React hot-loader preserves state and do that
+- Log out when a push fails, or log the JS code if the push succeeds but doesn't get eval'ed
 
 ## License
 

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

@@ -1,6 +1,6 @@
 var ReactRailsHotLoader = {
   since: null,
-  port: 8082,
+  port: <%= React::Rails::HotLoader.port %>,
   host: window.location.hostname,
   shouldLog: true,
 
@@ -17,17 +17,11 @@ var ReactRailsHotLoader = {
 
     this._socket.onmessage = function(message) {
       var changes = JSON.parse(message.data)
-      _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)
-        }
-      })
-      ReactRailsUJS.mountComponents()
-      _this._resetSince()
-      _this.log("update finished")
+      if (changes.bankrupt) {
+        _this._handleBankrupt(changes)
+      } else {
+        _this._hotLoad(changes)
+      }
     }
 
     this._interval = setInterval(function() {
@@ -53,7 +47,28 @@ var ReactRailsHotLoader = {
     if (this.shouldLog) {
       console.log("[HotLoader] " + msg)
     }
-  }
+  },
+
+  _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)
+      }
+    })
+    ReactRailsUJS.mountComponents()
+    this._resetSince()
+    this.log("update finished")
+  },
+
+  _handleBankrupt: function(response) {
+    this.log("declaring bankruptcy! " + response.changed_files_count + " files changed.")
+    this.stop()
+    this.log("stopped")
+  },
 }
 
 ReactRailsHotLoader.start()

data/lib/hot_loader/asset_change_set.rb

@@ -2,9 +2,12 @@ module React
   module Rails
     module HotLoader
       class AssetChangeSet
-        attr_reader :since, :path, :changed_files, :changed_file_names, :changed_asset_contents
-        class_attribute :asset_glob
+        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}*"
+        # 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
@@ -13,12 +16,11 @@ module React
           @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_file_names = changed_files.map { |f| f.split("/").last }
-          @changed_asset_contents = changed_files.map do |f|
-            logical_path = to_logical_path(f)
-            asset = ::Rails.application.assets[logical_path]
-            asset.to_s
-          end
+          @changed_file_names = changed_files.map { |f| File.basename(f) }
+        end
+
+        def bankrupt?
+          changed_files.length >= self.class.bankruptcy_count
         end
 
         def any?
@@ -34,6 +36,14 @@ module React
           }
         end
 
+        def changed_asset_contents
+          @changed_asset_contents ||= changed_files.map do |f|
+            logical_path = to_logical_path(f)
+            asset = ::Rails.application.assets[logical_path]
+            asset.to_s
+          end
+        end
+
         private
 
         def to_logical_path(asset_path)

data/lib/hot_loader/railtie.rb

@@ -8,20 +8,24 @@ module React
         end
 
         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 :(
+          if ::Rails.env.development?
             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.
+            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
+
+            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

@@ -6,7 +6,7 @@ module React
       class Server
         attr_reader :host, :port, :change_set_class
 
-        def initialize(host:  "0.0.0.0", port: 8082, change_set_class: React::Rails::HotLoader::AssetChangeSet)
+        def initialize(host: "0.0.0.0", port:, change_set_class: React::Rails::HotLoader::AssetChangeSet)
           @host = host
           @port = port
           @change_set_class = change_set_class
@@ -16,7 +16,11 @@ module React
         def restart
           start
         rescue StandardError => err
-          React::Rails::HotLoader.error(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
 
         private
@@ -38,7 +42,17 @@ module React
           # React::Rails::HotLoader.log("received message: #{msg}")
           since_time =  Time.at(msg.to_i)
           changes = change_set_class.new(since: since_time)
-          if changes.any?
+          if changes.bankrupt?
+            changed_files_count = changes.changed_file_names.length
+            React::Rails::HotLoader.log("declared bankruptcy! (#{changed_files_count} files changed)")
+
+            bankruptcy_response = {
+              bankrupt: true,
+              changed_files_count: changed_files_count,
+            }
+
+            ws.send(bankruptcy_response.to_json)
+          elsif changes.any?
             React::Rails::HotLoader.log("sent changes: #{changes.changed_file_names}")
             ws.send(changes.to_json)
           end
@@ -57,12 +71,7 @@ module React
           end
 
           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.5.0'
+      VERSION = "0.6.0"
     end
   end
 end

data/lib/hot_loader.rb

@@ -2,17 +2,13 @@ module React
   module Rails
     module HotLoader
       mattr_accessor :server
+      mattr_accessor :port
+      self.port = 8082
 
-      # Create a new server with `options` & start it
-      def self.start(options={})
-        server_class = options.delete(:server_class) || Server
-        self.server = server_class.new(options)
-        restart
-      end
-
-      # Restart the server with the same options
+      # Start _or_ restart the server
       def self.restart
-        server.restart
+        self.server ||= Server.new(port: port)
+        self.server.restart
       rescue StandardError => err
         React::Rails::HotLoader.error(err)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: react-rails-hot-loader
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Robert Mosolgo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-24 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
@@ -210,7 +210,7 @@ files:
 - bin/console
 - bin/setup
 - lib/assets/dummy/react-rails-hot-loader.js
-- lib/assets/react-rails-hot-loader.js
+- lib/assets/react-rails-hot-loader.js.erb
 - lib/hot_loader.rb
 - lib/hot_loader/asset_change_set.rb
 - lib/hot_loader/asset_path.rb
@@ -239,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Live-reload React.js components with Ruby on Rails