js2 0.0.5 → 0.0.7

data/Changelog

@@ -1,3 +1,13 @@
+== 0.0.7 2009-12-23
+* Added Observable.js
+* Added JS2.App Class
+* Added JS2.App.JQuery Class
+* Added yml support for templating classes for applications
+* Added compiliations for applications
+
+== 0.0.6 2009-12-08
+* removing deprecated classes file
+
 == 0.0.5 2009-12-04
 * added bootstrap
 

data/Manifest.txt

@@ -10,9 +10,8 @@ Rakefile
 examples/js2.yml
 examples/test.yml
 lib/javascript/sel_marker.js2
-lib/javascript/bootstrap.js
-lib/javascript/observer.js2
 lib/javascript/test.js2
+lib/js2bootstrap.js2
 lib/js2.rb
 lib/js2/ast/class_node.rb
 lib/js2/ast/comment_node.rb

data/lib/javascript/sel_marker.js2

@@ -102,6 +102,16 @@ class JS2.SelMarker {
     this.normalized = true;
   }
 
+  function getRealClassScope (klass) {
+    if (klass.main && klass.main.factoryId) {
+      var namespace = klass.main._klass.replace(/\.\w+$/, '');
+      var classname = klass._klass.match(/\.\w+$/)[0];
+      return namespace + classname;
+    } else {
+      return klass._klass;
+    }
+  }
+
   private
 
   function normalizeVal (val) {

data/lib/js2/decorator/cleanser.rb

@@ -12,7 +12,7 @@ class JS2::Decorator::Cleanser
     # TODO foreach:key  (var key in hash)
     #
     # SUPPORTED foreach (var item:i in items)
-    if m = str.match(%r|foreach\s*(:([^\s]))?\s*\(\s*var\s+([^\s\:]+)\s*(:?([^\s]))?\s+in\s+([^\s]+)\s*\)|)
+    if m = str.match(%r|foreach\s*(:([^\s]))?\s*\(\s*var\s+([^\s\:]+)\s*(:?([^\s]+))?\s+in\s+([^\s]+)\s*\)|)
       type = m[2]
       decl = m[3]
       it   = m[5] || ('it_' + (@@enum += 1).to_s) 

data/lib/js2/decorator/standard.rb

@@ -14,14 +14,10 @@ class JS2::Decorator::Standard
     return str
   end
 
-  def draw_bootstrap ()
-    return File.read(File.dirname(__FILE__) + '/../../javascript/bootstrap.js')
-  end
-
   private
 
   def draw_method (node)
-    return %{  // #{node.filename}:#{node.line_number} 
+    return %{ 
   #{node.name}:function #{node.text}}
   end
 
@@ -51,7 +47,7 @@ class JS2::Decorator::Standard
       return draw_comment(node)
     end
 
-    return %{  // #{node.filename}:#{node.line_number}
+    return %{ 
   #{node.name}:#{node.text}}
   end
 
@@ -89,7 +85,7 @@ class JS2::Decorator::Standard
     end
 
     return <<-END
-// #{node.filename}:#{node.line_number}
+
 JS2.createClass("#{node.name}");
 #{node.name}.prototype={#{meta}
 #{member_js.join(",\n") }

data/lib/js2/decorator/test.rb

@@ -115,7 +115,7 @@ class JS2::Decorator::Test < JS2::Decorator::Standard
       (@references[@scope] ||= {})[key] = comment
       scope = 
         if @in_class
-          "this._klass"
+          "TMP_SEL_MARKER.getRealClassScope(this)"
         else
           @scope.to_json
         end

data/lib/js2/process/file_handler.rb

@@ -4,6 +4,7 @@ class JS2::Process::FileHandler
     @write_dir = params[:write_dir]
     @haml_dir  = params[:haml_dir]
     @view_dir  = params[:view_dir]
+    @yml_dir   = params[:read_dir]
 
     @mtimes = Hash.new
   end
@@ -13,10 +14,6 @@ class JS2::Process::FileHandler
     return @write_dir + '/classes.js'
   end
 
-  def bootstrap_file 
-    return @write_dir + '/js2bootstrap.js'
-  end
-
   def get_view_files
     return [] unless @view_dir
     return Dir.glob(@view_dir + '/**/*.haml')
@@ -27,56 +24,53 @@ class JS2::Process::FileHandler
     return Dir.glob(@haml_dir + '/**/*/*.js2.haml') + Dir.glob(@haml_dir + '/*.js2.haml')
   end
 
+  def get_yml_files
+    return [] unless @haml_dir
+    return Dir.glob(@haml_dir + '/**/*/*.js2.yml') + Dir.glob(@haml_dir + '/*.js2.yml')
+  end
+
   def get_files
-    return Dir.glob(@read_dir + '/**/*/*.js2') + Dir.glob(@read_dir + '/*.js2')
+    return Dir.glob(@read_dir + '/**/*/*.js2') + Dir.glob(@read_dir + '/*.js2') 
   end
 
   def write_file (filename, str)
-    to_write = filename.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.js')
+    to_write = nil
+
+    # hack just for bootstrap so that its written in the root dir
+    if filename.match(/js2bootstrap.js2$/)
+      to_write = @write_dir + '/js2bootstrap.js'
+    else 
+      to_write = filename.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.js')
+    end
+
     FileUtils.mkpath(File.dirname(to_write))
     File.open(to_write, 'w') do |f|
       f << str
     end
   end
 
-  def write_class_file (str)
-    FileUtils.mkpath(File.dirname(class_file))
-    File.open(class_file, 'w') do |f|
-      f << "alert('classes.js is deprecated, please include js2bootstrap.js instead.');"
-      f << str
+  def write_compilation (filename, compilation)
+    to_write = filename.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.comp.js')
+    str = ""
+
+    compilation.each do |f|
+      read_file = f.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.js')
+      str << File.read(read_file) + "\n"
     end
-  end
 
-  def write_bootstrap_file (str)
-    FileUtils.mkpath(File.dirname(bootstrap_file))
-    File.open(bootstrap_file, 'w') do |f|
+    FileUtils.mkpath(File.dirname(to_write))
+    File.open(to_write, 'w') do |f|
       f << str
     end
   end
 
-
   def need_update!
     ret = false
     did = Hash.new
-    self.get_files.each do |file|
-      mtime = File.mtime(file)
-      if @mtimes[file] != mtime
-        @mtimes[file] = mtime
-        ret = true
-      end
-      did[file] = mtime
-    end
 
-    self.get_haml_files.each do |file|
-      mtime = File.mtime(file)
-      if @mtimes[file] != mtime
-        @mtimes[file] = mtime
-        ret = true
-      end
-      did[file] = mtime
-    end
+    files = self.get_files + self.get_haml_files + self.get_yml_files
 
-    self.get_view_files.each do |file|
+    files.each do |file|
       mtime = File.mtime(file)
       if @mtimes[file] != mtime
         @mtimes[file] = mtime

data/lib/js2/process/universe.rb

@@ -1,9 +1,13 @@
 class JS2::Process::Universe 
+  attr_accessor :compilations
+
   def initialize 
     @class_lookup = Hash.new
     @haml_lookup  = Hash.new
     @node_containers = Array.new
     @mod_lookup      = Hash.new
+
+    @compilations = Hash.new
   end
 
   def add_nodes (nodes)
@@ -18,6 +22,34 @@ class JS2::Process::Universe
     @node_containers << nodes
   end
 
+  def add_yml (yml, filename)
+    yml.each_pair do |klass_name, config|
+      template = config['template']
+      next unless template
+
+      str = "  function getTemplate () { return #{template.to_json} }"
+      node = JS2::AST::MethodNode.new(filename, 0, str)
+      k = @class_lookup[klass_name]
+      k.members << node
+      k.mem_hash['getTemplate'] = node
+
+      if config['make_compilation']
+        compilation = [ k.filename ]
+
+        if config['include']
+          compilation += config['include'].collect { |name| @class_lookup[name].filename }
+        end
+
+        template.each do |t|
+          klass_name = t['class']
+          klass = @class_lookup[klass_name]
+          compilation << klass.filename
+        end
+        @compilations[k.filename] = compilation
+      end
+    end
+  end
+
   def node_containers 
     return @node_containers
   end

data/lib/js2/processor.rb

@@ -106,19 +106,31 @@ class JS2::Processor
   end
 
   def write_files
-    universe = JS2::Process::Universe.new()
-
     parser       ||= JS2::Parser::Fast.new()
     haml_parser  ||= JS2::Parser::Haml.new(@haml_engine)
     universe       = JS2::Process::Universe.new
 
     decorator = @decorator_klass.new
 
+    bootstrap_file = File.dirname(__FILE__) + "/../js2bootstrap.js2"
+    bootstrap_nodes = parser.parse(bootstrap_file)
+    universe.add_nodes(bootstrap_nodes)
+
     @fh.get_files.each do |filename|
       nodes = parser.parse(filename)
       universe.add_nodes(nodes)
     end
 
+    @fh.get_yml_files.each do |filename|
+      begin
+        yml = YAML.load_file(filename)
+        universe.add_yml(yml, filename)
+      rescue Exception => e
+        puts "YAML Error in #{filename}:"
+        puts e.to_s
+      end
+    end
+
     @fh.get_haml_files.each do |filename|
       hash = haml_parser.parse(filename)
       universe.add_haml_hash(hash)
@@ -131,11 +143,6 @@ class JS2::Processor
       @fh.write_file(nc.filename, str)
     end
 
-    str = decorator.draw_bootstrap()
-
-    @fh.write_class_file(str)
-    @fh.write_bootstrap_file(str)
-
     if @test_mode
       decorator.write_references(@reference_dir)
     end
@@ -147,6 +154,10 @@ class JS2::Processor
       decorator.draw_nodes(nodes)
       decorator.write_references(@reference_dir)
     end
+
+    universe.compilations.each_pair do |filename, hash|
+      @fh.write_compilation(filename, hash)
+    end
   end
 
 end

data/lib/js2/test/selenium.rb

@@ -27,11 +27,10 @@ class JS2::Test::Selenium < Selenium::Client::Driver
 
       reference_dir = config['reference_dir'] || './spec/js2refs'
       config = config['selenium']
-
       ret =  self.new( :host    => config['host']    || 'localhost',
                        :port    => config['port']    || 4444,
                        :browser => config['browser'] || '*firefox',
-                       :url     => config['url']     || 'http://google.com',
+                       :url     => config['url']     || 'http://www.factual.com',
 
                        :timeout_in_second         => config[:timeout] || 60,
                        :highlight_located_element => config['highlight'] || false,
@@ -40,7 +39,6 @@ class JS2::Test::Selenium < Selenium::Client::Driver
       # hack to get an instance var in.
       ret.reference_dir = reference_dir
       ret.child_selector = nil
-
       return ret
     end
   end

data/lib/js2/test/selenium_element.rb

@@ -150,6 +150,10 @@ class JS2::Test::SeleniumElement
     @sel.mouse_out(get_ele())
   end
 
+  def key_down(value)
+    @sel.key_down(get_ele(), value)
+  end
+
   def type (*params)
     elem = get_ele()
     @sel.type(elem, *params)

data/lib/js2.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Js2
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end
 
 module JS2

data/lib/js2bootstrap.js2

@@ -0,0 +1,274 @@
+var JS2 = {};
+JS2.createClass = function (name) {
+  var splitName = name.split('.');
+  var namespace = window;
+  while (splitName.length) {
+    var subName = splitName.shift();
+    if (! namespace[subName]) {
+      namespace = 
+        namespace[subName] = 
+        function () { if (this.initialize) this.initialize.apply(this, arguments) };
+    } else {
+      namespace = namespace[subName];
+    }
+  }
+}
+
+JS2.getClass = function (name) {
+  var splitName = name.split('.');
+  var namespace = window;
+
+  while (splitName.length) {
+    var subName = splitName.shift();
+    if (namespace[subName]) {
+      namespace = namespace[subName];
+    } else {
+      return null;
+    }
+  }
+
+  return namespace;
+}
+
+function _super () {
+  var method = arguments.callee.caller._super;
+  if (! method) return;
+  var self = arguments[0];
+  var args = [];
+  for (var i=1,len=arguments.length;i<len;i++) {
+    args.push(arguments[i]);
+  }
+  return method.apply(self, args);
+}
+
+
+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;
+
+  function initialize () {
+    this.chains  = {};
+    this.autoInc = 1;
+    this.id = this['class'].prototype.autoInc;
+    this['class'].prototype.autoInc++;
+  }
+
+  function register (comp) {
+    if (! comp.__notifier_ids) {
+      comp.__notifier_ids = {};
+    }
+
+    if (! comp.__notifier_ids[this.id]) {
+      comp.__notifier_ids[this.id] = this.autoInc;
+      this.autoInc++;
+    }
+
+    for (var key in comp) {
+      if (key.indexOf('e_') == 0) {
+        var eventType = key.substr(2);
+        if (! this.chains[eventType]) this.chains[eventType] = [];
+        this.chains[eventType].push([ comp, comp[key] ]);
+      }
+    }
+
+    comp.notify = curry with (this) {
+      self.notify.apply(self, arguments);
+    };
+  }
+
+  function remove (comp) {
+    var id = comp.__notifier_id;
+    for (var key in this.chains) {
+      var newChain = [];
+      foreach (var ele:j in chain) {
+        if (ele[0].__notifier_id[this.id] != id) {
+          newChain.push(ele); 
+        }
+      }
+
+      this.chains[key] = newChain;
+    }
+  }
+
+  function registerListener (listener) {
+    for (var key in listener) {
+      var funct = listener[key];
+      if (typeof funct != 'function') continue;
+      if (! this.chains[key]) this.chains[key] = [];
+      this.chains[key].push([ listener, funct ]);
+    }
+  }
+
+  function notify () {
+    var eventType = arguments[0];
+    var args;
+
+    // optimize for 1 argument
+    if (arguments.length == 2) {
+      args = [ arguments[1] ];
+    } else {
+      args = [];
+      for (var i=1; i<=arguments.length; i++) args.push(arguments[i]);
+    }
+
+    var chain = this.chains[eventType];
+    if (chain) {
+      for (var i=0,pair; pair=chain[i++];) {
+        pair[1].apply(pair[0], args); 
+      }
+    }
+  }
+}
+
+
+
+class JS2.App {
+  include JS2.Observer;
+
+  function start () {
+    // hack to get notifier
+    this.getNotifier();
+
+    this.build();
+    this.notify('initHTML');
+    this.notify('registerEvents');
+    this.notify('finalize');
+  }
+
+
+  function register (comp) {
+    this.getNotifier().register(comp);
+  }
+
+  function getNotifier () {
+    if (! this._notifier) {
+      this._notifier = new JS2.App.Notifier();
+      this._notifier.register(this);
+    }
+
+    return this._notifier;
+  }
+
+  function build () { 
+    var components = {};
+    var template   = this.getTemplate();
+
+    // instantiate all components
+    foreach (var config:i in template) {
+      if (!config['class']) alert("Invalid class defined for " + name + ':' + config['class']);
+      var klass = JS2.getClass(config['class']);
+
+      components[config.name] = new klass();
+      this.register(components[config.name]);
+    }
+
+    foreach (var config:i in template) {
+      var name = config.name;
+      var comp = components[name];
+
+      // inject set dependencies as an array
+      if (config.dependencies instanceof Array) {
+        foreach (var dep:j in config.dependencies) {
+          comp[dep] = components[dep];
+        }
+      } 
+      
+      // as a hash... for use when nickname is not the dependency name
+      else if (config.dependencies instanceof Object) {
+        for (var key in config.dependencies) {
+          comp[key] = components[config.dependencies[key]];
+        }
+      }
+    }
+
+    this.notify('initBaseHTML');
+
+    // handle selectors as root elements
+    foreach (var config:i in template) {
+      var name = config.name;
+      var comp = components[name];
+
+      if (config.selector)       comp.$root = this.htmlSelect(this.$root, config.selector);
+      if (config.globalSelector) comp.$root = this.htmlSelect(config.globalSelector);
+    }
+  }
+
+  function htmlSelect (root, text) {
+    alert('html selector not implemented');
+  }
+
+  function getTemplate () {
+    return {};
+  }
+}
+
+class JS2.App.JQuery extends JS2.App {
+  function htmlSelect ($root, text) {
+    if (text) {
+      return $root.find(text);
+    } else {
+      return $(root);
+    }
+  }
+}
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jeff Su
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -08:00
+date: 2009-12-23 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,9 +68,8 @@ files:
 - examples/js2.yml
 - examples/test.yml
 - lib/javascript/sel_marker.js2
-- lib/javascript/bootstrap.js
-- lib/javascript/observer.js2
 - lib/javascript/test.js2
+- lib/js2bootstrap.js2
 - lib/js2.rb
 - lib/js2/ast/class_node.rb
 - lib/js2/ast/comment_node.rb

data/lib/javascript/bootstrap.js

@@ -1,42 +0,0 @@
-var JS2 = {};
-JS2.createClass = function (name) {
-  var splitName = name.split('.');
-  var namespace = window;
-  while (splitName.length) {
-    var subName = splitName.shift();
-    if (! namespace[subName]) {
-      namespace = 
-        namespace[subName] = 
-        function () { if (this.initialize) this.initialize.apply(this, arguments) };
-    } else {
-      namespace = namespace[subName];
-    }
-  }
-}
-
-JS2.getClass = function (name) {
-  var splitName = name.split('.');
-  var namespace = window;
-
-  while (splitName.length) {
-    var subName = splitName.shift();
-    if (namespace[subName]) {
-      namespace = namespace[subName];
-    } else {
-      return null;
-    }
-  }
-
-  return namespace;
-}
-
-function _super () {
-  var method = arguments.callee.caller._super;
-  if (! method) return;
-  var self = arguments[0];
-  var args = [];
-  for (var i=1,len=arguments.length;i<len;i++) {
-    args.push(arguments[i]);
-  }
-  return method.apply(self, args);
-}

data/lib/javascript/observer.js2

@@ -1,59 +0,0 @@
-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);
-  }
-}