hyper-react 1.0.0.lap24 → 1.0.0.lap25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f835a40b1580dca8202104593f6d2c8f68cbe342236850bab449d24e56691859
-  data.tar.gz: 85432b5f788b3860b518df213ff6f19744a431cbc7943d46713882ac0440c3aa
+  metadata.gz: 4359d66ff90af21650612feaaa0c166bf6f91863a71a259987b6c32f8c422000
+  data.tar.gz: 9c2008546a55dea4c180f5524045a8d7ea943e6d8455a0d126c75544457f9376
 SHA512:
-  metadata.gz: fb068dad9c84503247339c1205012f81385bc5460feb060bca396fa2886b2df5ab449a918c3dc70ee784b5d3b470c1c5bbe989e7f0fdffdf41481a1e91272529
-  data.tar.gz: 04f88e4453a78556bbdc8c2c66f0a3ffd490d08932c5279c6dd6373071847a122522eb2e445d2e37800b88613affb83fbdce3d7c1b1b1af425e8e9e3a1a04df9
+  metadata.gz: d88f3bc7f4ebfb1a53a959d299e6ba851a42c72375edca576314a23b8781d6a0fe4536ab48241f268918b0856b0a21fc6f14c24b21f86ba2655f05b24528b55d
+  data.tar.gz: 7f1b7dad44b7af799006f0349838c4bf9a718a8e2a4de5b3b6446a320b13d81d45b3c539b9f0d27a686209dcfcd0e4cce2cdf86bb32126160e8327bf35ecafc3

data/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

data/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

data/lib/react/react-source.rb

@@ -11,6 +11,7 @@ if RUBY_ENGINE == 'opal'
 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

data/lib/react/rendering_context.rb

@@ -80,7 +80,7 @@ module React
       #   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 @@ module React
       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

data/lib/reactive-ruby/isomorphic_helpers.rb

@@ -37,9 +37,7 @@ module React
     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
 

data/lib/reactive-ruby/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '1.0.0.lap24'
+  VERSION = '1.0.0.lap25'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyper-react
 version: !ruby/object:Gem::Version
-  version: 1.0.0.lap24
+  version: 1.0.0.lap25
 platform: ruby
 authors:
 - David Chang
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-28 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hyper-store
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap24
+        version: 1.0.0.lap25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap24
+        version: 1.0.0.lap25
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: hyperloop-config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.lap25
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.lap25
 - !ruby/object:Gem::Dependency
   name: chromedriver-helper
   requirement: !ruby/object:Gem::Requirement
@@ -81,14 +95,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap24
+        version: 1.0.0.lap25
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.lap24
+        version: 1.0.0.lap25
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -367,8 +381,6 @@ files:
 - lib/react/component/should_component_update.rb
 - lib/react/component/tags.rb
 - lib/react/config.rb
-- lib/react/config/client.rb.erb
-- lib/react/config/server.rb
 - lib/react/element.rb
 - lib/react/event.rb
 - lib/react/ext/hash.rb

data/lib/react/config/client.rb.erb

@@ -1,19 +0,0 @@
-if RUBY_ENGINE == 'opal'
-  module React
-    module Config
-      extend self
-      def environment=(value)
-        raise "Environment cannot be configured at runtime."
-      end
-
-      def config
-        hash = %x{
-          Opal.hash({
-            environment: <%= '"' + React::Config.config[:environment] + '"' %>
-          })
-        }
-        hash
-      end
-    end
-  end
-end

data/lib/react/config/server.rb

@@ -1,23 +0,0 @@
-if RUBY_ENGINE != 'opal'
-  module React
-    module Config
-      extend self
-      def environment=(value)
-        config[:environment] = value
-      end
-
-      def config
-        @config ||= default_config
-      end
-
-      def default_config
-        {
-          environment: ENV['RACK_ENV'] || 'development'
-        }
-      end
-    end
-  end
-  module Hyperloop
-    define_setting :prerendering, :off
-  end
-end