js2 0.3.5 → 0.3.6

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.3.6
+  * Verbosity mode
+  * Fixed ruby file "watch" mode
+  * Cleaned up rack hooks
+
 0.3.5
   * Added scope and binding support to shorthand functions
 	* Added support for modules

data/lib/js2/browser.js

@@ -0,0 +1,278 @@
+(function (root) {
+  // temporarily set root 
+// to JS2 global var for this scope
+function mainFunction (arg) {
+  if (typeof arg == 'string') {
+    return JS2.Parser.parse(arg).toString();
+  } else if (arg instanceof Array) {
+    return new JS2.Array(arg);
+  } else {
+    return new JS2.Array();
+  }
+}
+
+
+  if (!root.console) {
+    root.console = {};
+    console.log = function (m) {};
+  }
+
+  var JS2 = root.JS2 = mainFunction;
+  var js2 = root.js2 = JS2;
+  js2.VERSION = "0.3.6";
+
+  JS2.ROOT = JS2;
+
+  
+// CLASS HELPERS
+(function (undefined, JS2) {
+
+  var OO = function (klass, par) {
+    this.klass = klass;
+    this.par   = par;
+
+    this.members       = {};
+    this.staticMembers = {};
+    this.children = [];
+    this.included = [];
+
+    if (this.par) this.par.OO.children.push(klass);
+  };
+
+  OO.prototype = {
+    forbiddenMembers: { 
+      'prototype': undefined, 
+      'OO': undefined 
+    },
+ 
+    include: function(module) {
+      this.included.push(module);
+      var members = module.OO.members;
+      for (var name in members) {
+        if (members.hasOwnProperty(name)) {
+          this.addMember(name, members[name]);
+        }
+      }
+
+      var staticMembers = module.OO.staticMembers;
+      for (var name in staticMembers) {
+        if (staticMembers.hasOwnProperty(name)) {
+          this.addStaticMember(name, staticMembers[name]);
+        }
+      }
+
+      if (typeof staticMembers['included'] == 'function') {
+        staticMembers['included'](this.klass);
+      }
+    },
+
+    createNamespace: function(name) {
+      var splitted = name.split('.');
+      var klassName = splitted.pop();
+      var root = JS2.ROOT;
+
+      while (splitted.length > 0) {
+        var name = splitted.shift();
+        if (!root[name]) root[name] = JS2.Class.extend({});
+        root = root[name];
+      }
+
+      return [ root, klassName ];
+    },
+
+    makeSuper: function(newMethod, oldMethod) {
+      if (!oldMethod) return newMethod;
+
+      return function() {
+        this.$super = oldMethod;
+        return newMethod.apply(this, arguments);
+      };
+    },
+
+    addMember: function(name, member) {
+      if (this.forbiddenMembers.hasOwnProperty(name)) return;
+
+      var proto = this.klass.prototype;
+      if (typeof proto[name] == 'function' && !(proto[name] instanceof RegExp)) {
+        member = this.makeSuper(member, proto[name]);
+      }
+
+      proto[name] = member;
+      this.members[name] = member;
+    },
+
+    addStaticMember: function(name, member) {
+      if (this.forbiddenMembers.hasOwnProperty(name)) return;
+
+      if (typeof this.klass[name] == 'function') {
+        if (!this.klass.hasOwnProperty(name)) {
+          member = this.makeSuper(member, this.klass[name]);
+        }
+      }
+      
+      this.klass[name] = member;
+      this.staticMembers[name] = member;
+    }
+  };
+
+  JS2.Class = function() { this.initialize.apply(this, arguments); };
+  JS2.Class.OO = new OO(JS2.Class);
+  JS2.Class.prototype = {
+    initialize: function () {},
+    oo: JS2.Class.OO
+  };
+
+  var namedClasses = {};
+  JS2.getClass = function(name) {
+    return namedClasses[name];
+  };
+
+  var noInit = false;
+  JS2.Class.extend = function(name, klassDef) {
+    var klass = function() { if (!noInit) this.initialize.apply(this, arguments); };
+    klass.OO  = new OO(klass, this);
+
+    if (typeof name != 'string') {
+      klassDef = name;
+    } else {
+      namedClasses[name] = klass;
+      var namespace = this.OO.createNamespace(name);
+      namespace[0][namespace[1]] = klass;
+    }
+
+    // create instance of this as prototype for new this
+    noInit = true;
+    var proto = new this();
+    noInit = false;
+
+    klass.prototype = proto;
+    var oo   = klass.OO;
+    proto.OO = oo;
+
+    for (var name in this) {
+      oo.addStaticMember(name, this[name]);
+    }
+
+    if (typeof klassDef == 'function') {
+      klassDef(klass, oo);
+    } else {
+      for (var name in klassDef) {
+        oo.addMember(name, klassDef[name]);
+      }
+    }
+
+    return klass;
+  };
+
+  JS2.Module = JS2.Class;
+
+  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+".") },
+    'isTrue': function(val) { if (!val) console.log("Expected true, but got " +val+".") }
+  };
+
+  JS2.test = function(message, callback) {
+    if (!callback) callback = message;
+    callback(assert);
+  };
+
+
+  return JS2;
+})(undefined, JS2);
+
+  JS2.Array = function (arr) {
+  if (arr instanceof Array) {
+    this.append(arr);
+  }
+};
+
+JS2.Array.prototype = new Array();
+JS2.Array.prototype.each = function(f) {
+  for (var i=0; i<this.length; i++) {
+    f.call(this, this[i], i );
+  }
+  return this;
+};
+
+JS2.Array.prototype.toString = function() {
+  return this.join(',');
+};
+
+
+JS2.Array.prototype.until = function(f) {
+  for (var i=0; i<this.length; i++) {
+    if (f.call(this, this[i], i )) return true;;
+  }
+  return false;
+};
+
+
+JS2.Array.prototype.collect = function(f) {
+  var ret  = new JS2.Array();
+  var self = this;
+  this.each(function($1,$2,$3){ ret.push(f.call(self, $1, $2)) });
+  return ret;
+};
+
+// http://clojure.github.com/clojure/clojure.core-api.html#clojure.core/reduce
+JS2.Array.prototype.reduce = function(f, val) {
+  if (this.length == 0) return val; 
+  if (this.length == 1) return val == null ? f(this[0]) : f(val, this[0]);
+
+  var i = 0;
+  if (val == null) val = this[i++];
+
+  for (var n=this.length;i<n;i++) {
+    val = f(val, this[i]);
+  }
+
+  return val;
+};
+
+JS2.Array.prototype.reject = function(f) {
+  var ret = new JS2.Array();
+  if (f instanceof RegExp) {
+    this.each(function($1,$2,$3){ if (!$1.match(f)) ret.push($1) });
+  } else if (typeof f == 'string' || typeof f == 'number') {
+    this.each(function($1,$2,$3){ if ($1 != f) ret.push($1) });
+  } else if (typeof f == 'function') {
+    var self = this;
+    this.each(function($1,$2,$3){ if (!f.call(self, $1, $2)) ret.push($1) });
+  }
+  return ret;
+};
+
+JS2.Array.prototype.select = function(f) {
+  var ret = new JS2.Array();
+  if (f instanceof RegExp) {
+    this.each(function($1,$2,$3){ if ($1.match(f)) ret.push($1) });
+  } else if (typeof f == 'string' || typeof f == 'number') {
+    this.each(function($1,$2,$3){ if ($1 == f) ret.push($1) });
+  } else if (typeof f == 'function') {
+    var self = this;
+    this.each(function($1,$2,$3){ if (f.call(self, $1, $2)) ret.push($1) });
+  }
+  return ret;
+};
+
+JS2.Array.prototype.append = function(arr) {
+  this.push.apply(this, arr);
+  return this;
+};
+
+JS2.Array.prototype.empty = function() {
+  return this.length == 0;
+};
+
+JS2.Array.prototype.any = function() {
+  return this.length > 0;
+};
+
+
+
+  js2.ROOT = root;
+
+  return JS2;
+
+})(window);

