js2 0.3.9 → 0.3.12

data/CHANGELOG

@@ -1,3 +1,18 @@
+0.3.12
+  * fixed parse error in JSMLElement
+  * Yanking 0.3.11
+
+0.3.11
+  * fixed minor issue finding Rails.root in rack
+  * Yanking 0.3.10
+
+0.3.10
+  * fixed foreach boolean
+  * fixed https://github.com/jeffsu/js2/issues#issue/1
+  * Rack to try and use Rails.root otherwise, use cwd
+  * put boundaries in lexer for js2 keywords
+  * made regex/divide solution more robust
+
 0.3.9
   * fixed regex/divide issue
 

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.9";
+  js2.VERSION = "0.3.12";
 
   JS2.ROOT = JS2;
 
@@ -168,7 +168,7 @@ function mainFunction (arg) {
 
   var assert = {
     'eq': function(expected, actual) { if (expected != actual) console.log("Expected "+expected+", but got "+actual+".") },
-    'isFalse': function(val) { if (val) console.log("Expected false, but got "+val+".") },
+    'isFalse': function(val) { if (val) console.log("Expected false, but got "+JSON.stringify(val)+".") },
     'isTrue': function(val) { if (!val) console.log("Expected true, but got " +val+".") }
   };
 

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.9";
+  js2.VERSION = "0.3.12";
 
   JS2.ROOT = JS2;
   
@@ -162,7 +162,7 @@ function mainFunction (arg) {
 
   var assert = {
     'eq': function(expected, actual) { if (expected != actual) console.log("Expected "+expected+", but got "+actual+".") },
-    'isFalse': function(val) { if (val) console.log("Expected false, but got "+val+".") },
+    'isFalse': function(val) { if (val) console.log("Expected false, but got "+JSON.stringify(val)+".") },
     'isTrue': function(val) { if (!val) console.log("Expected true, but got " +val+".") }
   };
 
@@ -180,19 +180,19 @@ function mainFunction (arg) {
     [ 'COMMENT', "\\/\\/|/\\*" ],
     [ 'SPACE', "\\s+" ],
     [ 'REGEX', "\\/" ],
-    [ 'CLASS', "class" ],
-    [ 'MODULE', "module" ],
-    [ 'STATIC', "static" ],
-    [ 'include', "include" ],
+    [ 'CLASS', "\\bclass\\b" ],
+    [ 'MODULE', "\\bmodule\\b" ],
+    [ 'STATIC', "\\bstatic\\b" ],
+    [ 'include', "\\binclude\\b" ],
     [ 'SHORT_FUNCT', "#\\{|#\\(" ],
-    [ 'FOREACH', "foreach" ],
-    [ 'CURRY', "curry" ],
+    [ 'FOREACH', "\\bforeach\\b" ],
+    [ 'CURRY', "\\bcurry\\b" ],
     [ 'IDENT', "[\\w$]+" ],
     [ 'DSTRING', '"' ],
     [ 'SSTRING', "'" ],
     [ 'ISTRING', "%\\{" ],
     [ 'HEREDOC', "<<-?\\w+" ],
-    [ 'OPERATOR', "[^\\w]" ]
+    [ 'OPERATOR', "(?:\\+\\+|\\-\\-|[^\\w])" ]
   ];
 
   var IDS = {};
@@ -343,7 +343,7 @@ function mainFunction (arg) {
 
   JS2.Lexer.ISTRING.extend('Lexer.HEREDOC', {
     REGEX_NEXT: /^((\\#|[^#])*?)(#{|\r?\n)/,
-    REGEX: /^<<\-?(\w+)\r?\n/m,
+    REGEX: /^<<\-?(\w+)(?::(\w+))?\s*\r?\n/m,
     ID: IDS.HEREDOC,
     consume: function() {
       var m = this.tokens.match(this.REGEX);
@@ -376,10 +376,13 @@ function mainFunction (arg) {
 
         var next = this.tokens.match(this.REGEX_NEXT);
         if (next) {
+          var str    = next[1];
+          var ending = next[2];
+
           if (next[1]) {
             this.tokens.chomp(next[1].length);
             this.tokens.push([ (first ? '' : '+') + '"' + this.sanitize(next[1]) + '\\\\n"', IDS.DSTRING ]);
-          } 
+          }
 
           if (next[3] == '#{') {
             this.tokens.chomp(1);
@@ -474,7 +477,7 @@ function mainFunction (arg) {
 
     divideCompatible: function() {
       var last = this.lastNonSpace();
-      return (last[0].match(/(\}|\))/) || last[1] == IDS.IDENT);
+      return (last[0].match(/(\}|\)|\+\+|\-\-)$/) || last[1] == IDS.IDENT);
     },
 
     lastNonSpace: function() {
@@ -1242,7 +1245,7 @@ JS2.Class.extend('Updater', function(KLASS, OO){
 
   OO.addMember("matchDirs",function (dir) {
     var subs = this.fs.readdir(dir);
-    for(var _i4=0,_c4=subs,_l4=_c4.length,sub;sub=_c4[_i4]||_i4<_l4;_i4++){
+    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));
@@ -1484,7 +1487,7 @@ JS2.Class.extend('JSML', function(KLASS, OO){
     this.current = this.root;
     this.stack   = [ this.root ];
 
-    for(var _i4=0,_c4=lines,_l4=_c4.length,l;l=_c4[_i4]||_i4<_l4;_i4++){
+    for(var _i1=0,_c1=lines,_l1=_c1.length,l;(l=_c1[_i1])||(_i1<_l1);_i1++){
       if (l.match(/^\s*$/)) continue;
       this.processLine(l);
     }
@@ -1525,6 +1528,39 @@ 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("initialize",function (line) {
+    var spaceMatch = line.match(this.SCOPE_REGEX);
+    this.scope = spaceMatch[1].length / 2;
+
+    this.classes  = [];
+    this.nodeID   = null;
+
+    this.parse(spaceMatch[2]);
+  });
+
+  OO.addMember("parse",function (line) {
+    var self = this;
+    line = line.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;
+      } 
+      return '';
+    });
+
+    line = line.replace(this.JS_OUT_REGEX, function(match, type, content){
+      switch(type) {
+        case '=': this.jsEQ = content; break;
+        case '-': this.jsExec = content; break;
+      }
+      return '';
+    });
+  });
 });
 
 

data/lib/js2/rack.rb

@@ -3,19 +3,24 @@ require 'yaml'
 module JS2
   # this is a hack for now until I can get v8 stable
   class Rack
-    ROOT = File.expand_path(Dir.getwd)
-
-    DEFAULT_CONFIG = {
-      'source_dir'  => "#{ROOT}/app/js2",
-      'target_dir'  => "#{ROOT}/public/javascripts",
-      'bin'         => (`which js2`.chomp rescue nil),
-      'copy_js2'    => true
-    }
+    def get_root 
+      @root ||= defined?(Rails) ? Rails.root : File.expand_path(Dir.getwd)
+      puts "ROOT:#{@root}"
+      return @root
+    end
 
     def initialize(app)
       @app = app
 
-      config = YAML.load_file(ROOT + '/config/js2.yml') rescue DEFAULT_CONFIG
+      default = {
+        'source_dir'  => "#{get_root}/app/js2",
+        'target_dir'  => "#{get_root}/public/javascripts",
+        'bin'         => (`which js2`.chomp rescue nil),
+        'copy_js2'    => true
+      }
+
+
+      config = YAML.load_file(get_root + '/config/js2.yml') rescue default
 
       @source_dir = config['source_dir'] || './app/js2'
       @target_dir = config['target_dir'] || './public/javascripts'
@@ -31,9 +36,11 @@ module JS2
 
     def call(env)
       if @copy_js2
-        to_file = ROOT + '/public/javascripts/js2.js'
+        to_file = "#{get_root}/public/javascripts/js2.js"
         unless File.exists?(to_file) 
           from_file = JS2::ROOT + '/js2/browser.js'
+          puts "--- #{get_root}"
+          puts "#{from_file} #{to_file}"
           File.open(to_file, 'w') { |f| f << File.read(from_file) }
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: js2
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.9
+  version: 0.3.12
 platform: ruby
 authors: 
 - Jeff Su
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +08:00
+date: 2011-03-31 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency