serenade_rails 0.2.0 → 0.2.1

data/lib/assets/javascripts/serenade.js

@@ -1,5 +1,5 @@
 /**
- * Serenade.js JavaScript Framework v0.2.0
+ * Serenade.js JavaScript Framework v0.2.1
  * http://github.com/elabs/serenade.js
  *
  * Copyright 2011, Jonas Nicklas, Elabs AB
@@ -109,6 +109,20 @@
     isArray: function(object) {
       return Object.prototype.toString.call(object) === "[object Array]";
     },
+    indexOf: function(object, search) {
+      var index, item, _i, _len;
+      if (typeof Array.prototype.indexOf === "function") {
+        return Array.prototype.indexOf.call(object, search);
+      } else {
+        for (index = _i = 0, _len = object.length; _i < _len; index = ++_i) {
+          item = object[index];
+          if (item === search) {
+            return index;
+          }
+        }
+        return -1;
+      }
+    },
     pairToObject: function(one, two) {
       var temp;
       temp = {};
@@ -202,12 +216,12 @@
 };require['./collection'] = new function() {
   var exports = this;
   (function() {
-  var Events, extend, get, getLength, isArrayIndex, serializeObject, _ref,
+  var Events, extend, get, getLength, indexOf, isArrayIndex, serializeObject, _ref,
     __slice = [].slice;
 
   Events = require('./events').Events;
 
-  _ref = require('./helpers'), extend = _ref.extend, serializeObject = _ref.serializeObject, get = _ref.get;
+  _ref = require('./helpers'), indexOf = _ref.indexOf, extend = _ref.extend, serializeObject = _ref.serializeObject, get = _ref.get;
 
   isArrayIndex = function(index) {
     return index.match(/^\d+$/);
@@ -364,18 +378,7 @@
     };
 
     Collection.prototype.indexOf = function(search) {
-      var index, item, _i, _len;
-      if (typeof Array.prototype.indexOf === "function") {
-        return Array.prototype.indexOf.call(this, search);
-      } else {
-        for (index = _i = 0, _len = this.length; _i < _len; index = ++_i) {
-          item = this[index];
-          if (item === search) {
-            return index;
-          }
-        }
-        return -1;
-      }
+      return indexOf(this, search);
     };
 
     Collection.prototype.lastIndexOf = function(search) {
@@ -657,7 +660,7 @@
 };require['./properties'] = new function() {
   var exports = this;
   (function() {
-  var AssociationCollection, Associations, Collection, Events, Properties, addDependencies, addGlobalDependencies, define, exp, extend, get, globalDependencies, pairToObject, prefix, serializeObject, triggerChangesTo, triggerGlobal, _ref,
+  var AssociationCollection, Associations, Collection, Events, Properties, addDependencies, addGlobalDependencies, define, exp, extend, get, globalDependencies, indexOf, pairToObject, prefix, serializeObject, triggerChangesTo, triggerGlobal, _ref,
     __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; },
     __hasProp = {}.hasOwnProperty;
 
@@ -667,7 +670,7 @@
 
   Events = require('./events').Events;
 
-  _ref = require('./helpers'), pairToObject = _ref.pairToObject, serializeObject = _ref.serializeObject, extend = _ref.extend, get = _ref.get;
+  _ref = require('./helpers'), indexOf = _ref.indexOf, pairToObject = _ref.pairToObject, serializeObject = _ref.serializeObject, extend = _ref.extend, get = _ref.get;
 
   prefix = "_prop_";
 
@@ -718,7 +721,7 @@
         _ref1 = name.split(/[:\.]/), name = _ref1[0], subname = _ref1[1];
       }
       object[_name = "_dep_" + name] || (object[_name] = []);
-      if (object["_dep_" + name].indexOf(dependency) === -1) {
+      if (indexOf(object["_dep_" + name], dependency) === -1) {
         _results.push(object["_dep_" + name].push(dependency));
       } else {
         _results.push(void 0);
@@ -773,7 +776,7 @@
         _results = [];
         for (_i = 0, _len = dependencies.length; _i < _len; _i++) {
           dependency = dependencies[_i];
-          if (names.indexOf(dependency) === -1) {
+          if (indexOf(names, dependency) === -1) {
             names.push(dependency);
             _results.push(findDependencies(dependency));
           } else {
@@ -936,7 +939,9 @@
           return get(this.get(name), 'id');
         },
         set: function(id) {
-          return this.attributes[name] = attributes.as().find(id);
+          if (id != null) {
+            return this.set(name, attributes.as().find(id));
+          }
         },
         dependsOn: name,
         serialize: attributes.serializeId
@@ -1053,7 +1058,11 @@
         New.modelName = name;
 
         function New() {
-          New.__super__.constructor.apply(this, arguments);
+          var val;
+          val = New.__super__.constructor.apply(this, arguments);
+          if (val) {
+            return val;
+          }
           if (ctor) {
             ctor.apply(this, arguments);
           }
@@ -1128,7 +1137,7 @@
   extend(Serenade.prototype, Properties);
 
   extend(Serenade, {
-    VERSION: '0.2.0',
+    VERSION: '0.2.1',
     _views: {},
     _controllers: {},
     document: typeof window !== "undefined" && window !== null ? window.document : void 0,
@@ -1141,8 +1150,8 @@
         return new View(void 0, nameOrTemplate);
       }
     },
-    render: function(name, model, controller, parent) {
-      return this._views[name].render(model, controller, parent);
+    render: function(name, model, controller, parent, skipCallback) {
+      return this._views[name].render(model, controller, parent, skipCallback);
     },
     controller: function(name, klass) {
       return this._controllers[name] = klass;
@@ -1217,7 +1226,7 @@
 };require['./lexer'] = new function() {
   var exports = this;
   (function() {
-  var IDENTIFIER, KEYWORDS, LITERAL, Lexer, MULTI_DENT, STRING, WHITESPACE,
+  var COMMENT, IDENTIFIER, KEYWORDS, LITERAL, Lexer, MULTI_DENT, STRING, WHITESPACE,
     __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; };
 
   IDENTIFIER = /^[a-zA-Z][a-zA-Z0-9\-_]*/;
