js2 0.3.15 → 0.3.16

data/CHANGELOG

@@ -1,3 +1,7 @@
+0.3.16
+  * JSML: Support dashes in classes and id
+  * GEM: Took out debug info in rack.rb
+
 0.3.15
   * JSML: added "eval'd" attribute handling
   * JSML: fixed browser js2 file
@@ -52,5 +56,3 @@
 0.3.3
   * using closure for classes instead of hashes
   * adding static methods
-
-

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.15";
+  js2.VERSION = "0.3.16";
 
   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);
@@ -332,8 +331,8 @@ JS2.Array.prototype.any = function() {
 
 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("SPLIT_REGEX",/^((?:\.|\#|\%)[^=\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w][\w\-]*)/g);
   OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
   OO.addMember("SCOPE_OFFSET",1);
 
@@ -459,7 +458,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.15";
+  js2.VERSION = "0.3.16";
 
   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,7 +1233,6 @@ 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;
@@ -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);
@@ -1547,8 +1541,8 @@ 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("TOKEN_REGEX",/(\%|\#|\.)([\w-]+)/g);
+  OO.addMember("SPLIT_REGEX",/^((?:\.|\#|\%)[^=\s\{]*)?(\{.*\})?(=|-)?(?:\s*)(.*)$/);
+  OO.addMember("TOKEN_REGEX",/(\%|\#|\.)([\w][\w\-]*)/g);
   OO.addMember("JS_REGEX",/^(-|=)(.*)$/g);
   OO.addMember("SCOPE_OFFSET",1);
 
@@ -1673,7 +1667,6 @@ JS2.Class.extend('JSMLElement', function(KLASS, OO){
     return (out.length ? ' ' : '') + out.join(' ');
   });
 });
-
 JS2.TEMPLATES = { jsml: JS2.JSML };
 
 

data/lib/js2/rack.rb

@@ -5,7 +5,6 @@ module JS2
   class Rack
     def get_root 
       @root ||= defined?(Rails) ? Rails.root : File.expand_path(Dir.getwd)
-      puts "ROOT:#{@root}"
       return @root
     end
 

metadata

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