rivets-rails 0.2.0 → 0.2.1

data/build/update.sh

@@ -1,3 +1,3 @@
-TAG=v0.5.7
+TAG=v0.5.10
 curl -s -o dist/rivets.js https://raw.github.com/mikeric/rivets/$TAG/dist/rivets.js
 curl -s -o dist/rivets.min.js https://raw.github.com/mikeric/rivets/$TAG/dist/rivets.min.js

data/dist/rivets.general_custom.js

@@ -1,5 +1,5 @@
 // rivets.custom_by_vkill.js
-// version: 0.1.0
+// version: 0.1.1
 // author: vkill
 // license: MIT
 (function() {

data/dist/rivets.general_custom.js.min.js

@@ -1,5 +1,5 @@
 // rivets.custom_by_vkill.js
-// version: 0.1.0
+// version: 0.1.1
 // author: vkill
 // license: MIT
 !function(){var a;a=this.rivets,a.configure({prefix:"bind"})}.call(this),function(){var a;a=this.rivets,a.binders.content={routine:a.binders.text,bind:function(b){var c;return c=this,this.callback=function(){return a.config.adapter.publish(c.model,c.keypath,b.textContent)},b.addEventListener("input",this.callback,!1)},unbind:function(a){return a.removeEventListener("input",this.callback,!1)}}}.call(this),function(){var a;a=this.rivets,a.formatters.shortdate=function(a){return moment(a).format("YYYY-MM-DD")},a.formatters.number=function(a){return+a},a.formatters.string=function(a){return String(a)},a.formatters.negate=function(a){return!a},a.formatters.eq=function(a,b){return a===b},a.formatters.not_eq=function(a,b){return a!==b},a.formatters.gt=function(a,b){return a>b},a.formatters.lt=function(a,b){return b>a},a.formatters.blank=function(a){return null==a||""===a},a.formatters.preventDefault=function(a){return function(b){return b.preventDefault(),a.call(this,b),!1}},a.formatters.length=function(a){return a.length}}.call(this),function(){var a;a=this.rivets,a.configure({adapter:{subscribe:function(a,b,c){return null!=a.on?a.on("change:"+b,c):void 0},unsubscribe:function(a,b,c){return null!=a.off?a.off("change:"+b,c):void 0},read:function(a,b){return a[b]},publish:function(a,b,c){return a[b]=c}}})}.call(this);

data/dist/rivets.js

@@ -1,11 +1,13 @@
 // Rivets.js
-// version: 0.5.7
+// version: 0.5.10
 // author: Michael Richards
 // license: MIT
 (function() {
   var Rivets,
     __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     __slice = [].slice,
+    __hasProp = {}.hasOwnProperty,
+    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
     __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
   Rivets = {};
@@ -34,7 +36,7 @@
       this.set = __bind(this.set, this);
       this.eventHandler = __bind(this.eventHandler, this);
       this.formattedValue = __bind(this.formattedValue, this);
-      if (!(this.binder = this.view.binders[type])) {
+      if (!(this.binder = Rivets.internalBinders[this.type] || this.view.binders[type])) {
         _ref = this.view.binders;
         for (identifier in _ref) {
           value = _ref[identifier];
@@ -173,16 +175,115 @@
       }
     };
 
-    Binding.prototype.update = function() {
-      this.unbind();
-      this.model = this.key ? this.view.models[this.key] : this.view.models;
-      return this.bind();
+    Binding.prototype.update = function(models) {
+      var _ref;
+
+      if (models == null) {
+        models = {};
+      }
+      if (this.key) {
+        if (models[this.key]) {
+          if (!this.options.bypass) {
+            this.view.config.adapter.unsubscribe(this.model, this.keypath, this.sync);
+          }
+          this.model = models[this.key];
+          if (this.options.bypass) {
+            this.sync();
+          } else {
+            this.view.config.adapter.subscribe(this.model, this.keypath, this.sync);
+            if (this.view.config.preloadData) {
+              this.sync();
+            }
+          }
+        }
+      } else {
+        this.sync();
+      }
+      return (_ref = this.binder.update) != null ? _ref.call(this, models) : void 0;
     };
 
     return Binding;
 
   })();
 
+  Rivets.ComponentBinding = (function(_super) {
+    __extends(ComponentBinding, _super);
+
+    function ComponentBinding(view, el, type) {
+      var attribute, _i, _len, _ref, _ref1;
+
+      this.view = view;
+      this.el = el;
+      this.type = type;
+      this.unbind = __bind(this.unbind, this);
+      this.bind = __bind(this.bind, this);
+      this.update = __bind(this.update, this);
+      this.locals = __bind(this.locals, this);
+      this.component = Rivets.components[this.type];
+      this.attributes = {};
+      this.inflections = {};
+      _ref = this.el.attributes || [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        attribute = _ref[_i];
+        if (_ref1 = attribute.name, __indexOf.call(this.component.attributes, _ref1) >= 0) {
+          this.attributes[attribute.name] = attribute.value;
+        } else {
+          this.inflections[attribute.name] = attribute.value;
+        }
+      }
+    }
+
+    ComponentBinding.prototype.sync = function() {};
+
+    ComponentBinding.prototype.locals = function(models) {
+      var inverse, key, model, result, _ref, _ref1;
+
+      if (models == null) {
+        models = this.view.models;
+      }
+      result = {};
+      _ref = this.inflections;
+      for (key in _ref) {
+        inverse = _ref[key];
+        result[key] = models[inverse];
+      }
+      for (key in models) {
+        model = models[key];
+        if ((_ref1 = result[key]) == null) {
+          result[key] = model;
+        }
+      }
+      return result;
+    };
+
+    ComponentBinding.prototype.update = function(models) {
+      var _ref;
+
+      return (_ref = this.componentView) != null ? _ref.update(this.locals(models)) : void 0;
+    };
+
+    ComponentBinding.prototype.bind = function() {
+      var el, _ref;
+
+      if (this.componentView != null) {
+        return (_ref = this.componentView) != null ? _ref.bind() : void 0;
+      } else {
+        el = this.component.build.call(this.attributes);
+        (this.componentView = new Rivets.View(el, this.locals(), this.view.options)).bind();
+        return this.el.parentNode.replaceChild(el, this.el);
+      }
+    };
+
+    ComponentBinding.prototype.unbind = function() {
+      var _ref;
+
+      return (_ref = this.componentView) != null ? _ref.unbind() : void 0;
+    };
+
+    return ComponentBinding;
+
+  })(Rivets.Binding);
+
   Rivets.View = (function() {
     function View(els, models, options) {
       var k, option, v, _base, _i, _len, _ref, _ref1, _ref2, _ref3;
@@ -197,6 +298,7 @@
       this.bind = __bind(this.bind, this);
       this.select = __bind(this.select, this);
       this.build = __bind(this.build, this);
+      this.componentRegExp = __bind(this.componentRegExp, this);
       this.bindingRegExp = __bind(this.bindingRegExp, this);
       if (!(this.els.jquery || this.els instanceof Array)) {
         this.els = [this.els];
@@ -234,108 +336,144 @@
       }
     };
 
+    View.prototype.componentRegExp = function() {
+      var _ref, _ref1;
+
+      return new RegExp("^" + ((_ref = (_ref1 = this.config.prefix) != null ? _ref1.toUpperCase() : void 0) != null ? _ref : 'RV') + "-");
+    };
+
     View.prototype.build = function() {
-      var bindingRegExp, el, node, parse, skipNodes, _i, _j, _len, _len1, _ref, _ref1,
+      var bindingRegExp, buildBinding, componentRegExp, el, parse, skipNodes, _i, _len, _ref,
         _this = this;
 
       this.bindings = [];
       skipNodes = [];
       bindingRegExp = this.bindingRegExp();
+      componentRegExp = this.componentRegExp();
+      buildBinding = function(node, type, declaration) {
+        var context, ctx, dependencies, key, keypath, options, path, pipe, pipes, splitPath;
+
+        options = {};
+        pipes = (function() {
+          var _i, _len, _ref, _results;
+
+          _ref = declaration.split('|');
+          _results = [];
+          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            pipe = _ref[_i];
+            _results.push(pipe.trim());
+          }
+          return _results;
+        })();
+        context = (function() {
+          var _i, _len, _ref, _results;
+
+          _ref = pipes.shift().split('<');
+          _results = [];
+          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+            ctx = _ref[_i];
+            _results.push(ctx.trim());
+          }
+          return _results;
+        })();
+        path = context.shift();
+        splitPath = path.split(/\.|:/);
+        options.formatters = pipes;
+        options.bypass = path.indexOf(':') !== -1;
+        if (splitPath[0]) {
+          key = splitPath.shift();
+        } else {
+          key = null;
+          splitPath.shift();
+        }
+        keypath = splitPath.join('.');
+        if (dependencies = context.shift()) {
+          options.dependencies = dependencies.split(/\s+/);
+        }
+        return _this.bindings.push(new Rivets.Binding(_this, node, type, key, keypath, options));
+      };
       parse = function(node) {
-        var attribute, attributes, binder, context, ctx, dependencies, identifier, key, keypath, n, options, path, pipe, pipes, regexp, splitPath, type, value, _i, _j, _k, _len, _len1, _len2, _ref, _ref1, _ref2, _ref3;
+        var attribute, attributes, binder, childNode, delimiters, identifier, n, parser, regexp, restTokens, startToken, text, token, tokens, type, value, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _m, _ref, _ref1, _ref2, _ref3, _ref4, _results;
 
         if (__indexOf.call(skipNodes, node) < 0) {
-          _ref = node.attributes;
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            attribute = _ref[_i];
-            if (bindingRegExp.test(attribute.name)) {
-              type = attribute.name.replace(bindingRegExp, '');
-              if (!(binder = _this.binders[type])) {
-                _ref1 = _this.binders;
-                for (identifier in _ref1) {
-                  value = _ref1[identifier];
-                  if (identifier !== '*' && identifier.indexOf('*') !== -1) {
-                    regexp = new RegExp("^" + (identifier.replace('*', '.+')) + "$");
-                    if (regexp.test(type)) {
-                      binder = value;
+          if (node.nodeType === Node.TEXT_NODE) {
+            parser = Rivets.TextTemplateParser;
+            if (delimiters = _this.config.templateDelimiters) {
+              if ((tokens = parser.parse(node.data, delimiters)).length) {
+                if (!(tokens.length === 1 && tokens[0].type === parser.types.text)) {
+                  startToken = tokens[0], restTokens = 2 <= tokens.length ? __slice.call(tokens, 1) : [];
+                  node.data = startToken.value;
+                  switch (startToken.type) {
+                    case 0:
+                      node.data = startToken.value;
+                      break;
+                    case 1:
+                      buildBinding(node, 'textNode', startToken.value);
+                  }
+                  for (_i = 0, _len = restTokens.length; _i < _len; _i++) {
+                    token = restTokens[_i];
+                    node.parentNode.appendChild((text = document.createTextNode(token.value)));
+                    if (token.type === 1) {
+                      buildBinding(text, 'textNode', token.value);
                     }
                   }
                 }
               }
-              binder || (binder = _this.binders['*']);
-              if (binder.block) {
-                _ref2 = node.getElementsByTagName('*');
-                for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-                  n = _ref2[_j];
-                  skipNodes.push(n);
-                }
-                attributes = [attribute];
-              }
             }
-          }
-          _ref3 = attributes || node.attributes;
-          for (_k = 0, _len2 = _ref3.length; _k < _len2; _k++) {
-            attribute = _ref3[_k];
-            if (bindingRegExp.test(attribute.name)) {
-              options = {};
-              type = attribute.name.replace(bindingRegExp, '');
-              pipes = (function() {
-                var _l, _len3, _ref4, _results;
-
-                _ref4 = attribute.value.split('|');
-                _results = [];
-                for (_l = 0, _len3 = _ref4.length; _l < _len3; _l++) {
-                  pipe = _ref4[_l];
-                  _results.push(pipe.trim());
+          } else if (componentRegExp.test(node.tagName)) {
+            type = node.tagName.replace(componentRegExp, '').toLowerCase();
+            _this.bindings.push(new Rivets.ComponentBinding(_this, node, type));
+          } else if (node.attributes != null) {
+            _ref = node.attributes;
+            for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+              attribute = _ref[_j];
+              if (bindingRegExp.test(attribute.name)) {
+                type = attribute.name.replace(bindingRegExp, '');
+                if (!(binder = _this.binders[type])) {
+                  _ref1 = _this.binders;
+                  for (identifier in _ref1) {
+                    value = _ref1[identifier];
+                    if (identifier !== '*' && identifier.indexOf('*') !== -1) {
+                      regexp = new RegExp("^" + (identifier.replace('*', '.+')) + "$");
+                      if (regexp.test(type)) {
+                        binder = value;
+                      }
+                    }
+                  }
                 }
-                return _results;
-              })();
-              context = (function() {
-                var _l, _len3, _ref4, _results;
-
-                _ref4 = pipes.shift().split('<');
-                _results = [];
-                for (_l = 0, _len3 = _ref4.length; _l < _len3; _l++) {
-                  ctx = _ref4[_l];
-                  _results.push(ctx.trim());
+                binder || (binder = _this.binders['*']);
+                if (binder.block) {
+                  _ref2 = node.childNodes;
+                  for (_k = 0, _len2 = _ref2.length; _k < _len2; _k++) {
+                    n = _ref2[_k];
+                    skipNodes.push(n);
+                  }
+                  attributes = [attribute];
                 }
-                return _results;
-              })();
-              path = context.shift();
-              splitPath = path.split(/\.|:/);
-              options.formatters = pipes;
-              options.bypass = path.indexOf(':') !== -1;
-              if (splitPath[0]) {
-                key = splitPath.shift();
-              } else {
-                key = null;
-                splitPath.shift();
               }
-              keypath = splitPath.join('.');
-              if (!key || (_this.models[key] != null)) {
-                if (dependencies = context.shift()) {
-                  options.dependencies = dependencies.split(/\s+/);
-                }
-                _this.bindings.push(new Rivets.Binding(_this, node, type, key, keypath, options));
+            }
+            _ref3 = attributes || node.attributes;
+            for (_l = 0, _len3 = _ref3.length; _l < _len3; _l++) {
+              attribute = _ref3[_l];
+              if (bindingRegExp.test(attribute.name)) {
+                type = attribute.name.replace(bindingRegExp, '');
+                buildBinding(node, type, attribute.value);
               }
             }
           }
-          if (attributes) {
-            attributes = null;
+          _ref4 = node.childNodes;
+          _results = [];
+          for (_m = 0, _len4 = _ref4.length; _m < _len4; _m++) {
+            childNode = _ref4[_m];
+            _results.push(parse(childNode));
           }
+          return _results;
         }
       };
       _ref = this.els;
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         el = _ref[_i];
         parse(el);
-        _ref1 = el.getElementsByTagName('*');
-        for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
-          node = _ref1[_j];
-          if (node.attributes != null) {
-            parse(node);
-          }
-        }
       }
     };
 
@@ -404,33 +542,85 @@
     };
 
     View.prototype.update = function(models) {
-      var binding, key, model, _results;
+      var binding, key, model, _i, _len, _ref, _results;
 
       if (models == null) {
         models = {};
       }
-      _results = [];
       for (key in models) {
         model = models[key];
         this.models[key] = model;
-        _results.push((function() {
-          var _i, _len, _ref, _results1;
+      }
+      _ref = this.bindings;
+      _results = [];
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        binding = _ref[_i];
+        _results.push(binding.update(models));
+      }
+      return _results;
+    };
+
+    return View;
+
+  })();
+
+  Rivets.TextTemplateParser = (function() {
+    function TextTemplateParser() {}
 
-          _ref = this.select(function(b) {
-            return b.key === key;
+    TextTemplateParser.types = {
+      text: 0,
+      binding: 1
+    };
+
+    TextTemplateParser.parse = function(template, delimiters) {
+      var index, lastIndex, lastToken, length, substring, tokens, value;
+
+      tokens = [];
+      length = template.length;
+      index = 0;
+      lastIndex = 0;
+      while (lastIndex < length) {
+        index = template.indexOf(delimiters[0], lastIndex);
+        if (index < 0) {
+          tokens.push({
+            type: this.types.text,
+            value: template.slice(lastIndex)
           });
-          _results1 = [];
-          for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-            binding = _ref[_i];
-            _results1.push(binding.update());
+          break;
+        } else {
+          if (index > 0 && lastIndex < index) {
+            tokens.push({
+              type: this.types.text,
+              value: template.slice(lastIndex, index)
+            });
           }
-          return _results1;
-        }).call(this));
+          lastIndex = index + 2;
+          index = template.indexOf(delimiters[1], lastIndex);
+          if (index < 0) {
+            substring = template.slice(lastIndex - 2);
+            lastToken = tokens[tokens.length - 1];
+            if ((lastToken != null ? lastToken.type : void 0) === this.types.text) {
+              lastToken.value += substring;
+            } else {
+              tokens.push({
+                type: this.types.text,
+                value: substring
+              });
+            }
+            break;
+          }
+          value = template.slice(lastIndex, index).trim();
+          tokens.push({
+            type: this.types.binding,
+            value: value
+          });
+          lastIndex = index + 2;
+        }
       }
-      return _results;
+      return tokens;
     };
 
-    return View;
+    return TextTemplateParser;
 
   })();
 
@@ -610,7 +800,7 @@
       routine: function(el, value) {
         var key, model, models, options, _ref;
 
-        if (value === (this.nested == null)) {
+        if (!!value === (this.nested == null)) {
           if (value) {
             models = {};
             _ref = this.view.models;
@@ -631,6 +821,9 @@
             return delete this.nested;
           }
         }
+      },
+      update: function(models) {
+        return this.nested.update(models);
       }
     },
     unless: {
@@ -643,6 +836,9 @@
       },
       routine: function(el, value) {
         return Rivets.binders["if"].routine.call(this, el, !value);
+      },
+      update: function(models) {
+        return Rivets.binders["if"].update.call(this, models);
       }
     },
     "on-*": {
@@ -737,6 +933,24 @@
           }
         }
         return _results;
+      },
+      update: function(models) {
+        var data, key, model, view, _i, _len, _ref, _results;
+
+        data = {};
+        for (key in models) {
+          model = models[key];
+          if (key !== this.args[0]) {
+            data[key] = model;
+          }
+        }
+        _ref = this.iterated;
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          view = _ref[_i];
+          _results.push(view.update(data));
+        }
+        return _results;
       }
     },
     "class-*": function(el, value) {
@@ -756,6 +970,14 @@
     }
   };
 
+  Rivets.internalBinders = {
+    textNode: function(node, value) {
+      return node.data = value != null ? value : '';
+    }
+  };
+
+  Rivets.components = {};
+
   Rivets.config = {
     preloadData: true,
     handler: function(context, ev, binding) {
@@ -766,7 +988,9 @@
   Rivets.formatters = {};
 
   Rivets.factory = function(exports) {
+    exports._ = Rivets;
     exports.binders = Rivets.binders;
+    exports.components = Rivets.components;
     exports.formatters = Rivets.formatters;
     exports.config = Rivets.config;
     exports.configure = function(options) {