@@ -1230,6 +1239,8 @@
 
   WHITESPACE = /^[^\r\n\S]+/;
 
+  COMMENT = /^\s*\/\/[^\n]*/;
+
   KEYWORDS = ["IF", "COLLECTION", "IN", "VIEW", "UNLESS"];
 
   Lexer = (function() {
@@ -1249,7 +1260,7 @@
       this.tokens = [];
       i = 0;
       while (this.chunk = this.code.slice(i)) {
-        i += this.identifierToken() || this.whitespaceToken() || this.lineToken() || this.stringToken() || this.literalToken();
+        i += this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.stringToken() || this.literalToken();
       }
       while (tag = this.ends.pop()) {
         if (tag === 'OUTDENT') {
@@ -1258,9 +1269,24 @@
           this.error("missing " + tag);
         }
       }
+      while (this.tokens[0][0] === "TERMINATOR") {
+        this.tokens.shift();
+      }
+      while (this.tokens[this.tokens.length - 1][0] === "TERMINATOR") {
+        this.tokens.pop();
+      }
       return this.tokens;
     };
 
+    Lexer.prototype.commentToken = function() {
+      var match;
+      if (match = COMMENT.exec(this.chunk)) {
+        return match[0].length;
+      } else {
+        return 0;
+      }
+    };
+
     Lexer.prototype.whitespaceToken = function() {
       var match;
       if (match = WHITESPACE.exec(this.chunk)) {
@@ -1563,7 +1589,7 @@
   getValue = function(ast, model) {
     if (ast.bound && ast.value) {
       return get(model, ast.value, true);
-    } else if (ast.value) {
+    } else if (ast.value != null) {
       return ast.value;
     } else {
       return model;
@@ -1662,8 +1688,9 @@
             classes = classes.concat(value);
           }
           if (classes.length) {
-            return element.setAttribute(ast.name, classes.join(' '));
+            return element.className = classes.join(' ');
           } else {
+            element.className = '';
             return element.removeAttribute(ast.name);
           }
         } else if (value === void 0) {
@@ -1695,9 +1722,14 @@
       if ((_ref1 = ast.classes) != null ? _ref1.length : void 0) {
         element.setAttribute('class', ast.classes.join(' '));
       }
-      _ref2 = ast.properties;
+      _ref2 = ast.children;
       for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        property = _ref2[_i];
+        child = _ref2[_i];
+        compile(child, model, controller).append(element);
+      }
+      _ref3 = ast.properties;
+      for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
+        property = _ref3[_j];
         action = Property[property.scope];
         if (action) {
           action(property, node, model, controller);
@@ -1705,17 +1737,16 @@
           throw SyntaxError("" + property.scope + " is not a valid scope");
         }
       }
-      _ref3 = ast.children;
-      for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
-        child = _ref3[_j];
-        compile(child, model, controller).append(element);
-      }
       return node;
     },
     view: function(ast, model, parent) {
-      var controller, element;
-      controller = Serenade.controllerFor(ast["arguments"][0]) || parent;
-      element = Serenade.render(ast["arguments"][0], model, controller, parent);
+      var controller, element, skipCallback;
+      controller = Serenade.controllerFor(ast["arguments"][0]);
+      if (!controller) {
+        skipCallback = true;
+        controller = parent;
+      }
+      element = Serenade.render(ast["arguments"][0], model, controller, parent, skipCallback);
       return new Node(ast, element);
     },
     helper: function(ast, model, controller) {
@@ -1830,11 +1861,8 @@
       return dynamic;
     },
     "in": function(ast, model, controller) {
-      var dynamic, update;
-      dynamic = new DynamicNode(ast);
-      update = function() {
-        var child, nodes, value;
-        value = get(model, ast["arguments"][0]);
+      return Compile.bound(ast, model, controller, function(dynamic, value) {
+        var child, nodes;
         if (value) {
           nodes = (function() {
             var _i, _len, _ref1, _results;
@@ -1850,19 +1878,11 @@
         } else {
           return dynamic.clear();
         }
-      };
-      update();
-      if (typeof model.bind === "function") {
-        model.bind("change:" + ast["arguments"][0], update);
-      }
-      return dynamic;
+      });
     },
     "if": function(ast, model, controller) {
-      var dynamic, update;
-      dynamic = new DynamicNode(ast);
-      update = function() {
-        var child, nodes, value;
-        value = get(model, ast["arguments"][0]);
+      return Compile.bound(ast, model, controller, function(dynamic, value) {
+        var child, nodes;
         if (value) {
           nodes = (function() {
             var _i, _len, _ref1, _results;
@@ -1878,19 +1898,11 @@
         } else {
           return dynamic.clear();
         }
-      };
-      update();
-      if (typeof model.bind === "function") {
-        model.bind("change:" + ast["arguments"][0], update);
-      }
-      return dynamic;
+      });
     },
     unless: function(ast, model, controller) {
-      var dynamic, update;
-      dynamic = new DynamicNode(ast);
-      update = function() {
-        var child, nodes, value;
-        value = get(model, ast["arguments"][0]);
+      return Compile.bound(ast, model, controller, function(dynamic, value) {
+        var child, nodes;
         if (value) {
           return dynamic.clear();
         } else {
@@ -1906,6 +1918,15 @@
           })();
           return dynamic.replace([nodes]);
         }
+      });
+    },
+    bound: function(ast, model, controller, callback) {
+      var dynamic, update;
+      dynamic = new DynamicNode(ast);
+      update = function() {
+        var value;
+        value = get(model, ast["arguments"][0]);
+        return callback(dynamic, value);
       };
       update();
       if (typeof model.bind === "function") {
@@ -2232,185 +2253,7 @@ parse: function parse(input) {
     return true;
 }
 };
-undefined/* Jison generated lexer */
-var lexer = (function(){
-var lexer = ({EOF:1,
-parseError:function parseError(str, hash) {
-        if (this.yy.parser) {
-            this.yy.parser.parseError(str, hash);
-        } else {
-            throw new Error(str);
-        }
-    },
-setInput:function (input) {
-        this._input = input;
-        this._more = this._less = this.done = false;
-        this.yylineno = this.yyleng = 0;
-        this.yytext = this.matched = this.match = '';
-        this.conditionStack = ['INITIAL'];
-        this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-        if (this.options.ranges) this.yylloc.range = [0,0];
-        this.offset = 0;
-        return this;
-    },
-input:function () {
-        var ch = this._input[0];
-        this.yytext += ch;
-        this.yyleng++;
-        this.offset++;
-        this.match += ch;
-        this.matched += ch;
-        var lines = ch.match(/(?:\r\n?|\n).*/g);
-        if (lines) {
-            this.yylineno++;
-            this.yylloc.last_line++;
-        } else {
-            this.yylloc.last_column++;
-        }
-        if (this.options.ranges) this.yylloc.range[1]++;
-
-        this._input = this._input.slice(1);
-        return ch;
-    },
-unput:function (ch) {
-        var len = ch.length;
-        var lines = ch.split(/(?:\r\n?|\n)/g);
-
-        this._input = ch + this._input;
-        this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-        //this.yyleng -= len;
-        this.offset -= len;
-        var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-        this.match = this.match.substr(0, this.match.length-1);
-        this.matched = this.matched.substr(0, this.matched.length-1);
-
-        if (lines.length-1) this.yylineno -= lines.length-1;
-        var r = this.yylloc.range;
-
-        this.yylloc = {first_line: this.yylloc.first_line,
-          last_line: this.yylineno+1,
-          first_column: this.yylloc.first_column,
-          last_column: lines ?
-              (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-              this.yylloc.first_column - len
-          };
-
-        if (this.options.ranges) {
-            this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-        }
-        return this;
-    },
-more:function () {
-        this._more = true;
-        return this;
-    },
-less:function (n) {
-        this.unput(this.match.slice(n));
-    },
-pastInput:function () {
-        var past = this.matched.substr(0, this.matched.length - this.match.length);
-        return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-    },
-upcomingInput:function () {
-        var next = this.match;
-        if (next.length < 20) {
-            next += this._input.substr(0, 20-next.length);
-        }
-        return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-    },
-showPosition:function () {
-        var pre = this.pastInput();
-        var c = new Array(pre.length + 1).join("-");
-        return pre + this.upcomingInput() + "\n" + c+"^";
-    },
-next:function () {
-        if (this.done) {
-            return this.EOF;
-        }
-        if (!this._input) this.done = true;
-
-        var token,
-            match,
-            tempMatch,
-            index,
-            col,
-            lines;
-        if (!this._more) {
-            this.yytext = '';
-            this.match = '';
-        }
-        var rules = this._currentRules();
-        for (var i=0;i < rules.length; i++) {
-            tempMatch = this._input.match(this.rules[rules[i]]);
-            if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                match = tempMatch;
-                index = i;
-                if (!this.options.flex) break;
-            }
-        }
-        if (match) {
-            lines = match[0].match(/(?:\r\n?|\n).*/g);
-            if (lines) this.yylineno += lines.length;
-            this.yylloc = {first_line: this.yylloc.last_line,
-                           last_line: this.yylineno+1,
-                           first_column: this.yylloc.last_column,
-                           last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-            this.yytext += match[0];
-            this.match += match[0];
-            this.matches = match;
-            this.yyleng = this.yytext.length;
-            if (this.options.ranges) {
-                this.yylloc.range = [this.offset, this.offset += this.yyleng];
-            }
-            this._more = false;
-            this._input = this._input.slice(match[0].length);
-            this.matched += match[0];
-            token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-            if (this.done && this._input) this.done = false;
-            if (token) return token;
-            else return;
-        }
-        if (this._input === "") {
-            return this.EOF;
-        } else {
-            return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                    {text: "", token: null, line: this.yylineno});
-        }
-    },
-lex:function lex() {
-        var r = this.next();
-        if (typeof r !== 'undefined') {
-            return r;
-        } else {
-            return this.lex();
-        }
-    },
-begin:function begin(condition) {
-        this.conditionStack.push(condition);
-    },
-popState:function popState() {
-        return this.conditionStack.pop();
-    },
-_currentRules:function _currentRules() {
-        return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
-    },
-topState:function () {
-        return this.conditionStack[this.conditionStack.length-2];
-    },
-pushState:function begin(condition) {
-        this.begin(condition);
-    }});
-lexer.options = {};
-lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-var YYSTATE=YY_START
-switch($avoiding_name_collisions) {
-}
-};
-lexer.rules = [];
-lexer.conditions = {"INITIAL":{"rules":[],"inclusive":true}};
-return lexer;})()
-parser.lexer = lexer;function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
+;function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
 return new Parser;
 })();
 if (typeof require !== 'undefined' && typeof exports !== 'undefined') {
@@ -2475,7 +2318,7 @@ if (typeof module !== 'undefined' && require.main === module) {
       }
     };
 
-    View.prototype.render = function(model, controller, parent) {
+    View.prototype.render = function(model, controller, parent, skipCallback) {
       var node;
       if (this.name) {
         controller || (controller = Serenade.controllerFor(this.name, model));
@@ -2485,8 +2328,10 @@ if (typeof module !== 'undefined' && require.main === module) {
         controller = new controller(model, parent);
       }
       node = compile(this.parse(), model, controller);
-      if (typeof controller.loaded === "function") {
-        controller.loaded(model, node.element);
+      if (!skipCallback) {
+        if (typeof controller.loaded === "function") {
+          controller.loaded(model, node.element);
+        }
       }
       return node.element;
     };

data/lib/serenade_rails/version.rb

@@ -1,3 +1,3 @@
 module SerenadeRails
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serenade_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2156993600 !ruby/object:Gem::Requirement
+  requirement: &2153773400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2156993600
+  version_requirements: *2153773400
 - !ruby/object:Gem::Dependency
   name: execjs
-  requirement: &2156992880 !ruby/object:Gem::Requirement
+  requirement: &2153772900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156992880
+  version_requirements: *2153772900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156992180 !ruby/object:Gem::Requirement
+  requirement: &2153772440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2156992180
+  version_requirements: *2153772440
 description: Use Serenade.js within the Rails asset pipeline
 email:
 - jonas.nicklas@gmail.com