js2 0.0.10 → 0.1.1

data/lib/js2/{js2bootstrap.js2 → util/js2bootstrap.js2}

@@ -74,20 +74,21 @@
       this[name] = member;
     },
 
-    'setHTMLCache': function (hash) {
+    'setHTMLAssets': function (hash) {
       // create temp class
       var tempClass = function () {};
 
-      // look for super htmlCache
+      // look for super htmlAssets
       var par = this.parent;
       if (par) {
-        var parCache = par.prototype.htmlCache;
+        var parCache = par.prototype.htmlAssets;
         if (parCache) tempClass.prototype = parCache;
       }
 
-      var htmlCache = new tempClass(); 
-      for (var k in hash) htmlCache[k] = hash[k];
-      this.oo('member', 'htmlCache', htmlCache);
+      var htmlAssets = new tempClass(); 
+      for (var k in hash) htmlAssets[k] = hash[k];
+      this.oo('member', 'htmlCache',  htmlAssets);
+      this.oo('member', 'htmlAssets', htmlAssets);
     },
 
     'super': function (member) {
@@ -199,66 +200,6 @@
 
 })(window);
 
-class JS2.Observer {
-  function initialize (owner) {
-    this.lookupBefore = {};
-    this.lookupAfter  = {};
-
-    this.replaced       = {};
-    this.replacedValues = {};
-  }
-
-  function replaceFunction (owner, eventName) {
-    if (this.replaced[eventName]) return;
-
-    this.replacedValues[eventName] = owner[eventName];
-    this.replaced[eventName]       = true;
-    owner[eventName] = this.getTrigger(eventName);
-  }
-
-  function trigger (owner, eventName, args) {
-    var beforeChain = this.lookupBefore[eventName];
-    if (beforeChain) this.executeChain(beforeChain, args);
-
-    var funct = this.replacedValues[eventName];
-    if (funct) funct.apply(owner, args);
-
-    var afterChain = this.lookupAfter[eventName];
-    if (afterChain) this.executeChain(afterChain, args);
-  }
-
-  function addListener (eventName, funct, before) {
-    var lookup = before ? this.lookupBefore : this.lookupAfter;
-
-    var chain = lookup[eventName] = lookup[eventName] || [];  
-    chain.push(funct);
-  }
-
-  private
-
-  function getTrigger (eventName) {
-    return function () { this.__observer.trigger(this, eventName, arguments); };
-  }
-
-  function executeChain (chain, args) {
-    foreach (var f:i in chain) if (f) f.apply(this, args);
-  }
-}
-
-module JS2.Observable {
-  function addListener (eventName, funct, before) {
-    if (! this.__observer) this.__observer = new Factual.Core.Observer();
-
-    var id = this.__observer.addListener(eventName, funct, before);
-    this.__observer.replaceFunction(this, eventName);
-    return id;
-  }
-
-  function triggerEvent (eventName, args) {
-    if (this.__observer) this.__observer.trigger(this, eventName, args);
-  }
-}
-
 
 class JS2.App.Notifier {
   var autoInc = 1;
@@ -340,7 +281,6 @@ class JS2.App.Notifier {
 
 
 class JS2.App {
-  include JS2.Observer;
 
   function start (options) {
     // hack to get notifier
@@ -401,7 +341,11 @@ class JS2.App {
       if (!config['class']) alert("Invalid class defined for " + name + ':' + config['class']);
       var klass = JS2.OO.get(config['class']);
 
-      components[config.name] = new klass();
+      if (klass) {
+        components[config.name] = new klass();
+      } else if (console) {
+        console.log('class "' + config.name + '" was not found."');
+      }
       this.register(components[config.name]);
     }
 

data/lib/js2/util/processor.rb

@@ -0,0 +1,88 @@
+class JS2::Util::Processor
+  attr_accessor :errors
+
+  def initialize (config)
+    @file_handler = config.file_handler
+    @lexer        = config.lexer
+    @factory      = config.node_factory
+    @haml_engine  = config.haml_engine
+    @haml_parser  = JS2::Parser::Haml.new(config.haml_engine, config.haml_vars)
+
+    @lookup = Hash.new
+
+    @config = config
+  end
+
+  def process!
+    @errors = []
+
+    ret = { :processed => [], :changed => [], :errors => @errors, :klasses => [], :pages => [] }
+    ret[:changed] = @file_handler.needs_update
+    return ret unless ret[:changed].any?
+
+    pages = ret[:pages]
+    klasses = Hash.new
+
+    @file_handler.get_files(:js2).each do |file|
+      begin
+        page = @lexer.parse_file(file, @factory)
+        page.klasses.each do |k|
+          (klasses[k.name] ||= []) << page.file
+        end
+
+        ret[:klasses] += page.klasses
+
+        pages << page
+
+        outfile = @file_handler.outfile(page.file)
+        outdir  = File.dirname(outfile)
+
+        FileUtils.mkdir_p(outdir)
+        File.open(@file_handler.outfile(page.file), 'w') { |f| f << page.to_s() }
+      rescue Exception => e
+        @errors << [ "Can't compile #{file}", e ]
+      end
+    end
+
+    js2_file = File.dirname(__FILE__) + '/js2bootstrap.js2'
+    js2_page = @lexer.parse_file(js2_file, @factory)
+    out_file = @file_handler.out_dir + '/js2bootstrap.js'
+    FileUtils.mkdir_p(@file_handler.out_dir)
+    File.open(out_file, 'w') { |f| f << js2_page.to_s() }
+
+    @file_handler.get_files(:haml).each do |file|
+      begin
+        result = @haml_parser.parse(file)
+        result.keys.each do |klass_name|
+          hash = result[klass_name]
+
+          out = []
+          hash.keys.sort.each do |key|
+            out << %{"#{key}":#{hash[key]}}
+          end
+
+          if files = klasses[klass_name]
+            outfile = @file_handler.outfile(files.first)
+            File.open(outfile, 'a') { |f| f << "#{klass_name}.oo('setHTMLAssets', {#{out.join(',')}});" }
+          end
+        end
+      rescue Exception => e
+        @errors << [ "Can't compile #{file}", e ]
+      end
+    end
+
+    @file_handler.get_files(:yml).each do |file|
+      begin
+        comps = JS2::Util::Compilation.parse(file, @file_handler)
+        comps.each do |c|
+          c.compile(klasses, errors)
+        end
+      rescue Exception => e
+        @errors << [ "Can't compile #{file}", e ]
+      end
+    end
+
+    return ret
+  end
+
+end

data/lib/js2/util/rdoc.rb

@@ -0,0 +1,35 @@
+class JS2::Util::Rdoc 
+
+  def self.build (pages, file_handler)
+
+    pages.each do |p|
+      str = ''
+      p.klasses.each do |k|
+        if k.comment
+          str << k.comment.clean.gsub(/^/, "# ") if k.comment
+        end
+        str << "class #{k.name.gsub(/\./, '::')}\n"
+        puts k.name
+
+        k.methods.each_with_index do |m,i|
+          puts ' - ' + m.name
+          str << m.comment.clean.gsub(/^/, "  # ") if m.comment
+          str << "  def #{m.name} (#{m.args})\n#{m.to_s.gsub(/^/, '  #')} end\n"
+        end
+
+        str << "end\n"
+      end
+      
+      outfile = file_handler.docfile(p.file)
+      outdir  = File.dirname(outfile)
+      FileUtils.mkdir_p(outdir)
+      File.open(outfile, 'w') { |f| f << str }
+    end
+
+    # TODO make this portable
+    jamis = File.dirname(__FILE__) + '/jamis.rb'
+    system("rdoc --template #{jamis} --extension js=rb #{file_handler.doc_dir}")
+  end
+
+
+end

data/lib/js2/{sel_decorator.rb → util/sel_decorator.rb}

@@ -1,6 +1,6 @@
 require 'json'
 
-class JS2::SelDecorator
+class JS2::Util::SelDecorator
 
   def initialize ()
     @references = Hash.new
@@ -12,6 +12,16 @@ class JS2::SelDecorator
     @in_class = false
   end
 
+  def decorate (str, node)
+    if node.is_a?(JS2::Standard::ClassNode)
+      return translate(str, nil, true)
+    elsif node.is_a?(JS2::Standard::StuffNode)
+      return translate(str, nil, false)
+    else
+      return str
+    end
+  end
+
   def translate (str, scope = nil, in_class = false)
     @scope    = scope
     @in_class = in_class

data/lib/js2.rb

@@ -1,55 +1,32 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-
 module JS2
-  VERSION = '0.0.10'
-  module Test
-  end
 end
 
-require 'js2/config'
-require 'js2/daemon'
-require 'js2/processor'
-require 'js2/sel_decorator'
-
-require 'js2/tree'
-require 'js2/parser'
-require 'js2/file_handler'
-require 'js2/universe'
-
-require 'js2/test/selenium'
-require 'js2/test/selenium_element'
-require 'js2/test/selenium_helper'
-
-$:.unshift File.dirname(__FILE__)
+module JS2::Parser
+end
 
-begin
-  require 'rubygems'
-  require 'json'
-rescue Exception => e
-  raise "JS2 Requires RubyGems and JSON gems"
+module JS2::Standard
 end
 
-begin
-  require 'haml'
-  require 'sass'
-  require 'js2/haml_parser'
-  require 'js2/haml_engine'
-rescue Exception => e
-  puts "HAML is not installed deactivating support"
+module JS2::Util
 end
 
 
-if JS2::HamlParser
-  # for haml filter
-  module JS2
-    include Haml::Filters::Base
+dir = File.dirname(__FILE__)
 
-    def render (text)
-      parser = ::JS2::Parser.new
-      tree  = parser.parse(text)  
-      return '<script language="Javascript">' + tree.to_s + "</script>"
-    end
-  end
-end
+# compiling stuff
+require "#{dir}/js2/parser/lexer"
+require "#{dir}/js2/parser/tokenizer"
+require "#{dir}/js2/parser/haml_engine"
+require "#{dir}/js2/parser/haml"
+
+# standard suite
+require "#{dir}/js2/standard/node"
+require "#{dir}/js2/standard/class_node"
+require "#{dir}/js2/standard/factory"
+
+# util stuff
+require "#{dir}/js2/util/processor"
+require "#{dir}/js2/util/file_handler"
+require "#{dir}/js2/util/config"
+require "#{dir}/js2/util/compilation"
+require "#{dir}/js2/util/rdoc"

data/test/compiled/bar.js

@@ -0,0 +1,3 @@
+JS2.OO.createClass("Bar");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+
+})(Bar, null);

data/test/compiled/basic.comp.js

@@ -0,0 +1,31 @@
+
+/*
+ * Comments
+ * This is a comment
+ */
+JS2.OO.createClass("Test.Foo");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+  K.oo('accessor', [ 'testAcc' ]);
+  K.oo('property', [ 'testProp' ]);
+
+  /*
+   * hello
+   */
+
+  K.oo('method', "testFunct", function () {
+
+  });
+
+  K.oo('method', "testForeach", function () {
+    for (var i=0,ele,i__arr=elements,i__len=i__arr.length; (ele=i__arr[i]) || i<i__len; i++){
+      for (var i=0,yo,i__arr=yos,i__len=i__arr.length; (yo=i__arr[i]) || i<i__len; i++){
+
+      }
+      
+    }
+  });
+
+})(Test.Foo, Test);Test.Foo.oo('setHTMLCache', {"main":function(){return "<div class='hello'>world</div>"}});JS2.OO.createClass("Bar");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+
+})(Bar, null);JS2.OO.createClass("Foo");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+
+})(Foo, null);

