js2 0.3.13 → 0.3.15

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.3.15
+  * JSML: added "eval'd" attribute handling
+  * JSML: fixed browser js2 file
+
+0.3.14
+  * JSML: added plain content children
+
 0.3.13
   * fixed problem that doesn't allow toString methods
   * fixed string sanitizer problem with double quotes
@@ -22,7 +29,7 @@
   * fixed regex/divide issue
 
 0.3.8
-  * fied "render"
+  * fixed "render"
   * fixed comment block bug
   * using target-dir instead of out-dir
 

data/lib/js2/browser.js

@@ -19,7 +19,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.13";
+  js2.VERSION = "0.3.15";
 
   JS2.ROOT = JS2;
 
@@ -270,6 +270,198 @@ JS2.Array.prototype.any = function() {
 };
 
 
+  JS2.Class.extend('JSML', function(KLASS, OO){
+  OO.addStaticMember("process",function (txt) {
+    return new KLASS(txt);
+  });
+
+  OO.addMember("initialize",function (txt) {
+    var lines = txt.split(/\n/);
+    this.root    = new JS2.JSMLElement();
+    this.stack   = [ this.root ];
+
+    for(var _i1=0,_c1=lines,_l1=_c1.length,l;(l=_c1[_i1])||(_i1<_l1);_i1++){
+      if (l.match(/^\s*$/)) continue;
+      this.processLine(l);
+    }
+
+    var toEval = 'function process() { var out = [];\n' + this.flatten().join('') + '\n return out.join("");\n}';
+    eval(toEval);
+
+    this.result = function(bound) {
+      bound = bound || {};
+      return process.call(bound);
+    };
+  });
+
+  OO.addMember("flatten",function () {
+    return this.root.flatten();
+  });
+
+  OO.addMember("processLine",function (line) {
+    var ele   = new JS2.JSMLElement(line);
+    var scope = this.getScope();
+
+    if (ele.scope == scope) {
+      this.stack.pop();
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    } else if (ele.scope > scope) {
+      this.getLast().push(ele); 
+      this.stack.push(ele);
+    } else if (ele.scope < scope) {
+      var diff = scope - ele.scope + 1;
+      while(diff-- > 0) {
+        this.stack.pop();
+      }
+      this.getLast().push(ele);
+      this.stack.push(ele);
+    }
+  });
+
+
+  OO.addMember("getScope",function () {
+    return this.stack.length - 1;
+  });
+
+  OO.addMember("getLast",function () {
+    return this.stack[this.stack.length-1];
+  });
+
+});
+
+JS2.Class.extend('JSMLElement', function(KLASS, OO){
+  OO.addMember("SCOPE_REGEX",/^(\s*)(.*)$/);
+  OO.addMember("SPLIT_REGEX",/^((?:\.|\#|\%)[^=\-\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w-]+)/g);
+  OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
+  OO.addMember("SCOPE_OFFSET",1);
+
+  OO.addMember("initialize",function (line) {
+    this.children = [];
+
+    if (line == null) {
+      this.scope = this.SCOPE_OFFSET;
+      return;
+    }
+
+    var spaceMatch = line.match(this.SCOPE_REGEX);
+    this.scope = spaceMatch[1].length / 2 + this.SCOPE_OFFSET;
+
+    this.classes  = [];
+    this.nodeID   = null;
+
+    this.parse(spaceMatch[2]);
+  });
+
+  OO.addMember("push",function (child) {
+    this.children.push(child);
+  });
+
+  OO.addMember("parse",function (line) {
+    this.attributes;
+    this.line = line;
+    var self = this;
+
+    var splitted = line.match(this.SPLIT_REGEX);
+    var tokens   = splitted[1];
+    var attrs    = splitted[2];
+    var jsType   = splitted[3];
+    var content  = splitted[4];
+
+    if (tokens) {
+      tokens.replace(this.TOKEN_REGEX, function(match, type, name){ 
+        switch(type) {
+          case '%': self.nodeType = name; break;
+          case '.': self.classes.push(name); break;
+          case '#': self.nodeID = name; break;
+        } 
+        return '';
+      });
+    }
+
+    if (jsType == '=') {
+      this.jsEQ = content;
+    } else if (jsType == '-') {
+      this.jsExec = content;
+    } else {
+      this.content = content;
+    }
+
+    if (attrs) {
+      this.attributes = attrs;
+    }
+
+    if (!this.nodeType && (this.classes.length || this.nodeID)) {
+      this.nodeType = 'div';
+    }
+  });
+
+  OO.addMember("flatten",function () {
+    var out = [];
+   
+    for(var _i1=0,_c1=this.children,_l1=_c1.length,c;(c=_c1[_i1])||(_i1<_l1);_i1++){
+      var arr = c.flatten();
+      for(var _i2=0,_c2=arr,_l2=_c2.length,item;(item=_c2[_i2])||(_i2<_l2);_i2++){
+        out.push(item);
+      }
+    }
+
+    if (this.nodeType) {
+      this.handleJsEQ(out);
+      this.handleContent(out);
+      out.unshift('out.push("<' + this.nodeType + '"+JS2.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+">");\n');
+      out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
+    } else {
+      this.handleJsExec(out);
+      this.handleJsEQ(out);
+      this.handleContent(out);
+    }
+
+    return out;
+  });
+
+  OO.addMember("handleJsEQ",function (out) {
+    if (this.jsEQ) {
+      this.jsEQ = this.jsEQ.replace(/;\s*$/, '');
+      out.unshift('out.push(' + this.jsEQ + ');\n');
+    }
+  });
+
+  OO.addMember("handleContent",function (out) {
+    if (this.content != null && this.content.length > 0) {
+      out.unshift('out.push(' + JSON.stringify(this.content) + ');\n');
+    }
+  });
+
+
+  OO.addMember("handleJsExec",function (out) {
+    if (this.jsExec) {
+      out.unshift(this.jsExec);
+      if (this.jsExec.match(/\{\s*$/)) {
+        out.push("}\n");
+      }
+    }
+  });
+
+  OO.addStaticMember("parseAttributes",function (hash, classes, id) {
+    var out = [];
+    classes = classes || [];
+    if (hash['class']) classes.push(hash['class']);
+    if (classes.length) hash['class'] = classes.join(" ");
+
+    for (var k in hash) {
+      if (hash.hasOwnProperty(k)) {
+        out.push(k + '=' + JSON.stringify(hash[k]));
+      }
+    }
+    return (out.length ? ' ' : '') + out.join(' ');
+  });
+});
+
+
+  JS2.TEMPLATES = { jsml: JS2.JSML };
+
 
   js2.ROOT = root;
 

data/lib/js2/js2.js

@@ -14,7 +14,7 @@ function mainFunction (arg) {
 
   var JS2 = root.JS2 = mainFunction;
   var js2 = root.js2 = JS2;
-  js2.VERSION = "0.3.13";
+  js2.VERSION = "0.3.15";
 
   JS2.ROOT = JS2;
   
@@ -1503,8 +1503,9 @@ JS2.Class.extend('JSML', function(KLASS, OO){
     var toEval = 'function process() { var out = [];\n' + this.flatten().join('') + '\n return out.join("");\n}';
     eval(toEval);
 
-    this.result = function(hash) {
-      return process.call(hash);
+    this.result = function(bound) {
+      bound = bound || {};
+      return process.call(bound);
     };
   });
 
@@ -1546,7 +1547,7 @@ JS2.Class.extend('JSML', function(KLASS, OO){
 
 JS2.Class.extend('JSMLElement', function(KLASS, OO){
   OO.addMember("SCOPE_REGEX",/^(\s*)(.*)$/);
-  OO.addMember("SPLIT_REGEX",/^([^=-\s\{]*)(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("SPLIT_REGEX",/^((?:\.|\#|\%)[^=\-\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
   OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w-]+)/g);
   OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
   OO.addMember("SCOPE_OFFSET",1);
@@ -1573,7 +1574,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
   });
 
   OO.addMember("parse",function (line) {
-    this.attributes = {};
+    this.attributes;
     this.line = line;
     var self = this;
 
@@ -1583,14 +1584,16 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     var jsType   = splitted[3];
     var content  = splitted[4];
 
-    tokens.replace(this.TOKEN_REGEX, function(match, type, name){ 
-      switch(type) {
-        case '%': self.nodeType = name; break;
-        case '.': self.classes.push(name); break;
-        case '#': self.nodeID = name; break;
-      } 
-      return '';
-    });
+    if (tokens) {
+      tokens.replace(this.TOKEN_REGEX, function(match, type, name){ 
+        switch(type) {
+          case '%': self.nodeType = name; break;
+          case '.': self.classes.push(name); break;
+          case '#': self.nodeID = name; break;
+        } 
+        return '';
+      });
+    }
 
     if (jsType == '=') {
       this.jsEQ = content;
@@ -1601,7 +1604,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     }
 
     if (attrs) {
-      eval('this.attributes = ' + attrs + ';');
+      this.attributes = attrs;
     }
 
     if (!this.nodeType && (this.classes.length || this.nodeID)) {
@@ -1622,7 +1625,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     if (this.nodeType) {
       this.handleJsEQ(out);
       this.handleContent(out);
-      out.unshift('out.push(' + JSON.stringify("<"+(this.nodeType)+""+(this.getAttributes())+">") + ');\n');
+      out.unshift('out.push("<' + this.nodeType + '"+JS2.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+">");\n');
       out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
     } else {
       this.handleJsExec(out);
@@ -1656,21 +1659,17 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     }
   });
 
-  OO.addMember("getAttributes",function () {
-    if (!this.attributes) return '';
-
+  OO.addStaticMember("parseAttributes",function (hash, classes, id) {
     var out = [];
-    var attrs = this.attributes;
+    classes = classes || [];
+    if (hash['class']) classes.push(hash['class']);
+    if (classes.length) hash['class'] = classes.join(" ");
 
-    if (attrs['class']) this.classes.push(attrs['class']);
-    if (this.classes.length) attrs['class'] = this.classes.join(' ');
-
-    for (var k in attrs) {
-      if (attrs.hasOwnProperty(k)) {
-        out.push(k + '=' + JSON.stringify(attrs[k]));
+    for (var k in hash) {
+      if (hash.hasOwnProperty(k)) {
+        out.push(k + '=' + JSON.stringify(hash[k]));
       }
-    } 
-
+    }
     return (out.length ? ' ' : '') + out.join(' ');
   });
 });

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.13
+  version: 0.3.15
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -07:00
+date: 2011-04-06 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2/command.rb
+- lib/js2.rb
 - lib/js2/context.rb
-- lib/js2/fs.rb
 - lib/js2/rack.rb
-- lib/js2.rb
+- lib/js2/command.rb
+- lib/js2/fs.rb
 - lib/js2/browser.js
 - lib/js2/js2.js
 - CHANGELOG
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar