isomorfeus-react 16.13.0 → 16.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 947da878f70ba5a12ed18872ce80759e8d8653a7690527a906bd91f10edc1333
-  data.tar.gz: 7ed9f57c7eb15dcf6b6b5d7d1650e4e55041702cc948cdec4c14321db995f50e
+  metadata.gz: 1c28956343a2d33bfd6e86a406a1479b403a609f482dc283df7e60dfee2b52fb
+  data.tar.gz: 6909f97fa27587d1635256763cf19d7fede19704f2027876b486043c48d291b4
 SHA512:
-  metadata.gz: 260fdc8fc33d3346b7c8f0faf037a9061fda2832aa2713fa12cc0981f9efcbf6084b1768fe5518eb925b5504e667cad95c4b5a0da0cd38bb105783abcf4b4a0d
-  data.tar.gz: 72e8199ae9fe16615f1f6140715ffdda6d9db023e2f54dfb8476d05da9b62849590f6925a02940d5e968a11a307198642ae9af04011f8e9633cb8af647e3b0ff
+  metadata.gz: ad4419cf10814eaf6c2c85dd36450f83ff321a38f47672342faa6a6b136110fcea7710aaae32fa10ea09c4794e226346bbde0a18a7d93ae9e59b2191fdeef2e6
+  data.tar.gz: 9ecdaa132dd659a414a9a6f1826b847476686ee3432c1b7827bdfb7a03755f9e9e67c1607a54675ebcf6f4b094c5508d8ad5f219c37a72b8a9567a93566892f6

data/lib/isomorfeus-react.rb

@@ -100,10 +100,12 @@ else
   Isomorfeus.server_side_rendering = true
 
   # cache
-  require 'isomorfeus/thread_local_cache'
+  require 'isomorfeus/thread_local_component_cache'
   require 'isomorfeus/react_view_helper'
 
-  Isomorfeus.component_cache_class = Isomorfeus::ThreadLocalCache
+  Isomorfeus.component_cache do
+    Isomorfeus::ThreadLocalComponentCache.new
+  end
 
   Opal.append_path(__dir__.untaint)
 

data/lib/isomorfeus/react_config.rb

@@ -109,13 +109,17 @@ module Isomorfeus
     self.add_client_option(:client_init_after_store_class_names, [])
   else
     class << self
-      attr_accessor :component_cache_class
+      attr_reader :component_cache
       attr_accessor :server_side_rendering
       attr_accessor :ssr_hot_asset_url
       attr_reader :env
       attr_accessor :zeitwerk
       attr_accessor :zeitwerk_lock
 
+      def component_cache(&block)
+        @component_cache = block
+      end
+
       def configuration(&block)
         block.call(self)
       end
@@ -146,6 +150,12 @@ module Isomorfeus
       def version
         Isomorfeus::VERSION
       end
+
+      def load_configuration
+        Dir.glob("config/*.rf").sort.each do |file|
+          require_relative file
+        end
+      end
     end
   end
 
@@ -155,9 +165,24 @@ module Isomorfeus
       execution_environment = if on_browser? then 'on Browser'
                               elsif on_ssr? then 'in Server Side Rendering'
                               elsif on_server? then 'on Server'
+                              elsif on_mobile? then 'on Mobile'
+                              elsif on_database? then 'on Database'
+                              else
+                                'on Client'
                               end
       error = error_class.new("Isomorfeus in #{env} #{execution_environment}:\n#{message}")
       error.set_backtrace(stack) if stack
+
+      if Isomorfeus.development?
+        if RUBY_ENGINE == 'opal'
+          ecn = error_class ? error_class.name : ''
+          m = message ? message : ''
+          s = stack ? stack : ''
+          `console.error(ecn, m, s)`
+        else
+          STDERR.puts "#{ecn}: #{m}\n #{s}"
+        end
+      end
       raise error
     end
   end

data/lib/isomorfeus/react_view_helper.rb

@@ -1,26 +1,22 @@
 module Isomorfeus
   module ReactViewHelper
