js2 0.3.17 → 0.3.18

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.3.18
+  * COMMAND: updaters should be using targetDir instead of outDir
+  * JSML: fixed empty space problem
+  * JSML: support for self-closing tags: area, base, basefont, br, hr, input, img, link, meta
+
 0.3.17
   * CORE: Adding counter to foreach "foreach (var item:i in items) { }"
   * COMMAND: Fixing compile to use targetDir instead of outDir

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.17";
+  js2.VERSION = "0.3.18";
 
   JS2.ROOT = JS2;
 
@@ -269,7 +269,6 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
-
   JS2.Class.extend('JSML', function(KLASS, OO){
   OO.addStaticMember("process",function (txt) {
     return new KLASS(txt);
@@ -299,6 +298,8 @@ JS2.Array.prototype.any = function() {
   });
 
   OO.addMember("processLine",function (line) {
+    if (line.match(/^\s*$/)) return;
+
     var ele   = new JS2.JSMLElement(line);
     var scope = this.getScope();
 
@@ -336,6 +337,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
   OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w][\w\-]*)/g);
   OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
   OO.addMember("SCOPE_OFFSET",1);
+  OO.addMember("SELF_CLOSING",{ area: null, basefont: null, br: null, hr: null, input: null, img: null, link: null, meta: null });
 
   OO.addMember("initialize",function (line) {
     this.children = [];
@@ -395,6 +397,12 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     if (!this.nodeType && (this.classes.length || this.nodeID)) {
       this.nodeType = 'div';
     }
+
+    if (this.SELF_CLOSING.hasOwnProperty(this.nodeType) && this.children.length == 0) {
+      this.selfClose = '/';
+    } else {
+      this.selfClose = '';
+    }
   });
 
   OO.addMember("flatten",function () {
@@ -410,8 +418,10 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     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');
+      out.unshift('out.push("<' + this.nodeType + '"+JS2.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+"' + this.selfClose + '>");\n');
+      if (this.selfClose == '') {
+        out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
+      }
     } else {
       this.handleJsExec(out);
       this.handleJsEQ(out);
@@ -459,7 +469,6 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
   });
 });
 
-
   JS2.TEMPLATES = { jsml: JS2.JSML };
 
 

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.17";
+  js2.VERSION = "0.3.18";
 
   JS2.ROOT = JS2;
   
@@ -1124,7 +1124,6 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
-
 JS2.Class.extend('FileSystem', function(KLASS, OO){
   OO.addMember("initialize",function (adapter) {
     this.adapter = adapter;
@@ -1234,13 +1233,12 @@ JS2.Class.extend('FileSystem', function(KLASS, OO){
   });
 });
 
-
 JS2.Class.extend('Updater', function(KLASS, OO){
   OO.addMember("initialize",function (fs, inDir, outDir, recursive) {
     this.recursive = recursive;
-    this.fs      = fs; 
-    this.inDir   = this.fs.canonical(inDir);
-    this.outDir  = this.fs.canonical(outDir);
+    this.fs        = fs; 
+    this.inDir     = this.fs.canonical(inDir);
+    this.targetDir = this.fs.canonical(outDir);
     this.verbose = true;
   });
 
@@ -1257,14 +1255,14 @@ JS2.Class.extend('Updater', function(KLASS, OO){
     for(var _i1=0,_c1=subs,_l1=_c1.length,sub;(sub=_c1[_i1])||(_i1<_l1);_i1++){
       var path = dir + '/' + sub;
       if (this.fs.isDirectory(path)) {
-        this.fs.mkdir(path.replace(this.inDir, this.outDir));
+        this.fs.mkdir(path.replace(this.inDir, this.targetDir));
         this.matchDirs(path);
       }
     }
   });
 
   OO.addMember("tryUpdate",function (file, force, funct) {
-    var outFile = file.replace(this.inDir, this.outDir).replace(/\.js2$/, '.js');
+    var outFile = file.replace(this.inDir, this.targetDir).replace(/\.js2$/, '.js');
 
     var dir = this.fs.dirname(file);
     if (! this.fs.isDirectory(dir)) this.fs.mkpath(dir);
@@ -1280,7 +1278,6 @@ JS2.Class.extend('Updater', function(KLASS, OO){
   });
 });
 
-
 JS2.Class.extend('Config', function(KLASS, OO){
   OO.addMember("CLI_REGEX",/^-(r|i|f|n|v|m)(=(\w+))?$/);
   OO.addMember("optsLookup",{ 
@@ -1352,7 +1349,6 @@ JS2.Class.extend('Config', function(KLASS, OO){
 
 });
 
-
 JS2.Class.extend('Commander', function(KLASS, OO){
   OO.addMember("BANNER","js2 <command> [options] <arguments>\n" +
     "VERSION: " + JS2.VERSION + "\n" +
@@ -1439,7 +1435,6 @@ JS2.Class.extend('Commander', function(KLASS, OO){
 });
 
 
-
 JS2.Class.extend('BrowserDecorator', function(KLASS, OO){
   OO.addMember("file",function (code) {
     return code;
@@ -1484,7 +1479,6 @@ JS2.Class.extend('RingoDecorator', function(KLASS, OO){
 
 JS2.DECORATOR = JS2.DECORATOR || new JS2.BrowserDecorator();
 
-
 JS2.Class.extend('JSML', function(KLASS, OO){
   OO.addStaticMember("process",function (txt) {
     return new KLASS(txt);
@@ -1514,6 +1508,8 @@ JS2.Class.extend('JSML', function(KLASS, OO){
   });
 
   OO.addMember("processLine",function (line) {
+    if (line.match(/^\s*$/)) return;
+
     var ele   = new JS2.JSMLElement(line);
     var scope = this.getScope();
 
@@ -1551,6 +1547,7 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
   OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w][\w\-]*)/g);
   OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
   OO.addMember("SCOPE_OFFSET",1);
+  OO.addMember("SELF_CLOSING",{ area: null, basefont: null, br: null, hr: null, input: null, img: null, link: null, meta: null });
 
   OO.addMember("initialize",function (line) {
     this.children = [];
@@ -1610,6 +1607,12 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     if (!this.nodeType && (this.classes.length || this.nodeID)) {
       this.nodeType = 'div';
     }
+
+    if (this.SELF_CLOSING.hasOwnProperty(this.nodeType) && this.children.length == 0) {
+      this.selfClose = '/';
+    } else {
+      this.selfClose = '';
+    }
   });
 
   OO.addMember("flatten",function () {
@@ -1625,8 +1628,10 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     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');
+      out.unshift('out.push("<' + this.nodeType + '"+JS2.JSMLElement.parseAttributes(' + (this.attributes || "{}") + ', ' + JSON.stringify(this.classes || []) + ', ' + JSON.stringify(this.id || null) + ')+"' + this.selfClose + '>");\n');
+      if (this.selfClose == '') {
+        out.push('out.push(' + JSON.stringify("</"+(this.nodeType)+">") + ');\n');
+      }
     } else {
       this.handleJsExec(out);
       this.handleJsEQ(out);
@@ -1673,7 +1678,6 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     return (out.length ? ' ' : '') + out.join(' ');
   });
 });
-
 JS2.TEMPLATES = { jsml: JS2.JSML };
 
 

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 +08:00
+date: 2011-04-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency