clearwater 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0dbe512477a239908316a57e35d45ee6071a644
-  data.tar.gz: 1a1e20bb5da838c0e7abd7cb8f43394fde474763
+  metadata.gz: 11ea030584d8c9bbc61d8d81690140cc88fa6a6b
+  data.tar.gz: 7a2dc906feb4e2c005f0521c1e842592466edd18
 SHA512:
-  metadata.gz: 974c1f2fba54d8cf8b0467fcaaae1ebfa4e92ad1ce419be6096dbe0869044ed402b24bf8fbb557b9ab44fa37ea0ed388f443bbddb97f1a6c0dcc60b8a4e5321a
-  data.tar.gz: ff9e1f46a84c517f5984b0a7854add9ec298ef00dbbc206cede4b29866898b0b80d4c268e42d6af987bca27a3d565d4bf79330bd0e9fdf37c2df6f6587fa4edf
+  metadata.gz: 3b166c268e598a8f5179c05d33200ac7656ed153f49bb0da56e1a7f3e0e5a6d06c79e3e47ecd10b1c0f7be84136e74b7aa2e88490568aa5fb4cf54f1007d13bb
+  data.tar.gz: 65fa07556d0afacd3a63bfce7e49cb1d992fd31860afa1dbf8a61a4841a31bb0aa8bc203a7ffe900f36daa3dfc38ba56979b73eb8bd69561ee26fab8f164fff0

data/lib/clearwater/version.rb

@@ -1,3 +1,3 @@
 module Clearwater
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/clearwater.rb

@@ -1,4 +1,5 @@
 require "opal"
+require "opal/browser"
 
 module Clearwater
   require_relative "clearwater/version"

data/opal/clearwater/cached_render.rb

@@ -1,7 +1,7 @@
 module Clearwater
   module CachedRender
     def cached_render
-      if !@cached_render || should_render?
+      if !defined?(@cached_render) || should_render?
         @cached_render = sanitize_content(render)
       else
         @cached_render

data/opal/clearwater/component.rb

@@ -141,6 +141,12 @@ module Clearwater
     end
 
     def tag tag_name, attributes=nil, content=nil
+      case attributes
+      when Array, Component, Numeric, String
+        content = attributes
+        attributes = nil
+      end
+
       VirtualDOM.node(
         tag_name,
         sanitize_attributes(attributes),
@@ -157,7 +163,7 @@ module Clearwater
     end
 
     def sanitize_attributes attributes
-      return nil if attributes.nil?
+      return attributes unless attributes.is_a? Hash
 
       # Allow specifying `class` instead of `class_name`.
       # Note: `class_name` is still allowed
@@ -171,7 +177,7 @@ module Clearwater
       end
 
       attributes.each do |key, handler|
-        if key.start_with? 'on'
+        if key[0, 2] == 'on'
           attributes[key] = proc do |event|
             handler.call(Browser::Event.new(event))
           end
@@ -182,20 +188,28 @@ module Clearwater
     end
 
     def sanitize_content content
-      case content
-      when Numeric, String
-        content.to_s
-      when Array
-        content.map { |c| sanitize_content(c) }.compact
-      else
-        if content.respond_to? :cached_render
-          content.cached_render
-        elsif content.respond_to? :render
-          sanitize_content content.render
-        else
-          content
-        end
-      end
+      %x{
+        if(content.$$class) {
+          if(content.$$class === Opal.Array) {
+            return #{content.map { |c| `self.$sanitize_content(c)` }};
+          } else if(content === Opal.nil) {
+            return '';
+          } else {
+            var cached_render = content.$cached_render;
+            var render = content.$render;
+
+            if(cached_render && !cached_render.$$stub) {
+              return content.$cached_render();
+            } else if(render && !render.$$stub) {
+              return self.$sanitize_content(content.$render());
+            } else {
+              return content;
+            }
+          }
+        } else {
+          return content;
+        }
+      }
     end
 
     def call &block

data/opal/clearwater/link.rb

@@ -86,7 +86,9 @@ class Link
   end
 
   def navigate event
-    unless event.meta? || event.shift? || event.ctrl? || event.alt?
+    # Don't handle middle-button clicks and clicks with modifier keys. Let them
+    # pass through to the browser's default handling or the user's modified handling.
+    unless event.meta? || event.shift? || event.ctrl? || event.alt? || (event.respond_to?(:button) && event.button == 1)
       event.prevent
       if href != $window.location.path
         $window.history.push href

data/opal/clearwater/virtual_dom/js/virtual_dom.js

@@ -3,17 +3,17 @@ var createElement = require("./vdom/create-element.js")
 
 module.exports = createElement
 
-},{"./vdom/create-element.js":14}],2:[function(require,module,exports){
+},{"./vdom/create-element.js":13}],2:[function(require,module,exports){
 var diff = require("./vtree/diff.js")
 
 module.exports = diff
 
-},{"./vtree/diff.js":34}],3:[function(require,module,exports){
+},{"./vtree/diff.js":33}],3:[function(require,module,exports){
 var h = require("./virtual-hyperscript/index.js")
 
 module.exports = h
 
-},{"./virtual-hyperscript/index.js":21}],4:[function(require,module,exports){
+},{"./virtual-hyperscript/index.js":20}],4:[function(require,module,exports){
 var diff = require("./diff.js")
 var patch = require("./patch.js")
 var h = require("./h.js")
@@ -30,115 +30,7 @@ module.exports = {
     VText: VText
 }
 
-},{"./create-element.js":1,"./diff.js":2,"./h.js":3,"./patch.js":12,"./vnode/vnode.js":30,"./vnode/vtext.js":32}],5:[function(require,module,exports){
-/*!
- * Cross-Browser Split 1.1.1
- * Copyright 2007-2012 Steven Levithan <stevenlevithan.com>
- * Available under the MIT License
- * ECMAScript compliant, uniform cross-browser split method
- */
-
-/**
- * Splits a string into an array of strings using a regex or string separator. Matches of the
- * separator are not included in the result array. However, if `separator` is a regex that contains
- * capturing groups, backreferences are spliced into the result each time `separator` is matched.
- * Fixes browser bugs compared to the native `String.prototype.split` and can be used reliably
- * cross-browser.
- * @param {String} str String to split.
- * @param {RegExp|String} separator Regex or string to use for separating the string.
- * @param {Number} [limit] Maximum number of items to include in the result array.
- * @returns {Array} Array of substrings.
- * @example
- *
- * // Basic use
- * split('a b c d', ' ');
- * // -> ['a', 'b', 'c', 'd']
- *
- * // With limit
- * split('a b c d', ' ', 2);
- * // -> ['a', 'b']
- *
- * // Backreferences in result array
- * split('..word1 word2..', /([a-z]+)(\d+)/i);
- * // -> ['..', 'word', '1', ' ', 'word', '2', '..']
- */
-module.exports = (function split(undef) {
-
-  var nativeSplit = String.prototype.split,
-    compliantExecNpcg = /()??/.exec("")[1] === undef,
-    // NPCG: nonparticipating capturing group
-    self;
-
-  self = function(str, separator, limit) {
-    // If `separator` is not a regex, use `nativeSplit`
-    if (Object.prototype.toString.call(separator) !== "[object RegExp]") {
-      return nativeSplit.call(str, separator, limit);
-    }
-    var output = [],
-      flags = (separator.ignoreCase ? "i" : "") + (separator.multiline ? "m" : "") + (separator.extended ? "x" : "") + // Proposed for ES6
-      (separator.sticky ? "y" : ""),
-      // Firefox 3+
-      lastLastIndex = 0,
-      // Make `global` and avoid `lastIndex` issues by working with a copy
-      separator = new RegExp(separator.source, flags + "g"),
-      separator2, match, lastIndex, lastLength;
-    str += ""; // Type-convert
-    if (!compliantExecNpcg) {
-      // Doesn't need flags gy, but they don't hurt
-      separator2 = new RegExp("^" + separator.source + "$(?!\\s)", flags);
-    }
-    /* Values for `limit`, per the spec:
-     * If undefined: 4294967295 // Math.pow(2, 32) - 1
-     * If 0, Infinity, or NaN: 0
-     * If positive number: limit = Math.floor(limit); if (limit > 4294967295) limit -= 4294967296;
-     * If negative number: 4294967296 - Math.floor(Math.abs(limit))
-     * If other: Type-convert, then use the above rules
-     */
-    limit = limit === undef ? -1 >>> 0 : // Math.pow(2, 32) - 1
-    limit >>> 0; // ToUint32(limit)
-    while (match = separator.exec(str)) {
-      // `separator.lastIndex` is not reliable cross-browser
-      lastIndex = match.index + match[0].length;
-      if (lastIndex > lastLastIndex) {
-        output.push(str.slice(lastLastIndex, match.index));
-        // Fix browsers whose `exec` methods don't consistently return `undefined` for
-        // nonparticipating capturing groups
-        if (!compliantExecNpcg && match.length > 1) {
-          match[0].replace(separator2, function() {
-            for (var i = 1; i < arguments.length - 2; i++) {
-              if (arguments[i] === undef) {
-                match[i] = undef;
-              }
-            }
-          });
-        }
-        if (match.length > 1 && match.index < str.length) {
-          Array.prototype.push.apply(output, match.slice(1));
-        }
-        lastLength = match[0].length;
-        lastLastIndex = lastIndex;
-        if (output.length >= limit) {
-          break;
-        }
-      }
-      if (separator.lastIndex === match.index) {
-        separator.lastIndex++; // Avoid an infinite loop
-      }
-    }
-    if (lastLastIndex === str.length) {
-      if (lastLength || !separator.test("")) {
-        output.push("");
-      }
-    } else {
-      output.push(str.slice(lastLastIndex));
-    }
-    return output.length > limit ? output.slice(0, limit) : output;
-  };
-
-  return self;
-})();
-
-},{}],6:[function(require,module,exports){
+},{"./create-element.js":1,"./diff.js":2,"./h.js":3,"./patch.js":11,"./vnode/vnode.js":29,"./vnode/vtext.js":31}],5:[function(require,module,exports){
 'use strict';
 
 var OneVersionConstraint = require('individual/one-version');
@@ -160,7 +52,7 @@ function EvStore(elem) {
     return hash;
 }
 
-},{"individual/one-version":8}],7:[function(require,module,exports){
+},{"individual/one-version":7}],6:[function(require,module,exports){
 (function (global){
 'use strict';
 
@@ -183,7 +75,7 @@ function Individual(key, value) {
 }
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{}],8:[function(require,module,exports){
+},{}],7:[function(require,module,exports){
 'use strict';
 
 var Individual = require('./index.js');
@@ -207,7 +99,7 @@ function OneVersion(moduleName, version, defaultValue) {
     return Individual(key, defaultValue);
 }
 
-},{"./index.js":7}],9:[function(require,module,exports){
+},{"./index.js":6}],8:[function(require,module,exports){
 (function (global){
 var topLevel = typeof global !== 'undefined' ? global :
     typeof window !== 'undefined' ? window : {}
@@ -226,14 +118,14 @@ if (typeof document !== 'undefined') {
 }
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"min-document":35}],10:[function(require,module,exports){
+},{"min-document":34}],9:[function(require,module,exports){
 "use strict";
 
 module.exports = function isObject(x) {
 	return typeof x === "object" && x !== null;
 };
 
-},{}],11:[function(require,module,exports){
+},{}],10:[function(require,module,exports){
 var nativeIsArray = Array.isArray
 var toString = Object.prototype.toString
 
@@ -243,12 +135,12 @@ function isArray(obj) {
     return toString.call(obj) === "[object Array]"
 }
 
-},{}],12:[function(require,module,exports){
+},{}],11:[function(require,module,exports){
 var patch = require("./vdom/patch.js")
 
 module.exports = patch
 
-},{"./vdom/patch.js":17}],13:[function(require,module,exports){
+},{"./vdom/patch.js":16}],12:[function(require,module,exports){
 var isObject = require("is-object")
 var isHook = require("../vnode/is-vhook.js")
 
@@ -347,7 +239,7 @@ function getPrototype(value) {
     }
 }
 
-},{"../vnode/is-vhook.js":25,"is-object":10}],14:[function(require,module,exports){
+},{"../vnode/is-vhook.js":24,"is-object":9}],13:[function(require,module,exports){
 var document = require("global/document")
 
 var applyProperties = require("./apply-properties")
@@ -395,7 +287,7 @@ function createElement(vnode, opts) {
     return node
 }
 
-},{"../vnode/handle-thunk.js":23,"../vnode/is-vnode.js":26,"../vnode/is-vtext.js":27,"../vnode/is-widget.js":28,"./apply-properties":13,"global/document":9}],15:[function(require,module,exports){
+},{"../vnode/handle-thunk.js":22,"../vnode/is-vnode.js":25,"../vnode/is-vtext.js":26,"../vnode/is-widget.js":27,"./apply-properties":12,"global/document":8}],14:[function(require,module,exports){
 // Maps a virtual DOM tree onto a real DOM tree in an efficient manner.
 // We don't want to read all of the DOM nodes in the tree so we use
 // the in-order tree indexing to eliminate recursion down certain branches.
@@ -482,13 +374,12 @@ function ascending(a, b) {
     return a > b ? 1 : -1
 }
 
-},{}],16:[function(require,module,exports){
+},{}],15:[function(require,module,exports){
 var applyProperties = require("./apply-properties")
 
 var isWidget = require("../vnode/is-widget.js")
 var VPatch = require("../vnode/vpatch.js")
 
-var render = require("./create-element")
 var updateWidget = require("./update-widget")
 
 module.exports = applyPatch
@@ -536,7 +427,7 @@ function removeNode(domNode, vNode) {
 }
 
 function insertNode(parentNode, vNode, renderOptions) {
-    var newNode = render(vNode, renderOptions)
+    var newNode = renderOptions.render(vNode, renderOptions)
 
     if (parentNode) {
         parentNode.appendChild(newNode)
@@ -553,7 +444,7 @@ function stringPatch(domNode, leftVNode, vText, renderOptions) {
         newNode = domNode
     } else {
         var parentNode = domNode.parentNode
-        newNode = render(vText, renderOptions)
+        newNode = renderOptions.render(vText, renderOptions)
 
         if (parentNode && newNode !== domNode) {
             parentNode.replaceChild(newNode, domNode)
@@ -570,7 +461,7 @@ function widgetPatch(domNode, leftVNode, widget, renderOptions) {
     if (updating) {
         newNode = widget.update(leftVNode, domNode) || domNode
     } else {
-        newNode = render(widget, renderOptions)
+        newNode = renderOptions.render(widget, renderOptions)
     }
 
     var parentNode = domNode.parentNode
@@ -588,7 +479,7 @@ function widgetPatch(domNode, leftVNode, widget, renderOptions) {
 
 function vNodePatch(domNode, leftVNode, vNode, renderOptions) {
     var parentNode = domNode.parentNode
-    var newNode = render(vNode, renderOptions)
+    var newNode = renderOptions.render(vNode, renderOptions)
 
     if (parentNode && newNode !== domNode) {
         parentNode.replaceChild(newNode, domNode)
@@ -636,16 +527,21 @@ function replaceRoot(oldRoot, newRoot) {
     return newRoot;
 }
 
-},{"../vnode/is-widget.js":28,"../vnode/vpatch.js":31,"./apply-properties":13,"./create-element":14,"./update-widget":18}],17:[function(require,module,exports){
+},{"../vnode/is-widget.js":27,"../vnode/vpatch.js":30,"./apply-properties":12,"./update-widget":17}],16:[function(require,module,exports){
 var document = require("global/document")
 var isArray = require("x-is-array")
 
+var render = require("./create-element")
 var domIndex = require("./dom-index")
 var patchOp = require("./patch-op")
 module.exports = patch
 
-function patch(rootNode, patches) {
-    return patchRecursive(rootNode, patches)
+function patch(rootNode, patches, renderOptions) {
+    renderOptions = renderOptions || {}
+    renderOptions.patch = renderOptions.patch || patchRecursive
+    renderOptions.render = renderOptions.render || render
+
+    return renderOptions.patch(rootNode, patches, renderOptions)
 }
 
 function patchRecursive(rootNode, patches, renderOptions) {
@@ -658,11 +554,8 @@ function patchRecursive(rootNode, patches, renderOptions) {
     var index = domIndex(rootNode, patches.a, indices)
     var ownerDocument = rootNode.ownerDocument
 
-    if (!renderOptions) {
-        renderOptions = { patch: patchRecursive }
-        if (ownerDocument !== document) {
-            renderOptions.document = ownerDocument
-        }
+    if (!renderOptions.document && ownerDocument !== document) {
+        renderOptions.document = ownerDocument
     }
 
     for (var i = 0; i < indices.length; i++) {
@@ -714,7 +607,7 @@ function patchIndices(patches) {
     return indices
 }
 
-},{"./dom-index":15,"./patch-op":16,"global/document":9,"x-is-array":11}],18:[function(require,module,exports){
+},{"./create-element":13,"./dom-index":14,"./patch-op":15,"global/document":8,"x-is-array":10}],17:[function(require,module,exports){
 var isWidget = require("../vnode/is-widget.js")
 
 module.exports = updateWidget
@@ -731,7 +624,7 @@ function updateWidget(a, b) {
     return false
 }
 
-},{"../vnode/is-widget.js":28}],19:[function(require,module,exports){
+},{"../vnode/is-widget.js":27}],18:[function(require,module,exports){
 'use strict';
 
 var EvStore = require('ev-store');
@@ -760,7 +653,7 @@ EvHook.prototype.unhook = function(node, propertyName) {
     es[propName] = undefined;
 };
 
-},{"ev-store":6}],20:[function(require,module,exports){
+},{"ev-store":5}],19:[function(require,module,exports){
 'use strict';
 
 module.exports = SoftSetHook;
@@ -779,7 +672,7 @@ SoftSetHook.prototype.hook = function (node, propertyName) {
     }
 };
 
-},{}],21:[function(require,module,exports){
+},{}],20:[function(require,module,exports){
 'use strict';
 
 var isArray = require('x-is-array');
@@ -845,6 +738,8 @@ function h(tagName, properties, children) {
 function addChild(c, childNodes, tag, props) {
     if (typeof c === 'string') {
         childNodes.push(new VText(c));
+    } else if (typeof c === 'number') {
+        childNodes.push(new VText(String(c)));
     } else if (isChild(c)) {
         childNodes.push(c);
     } else if (isArray(c)) {
@@ -916,14 +811,9 @@ function errorString(obj) {
     }
 }
 
-},{"../vnode/is-thunk":24,"../vnode/is-vhook":25,"../vnode/is-vnode":26,"../vnode/is-vtext":27,"../vnode/is-widget":28,"../vnode/vnode.js":30,"../vnode/vtext.js":32,"./hooks/ev-hook.js":19,"./hooks/soft-set-hook.js":20,"./parse-tag.js":22,"x-is-array":11}],22:[function(require,module,exports){
+},{"../vnode/is-thunk":23,"../vnode/is-vhook":24,"../vnode/is-vnode":25,"../vnode/is-vtext":26,"../vnode/is-widget":27,"../vnode/vnode.js":29,"../vnode/vtext.js":31,"./hooks/ev-hook.js":18,"./hooks/soft-set-hook.js":19,"./parse-tag.js":21,"x-is-array":10}],21:[function(require,module,exports){
 'use strict';
 
-var split = require('browser-split');
-
-var classIdSplit = /([\.#]?[a-zA-Z0-9_:-]+)/;
-var notClassId = /^\.|#/;
-
 module.exports = parseTag;
 
 function parseTag(tag, props) {
@@ -933,16 +823,13 @@ function parseTag(tag, props) {
 
     var noId = !(props.hasOwnProperty('id'));
 
-    var tagParts = split(tag, classIdSplit);
-    var tagName = null;
+    var tagParts = splitTag(tag);
 
-    if (notClassId.test(tagParts[1])) {
-        tagName = 'DIV';
-    }
+    var tagName = tagParts[0] || 'DIV';
 
     var classes, part, type, i;
 
-    for (i = 0; i < tagParts.length; i++) {
+    for (i = 1; i < tagParts.length; i++) {
         part = tagParts[i];
 
         if (!part) {
@@ -951,9 +838,7 @@ function parseTag(tag, props) {
 
         type = part.charAt(0);
 
-        if (!tagName) {
-            tagName = part;
-        } else if (type === '.') {
+        if (type === '.') {
             classes = classes || [];
             classes.push(part.substring(1, part.length));
         } else if (type === '#' && noId) {
@@ -972,7 +857,35 @@ function parseTag(tag, props) {
     return props.namespace ? tagName : tagName.toUpperCase();
 }
 
-},{"browser-split":5}],23:[function(require,module,exports){
+
+function splitTag(tag) {
+
+    var classIndex, idIndex,
+        remaining = tag,
+        parts = [],
+        last = '';
+
+    do {
+        idIndex = remaining.indexOf('#');
+        classIndex = remaining.indexOf('.');
+        if ((idIndex === -1 || idIndex > classIndex) && classIndex !== -1) {
+            parts.push(last + remaining.substr(0, classIndex));
+            last = '.';
+            remaining = remaining.substr(classIndex + 1);
+        } else if (idIndex !== -1){
+            parts.push(last + remaining.substr(0, idIndex));
+            last = '#';
+            remaining = remaining.substr(idIndex + 1);
+        }
+
+    } while(idIndex !== -1 || classIndex !== -1)
+
+    parts.push(last + remaining);
+
+    return parts;
+}
+
+},{}],22:[function(require,module,exports){
 var isVNode = require("./is-vnode")
 var isVText = require("./is-vtext")
 var isWidget = require("./is-widget")
@@ -1014,14 +927,14 @@ function renderThunk(thunk, previous) {
     return renderedThunk
 }
 
-},{"./is-thunk":24,"./is-vnode":26,"./is-vtext":27,"./is-widget":28}],24:[function(require,module,exports){
+},{"./is-thunk":23,"./is-vnode":25,"./is-vtext":26,"./is-widget":27}],23:[function(require,module,exports){
 module.exports = isThunk
 
 function isThunk(t) {
     return t && t.type === "Thunk"
 }
 
-},{}],25:[function(require,module,exports){
+},{}],24:[function(require,module,exports){
 module.exports = isHook
 
 function isHook(hook) {
@@ -1030,7 +943,7 @@ function isHook(hook) {
        typeof hook.unhook === "function" && !hook.hasOwnProperty("unhook"))
 }
 
-},{}],26:[function(require,module,exports){
+},{}],25:[function(require,module,exports){
 var version = require("./version")
 
 module.exports = isVirtualNode
@@ -1039,7 +952,7 @@ function isVirtualNode(x) {
     return x && x.type === "VirtualNode" && x.version === version
 }
 
-},{"./version":29}],27:[function(require,module,exports){
+},{"./version":28}],26:[function(require,module,exports){
 var version = require("./version")
 
 module.exports = isVirtualText
@@ -1048,17 +961,17 @@ function isVirtualText(x) {
     return x && x.type === "VirtualText" && x.version === version
 }
 
-},{"./version":29}],28:[function(require,module,exports){
+},{"./version":28}],27:[function(require,module,exports){
 module.exports = isWidget
 
 function isWidget(w) {
     return w && w.type === "Widget"
 }
 
-},{}],29:[function(require,module,exports){
+},{}],28:[function(require,module,exports){
 module.exports = "2"
 
-},{}],30:[function(require,module,exports){
+},{}],29:[function(require,module,exports){
 var version = require("./version")
 var isVNode = require("./is-vnode")
 var isWidget = require("./is-widget")
@@ -1132,7 +1045,7 @@ function VirtualNode(tagName, properties, children, key, namespace) {
 VirtualNode.prototype.version = version
 VirtualNode.prototype.type = "VirtualNode"
 
-},{"./is-thunk":24,"./is-vhook":25,"./is-vnode":26,"./is-widget":28,"./version":29}],31:[function(require,module,exports){
+},{"./is-thunk":23,"./is-vhook":24,"./is-vnode":25,"./is-widget":27,"./version":28}],30:[function(require,module,exports){
 var version = require("./version")
 
 VirtualPatch.NONE = 0
@@ -1156,7 +1069,7 @@ function VirtualPatch(type, vNode, patch) {
 VirtualPatch.prototype.version = version
 VirtualPatch.prototype.type = "VirtualPatch"
 
-},{"./version":29}],32:[function(require,module,exports){
+},{"./version":28}],31:[function(require,module,exports){
 var version = require("./version")
 
 module.exports = VirtualText
@@ -1168,7 +1081,7 @@ function VirtualText(text) {
 VirtualText.prototype.version = version
 VirtualText.prototype.type = "VirtualText"
 
-},{"./version":29}],33:[function(require,module,exports){
+},{"./version":28}],32:[function(require,module,exports){
 var isObject = require("is-object")
 var isHook = require("../vnode/is-vhook")
 
@@ -1228,7 +1141,7 @@ function getPrototype(value) {
   }
 }
 
-},{"../vnode/is-vhook":25,"is-object":10}],34:[function(require,module,exports){
+},{"../vnode/is-vhook":24,"is-object":9}],33:[function(require,module,exports){
 var isArray = require("x-is-array")
 
 var VPatch = require("../vnode/vpatch")
@@ -1657,7 +1570,7 @@ function appendPatch(apply, patch) {
     }
 }
 
-},{"../vnode/handle-thunk":23,"../vnode/is-thunk":24,"../vnode/is-vnode":26,"../vnode/is-vtext":27,"../vnode/is-widget":28,"../vnode/vpatch":31,"./diff-props":33,"x-is-array":11}],35:[function(require,module,exports){
+},{"../vnode/handle-thunk":22,"../vnode/is-thunk":23,"../vnode/is-vnode":25,"../vnode/is-vtext":26,"../vnode/is-widget":27,"../vnode/vpatch":30,"./diff-props":32,"x-is-array":10}],34:[function(require,module,exports){
 
 },{}]},{},[4])(4)
 });

data/opal/clearwater/virtual_dom.rb

@@ -1,108 +1,80 @@
 require 'browser'
 require 'clearwater/virtual_dom/js/virtual_dom.js'
 
-module StringUtils
-  def self.camelize string
-    string.gsub(/_(\w)/) { |match| match.gsub(/_/, '').upcase }
+module VirtualDOM
+  def self.node(tag_name, attributes, content)
+    content = sanitize_content(content)
+    attributes = HashUtils.camelize_keys(attributes).to_n
+    `virtualDom.h(tag_name, attributes, content)`
   end
-end
 
-module HashUtils
-  def self.camelize_keys(hash)
-    return nil if hash.nil?
-
-    Hash[hash.map { |k,v|
-      key = StringUtils.camelize(k)
-      value = if Hash === v
-                camelize_keys(v)
-              else
-                v
-              end
-
-      [key, value]
-    }]
+  def self.diff first, second
+    `virtualDom.diff(first, second)`
   end
-end
 
-module VirtualDOM
-  def self.node(tag_name, attributes, content)
-    content = Array(content).map { |node|
-      case node
-      when Node
-        node.node
-      else
-        node
-      end
-    }
-    attributes = HashUtils.camelize_keys(attributes).to_n
-    Node.new(`virtualDom.h(tag_name, attributes, content)`)
+  def self.patch node, diff
+    `virtualDom.patch(node, diff)`
   end
 
-  def self.create_element node
-    `virtualDom.create(node)`
+  def self.sanitize_content content
+    %x{
+      if(content === Opal.nil) return Opal.nil;
+      if(content.$$class === Opal.Array)
+        return #{content.map!{ |c| sanitize_content c }};
+      return content;
+    }
   end
 
   class Document
     def initialize(root=$document.create_element('div'))
       @root = root
-      @rendered_nodes = {}
     end
 
     def render node
       if rendered?
-        diff = @node.diff(node)
-        @tree = Element.new(@tree.patch(diff))
+        diff = VirtualDOM.diff @node, node
+        VirtualDOM.patch @tree, diff
         @node = node
       else
         @node = node
-        @tree = node.to_element
-        @root.inner_dom = @tree.to_n
+        @tree = create_element(node)
+        @root.inner_dom = @tree
         @rendered = true
       end
     end
 
+    def create_element node
+      `virtualDom.create(node)`
+    end
+
     def rendered?
       @rendered
     end
   end
 
-  class Node
-    attr_reader :node
-
-    def initialize(node)
-      @node = node
-    end
-
-    def method_missing *args, &block
-      node.send *args, &block
-    end
-
-    def to_element
-      Element.new(VirtualDOM.create_element(node))
-    end
-
-    def diff other
-      `virtualDom.diff(self.node, other.node)`
-    end
-
-    def patch diff
-      `virtualDom.patch(#{to_element.to_n}, diff)`
+  module StringUtils
+    def self.camelize string
+      string.gsub(/_(\w)/) { |match| match.gsub(/_/, '').upcase }
     end
   end
 
-  class Element
-    attr_reader :element
+  module HashUtils
+    def self.camelize_keys(hash)
+      return hash unless hash.is_a? Hash
 
-    def initialize(element)
-      @element = element
-    end
+      camelized = {}
+      hash.each do |k, v|
+        key = StringUtils.camelize(k)
+        value = if v.class == Hash
+                  camelize_keys(v)
+                else
+                  v
+                end
 
-    def patch(diff)
-      `virtualDom.patch(#{element}, diff)`
-    end
+        camelized[key] = value
+      end
 
-    def to_n
-      @element
+      camelized
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clearwater
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-12 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: opal-browser
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,6 @@ files:
 - opal/clearwater/cgi.rb
 - opal/clearwater/component.rb
 - opal/clearwater/link.rb
-- opal/clearwater/model.rb
 - opal/clearwater/router.rb
 - opal/clearwater/router/route.rb
 - opal/clearwater/router/route_collection.rb
@@ -166,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Front-end web framework built on Opal

data/opal/clearwater/model.rb

@@ -1,33 +0,0 @@
-require "clearwater/binding"
-
-module Clearwater
-  class Model
-    def initialize attributes={}
-      @_bindings = Hash.new { |h,k| h[k] = [] }
-      self.class.attributes.each do |attr|
-        public_send "#{attr}=", attributes[attr]
-      end
-    end
-
-    def add_binding attribute, &block
-      binding = Binding.new(self, attribute, &block)
-      @_bindings[attribute].delete_if(&:dead?)
-      @_bindings[attribute] << binding
-      binding
-    end
-
-    def self.attributes *args
-      @attributes ||= []
-      args.each do |attr|
-        attr_reader attr
-
-        define_method "#{attr}=" do |value|
-          instance_variable_set "@#{attr}", value
-          @_bindings[attr].each(&:call)
-          @_bindings[attr].delete_if(&:dead?)
-        end
-      end
-      @attributes.concat args
-    end
-  end
-end