data/test/compiled/basic.js

@@ -0,0 +1,27 @@
+
+/*
+ * Comments
+ * This is a comment
+ */
+JS2.OO.createClass("Test.Foo");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+  K.oo('accessor', [ 'testAcc' ]);
+  K.oo('property', [ 'testProp' ]);
+
+  /*
+   * hello
+   */
+
+  K.oo('method', "testFunct", function () {
+
+  });
+
+  K.oo('method', "testForeach", function () {
+    for (var i=0,ele,i__arr=elements,i__len=i__arr.length; (ele=i__arr[i]) || i<i__len; i++){
+      for (var i=0,yo,i__arr=yos,i__len=i__arr.length; (yo=i__arr[i]) || i<i__len; i++){
+
+      }
+      
+    }
+  });
+
+})(Test.Foo, Test);Test.Foo.oo('setHTMLCache', {"main":function(){return "<div class='hello'>world</div>"}});

data/test/compiled/foo.js

@@ -0,0 +1,3 @@
+JS2.OO.createClass("Foo");  (function (K,Package) {var self=K; var _super=JS2.OO['super']; 
+
+})(Foo, null);

data/test/fixtures/bar.js2

@@ -0,0 +1,3 @@
+class Bar {
+
+}

data/test/fixtures/basic.js2

@@ -0,0 +1,27 @@
+
+/*
+ * Comments
+ * This is a comment
+ */
+class Test.Foo {
+  accessor testAcc;
+  property testProp;
+
+  /*
+   * hello
+   */
+
+  function testFunct () {
+
+  }
+
+  function testForeach () {
+    foreach (var ele:i in elements) {
+      foreach (var yo:i in yos) {
+
+      }
+      
+    }
+  }
+
+}

data/test/fixtures/basic.js2.haml

@@ -0,0 +1,4 @@
+Test.Foo
+  main
+    .hello
+      world

data/test/fixtures/basic.js2.yml

@@ -0,0 +1,5 @@
+Test.Foo:
+  make_compilation: true
+  template:
+    - class: Bar
+    - class: Foo

data/test/fixtures/curry.js2

@@ -0,0 +1,5 @@
+curry (hello) with (this)  {
+
+}
+
+hello.foo(curry (hello) with (this) { });

data/test/fixtures/foo.js2

@@ -0,0 +1,3 @@
+class Foo {
+
+}

data/test/fixtures/member.js2

@@ -0,0 +1,14 @@
+class TestMember {
+
+  var WIDTH = 84;
+  var MENU_ACTIONS = [ 'sortData', 'sortData', 'hideColumn' ];
+
+  var arr = [ 'hello', 'world' ];
+  var one, two, three;
+  var foo = {};
+  var bar;
+  var foo1 = 'hello';
+  var bar1 = {
+    hello: "world"
+  };
+}

