js2 0.0.8 → 0.0.9

data/Changelog

@@ -1,3 +1,6 @@
+== 0.0.9 2009-12-23
+* large 1st move to runtime js2
+
 == 0.0.8 2009-12-23
 * fixed unique file problem in compilition files
 

data/Manifest.txt

@@ -11,37 +11,22 @@ examples/js2.yml
 examples/test.yml
 lib/javascript/sel_marker.js2
 lib/javascript/test.js2
-lib/js2bootstrap.js2
+lib/tasks/js2.rake
 lib/js2.rb
-lib/js2/ast/class_node.rb
-lib/js2/ast/comment_node.rb
-lib/js2/ast/haml_node.rb
-lib/js2/ast/include_node.rb
-lib/js2/ast/inherited_node.rb
-lib/js2/ast/member_node.rb
-lib/js2/ast/method_node.rb
-lib/js2/ast/module_node.rb
-lib/js2/ast/node.rb
-lib/js2/ast/nodes.rb
-lib/js2/ast/stuff_node.rb
 lib/js2/config.rb
 lib/js2/daemon.rb
-lib/js2/decorator/app.rb
-lib/js2/decorator/cleanser.rb
-lib/js2/decorator/standard.rb
-lib/js2/decorator/test.rb
-lib/js2/parser/fast.rb
-lib/js2/parser/haml.rb
-lib/js2/process/file_handler.rb
-lib/js2/process/haml_engine.rb
-lib/js2/process/universe.rb
+lib/js2/file_handler.rb
+lib/js2/foo.js2.haml
+lib/js2/haml_engine.rb
+lib/js2/haml_parser.rb
+lib/js2/js2.js
+lib/js2/js2bootstrap.js2
+lib/js2/parser.rb
 lib/js2/processor.rb
-lib/js2/test/selenium.rb
-lib/js2/test/selenium_element.rb
-lib/js2/test/selenium_helper.rb
-lib/tasks/js2.rake
-meta/c_tokenizer.rl.erb
-meta/replace.rb
+lib/js2/replace.rb
+lib/js2/sel_decorator.rb
+lib/js2/tokenizer.rl.erb
+lib/js2/tree.rb
+lib/js2/universe.rb
 bin/js2
 website/index.txt
-

data/Rakefile

@@ -20,22 +20,22 @@ require 'newgem/tasks'
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 
-task :default => [ :build_ragel, :test ] do
-end
-
-task :build_ragel do
-  puts "build_ragel"
-  system("cd meta/; ruby replace.rb; cd ../; ragel -C meta/final_tokenizer.rl; mv meta/final_tokenizer.c lib/js2/parser/fast.rb")
-end
-
-task :test do
-  puts "run test"
-  system("ruby test/test.rb")
-end
-
-namespace :js2 => :envionment do
-  task :build do 
-    p = JS2::Processor.processor_from_file(RAILS_ROOT + '/config/js2.yml',  RAILS_ENV)
-    p.write_files
-  end
-end
+#task :default => [ :build_ragel, :test ] do
+#end
+#
+#task :build_ragel do
+#  puts "build_ragel"
+#  system("cd meta/; ruby replace.rb; cd ../; ragel -C meta/final_tokenizer.rl; mv meta/final_tokenizer.c lib/js2/parser/fast.rb")
+#end
+#
+#task :test do
+#  puts "run test"
+#  system("ruby test/test.rb")
+#end
+#
+#namespace :js2 => :envionment do
+#  task :build do 
+#    p = JS2::Processor.processor_from_file(RAILS_ROOT + '/config/js2.yml',  RAILS_ENV)
+#    p.write_files
+#  end
+#end

data/bin/js2

@@ -9,70 +9,77 @@ options = Hash.new
 
 dir = nil
 
-# assume rails
-if ARGV.empty? && File.directory?('public') && File.directory?('app') && File.directory?('vendor') && File.directory?('config')
 
-  puts "Detected Rails setup: using auto config"
+usage = "Usage: js2 [options] <dir-with-js2>"
+op = OptionParser.new do |opts|
+  opts.banner = usage
 
-  dir = File.directory?('app/js2') ? './app/js2' : './js2'
-  puts "Using js2 dir: #{dir}"
+  opts.on("--js2-haml-dir DIR", "Directory with js2.haml files") do |haml|
+    options[:js2_haml_dir] = haml
+  end
 
-  options[:write_dir] = './public/javascripts'
-  puts "Writing to: #{options[:write_dir]}"
+  opts.on("--out-dir DIR", "Directory of js2 -> js output") do |out|
+    options[:write_dir] = out
+  end
 
-  options[:daemonize] = true
+  opts.on("--vars VARS", "Example: var1=val1;var2=val2") do |out|
+    vars = Hash.new
+    out.split(/;/).each do |str|
+      pair = str.split(/=/)
+      vars[pair[0]] = pair[1]
+    end
+    options[:var] = vars
+  end
 
-  options[:js2_haml_dir] = dir
-  puts "HAML dir (optional): #{options[:js2_haml_dir]}"
+  opts.on("-d", "--daemonize") do |d|
+    options[:daemonize] = true
+  end
 
-else
+  opts.on('-h', "--help", "Help Screen") do 
+    puts opts
+    exit
+  end
+end
 
-  usage = "Usage: js2 [options] <dir-with-js2>"
-  op = OptionParser.new do |opts|
-    opts.banner = usage
+# assume rails
+if ! options[:write_dir] &&  File.directory?('public') && File.directory?('app') && File.directory?('vendor') && File.directory?('config')
+  puts "Detected Rails setup: using auto config"
 
-    opts.on("--js2-haml-dir DIR", "Directory with js2.haml files") do |haml|
-      options[:js2_haml_dir] = haml
-    end
+  options[:js2_dir] = File.directory?('app/js2') ? './app/js2' : './js2'
 
-    opts.on("--out-dir DIR", "Directory of js2 -> js output") do |out|
-      options[:write_dir] = out
-    end
+  options[:write_dir] ||= './public/javascripts'
 
-    opts.on("-d", "--daemonize") do |d|
-      options[:daemonize] = true
-    end
+  options[:daemonize] = true
 
-    opts.on('-h', "--help", "Help Screen") do 
-      puts opts
-      exit
-    end
-  end
+  options[:js2_haml_dir] = dir
+end
 
-  begin
-    op.parse!(ARGV)
-  rescue OptionParser::ParseError => e
-    puts op
-  end
 
-  dir = ARGV.pop
+begin
+  op.parse!(ARGV)
+rescue OptionParser::ParseError => e
+  puts op
 end
 
 if !dir && File.directory?("./public/javascripts")
   dir = "./public/javascripts" 
 end
 
-unless dir
-  puts op
-  exit
-end
+options[:js2_dir]      ||= '.'
+options[:js2_haml_dir] ||= '.'
+options[:write_dir]    ||= '.'
+options[:vars]         ||= {}
 
+puts "Using js2 dir: #{options[:dir]}"
+puts "Writing to: #{options[:write_dir]}"
+puts "HAML dir (optional): #{options[:js2_haml_dir]}"
 
 config = JS2::Config.new
 
-config.js2_dir      = dir
-config.js2_haml_dir = options[:js2_haml_dir] || dir
-config.write_dir    = options[:write_dir]    || dir
+config.js2_dir      = options[:js2_dir]
+config.js2_haml_dir = options[:js2_haml_dir]
+config.write_dir    = options[:write_dir]
+config.vars         = options[:vars]
 
 p = JS2::Processor.get(config)
 if options[:daemonize]

data/lib/javascript/sel_marker.js2

@@ -104,11 +104,11 @@ class JS2.SelMarker {
 
   function getRealClassScope (klass) {
     if (klass.main && klass.main.factoryId) {
-      var namespace = klass.main._klass.replace(/\.\w+$/, '');
-      var classname = klass._klass.match(/\.\w+$/)[0];
+      var namespace = klass.main['class'].className.replace(/\.\w+$/, '');
+      var classname = klass['class'].className.match(/\.\w+$/)[0];
       return namespace + classname;
     } else {
-      return klass._klass;
+      return klass.className;
     }
   }
 

data/lib/js2/config.rb

@@ -11,12 +11,15 @@ class JS2::Config
     :test_mode         => false,
     :js2_haml_dir      => './js2',
     :haml_dir          => './app/views',
-    :selenium          => { }
+    :selenium          => { },
+    :vars              => { }
   }
 
   attr_accessor *DEFAULTS.keys
 
   def initialize (hash = nil)
+    @vars = Hash.new
+
     DEFAULTS.each_pair do |k,v|
       self.send(k.to_s + '=', v)
     end
@@ -29,6 +32,8 @@ class JS2::Config
       k = k.to_s
       self.send(k + '=', hash[k]) if hash.has_key?(k)
     end
+
+    self.js2_dir = hash[:read_dir] if hash[:read_dir]
   end
 end
 

data/lib/js2/{process/file_handler.rb → file_handler.rb}

@@ -1,19 +1,14 @@
-class JS2::Process::FileHandler
+class JS2::FileHandler
   def initialize (params = {})
     @read_dir  = params[:read_dir]
-    @write_dir = params[:write_dir]
-    @haml_dir  = params[:haml_dir]
-    @view_dir  = params[:view_dir]
+    @write_dir = params[:write_dir] || @read_dir
+    @haml_dir  = params[:haml_dir]  || @read_dir
+    @view_dir  = params[:view_dir]  || @read_dir
     @yml_dir   = params[:read_dir]
 
     @mtimes = Hash.new
   end
 
-  # depricated
-  def class_file 
-    return @write_dir + '/classes.js'
-  end
-
   def get_view_files
     return [] unless @view_dir
     return Dir.glob(@view_dir + '/**/*.haml')
@@ -33,22 +28,23 @@ class JS2::Process::FileHandler
     return Dir.glob(@read_dir + '/**/*/*.js2') + Dir.glob(@read_dir + '/*.js2') 
   end
 
-  def write_file (filename, str)
-    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
-
+  def write_file (filename, str, force = false)
+    to_write = get_js_filename(filename, force)
     FileUtils.mkpath(File.dirname(to_write))
     File.open(to_write, 'w') do |f|
       f << str
     end
   end
 
+  def get_js_filename (filename, force = false)
+    to_write = filename.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.js')
+
+    if force
+      to_write = @write_dir + '/' + filename
+    end
+    return to_write
+  end
+
   def write_compilation (filename, compilation)
     to_write = filename.sub(/^#{@read_dir}/, @write_dir).sub(/\.js2$/, '.comp.js')
     str = ""

data/lib/js2/foo.js2.haml

@@ -0,0 +1,3 @@
+Foo
+  main
+    %div

data/lib/js2/{process/haml_engine.rb → haml_engine.rb}

@@ -8,7 +8,7 @@ rescue Exception
 end
 
 
-class JS2::Process::HamlEngine
+class JS2::HamlEngine
   def hamlize (string)
     return Haml::Engine.new(string, { :ugly => true }).render(self).gsub(/\n/, '')
   end

data/lib/js2/{parser/haml.rb → haml_parser.rb}

@@ -1,15 +1,15 @@
 begin
   require 'rubygems'
   require 'haml'
+  require 'erb'
   require 'json'
-rescue Exception
-  puts "HAML is not supported"
-end
 
-class JS2::Parser::Haml
+class JS2::HamlParser
+  attr_accessor :vars
 
-  def initialize (haml_engine)
-    @haml_engine = haml_engine
+  def initialize (haml_engine = nil, vars = nil)
+    @haml_engine = haml_engine || JS2::HamlEngine.new
+    @vars = vars || Hash.new
   end
 
   def parse_out_js (file)
@@ -32,7 +32,10 @@ class JS2::Parser::Haml
   end
 
   def parse (file)
-    lines  = File.read(file).split(/\r?\n/)
+    erb = ERB.new(File.read(file))
+    str = erb.result(binding)
+
+    lines  = str.split(/\r?\n/)
     result = Hash.new
 
     klass = Hash.new
@@ -77,6 +80,9 @@ class JS2::Parser::Haml
     end
 
     return result
+  rescue Exception => e
+    puts file
+    raise e
   end
 
   private
@@ -87,6 +93,7 @@ class JS2::Parser::Haml
     rescue Exception => e
       puts "Error Processing SASS:"
       puts string
+      puts e.backtrace.join("\n")
       raise e
     end
     return css.gsub(/\n/, '').to_json
@@ -98,6 +105,7 @@ class JS2::Parser::Haml
     rescue Exception => e
       puts "Error Processing HAML:"
       puts string
+      puts e.backtrace.join("\n")
       raise e
     end
 
@@ -129,4 +137,9 @@ class JS2::Parser::Haml
   end
 
 
+end
+rescue Exception
+  puts "HAML is not supported"
+
+
 end

data/lib/js2/js2.js

@@ -0,0 +1,108 @@
+(function (scope) {
+  var JS2 = {};
+  scope.JS2 = JS2;
+
+  var ooUtils = {
+    extends: function (par) {
+      this.oo.parent = par;
+      this.oo.prime.prototype = par.oo.instance;
+      this.prototype = new this.oo.prime();
+    },
+ 
+    include: function (mod) {
+      var hash  = mod.prototype;
+      var members = this.oo.members;
+      for (var k in hash) {
+        if (! members[k]) this.oo.prime.prototype[k] = newFly[k];
+      }
+    },
+ 
+    member: function (name, member) {
+      this.oo.members[name] = true;
+      this.oo.prime.prototype[name] = member;
+    },
+
+    staticMember: function (name, member) {
+      this[name] = member;
+    },
+
+    setHTMLCache: function (hash) {
+      // create temp class
+      var tempClass = function () {};
+
+      // look for super htmlCache
+      var par = this.oo.parent;
+      if (par) {
+        var parCache = par.oo.instance.htmlCache;
+        if (parCache) tempClass.prototype = parCache;
+      }
+
+      var htmlCache = new tempClass(); 
+      for (var k in hash) tempObj[k] = hash[k];
+      this.oo('member', 'htmlCache', htmlCache);
+    },
+
+    super: function (member) {
+      return this.oo.parent.instance[member];
+    },
+
+    property: function (names) {
+      for (var i=0; i<names.length; i++) {
+        var name = names[i];
+        var getter = 'get' + name.charAt(0).toUpperCase() + a.substr(1);
+        var setter = 'set' + name.charAt(0).toUpperCase() + a.substr(1);
+        if (!this.oo.members[getter]) this.oo('member', getter, function () { return this[name] });   
+        if (!this.oo.members[setter]) this.oo('member', setter, function (val) { return this[name] = val });   
+      }
+    }
+
+  };
+
+  // ROOT Object
+  (function (JS2) {
+    JS2.Object = function () {};
+    JS2.Object.meta = { instance: new JS2.Object(), methods: {} };
+    JS2.Object.prototype.initialize = function () { return function () {} };
+    JS2.Object.prototype.super = function (member) { return this.prototype.prototype[member]; };
+  })(JS2);
+ 
+  function createClass (name, par) {
+    var K = function () { this.initialize.apply(this, arguments); };
+
+    var prime = function () {};
+    K.prototype            = new prime();
+    K.prototype.class      = K;
+    K.prototype.initialize = prime; // hack
+
+    K.oo = function (method, param1, param2) { 
+      ooUtils[method].apply(K, [ param1, param2 ]); 
+    };
+
+    K.oo.prime    = prime;
+    K.oo.includes = [];
+    K.oo.instance = new K();
+    K.oo.members  = {};
+ 
+    return K;
+  }
+  
+  function createNamespace (space, currentScope) {
+    var currentScope = currentScope || scope;
+ 
+    var splitted = space.split('.');
+    var name = [];
+    while (splitted.length) {
+      var part = splitted.shift();
+      name.push(part);
+      if (! currentScope[part]) currentScope[part] = createClass();
+      currentScope = currentScope[part];
+      currentScope.name = name.join('.');
+    }
+  }
+
+  JS2.OO = {};
+  JS2.OO.createClass = createNamespace;
+
+
+})(window);
+