data/lib/js2/fs.rb

@@ -47,7 +47,7 @@ class JS2::FS
 
   def setInterval(code, time)
     while true
-      @ctx.eval(code)
+      code.call()
       sleep(time/1000)
     end
   end

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.5";
+  js2.VERSION = "0.3.6";
 
   JS2.ROOT = JS2;
   
@@ -1233,6 +1233,7 @@ JS2.Class.extend('Updater', function(KLASS, OO){
     if (! this.fs.isDirectory(dir)) this.fs.mkpath(dir);
 
     if (force || this.fs.mtime(file) > this.fs.mtime(outFile)) {
+      JS2.LOGGER.info(file + ' -> ' + outFile);
       if (funct) {
         this.fs.write(outFile, funct(JS2(this.fs.read(file))));
       } else {
@@ -1244,11 +1245,13 @@ JS2.Class.extend('Updater', function(KLASS, OO){
 
 
 JS2.Class.extend('Config', function(KLASS, OO){
-  OO.addMember("CLI_REGEX",/^-(r|i|f)(=(\w+))$/);
+  OO.addMember("CLI_REGEX",/^-(r|i|f|n|v|m)(=(\w+))?$/);
   OO.addMember("optsLookup",{ 
     'n': 'non-recursive',
     'i': 'interval',
-    'f': 'format'
+    'f': 'format',
+    'v': 'verbose',
+    'm': 'use_mtime'
   });
 
   OO.addMember("initialize",function (fs, argv) {
@@ -1292,8 +1295,10 @@ JS2.Class.extend('Config', function(KLASS, OO){
         this.interval  = config['interval'] ? config['interval'] : this.interval;
         this.sourceDir = config['source-dir'] || this.sourceDir;
         this.outDir    = config['out-dir'] || this.outDir;
+        this.verbose   = ('verbose' in config) ? config['verbose'] : false;
 
         this['non-recursive'] = config['non-recursive'];
+        this['use-mtime']     = config['use-mtime'];
 
         return true;
       } catch(e) {
@@ -1308,31 +1313,32 @@ 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" +
+    "VERSION: " + JS2.VERSION + "\n" +
     "Commands:\n" +
     "  * run <file>                -- Executes file\n" +
     "  * render <file>             -- Shows JS2 compiled output\n" +
     "  * compile <inDir> [outDir]  -- Compiles a directory and puts js files into outDir.  If outDir is not specified, inDir will be used\n" + 
     "    Options:\n" +
     "      -n                      -- Do NOT traverse directories recursively\n" +
+    "      -v                      -- Verbose \n" +
     "      -f=<format>             -- Compile for different formats: node, ringo, or browser\n" +
     "  * compile <file>            -- Compiles a single js2 file into js\n" +
     "  * watch <inDir> <outDir>    -- Similar to compile, but update will keep looping while watching for modifications\n" +
     "    Options:\n" +
     "      -n                      -- Do NOT traverse directories recursively\n" +
     "      -f=<format>             -- Compile for different formats: node, ringo, or browser\n" +
+    "      -v                      -- Verbose \n" +
     "      -i=<seconds>            -- Interval time in seconds between loops\n");
 
-  OO.addMember("DEFAULT_CONFIG",{
-    compile: { inDir: 'src', outDir: 'lib', recursive: true, decorator: 'Node'  },
-    watch: { inDir: 'src', outDir: 'lib', recursive: true, decorator: 'Node' }
-  });
-
   OO.addMember("initialize",function (argv) {
     this.fs      = JS2.fs;
     this.config  = new JS2.Config(this.fs, argv);
     this.command = this.config.command;
 
+    // HACK for now
+    JS2.VERBOSE = this.config.verbose || false;
+    JS2.LOGGER  = { info: function($1,$2,$3){ if (JS2.VERBOSE) console.log($1) } };
+
     switch(this.config.format) {
       case 'ringo':    JS2.DECORATOR = new JS2.RingoDecorator(); break;
       case 'node':     JS2.DECORATOR = new JS2.NodeDecorator(); break;
@@ -1349,7 +1355,7 @@ JS2.Class.extend('Commander', function(KLASS, OO){
   });
 
   OO.addMember("render",function () {
-    console.log(js2.render(this.fs.read(this.config.args[0])));
+    JS2.LOGGER.info(js2.render(this.fs.read(this.config.args[0])));
   });
 
   OO.addMember("run",function () {
@@ -1362,7 +1368,8 @@ JS2.Class.extend('Commander', function(KLASS, OO){
 
   OO.addMember("compile",function () {
     var self = this;
-    this.getUpdater().update(true, function($1,$2,$3){ return JS2.DECORATOR.file($1); });
+    var force = this.config['use-mtime'] ? false : true;
+    this.getUpdater().update(force, function($1,$2,$3){ return JS2.DECORATOR.file($1); });
   });
 
   OO.addMember("getUpdater",function () {
@@ -1375,12 +1382,13 @@ JS2.Class.extend('Commander', function(KLASS, OO){
     var updater = this.getUpdater();
     var self = this;
     var interval = this.config.interval || 2;
-    console.log('Input Directory:' + updater.inDir + ' -> Output Directory:' + updater.outDir);
-    if (updater.recursive) console.log('RECURSIVE');
+    JS2.LOGGER.info('Input Directory:' + updater.inDir + ' -> Output Directory:' + updater.outDir);
+    if (updater.recursive) JS2.LOGGER.info('RECURSIVE');
 
     // HACK to get this integrated with ruby
-    updater.update();
-    setInterval(function($1,$2,$3){ console.log('updating'); updater.update(true, function($1,$2,$3){ return JS2.DECORATOR.file($1); }); }, interval * 1000);
+    var decor = function($1,$2,$3){ return JS2.DECORATOR.file($1) };
+    updater.update(true, decor);
+    this.fs.setInterval(function($1,$2,$3){ JS2.LOGGER.info('updating'); updater.update(false, decor); }, interval * 1000);
   });
 
   OO.addMember("showBanner",function () {

data/lib/js2/rack.rb

@@ -6,21 +6,23 @@ module JS2
     ROOT = File.expand_path(Dir.getwd)
 
     DEFAULT_CONFIG = {
-      'in_dir'  => "#{ROOT}/app/js2",
-      'out_dir' => "#{ROOT}/public/javascripts",
-      'bin'     => (`which js2`.chomp rescue nil)
+      'source_dir'  => "#{ROOT}/app/js2",
+      'out_dir'     => "#{ROOT}/public/javascripts",
+      'bin'         => (`which js2`.chomp rescue nil),
+      'copy_js2'    => true
     }
 
     def initialize(app)
       @app = app
 
-      @config = YAML.read_file(ROOT + '/config/js2.yml') rescue DEFAULT_CONFIG
+      config = YAML.load_file(ROOT + '/config/js2.yml') rescue DEFAULT_CONFIG
 
-      @in_dir  = @config['in_dir']
-      @out_dir = @config['out_dir']
-      @bin     = @config['bin']
+      @source_dir = config['source_dir'] || './app/js2'
+      @out_dir    = config['out_dir'] || './public/javascripts'
+      @bin        = config['bin'] || 'js2'
+      @copy_js2   = config.has_key?('copy_js2') ? config['copy_js2'] : true
 
-      @valid = @in_dir && @out_dir && !@bin.blank?
+      @valid = @source_dir && @out_dir && !@bin.blank?
 
       unless @valid
         puts "JS2 is not configured properly"
@@ -28,7 +30,15 @@ module JS2
     end
 
     def call(env)
-      `#{@bin} compile #{@in_dir} #{@out_dir}` if @valid
+      if @copy_js2
+        to_file = ROOT + '/public/javascripts/js2.js'
+        unless File.exists?(to_file) 
+          from_file = JS2::ROOT + '/js2/browser.js'
+          File.open(to_file, 'w') { |f| f << File.read(from_file) }
+        end
+      end
+
+      `#{@bin} compile -f=browser -m #{@source_dir} #{@out_dir}` if @valid
       @app.call(env)
     end
   end

data/lib/js2.rb

@@ -20,6 +20,8 @@ module JS2
 end
 
 dirname = File.dirname(File.expand_path('', __FILE__))
+JS2::ROOT = dirname
+
 %W{ context fs command rack }.each do |f|
   require "#{dirname}/js2/#{f}"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 5
-  version: 0.3.5
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Jeff Su
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -07:00
+date: 2011-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/js2/fs.rb
 - lib/js2/rack.rb
 - lib/js2.rb
+- lib/js2/browser.js
 - lib/js2/js2.js
 - CHANGELOG
 has_rdoc: true