data/test/fixtures/private.js2

@@ -0,0 +1,5 @@
+class TestPrivate {
+
+  private
+
+}

data/test/fixtures/property.js2

@@ -0,0 +1,4 @@
+class TestProperty {
+  property foo;
+  property foo, bar;
+}

data/test/test_helper.rb

@@ -0,0 +1,25 @@
+require 'stringio'
+require 'test/unit'
+require File.dirname(__FILE__) + '/../lib/js2'
+JS2_TEST_DIR = File.dirname(__FILE__)
+
+class Test::Unit::TestCase
+  def js2_fixture (name)
+    return JS2_TEST_DIR + "/fixtures/#{name}.js2"
+  end
+
+  def js_read_fixture (name)
+    return File.read(JS2_TEST_DIR + "/fixtures/#{name}.js").chomp
+  end
+
+  def compare_dir (dir1, dir2)
+    files1 = Dir["#{dir1}/*.js"] 
+
+    files1.each do |file|
+      content1 = File.read(file)
+      file2 = file.sub(/^#{dir1}/, dir2)
+      content2 = File.read(file2)
+      assert_equal(content1.chomp, content2.chomp, "Comparing #{file} and #{file2}")
+    end
+  end
+end

data/test/test_js2.rb

@@ -0,0 +1,43 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestJs2 < Test::Unit::TestCase
+
+  def setup
+    @lexer   = JS2::Parser::Lexer.new
+    @factory = JS2::Standard::Factory.new
+  end
+  
+  def test_processor
+
+    config = JS2::Util::Config.new
+    fh = config.file_handler 
+    fh.js2_dir  = './test/fixtures'
+    fh.out_dir  = './test/out'
+    fh.haml_dir = './test/fixtures'
+
+    system("rm -rf #{fh.out_dir}")
+
+    processor = JS2::Util::Processor.new(config)
+    ret1 = processor.process!
+    ret2 = processor.process!
+    assert_equal(ret2[:changed].any?, false)
+
+    compare_dir(fh.out_dir, './test/compiled')
+  end
+
+  def test_rdoc
+
+    config = JS2::Util::Config.new
+    fh = config.file_handler 
+    fh.js2_dir  = './test/fixtures'
+    fh.out_dir  = './test/out'
+    fh.haml_dir = './test/fixtures'
+    fh.doc_dir  = './test/doc'
+    system("rm -rf #{fh.out_dir}")
+
+    processor = JS2::Util::Processor.new(config)
+    ret = processor.process!
+    JS2::Util::Rdoc.build(ret[:pages], fh)
+  end
+
+end

data/wiki/features.md

@@ -0,0 +1,106 @@
+## Object Oriented
+
+### Class Definition
+
+>     class Foo {
+>       function method () {
+>       }
+>     }
+
+### Inheritance
+
+>     class Vehicle {
+>       function drive () {
+>         alert('drive');
+>       }
+>     }
+>
+>     class Car extends Vehicle {
+>     }
+
+### Getters and Setters
+
+>     class Duck {
+>       property color; // adds getColor() and setColor()
+>     }
+
+### Mixins (Ruby's multiple inheritance solution)
+
+>     module Flyable {
+>       function fly () {
+>         alert('Flying!');
+>       }
+>     }
+>
+>     class Duck {
+>       include Flyable;
+>     }
+
+### AOP (Aspect Oriented Programming)
+
+>     var me = new Human();
+>     me.addListener('walk', function () { alert('walking') });
+
+### Static Methods
+
+>     class Human {
+>       static function getCount () {
+>         return this.count;
+>       }
+>       static function create () {
+>         if (this.count) {
+>           this.count++;
+>         } else {
+>           this.count = 1;
+>         }
+>         return new this();
+>       }
+>     }
+
+## Syntactic Sugar
+
+### Currying
+
+>     var nonScoped = [ ... lots of data .. ];
+>     var submitBtn = new Button();
+>     var ele = document.getElementById('submitBtn'); 
+>     ele.onClick = curry (evt) with (submitBtn) {
+>       submitBtn.click();
+>     };
+
+### Foreach
+
+>     foreach (var item in array) alert(item);
+>     foreach (var item:i in array) alert(i + ' is ' + item);
+>     curry (arg1, arg2) with (scopeVar1, scopeVar2) { };
+
+##Other Features
+
+### Templating in HAML/SASS (useful for ajax applications)
+
+>     //--- in uiBuilder.js2.haml
+>     UIBuilder
+>       button(name)
+>         %div.button= "#name#"
+>
+>     //--- in uiBuilder.js2
+>     class UIBuilder {
+>       function getButton (name) {
+>         this.htmlCache.button(name);
+>       }
+>     }
+>
+>     //--- in page.html
+>     var ui  = new UIBuilder();
+>     var ele = document.getElementById('buttonContainer');
+>     ele.innerHTML = ui.button('my button');
+
+### Selenium Testing Integration
+
+... Coming soon ...
+
+This is a little bit harder to explain, and is only for Ruby Selenium RC developers. The idea is that complex javascript applications usually reference most important DOM elements in javascript for things such as altering html or adding event handlers. What selenium integration in js2 means is that one can use annotations in his/her code to "mark" DOM elements instead of using xpaths.
+
+One of the pain points in Selenium testing is that the xpaths are always changing with each iteration of the view layer. In a complex javascript application, one has to maintain the references to DOM objects in javascript anyway, so this would be an easier way to maintain the Selenium references to the DOM.
+
+While this is available, its not quite ready for public consumption.