isomorfeus-react 16.10.12 → 16.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212995320dc44b1d0044e78018b806842eac6f3a9e9de729276cfdece8678547
-  data.tar.gz: c1b472d9c8e77c452d2f6ebdd479afe798e1a4a6b51e3e7d544066331369be4f
+  metadata.gz: 89d11f7a3996ea44b089e50e65bd9e473edeb12cb877599054790db2705caa8a
+  data.tar.gz: 90ce6397b467688228cce66dcc0f3b1cd59a0aa15c83dd8ce3f15a3997017750
 SHA512:
-  metadata.gz: '00188bcb28282e7ad13198b3b0e3bf2d1faa28895df3a4488e51cb068adbcc27a033fa41c20243f6278b74cd31bdb885b31c793d022c5db841945031d14cd36d'
-  data.tar.gz: 56313a58b6a58c0c76e01f0e9844555842ce22c28db06f778615ee6d7c38b0326bfa2c57d71171f2a4d0c43447b64971b93e20fc738bc0df15c47fe92fec7318
+  metadata.gz: e3bf6b9a9029f53ad7ccdbc674bc166e09b863d7ab088cfcd68c732e1592d2986b514faf6c33e0aa13fa9f12b820f87c11570f46a55fe10130cc87757c423bef
+  data.tar.gz: 84450d0bff23041bcadb040107e72f8086c9631f7849a1b889a9a8e903274acb008f185a1dacb1aef7fe5dafef39863293cbad9c89e5dae9545839b7be39cbe0

data/README.md

@@ -71,8 +71,3 @@ https://github.com/facebook/react-devtools
 - clone repo
 - `bundle install`
 - `rake`
-
-Implementations for the [js-framework-benchmark](https://github.com/krausest/js-framework-benchmark):
-
-- [using LucidComponent](https://github.com/janbiedermann/js-framework-benchmark/tree/master/frameworks/keyed/isomorfeus-lucid)
-- [using React::Component](https://github.com/janbiedermann/js-framework-benchmark/tree/master/frameworks/keyed/isomorfeus-react)

data/lib/lucid_app/mixin.rb

@@ -5,7 +5,7 @@ module LucidApp
       base.extend(::LucidApp::NativeComponentConstructor)
       base.extend(::LucidPropDeclaration::Mixin)
       base.extend(::React::Component::EventHandler)
-      base.extend(::LucidComponent::PreloadingSupport)
+      base.include(::LucidComponent::PreloadingSupport)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.include(::React::Component::Elements)

data/lib/lucid_app/native_component_constructor.rb

@@ -64,7 +64,7 @@ module LucidApp
             Opal.React.active_components.push(this);
             Opal.React.active_redux_components.push(this.__ruby_instance);
             let block_result;
-            if (base.preload_block && !this.state.preloaded && base.while_loading_block) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+            if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result); }
             Opal.React.active_redux_components.pop();

data/lib/lucid_component/mixin.rb

@@ -5,7 +5,7 @@ module LucidComponent
       base.extend(::LucidComponent::NativeComponentConstructor)
       base.extend(::LucidPropDeclaration::Mixin)
       base.extend(::React::Component::EventHandler)
-      base.extend(::LucidComponent::PreloadingSupport)
+      base.include(::LucidComponent::PreloadingSupport)
       base.extend(::LucidComponent::EnvironmentSupport)
       base.include(::LucidComponent::EnvironmentSupport)
       base.include(::React::Component::Elements)

data/lib/lucid_component/native_component_constructor.rb

@@ -51,7 +51,7 @@ module LucidComponent
             Opal.React.active_components.push(this);
             Opal.React.active_redux_components.push(this);
             let block_result;
-            if (base.preload_block && !this.state.preloaded && base.while_loading_block) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+            if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
             else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
             if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result); }
             Opal.React.active_redux_components.pop();

data/lib/lucid_component/preloading_support.rb

@@ -1,16 +1,24 @@
 module LucidComponent
   module PreloadingSupport
-    def preload(&block)
-      `self.preload_block = block`
-      component_did_mount do
-        instance_exec(&self.class().JS[:preload_block]).then do
-          set_state({preloaded: true})
+    def self.included(base)
+      base.instance_exec do
+        def preload(&block)
+          `base.preload_block = block`
+          component_did_mount do
+            instance_exec(&self.class.JS[:preload_block]).then do
+              self.state.preloaded = true
+            end
+          end
+        end
+
+        def while_loading(&block)
+          `base.while_loading_block = block`
         end
       end
-    end
 
-    def while_loading(&block)
-      `self.while_loading_block = block`
+      def preloaded?
+        !!state.preloaded
+      end
     end
   end
 end

data/lib/lucid_material/app/mixin.rb

@@ -6,7 +6,7 @@ module LucidMaterial
         base.extend(::LucidMaterial::App::NativeComponentConstructor)
         base.extend(::LucidPropDeclaration::Mixin)
         base.extend(::React::Component::EventHandler)
