closes #256 closes #255

Author: catmando

Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
+gem 'hyperloop-config', path: '../hyperloop-config'
 gem "opal-jquery", git: "https://github.com/opal/opal-jquery.git", branch: "master"
 gemspec

hyper-react.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'hyper-store', React::VERSION
   spec.add_dependency 'opal', '>= 0.11.0', '< 0.12.0'
   spec.add_dependency 'opal-activesupport', '~> 0.3.1'
+  spec.add_dependency 'hyperloop-config', React::VERSION
 
   spec.add_development_dependency 'chromedriver-helper'
   spec.add_development_dependency 'hyper-spec', React::VERSION

lib/react/config.rb

@@ -1,5 +1,5 @@
 if RUBY_ENGINE != 'opal'
-  require "react/config/server"
-else
-  require "react/config/client"
+  module Hyperloop
+    define_setting :prerendering, :off
+  end
 end

lib/react/config/client.rb.erb

@@ -11,6 +11,7 @@
 else
   require "react/config"
   require "react/rails/asset_variant"
-  react_directory = React::Rails::AssetVariant.new(React::Config.config).react_directory
+  variant = Hyperloop.env.production? ? 'production' : 'development'
+  react_directory = React::Rails::AssetVariant.new({environment: variant}).react_directory
   Opal.append_path react_directory.untaint
 end

lib/react/config/server.rb

@@ -80,7 +80,7 @@ def remove_nodes_from_args(args)
       #   3 an element that is NOT yet pushed on the rendering buffer
       #   4 or the last element pushed on the buffer
       #
-      # in case 1 we change the object to a string, and then it becomes case 2
+      # in case 1 we render a span
       # in case 2 we automatically push the string onto the buffer
       # in case 3 we also push the Element onto the buffer IF the buffer is empty
       # case 4 requires no special processing
@@ -93,7 +93,10 @@ def remove_nodes_from_args(args)
       def run_child_block(is_outer_scope)
         result = yield
         if result.respond_to?(:acts_as_string?) && result.acts_as_string?
-          @buffer << result.to_s
+          # hyper-mesh DummyValues respond to acts_as_string, and must
+          # be converted to spans INSIDE the parent, otherwise the waiting_on_resources
+          # flag will get set in the wrong context
+          React::RenderingContext.render(:span) { result.to_s }
         elsif result.is_a?(String) || (result.is_a?(React::Element) && @buffer.empty?)
           @buffer << result
         end

lib/react/react-source.rb

@@ -37,9 +37,7 @@ def self.context
     def self.log(message, message_type = :info)
       message = [message] unless message.is_a? Array
 
-      is_production = React::Config.config[:environment] == 'production'
-
-      if (message_type == :info || message_type == :warning) && is_production
+      if (message_type == :info || message_type == :warning) && Hyperloop.env.production?
         return
       end