opal_hot_reloader 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a867c114bf9d71275cc023f35c644944abe5decc
-  data.tar.gz: 4d0c10c661b6180a2881e5d6fbac3a10d6b77e02
+  metadata.gz: 47fb312acca42d54d68707e7f9134a58ae699a0a
+  data.tar.gz: 90bc58274efecb1f3ee22f810989f57c5c0b6a90
 SHA512:
-  metadata.gz: 267a9d178686be33693532036a2bd8919f2f15e362f6ab20df3f293c60070eee5b9988dfeb8097519077aafcb7a2f3cf523a1f6e20390d0b55e08478780f2ff3
-  data.tar.gz: 637125fea8cf8526c70c7e84badc5b5587243d3fec496fc9aef8d45c96c530e883d54001e396005b418adea48143ea5e2beea114e66c74213f9d99186cb872e1
+  metadata.gz: 32c175d56c79786cd331e8230e22fbd30a8dc4ebc8ce89a5e849cfdad05f3a6c903d6fec4a68b515f8290a8e7d723ee9631b17b287454b4adcb89ed64e6d508a
+  data.tar.gz: e9e71336ab0590c037f2c3e187f3e9cd4c326a95b0b1d357d8fbafebaa154417c5922b362aeabae9914a56f97242642412154d7aca7c244be3ac208321641e60

data/Changelog.org

@@ -1,3 +1,5 @@
+* 0.1.5
+- support hyperloop patching in Opal 0.11
 * 0.1.4
 - make alerts configurable via OpalHotReloader.alerts_off!/OpalHotReloader.alerts_on!
 * 0.1.3

data/README.md

@@ -73,6 +73,7 @@ OpalHotReloader.listen
 #### Alerts
 
 ![Reload Error Alert](images/reload_error.png)
+
 By default, if there is an error hot loading code, opal_hot_reloader
 will present an alert of the error. The following options can be used
 to turn the alerts on and off:

data/lib/opal_hot_reloader/server.rb

@@ -65,8 +65,8 @@ module OpalHotReloader
 
 
     def send_updated_file(modified_file)