-        base.extend(::LucidComponent::PreloadingSupport)
+        base.include(::LucidComponent::PreloadingSupport)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.include(::React::Component::Elements)

data/lib/lucid_material/app/native_component_constructor.rb

@@ -65,7 +65,7 @@ module LucidMaterial
               Opal.React.active_components.push(this);
               Opal.React.active_redux_components.push(this.__ruby_instance);
               let block_result;
-              if (base.preload_block && !this.state.preloaded && base.while_loading_block) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+              if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
               else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
               if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result); }
               Opal.React.active_redux_components.pop();

data/lib/lucid_material/component/mixin.rb

@@ -6,7 +6,7 @@ module LucidMaterial
         base.extend(::LucidMaterial::Component::NativeComponentConstructor)
         base.extend(::LucidPropDeclaration::Mixin)
         base.extend(::React::Component::EventHandler)
-        base.extend(::LucidComponent::PreloadingSupport)
+        base.include(::LucidComponent::PreloadingSupport)
         base.extend(::LucidComponent::EnvironmentSupport)
         base.include(::LucidComponent::EnvironmentSupport)
         base.include(::React::Component::Elements)

data/lib/lucid_material/component/native_component_constructor.rb

@@ -52,7 +52,7 @@ module LucidMaterial
               Opal.React.active_components.push(this);
               Opal.React.active_redux_components.push(this);
               let block_result;
-              if (base.preload_block && !this.state.preloaded && base.while_loading_block) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
+              if (base.preload_block && base.while_loading_block && !this.state.preloaded) { block_result = #{`this.__ruby_instance`.instance_exec(&`base.while_loading_block`)}; }
               else { block_result = #{`this.__ruby_instance`.instance_exec(&`base.render_block`)}; }
               if (block_result && (block_result.constructor === String || block_result.constructor === Number)) { Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(block_result); }
               Opal.React.active_redux_components.pop();

data/lib/react.rb

@@ -67,9 +67,7 @@ module React
 
     self.internal_render = function(component, props, string_child, block) {
       let children;
-      let react_element;
       let native_props = null;
-
       if (string_child) {
         children = string_child;
       } else if (block && block !== nil) {
@@ -85,8 +83,7 @@ module React
         else if (children.length === 0) { children = null; }
       }
       if (props && props !== nil) { native_props = Opal.React.to_native_react_props(props); }
-      react_element = Opal.global.React.createElement(component, native_props, children);
-      Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(react_element);
+      Opal.React.render_buffer[Opal.React.render_buffer.length - 1].push(Opal.global.React.createElement(component, native_props, children));
     };
 
     self.active_components = [];

data/lib/react/component/resolution.rb

@@ -3,7 +3,7 @@ module React
     module Resolution
       def self.included(base)
         base.instance_exec do
-          alias _react_component_resolution_original_const_missing const_missing
+          alias _react_component_class_resolution_original_const_missing const_missing
 
           def const_missing(const_name)
             # language=JS
@@ -13,7 +13,47 @@ module React
                 #{Object.const_set(const_name, `new_const`)};
                 return new_const;
               } else {
-                return #{_react_component_resolution_original_const_missing(const_name)};
+                return #{_react_component_class_resolution_original_const_missing(const_name)};
+              }
+            }
+          end
+
+          # this is required for autoloading support, as the component may not be loaded and so its method is not registered.
+          # must load it first, done by const_get, and next time the method will be there.
+          alias _react_component_class_resolution_original_method_missing method_missing
+
+          def method_missing(component_name, *args, &block)
+            # check for ruby component and render it
+            # otherwise pass on method missing
+            # language=JS
+            %x{
+              var modules = self.$to_s().split("::");
+              var modules_length = modules.length;
+              var module;
+              var constant;
+              var component;
+              for (var i = modules_length; i > 0; i--) {
+                try {
+                  module = modules.slice(0, i).join('::')
+                  constant = self.$const_get(module).$const_get(component_name, false);
+                  if (typeof constant.react_component !== 'undefined') {
+                    component = constant.react_component;
+                    break;
+                  }
+                } catch(err) { component = null; }
+              }
+              if (!component) {
+                try {
+                  constant = Opal.Object.$const_get(component_name);
+                  if (typeof constant.react_component !== 'undefined') {
+                    component = constant.react_component;
+                  }
+                } catch(err) { component = null; }
+              }
+              if (component) {
+                return Opal.React.internal_prepare_args_and_render(component, args, block);
+              } else {
+                return #{_react_component_resolution_original_method_missing(component_name, *args, block)};
               }
             }
           end
@@ -67,4 +107,4 @@ module React
       end
     end
   end
-end
+end

data/lib/react/version.rb

@@ -1,3 +1,3 @@
 module React
-  VERSION = '16.10.12'
+  VERSION = '16.10.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isomorfeus-react
 version: !ruby/object:Gem::Version
-  version: 16.10.12
+  version: 16.10.13
 platform: ruby
 authors:
 - Jan Biedermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj