clearwater 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c9a840ae557659a4f0df595834d8ff94590de64
-  data.tar.gz: af9368086749443938d6964c7fe85bc134a8185e
+  metadata.gz: 98660a461c2da1071bbc7a8f0cfd3db413ff2224
+  data.tar.gz: 53727157dec9793aafce8f6ec538099fc11c57d3
 SHA512:
-  metadata.gz: 5191ef0e82b48af68a202a0fb987a0325193508f64fee64f9f2eaa237bd55cd8fd0c2b86b6e8e4dbddd8fb3828a647570a86507e9adc32c7592b14e8d5eb76bd
-  data.tar.gz: abc0c95a41cfb1ccfb162025c408a092375d07188a3fa15204bfa556022f55ebcf4ddcefcb99a2128d95760006e913ae3544cba960b0470d4b0ebec7954ddada
+  metadata.gz: 1016b8ce23f014f05d8aa14df5e7721c59b1950896b45e7f60e498ec4722ab24dde35c58fbc24c2ecac9171c216bb9966fc5a0ace8e510f77de571a8dca1f521
+  data.tar.gz: 38d578979f4aaed936e475d80c577e77a64dc76ce595a4c645eec7bf55d5688b15af2d5d05d604bc4c7d8986d4efd16073975253d0b7fbdcb68b159e45c743e6

data/lib/clearwater/version.rb

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

data/opal/clearwater/virtual_dom.rb

@@ -1,107 +1,115 @@
 require 'clearwater/virtual_dom/js/virtual_dom.js'
 
-module VirtualDOM
-  def self.node(tag_name, attributes=nil, content=nil)
-    %x{
-      return virtualDom.h(
-        tag_name,
-        #{HashUtils.camelized_native(attributes)},
-        #{sanitize_content(content)}
-      );
-    }
-  end
-
-  def self.svg(tag_name, attributes=nil, content=nil)
-    %x{
-      return virtualDom.svg(
-        tag_name,
-        #{HashUtils.camelized_native(attributes)},
-        #{sanitize_content(content)}
-      );
-    }
-  end
+module Clearwater
+  module VirtualDOM
+    def self.node(tag_name, attributes=nil, content=nil)
+      %x{
+        return virtualDom.h(
+          tag_name,
+          #{HashUtils.camelized_native(attributes)},
+          #{sanitize_content(content)}
+        );
+      }
+    end
 
-  def self.create_element(node)
-    `virtualDom.create(node)`
-  end
+    def self.svg(tag_name, attributes=nil, content=nil)
+      %x{
+        return virtualDom.svg(
+          tag_name,
+          #{HashUtils.camelized_native(attributes)},
+          #{sanitize_content(content)}
+        );
+      }
+    end
 
-  def self.diff first, second
-    `virtualDom.diff(first, second)`
-  end
+    def self.create_element(node)
+      `virtualDom.create(node)`
+    end
 
-  def self.patch node, diff
-    `virtualDom.patch(node, diff)`
-  end
+    def self.diff first, second
+      `virtualDom.diff(first, second)`
+    end
 
-  def self.sanitize_content content
-    %x{
-      if(content === Opal.nil || content === undefined) return null;
-      if(content.$$is_array)
-        return #{content.map!{ |c| sanitize_content c }};
-      return content;
-    }
-  end
+    def self.patch node, diff
+      `virtualDom.patch(node, diff)`
+    end
 
-  class Document
-    def initialize(root=Bowser.document.create_element('div'))
-      @root = root
+    def self.sanitize_content content
+      %x{
+        if(content === Opal.nil || content === undefined) return null;
+        if(content.$$is_array)
+          return #{content.map!{ |c| sanitize_content c }};
+        return content;
+      }
     end
 
-    def render node
-      if rendered?
-        diff = VirtualDOM.diff @node, node
-        VirtualDOM.patch @tree, diff
-        @node = node
-      else
-        @node = node
-        @tree = create_element(node)
-        @root.inner_dom = @tree
-        @rendered = true
+    class Document
+      def initialize(root=Bowser.document.create_element('div'))
+        @root = root
       end
-    end
 
-    def create_element node
-      `virtualDom.create(node)`
-    end
+      def render node
+        if rendered?
+          diff = VirtualDOM.diff @node, node
+          VirtualDOM.patch @tree, diff
+          @node = node
+        else
+          @node = node
+          @tree = create_element(node)
+          @root.inner_dom = @tree
+          @rendered = true
+        end
+      end
 
-    def rendered?
-      @rendered
+      def create_element node
+        `virtualDom.create(node)`
+      end
+
+      def rendered?
+        @rendered
+      end
     end
-  end
 
-  module StringUtils
-    # Speed up camelization like whoa.
-    %x{ var camelized_cache = {}; }
+    module StringUtils
+      # Speed up camelization like whoa.
+      %x{ var camelized_cache = {}; }
 
-    def self.camelize string
-      %x{
-        if(camelized_cache.hasOwnProperty(string)) {
-          return camelized_cache[string];
-        } else {
-          camelized_cache[string] = string.replace(/_(\w)/g, self.$_camelize_handler);
-          return camelized_cache[string];
+      def self.camelize string
+        %x{
+          if(camelized_cache.hasOwnProperty(string)) {
+            return camelized_cache[string];
+          } else {
+            camelized_cache[string] = string.replace(/_(\w)/g, self.$_camelize_handler);
+            return camelized_cache[string];
+          }
         }
-      }
-    end
+      end
 
-    def self._camelize_handler _, character_match
-      `character_match.toUpperCase()`
+      def self._camelize_handler _, character_match
+        `character_match.toUpperCase()`
+      end
     end
-  end
 
-  module HashUtils
-    def self.camelized_native hash
-      return hash.to_n unless `!!hash.$$is_hash`
+    module HashUtils
+      def self.camelized_native hash
+        return hash.to_n unless `!!hash.$$is_hash`
 
-      %x{
-        var v, keys = #{hash.keys}, key, js_obj = {};
-        for(var index = 0; index < keys.length; index++) {
-          key = keys[index];
-          v = #{hash[`key`]};
-          js_obj[#{StringUtils.camelize(`key`)}] = v.$$is_hash ? self.$camelized_native(v) : v
+        %x{
+          var v, keys = #{hash.keys}, key, js_obj = {};
+          for(var index = 0; index < keys.length; index++) {
+            key = keys[index];
+            v = #{hash[`key`]};
+            js_obj[#{StringUtils.camelize(`key`)}] = v.$$is_hash
+              ? self.$camelized_native(v)
+              : (
+                (v && v.$$class) // If this is a Ruby object, nativize it
+                  ? #{`v`.to_n}
+                  : v
+                );
+          }
+          return js_obj;
         }
-        return js_obj;
-      }
+      end
     end
   end
 end

data/shared/clearwater/router.rb

@@ -100,6 +100,23 @@ module Clearwater
     end
 
     def set_outlets targets=targets_for_path(current_path)
+      @old_targets = @targets || []
+      @targets = targets
+      navigating_from = @old_targets - @targets
+      navigating_to = @targets - @old_targets
+
+      navigating_from.each do |target|
+        if target.respond_to? :on_route_from
+          target.on_route_from
+        end
+      end
+
+      navigating_to.each do |target|
+        if target.respond_to? :on_route_to
+          target.on_route_to
+        end
+      end
+
       if targets.any?
         (targets.count).times do |index|
           targets[index].outlet = targets[index + 1]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Front-end Ruby web framework for fast, reasonable, and composable applications