clearwater 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db375a0696ec574fae4263215dfde5ba4b0af97
-  data.tar.gz: bdf36853856326f64742bd6f2d075727f1514713
+  metadata.gz: 2c9a840ae557659a4f0df595834d8ff94590de64
+  data.tar.gz: af9368086749443938d6964c7fe85bc134a8185e
 SHA512:
-  metadata.gz: 50d6c60d11599bcfcd3935c7ebccfb86c11f6f85b1873c998e18ccd5b4b5f2107b5b0f3ff1d609d2dc22edd0fe25f19cfdecc735750820eaf7fa142711d69e84
-  data.tar.gz: 28a9a411ffe93d08ea8a9c0749574ac0ade1b144645013d00d60b2e5893c1fac58c5432d1cd358b2486a31933988e409368d45024a7556f21695780b2fccb16f
+  metadata.gz: 5191ef0e82b48af68a202a0fb987a0325193508f64fee64f9f2eaa237bd55cd8fd0c2b86b6e8e4dbddd8fb3828a647570a86507e9adc32c7592b14e8d5eb76bd
+  data.tar.gz: abc0c95a41cfb1ccfb162025c408a092375d07188a3fa15204bfa556022f55ebcf4ddcefcb99a2128d95760006e913ae3544cba960b0470d4b0ebec7954ddada

data/lib/clearwater/version.rb

@@ -1,3 +1,3 @@
 module Clearwater
-  VERSION = "1.0.0.rc2"
+  VERSION = "1.0.0.rc3"
 end

data/opal/clearwater/cached_render.rb

@@ -4,21 +4,16 @@ module Clearwater
   module CachedRender
     def self.included base
       %x{
-        Opal.defn(self, 'type', 'Thunk');
-        Opal.defn(self, 'render', function(prev) {
-          var self = this;
-
-          if(prev && prev.vnode && #{!should_render?(`prev`)}) {
-            return prev.vnode;
-          } else {
-            return #{Component.sanitize_content(render)};
-          }
-        });
+        Opal.defn(self, '$$cached_render', true);
       }
     end
 
     def should_render? _
       false
     end
+
+    def key
+      `undefined`
+    end
   end
 end

data/opal/clearwater/cached_render/wrapper.rb

@@ -0,0 +1,32 @@
+module Clearwater
+  module CachedRender
+    class Wrapper
+      attr_reader :content
+
+      def initialize content
+        @content = content
+        @key = content.key
+      end
+
+      # Hook into vdom diff/patch
+      %x{
+        def.type = 'Thunk';
+        def.render = function cached_render(prev) {
+          var self = this;
+
+          if(prev && prev.vnode && #{!@content.should_render?(`prev.content`)}) {
+            return prev.vnode;
+          } else {
+            var content = #{Component.sanitize_content(@content.render)};
+
+            while(content && content.type == 'Thunk' && content.render) {
+              content = #{Component.sanitize_content(`content.render(prev)`)};
+            }
+
+            return content;
+          }
+        };
+      }
+    end
+  end
+end

data/opal/clearwater/component.rb

@@ -1,5 +1,6 @@
 require 'clearwater/virtual_dom'
 require 'clearwater/component/html_tags'
+require 'clearwater/cached_render/wrapper'
 
 module Clearwater
   module Component
@@ -34,6 +35,12 @@ module Clearwater
       attributes
     end
 
+    # Runtime constant lookup isn't free, so if we cache a reference to it we
+    # don't have to do it every time we need to sanitize a node's content.
+    # This does need to happen at the JS level, though. If we use a Ruby
+    # variable, we won't have access to it in the method.
+    %x{ var wrapper = #{CachedRender::Wrapper}; }
+
     def self.sanitize_content content
       %x{
         if(content && content.$$class) {
@@ -42,10 +49,10 @@ module Clearwater
           } else {
             var render = content.$render;
 
-            if(content.type === 'Thunk' && typeof(content.render) === 'function') {
-              return content;
+            if(content.$$cached_render) {
+              return #{`wrapper`.new(content)};
             } else if(render && !render.$$stub) {
-              return self.$sanitize_content(content.$render());
+              return #{sanitize_content(content.render)};
             } else {
               return content;
             }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-09 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -128,6 +128,7 @@ files:
 - opal/clearwater/application_registry.rb
 - opal/clearwater/black_box_node.rb
 - opal/clearwater/cached_render.rb
+- opal/clearwater/cached_render/wrapper.rb
 - opal/clearwater/component.rb
 - opal/clearwater/dom_reference.rb
 - opal/clearwater/link.rb
@@ -142,7 +143,7 @@ files:
 - spec/clearwater/component_spec.rb
 - spec/clearwater/dom_reference_spec.rb
 - spec/spec_helper.rb
-homepage: https://clearwater-rb.github.io/
+homepage: https://github.com/clearwater-rb/clearwater
 licenses:
 - MIT
 metadata: {}