-      if modified_file =~ /\.rb$/
-        file_contents = File.read(modified_file)
+      if modified_file =~ /\.rb(\.erb)?$/
+        file_contents = File.read(modified_file).force_encoding(Encoding::UTF_8)
         update = {
           type: 'ruby',
           filename: modified_file,
@@ -93,7 +93,7 @@ module OpalHotReloader
 
     PROGRAM = 'opal-hot-reloader'
     def loop
-      listener = Listen.to(*@directories, only: %r{\.(rb|s?[ac]ss)$}) do |modified, added, removed|
+      listener = Listen.to(*@directories, only: %r{\.(rb(\.erb)?|s?[ac]ss)$}) do |modified, added, removed|
         modified.each { |modified_file| send_updated_file(modified_file) }
         puts "modified absolute path: #{modified}"
         puts "added absolute path: #{added}"
@@ -108,7 +108,7 @@ module OpalHotReloader
             puts "#{PROGRAM}:  client open"
           end
           client.onmessage do |mess|
-            puts "PROGRAM:  message received: #{mess}"
+            puts "PROGRAM:  message received: #{mess}" unless mess == ''
           end
           client.onclose do
             puts "#{PROGRAM}:  client closed"

data/lib/opal_hot_reloader/version.rb

@@ -1,3 +1,3 @@
 module OpalHotReloader
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/opal/opal_hot_reloader.rb

@@ -11,13 +11,12 @@ class OpalHotReloader
   def connect_to_websocket(port)
     host = `window.location.host`.sub(/:\d+/, '')
     host = '127.0.0.1' if host == ''
+    protocol = `window.location.protocol` == 'https:' ? 'wss:' : 'ws:'
     ws_url = "#{host}:#{port}"
     puts "Hot-Reloader connecting to #{ws_url}"
-    %x{
-      ws = new WebSocket('ws://' + #{ws_url});
-      // console.log(ws);
-      ws.onmessage = #{lambda { |e| reload(e) }}
-    }
+    ws = `new WebSocket(#{protocol} + '//' + #{ws_url})`
+    `#{ws}.onmessage = #{lambda { |e| reload(e) }}`
+    `setInterval(function() { #{ws}.send('') }, #{@ping * 1000})` if @ping
   end
 
   def notify_error(reload_request)
@@ -61,10 +60,11 @@ class OpalHotReloader
 
   # @param port [Integer] opal hot reloader port to connect to
   # @param reload_post_callback [Proc] optional callback to be called after re evaluating a file for example in react.rb files we want to do a React::Component.force_update!
-def initialize(port=25222, &reload_post_callback)
+def initialize(port=25222, ping=nil, &reload_post_callback)
   @port = port
   @reload_post_callback  = reload_post_callback
   @css_reloader = CssReloader.new
+  @ping = ping
 end
 # Opens a websocket connection that evaluates new files and runs the optional @reload_post_callback
 def listen
@@ -74,22 +74,28 @@ end
 # convenience method to start a listen w/one line
 # @param port [Integer] opal hot reloader port to connect to. Defaults to 25222 to match opal-hot-loader default
 # @deprecated reactrb - this flag no longer necessary and will be removed in gem release 0.2
-def self.listen(port=25222, reactrb=false)
+def self.listen(port=25222, reactrb=false, ping=nil)
   return if @server
   if reactrb
     warn "OpalHotReloader.listen(#{port}): reactrb flag is deprectated and will be removed in gem release 0.2. React will automatically be detected"
   end
-  create_framework_aware_server(port)
+  create_framework_aware_server(port, ping)
 end
 # Automatically add in framework specific hooks
 
-def self.create_framework_aware_server(port)
+def self.create_framework_aware_server(port, ping)
   if defined? ::React
     ReactrbPatches.patch!
-    @server = OpalHotReloader.new(port) { React::Component.force_update! }
+    @server = OpalHotReloader.new(port, ping) do
+      if defined?(Hyperloop) && 
+         defined?(Hyperloop::ClientDrivers) &&
+         Hyperloop::ClientDrivers.respond_to?(:initialize_client_drivers_on_boot)
+        Hyperloop::ClientDrivers.initialize_client_drivers_on_boot 
+      end
+      React::Component.force_update!
+    end 
   else
-    puts "No framework detected"
-    @server = OpalHotReloader.new(port)
+    @server = OpalHotReloader.new(port, ping)
   end
   @server.listen
 end

data/opal/opal_hot_reloader/reactrb_patches.rb

@@ -1,60 +1,31 @@
 # patches to support reloading react.rb
-class ReactrbPatches
-  # React.rb needs to be patched so the we don't keep adding callbacks
-  def self.patch!
-    module ::React
-      module Callbacks
-        module ClassMethods
-          def define_callback(callback_name)
-            attribute_name = "_#{callback_name}_callbacks"
-            class_attribute(attribute_name)
-            self.send("#{attribute_name}=", [])
-            define_singleton_method(callback_name) do |*args, &block|
-              # puts "calling new and improved callbacks"
-              callbacks = []
-              callbacks.concat(args)
-              callbacks.push(block) if block_given?
-              self.send("#{attribute_name}=", callbacks)
-            end
-          end
-        end
-      end
+module ReactrbPatchModules
+  module ReactComponent
+    def add_to_global_component_list(instance)
+      (@global_component_list ||= Set.new).add instance
     end
 
-    module ::React
-      module Callbacks
-
-        alias_method :original_run_callback, :run_callback
-
-        def run_callback(name, *args)
-          # monkey patch run callback because its easiest place to hook
-          # into all components lifecycles.
-          React::Component.add_to_global_component_list self if name == :before_mount
-          original_run_callback name, *args
-          React::Component.remove_from_global_component_list self if name == :before_unmount
-        end
-
-      end
-
-      module Component
-
-        def self.add_to_global_component_list instance
-          # puts "Adding #{instance} to component list"
-          (@global_component_list ||= Set.new).add instance
-        end
-
-        def self.remove_from_global_component_list instance
-          # puts "Removing #{instance} from component list"
-          @global_component_list.delete instance
-        end
-
-        def self.force_update!
-          # puts "Forcing global update"
-          @global_component_list && @global_component_list.each(&:force_update!)
-        end
+    def remove_from_global_component_list(instance)
+      @global_component_list.delete instance
+    end
 
-      end
+    def force_update!
+      @global_component_list && @global_component_list.each(&:force_update!)
     end
+  end
+end
 
+class ReactrbPatches
+  # React.rb needs to be patched so the we don't keep adding callbacks
+  def self.patch!
+    ::React::Component.extend ReactrbPatchModules::ReactComponent # works
+
+    ::React::Callbacks.alias_method :original_run_callback, :run_callback # works
+    # Easiest place to hook into all components lifecycles
+    ::React::Callbacks.define_method(:run_callback) do |name, *args| # works
+      React::Component.add_to_global_component_list self if name == :before_mount
+      original_run_callback name, *args
+      React::Component.remove_from_global_component_list self if name == :before_unmount
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal_hot_reloader
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Forrest Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ files:
 - bin/console
 - bin/opal-hot-reloader
 - bin/setup
+- images/reload_error.png
 - lib/opal_hot_reloader.rb
 - lib/opal_hot_reloader/server.rb
 - lib/opal_hot_reloader/version.rb