js2 0.3.16 → 0.3.17

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.17
+  * CORE: Adding counter to foreach "foreach (var item:i in items) { }"
+  * COMMAND: Fixing compile to use targetDir instead of outDir
+
 0.3.16
   * JSML: Support dashes in classes and id
   * GEM: Took out debug info in rack.rb

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.16";
+  js2.VERSION = "0.3.17";
 
   JS2.ROOT = JS2;
 
@@ -269,6 +269,7 @@ 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);
@@ -458,6 +459,7 @@ 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.16";
+  js2.VERSION = "0.3.17";
 
   JS2.ROOT = JS2;
   
@@ -901,12 +901,12 @@ function mainFunction (arg) {
 
     getBrace: function(brace) {
       var n = this.cache.count;
-      var iteratorName   = "_i" + n;
       var collectionName = "_c" + n;
       var l = "_l" + n;
 
-      var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s+)(in)(\s+)/);
+      var v = brace.validate(/(\()(\s*)(var)(\s+)(I)(\s*\:\s*(I))?(\s+)(in)(\s+)/);
       if (!v) return '';
+      var iteratorName   = v[7] || "_i" + n;
 
       var holder = v[5];
       var collection = v.last.replace(/\)$/, '');
@@ -1124,6 +1124,7 @@ JS2.Array.prototype.any = function() {
   return this.length > 0;
 };
 
+
 JS2.Class.extend('FileSystem', function(KLASS, OO){
   OO.addMember("initialize",function (adapter) {
     this.adapter = adapter;
@@ -1233,6 +1234,7 @@ 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;
@@ -1278,6 +1280,7 @@ 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",{ 
@@ -1349,6 +1352,7 @@ 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" +
@@ -1412,7 +1416,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){
 
   OO.addMember("getUpdater",function () {
     var inDir     = this.config.args[0] || this.config.sourceDir || '.';
-    var targetDir = this.config.args[1] || this.config.outDir || inDir;
+    var targetDir = this.config.args[1] || this.config.targetDir || inDir;
     return new JS2.Updater(this.fs, inDir, targetDir, this.config.recursive);
   });
 
@@ -1435,6 +1439,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){
 });
 
 
+
 JS2.Class.extend('BrowserDecorator', function(KLASS, OO){
   OO.addMember("file",function (code) {
     return code;
@@ -1479,6 +1484,7 @@ 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);
@@ -1667,6 +1673,7 @@ 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.16
+  version: 0.3.17
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 +08:00
+date: 2011-04-13 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: A superset of the Javascript language to make development easier.
+description: "Javascript Sugar: A superset of the Javascript language to make development easier."
 email: me@jeffsu.com
 executables: 
 - js2-ruby
@@ -71,6 +71,6 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: Javascript Syntactic Sugar
+summary: Javascript Sugar
 test_files: []