js2 0.3.12 → 0.3.13

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.3.13
+  * fixed problem that doesn't allow toString methods
+  * fixed string sanitizer problem with double quotes
+  * JSML POC 
+
 0.3.12
   * fixed parse error in JSMLElement
   * Yanking 0.3.11
@@ -19,7 +24,7 @@
 0.3.8
   * fied "render"
   * fixed comment block bug
-	* using target-dir instead of out-dir
+  * using target-dir instead of out-dir
 
 0.3.7
   * fixed foreach counter
@@ -31,7 +36,7 @@
 
 0.3.5
   * Added scope and binding support to shorthand functions
-	* Added support for modules
+  * Added support for modules
 
 0.3.4
   * coded reduce to clojure spec

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.12";
+  js2.VERSION = "0.3.13";
 
   JS2.ROOT = JS2;
 

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.12";
+  js2.VERSION = "0.3.13";
 
   JS2.ROOT = JS2;
   
@@ -308,7 +308,7 @@ function mainFunction (arg) {
     REGEX: /^%\{/,
     ID: IDS.ISTRING,
     sanitize: function(str) {
-      return str.replace('"', '\\"');
+      return JSON.stringify(str);
     },
     consume: function() {
       var m = this.tokens.match(this.REGEX);
@@ -322,14 +322,14 @@ function mainFunction (arg) {
         if (m) {
           var matched = m[1];
           if (m[3] == '#{') {
-            this.tokens.push([ '"' + this.sanitize(matched) + '"+(', this.ID ]);
+            this.tokens.push([ this.sanitize(matched) + '+(', this.ID ]);
             this.tokens.chomp(m[0].length-1);
             var block = new JS2.Lexer.Block(this.tokens);
             block.tokenize();
             this.tokens.push([ ')+', this.ID ]);
             toEnd = true;
           } else if (m[3] == '}' || m[0] == '}') {
-            this.tokens.push([ '"' + this.sanitize(matched) + '"', this.ID ]);
+            this.tokens.push([ this.sanitize(matched), this.ID ]);
             this.tokens.chomp(m[0].length);
             break;
           }
@@ -349,6 +349,7 @@ function mainFunction (arg) {
       var m = this.tokens.match(this.REGEX);
       if (!m) return false;
 
+      var templateEngine = m[2];
       this.tokens.chomp(m[0].length);
       this.tokens.push([ "\n", IDS.SPACE ]);
 
@@ -359,13 +360,15 @@ function mainFunction (arg) {
 
       var first   = true;
       var noChomp = false;
+      if (templateEngine) {
+        this.tokens.push([ 'JS2.TEMPLATES["' + templateEngine + '"].process(', IDS.IDENT ]);
+      }
 
       while (1) {
         var e = this.tokens.match(ender);
         if (e) {
           this.tokens.chomp(e[0].length);
-          this.tokens.push([ ';', IDS.DSTRING ]);
-          return true;
+          break;
         } 
 
         if (noChomp) {
@@ -381,7 +384,7 @@ function mainFunction (arg) {
 
           if (next[1]) {
             this.tokens.chomp(next[1].length);
-            this.tokens.push([ (first ? '' : '+') + '"' + this.sanitize(next[1]) + '\\\\n"', IDS.DSTRING ]);
+            this.tokens.push([ (first ? '' : '+') + this.sanitize(next[1]).replace(/"$/, '\\n"') , IDS.DSTRING ]);
           }
 
           if (next[3] == '#{') {
@@ -397,6 +400,12 @@ function mainFunction (arg) {
         }
         first = false;
       }
+
+      if (templateEngine) {
+        this.tokens.push([ ')', IDS.IDENT ]);
+      }
+
+      this.tokens.push([ ';', IDS.OPERATOR ]);
       return true;
     }
   });
@@ -646,7 +655,7 @@ function mainFunction (arg) {
     getTokenString: function(token) {
       if (token[1] == IDS.COMMENT) {
         return null;
-      } else if (token[0] in KEYWORDS) {
+      } else if (KEYWORDS.hasOwnProperty(token[0])) {
         return token[0];
       } else if (token[1] == IDS.SPACE) {
         return token[0];
@@ -1483,42 +1492,50 @@ JS2.Class.extend('JSML', function(KLASS, OO){
 
   OO.addMember("initialize",function (txt) {
     var lines = txt.split(/\n/);
-    this.root    = new JS2.JSMLElement('');
-    this.current = this.root;
+    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(hash) {
+      return process.call(hash);
+    };
+  });
+
+  OO.addMember("flatten",function () {
+    return this.root.flatten();
   });
 
   OO.addMember("processLine",function (line) {
-    console.log(line);
-    var ele  = new JS2.JSMLElement(line);
+    var ele   = new JS2.JSMLElement(line);
     var scope = this.getScope();
 
     if (ele.scope == scope) {
-      console.log('same');
       this.stack.pop();
       this.getLast().push(ele);
-    } else if (ele.scope == scope+1) {
-      console.log('greater');
+      this.stack.push(ele);
+    } else if (ele.scope > scope) {
       this.getLast().push(ele); 
       this.stack.push(ele);
     } else if (ele.scope < scope) {
-      console.log('less');
-      var diff = ele.scope - scope;
-      while(diff-- != 0) {
+      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;
+    return this.stack.length - 1;
   });
 
   OO.addMember("getLast",function () {
@@ -1528,13 +1545,22 @@ JS2.Class.extend('JSML', function(KLASS, OO){
 });
 
 JS2.Class.extend('JSMLElement', function(KLASS, OO){
-  OO.addMember("SCOPE_REGEX",/(\s+)(.*)/);
-  OO.addMember("TOKEN_REGEX",/^(%|#|\.)([\w-]+)/);
-  OO.addMember("JS_REGEX",/^(-|=)(.*)$/);
+  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 = spaceMatch[1].length / 2 + this.SCOPE_OFFSET;
 
     this.classes  = [];
     this.nodeID   = null;
@@ -1542,27 +1568,114 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     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;
-    line = line.replace(this.TOKEN_REGEX, function(match, type, name){ 
+
+    var splitted = line.match(this.SPLIT_REGEX);
+    var tokens   = splitted[1];
+    var attrs    = splitted[2];
+    var jsType   = splitted[3];
+    var content  = splitted[4];
+
+    tokens.replace(this.TOKEN_REGEX, function(match, type, name){ 
       switch(type) {
-        case '%': this.nodeType = name; break;
-        case '#': this.classes.push(name); break;
-        case '.': this.nodeID = name; break;
+        case '%': self.nodeType = name; break;
+        case '.': self.classes.push(name); break;
+        case '#': self.nodeID = name; break;
       } 
       return '';
     });
 
-    line = line.replace(this.JS_OUT_REGEX, function(match, type, content){
-      switch(type) {
-        case '=': this.jsEQ = content; break;
-        case '-': this.jsExec = content; break;
+    if (jsType == '=') {
+      this.jsEQ = content;
+    } else if (jsType == '-') {
+      this.jsExec = content;
+    } else {
+      this.content = content;
+    }
+
+    if (attrs) {
+      eval('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);
       }
-      return '';
-    });
+    }
+
+    if (this.nodeType) {
+      this.handleJsEQ(out);
+      this.handleContent(out);
+      out.unshift('out.push(' + JSON.stringify("<"+(this.nodeType)+""+(this.getAttributes())+">") + ');\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.addMember("getAttributes",function () {
+    if (!this.attributes) return '';
+
+    var out = [];
+    var attrs = this.attributes;
+
+    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]));
+      }
+    } 
+
+    return (out.length ? ' ' : '') + out.join(' ');
   });
 });
 
+JS2.TEMPLATES = { jsml: JS2.JSML };
 
 
   JS2.fs = new JS2.FileSystem(JS2_RUBY_FILE_ADAPTER);

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +08:00
+date: 2011-04-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,11 +36,11 @@ extra_rdoc_files: []
 files: 
 - bin/js2
 - bin/js2-ruby
-- lib/js2.rb
-- lib/js2/context.rb
-- lib/js2/rack.rb
 - lib/js2/command.rb
+- lib/js2/context.rb
 - lib/js2/fs.rb
+- lib/js2/rack.rb
+- lib/js2.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.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Javascript Syntactic Sugar