-    def cached_mount_component(component_name, props = {}, asset = 'application_ssr.js', static = false)
+    def cached_mount_component(component_name, props = {}, asset = 'web_ssr.js', static = false)
       key = "#{component_name}#{props}#{asset}"
-      if Isomorfeus.production? && component_cache.key?(key)
-        render_result = component_cache[key][:render_result]
-        @ssr_response_status = component_cache[key][:ssr_response_status]
-        @sst_styles = component_cache[key][:ssr_styles]
-      else
-        render_result = mount_component(component_name, props, asset, static)
-        status = ssr_response_status
-        if status >= 200 && status < 300
-          component_cache[key] = { render_result: render_result, ssr_response_status: status, ssr_styles: ssr_styles }
-        end
+      if Isomorfeus.production?
+        render_result, @ssr_response_status, @ssr_styles = component_cache.fetch(key)
+        return render_result if render_result
       end
+      render_result = mount_component(component_name, props, asset, static)
+      status = ssr_response_status
+      component_cache.set(key, render_result, status, ssr_styles) if status >= 200 && status < 300
       render_result
     end
 
-    def cached_mount_static_component(component_name, props = {}, asset = 'application_ssr.js')
+    def cached_mount_static_component(component_name, props = {}, asset = 'web_ssr.js')
       cached_mount_component(component_name, props, asset, true)
     end
 
-    def mount_component(component_name, props = {}, asset = 'application_ssr.js', static = false)
+    def mount_component(component_name, props = {}, asset = 'web_ssr.js', static = false)
       @ssr_response_status = nil
       @ssr_styles = nil
       thread_id_asset = "#{Thread.current.object_id}#{asset}"
@@ -214,7 +210,7 @@ module Isomorfeus
       render_result
     end
 
-    def mount_static_component(component_name, props = {}, asset = 'application_ssr.js')
+    def mount_static_component(component_name, props = {}, asset = 'web_ssr.js')
       mount_component(component_name, props, asset, true)
     end
 
@@ -229,7 +225,7 @@ module Isomorfeus
     private
 
     def component_cache
-      @_component_cache ||= Isomorfeus.component_cache_class.new
+      @_component_cache ||= Isomorfeus.component_cache.call
     end
   end
 end

data/lib/isomorfeus/thread_local_component_cache.rb

@@ -0,0 +1,15 @@
+module Isomorfeus
+  class ThreadLocalComponentCache
+    def initialize
+      Thread.current[:local_cache] = {} unless Thread.current.key?(:local_cache)
+    end
+
+    def fetch(key)
+      Thread.current[:local_cache][key]
+    end
+
+    def store(key, rendered_tree, response_status, styles)
+      Thread.current[:local_cache][key] = [rendered_tree, response_status, styles]
+    end
+  end
+end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.13.0'
+  VERSION = '16.13.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.13.0
+  version: 16.13.1
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: isomorfeus-redux
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,7 @@ files:
 - lib/isomorfeus/props/validator.rb
 - lib/isomorfeus/react_config.rb
 - lib/isomorfeus/react_view_helper.rb
-- lib/isomorfeus/thread_local_cache.rb
+- lib/isomorfeus/thread_local_component_cache.rb
 - lib/isomorfeus/top_level.rb
 - lib/isomorfeus/top_level_ssr.rb
 - lib/isomorfeus/vivify_module.rb

data/lib/isomorfeus/thread_local_cache.rb

@@ -1,21 +0,0 @@
-module Isomorfeus
-  class ThreadLocalCache
-    def initialize
-      Thread.current[:local_cache] = {} unless Thread.current.key?(:local_cache)
-    end
-
-    def [](key)
-      Thread.current[:local_cache][key]
-    end
-    alias fetch []
-
-    def []=(key, value)
-      Thread.current[:local_cache][key] = value
-    end
-    alias store []=
-
-    def key?(key)
-      Thread.current[:local_cache].key?(key)
-    end
-  end
-end