js2 0.0.10 → 0.1.1

data/Manifest

@@ -0,0 +1,42 @@
+Manifest
+README.md
+Rakefile
+bin/js2
+config/js2.yml
+js2.gemspec
+lib/js2.rb
+lib/js2/parser/haml.rb
+lib/js2/parser/haml_engine.rb
+lib/js2/parser/lexer.rb
+lib/js2/parser/tokenizer.rb
+lib/js2/ragel/helper.rb
+lib/js2/ragel/tokenizer.rl
+lib/js2/ragel/tokenizer.rl.erb
+lib/js2/standard/class_node.rb
+lib/js2/standard/factory.rb
+lib/js2/standard/node.rb
+lib/js2/util/compilation.rb
+lib/js2/util/config.rb
+lib/js2/util/exec.rb
+lib/js2/util/file_handler.rb
+lib/js2/util/js2bootstrap.js2
+lib/js2/util/processor.rb
+lib/js2/util/rdoc.rb
+lib/js2/util/sel_decorator.rb
+test/compiled/bar.js
+test/compiled/basic.comp.js
+test/compiled/basic.js
+test/compiled/foo.js
+test/fixtures/bar.js2
+test/fixtures/basic.js2
+test/fixtures/basic.js2.haml
+test/fixtures/basic.js2.yml
+test/fixtures/curry.js2
+test/fixtures/foo.js2
+test/fixtures/member.js2
+test/fixtures/private.js2
+test/fixtures/property.js2
+test/test_helper.rb
+test/test_js2.rb
+wiki/features.md
+wiki/installation.md

data/README.md

@@ -0,0 +1,65 @@
+* [Features](http://github.com/jeffsu/js2/blob/master/wiki/features.md) (simple documentation)
+* [Installation](http://github.com/jeffsu/js2/blob/master/wiki/installation.md)
+* [Source Code](http://github.com/jeffsu/js2)
+
+## OO Javascript
+
+For every Javascript developer that has ever wanted to create a library for his/her project, there comes a time when an Object Oriented approach is necessary (or extremely desired). Fortunately, there are a plethora of options to choose from:
+
+>     using prototype (not the framework) and hashes:
+>       var MyClass = function () {
+>         this.member1 = "member";
+>       };
+>       MyClass.prototype = {
+>         method1: function () { alert('method1 called'); }
+>       }
+>     embedding functions right in the instantiator:
+>       function MyClass () {
+>         this.member1 = "member1";
+>         function method1 () {
+>            alert("method1 called");
+>         }
+>       }
+>     using jQuery (or any of the js OO frameworks) by passing in hashes:
+>       var MyClass = Class.create({
+>           member1: "member1",
+>           method1: function(){ alert("method1 called") },
+>       });
+Unfortunately, these solutions are dissimilar to Java, Ruby, and C-based languages.
+
+## JS2 Solution
+
+JS2 language that is a superset of Javascript and the problem it tries to solve is bringing "natural" OO syntax to Javascript by adding a compilation layer.
+
+So in myClass.js2 one could write:
+
+    class MyClass {
+      var member1 = "member1";
+
+      function method1 () {
+         alert("method1 called");
+      }
+    }
+
+And after compilation myClass.js (notice the .js extension vs the .js2) would be:
+
+    var MyClass = function () { };
+    MyClass.prototype = {
+      member1: "member1",
+      method1: function () { alert("method1 called"); }
+    }
+
+One of the nice things about this solution is that it allows us to "calculate" things like mixins and inheritance at compile time rather than runtime. This compilation layer opens the doors for features such as:
+
+* Inheritance
+* Mixins (Ruby's multiple inheritance solution)
+* getters and setters
+* IoC (Dependency Injection)
+* AOP (Aspect Oriented Programming)
+* foreach
+* currying
+* More Features
+
+## Inspiration
+
+HAML, SASS, Ruby, Perl, jQuery, Prototype.js

data/Rakefile

@@ -1,41 +1,25 @@
 require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/js2'
+require 'rake'
+require 'echoe'
 
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'js2' do
-  self.developer 'Jeff Su', 'me@jeffsu.com'
-  self.rubyforge_name  = self.name 
-  self.extra_deps      = [['haml','>= 2.2.6'], [ 'RubyInline', '>= 3.8.3']]
+JS2_VERSION = '0.1.1'
+Echoe.new('js2', JS2_VERSION) do |p|
+  p.description    = ""
+  p.url            = "http://github.com/jeffsu/js2"
+  p.author         = "Jeff Su"
+  p.email          = "me@jeffsu.com"
+  p.ignore_pattern = ["tmp/*", "script/*", "test/out" ]
+  p.development_dependencies = []
 end
 
-require 'newgem/tasks'
-Dir['tasks/**/*.rake'].each { |t| load t }
+namespace :js2 do
+  task :compile do
+    system("pushd lib/js2/ragel/; ruby helper.rb; ragel -C tokenizer.rl; mv tokenizer.c ../parser/tokenizer.rb")
+  end
 
+  task :install do
+    Rake::Task['gem'].invoke
+    system("sudo gem install ./pkg/js2-#{JS2_VERSION}.gem")
+  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

@@ -1,108 +1,122 @@
 #!/usr/bin/env ruby
 
 require 'optparse'
+require 'ostruct'
 
 require 'rubygems'
 require 'js2'
 
-options = Hash.new
 
-dir = nil
+options = OpenStruct.new
+options.rails = false
+options.sleep_time = 1
 
 
-usage = "Usage: js2 [options] <dir-with-js2>"
 op = OptionParser.new do |opts|
-  opts.banner = usage
+  opts.banner = "Usage: js2 <daemon|compile|rdoc|help|config> [options]"
 
-  opts.on("--js2-haml-dir DIR", "Directory with js2.haml files") do |haml|
-    options[:js2_haml_dir] = haml
+  opts.on('-r', '--rails', "Rails (out_dir: ./public/javascript js2_dir: ./app/js2)") do |r|
+    options.rails = true
   end
 
-  opts.on("--out-dir DIR", "Directory of js2 -> js output") do |out|
-    options[:write_dir] = out
+  opts.on('-e', '--environment ENV', "Mostly for use with rails or a yml file with multiple configurations.") do |env|
+    options.env = env
   end
 
-  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
+  opts.on('-c', '--config FILE', "Use js2.yml config file (run: js2 config to generate a config file)") do |file|
+    options.yml = YAML.load_file(file)
   end
 
-  opts.on("-d", "--daemonize") do |d|
-    options[:daemonize] = true
+  opts.on('-i', '--include-rails', "Mostly for use with rails or a yml file with multiple configurations.") do |env|
+    options.include_rails = true
   end
 
-  opts.on("-y YAML_FILE", "--yml YAML_FILE", "Use yml config") do |f|
-    options[:yml] = f
+  opts.on('-s', '--sleep N', "Defines the wait time in between directory checks.  This is only applicable to daemon mode.") do |t|
+    options.sleep_time = t.to_i
   end
 
-  opts.on('-h', "--help", "Help Screen") do 
-    puts opts
-    exit
+
+  opts.on('-j', '--js2-dir DIR', "Directory where js2 files reside. Defaults to current directory.") do |d|
+    options.js2_dir = d
+  end
+
+  opts.on('-o', '--out-dir DIR', "Output directory where javascript is written to. Defaults to current directory.") do |d|
+    options.out_dir = d
+  end
+
+  opts.on('-h', '--haml-dir DIR', "Direcotry where js2.haml files reside.  Defaults to current directory.") do |d|
+    options.haml_dir = d
   end
 end
 
-# 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"
+main_action = ARGV.first
+if [ 'daemon', 'compile', 'rdoc', 'help', 'config' ].include?(main_action)
 
-  options[:js2_dir] = File.directory?('app/js2') ? './app/js2' : './js2'
+else
+  main_action = nil
+end
 
-  options[:write_dir] ||= './public/javascripts'
+if main_action == 'help' || ! main_action
+  puts op
+  exit
+end
 
-  options[:daemonize] = true
+if ! main_action
+  main_action = 'daemon'
+end
 
-  options[:js2_haml_dir] = dir
+op.parse!
+
+if options.yml && options.env
+  options.yml = options.yml[options.env]
 end
 
+if options.yml
+  options.yml.each_pair do |k,v|
+    options.send(k +'=', v) if options.send(k) == nil
+  end
+end
 
-begin
-  op.parse!(ARGV)
-rescue OptionParser::ParseError => e
-  puts op
+puts options.inspect
+puts options.include_rails.inspect
+
+if options.include_rails
+  puts "loading rails environment..."
+  ENV['RAILS_ENV'] = options.env if options.env
+  require './config/environment'
 end
 
-if !dir && File.directory?("./public/javascripts")
-  dir = "./public/javascripts" 
+config = JS2::Util::Config.new
+
+if options.rails
+  config.rails!
 end
 
-if options[:yml]
-  d = JS2::Processor.daemon_from_yaml(options[:yml])
-  d.run do
-    puts "Recompiled: " + Time.now.to_s
-    sleep 0.5
-  end
+config.out_dir  = options.out_dir  if options.out_dir
+config.js2_dir  = options.js2_dir  if options.js2_dir
+config.haml_dir = options.haml_dir if options.haml_dir
+config.haml_engine = eval('::' + options.haml_engine_class + '.new') if options.haml_engine_class
 
+puts config
+
+if main_action == 'config'
+  puts "# run: js2 config > js2.yml to create a config file"
+  puts config.example_yml
   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      = 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]
-  puts "Daemonizing..."
-  d = JS2::Daemon.new(p)
-  d.run do 
-    puts "Recompiled at #{Time.now}"
-    sleep 0.5
+processor = JS2::Util::Processor.new(config)
+
+if main_action == 'daemon'
+  puts "running in daemon mode..."
+  while 1
+    res = processor.process!
+    puts "Compiling #{Time.now}..." if res[:changed].any?
+    sleep options.sleep_time
   end
-else 
-  p.write_files
+elsif main_action == 'compile'
+  puts "compiling once! use daemon to monitor changes and compile automatically."
+elsif main_action == 'rdoc'
+  res = processor.process!
+  JS2::Util::Rdoc.build(res[:klasses])
 end

data/config/js2.yml

@@ -0,0 +1,2 @@
+js2_dir: './test/fixtures'
+out_dir: './test/out'

data/js2.gemspec

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{js2}
+  s.version = "0.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jeff Su"]
+  s.date = %q{2010-04-19}
+  s.default_executable = %q{js2}
+  s.description = %q{}
+  s.email = %q{me@jeffsu.com}
+  s.executables = ["js2"]
+  s.extra_rdoc_files = ["README.md", "bin/js2", "lib/js2.rb", "lib/js2/parser/haml.rb", "lib/js2/parser/haml_engine.rb", "lib/js2/parser/lexer.rb", "lib/js2/parser/tokenizer.rb", "lib/js2/ragel/helper.rb", "lib/js2/ragel/tokenizer.rl", "lib/js2/ragel/tokenizer.rl.erb", "lib/js2/standard/class_node.rb", "lib/js2/standard/factory.rb", "lib/js2/standard/node.rb", "lib/js2/util/compilation.rb", "lib/js2/util/config.rb", "lib/js2/util/exec.rb", "lib/js2/util/file_handler.rb", "lib/js2/util/js2bootstrap.js2", "lib/js2/util/processor.rb", "lib/js2/util/rdoc.rb", "lib/js2/util/sel_decorator.rb"]
+  s.files = ["Manifest", "README.md", "Rakefile", "bin/js2", "config/js2.yml", "js2.gemspec", "lib/js2.rb", "lib/js2/parser/haml.rb", "lib/js2/parser/haml_engine.rb", "lib/js2/parser/lexer.rb", "lib/js2/parser/tokenizer.rb", "lib/js2/ragel/helper.rb", "lib/js2/ragel/tokenizer.rl", "lib/js2/ragel/tokenizer.rl.erb", "lib/js2/standard/class_node.rb", "lib/js2/standard/factory.rb", "lib/js2/standard/node.rb", "lib/js2/util/compilation.rb", "lib/js2/util/config.rb", "lib/js2/util/exec.rb", "lib/js2/util/file_handler.rb", "lib/js2/util/js2bootstrap.js2", "lib/js2/util/processor.rb", "lib/js2/util/rdoc.rb", "lib/js2/util/sel_decorator.rb", "test/compiled/bar.js", "test/compiled/basic.comp.js", "test/compiled/basic.js", "test/compiled/foo.js", "test/fixtures/bar.js2", "test/fixtures/basic.js2", "test/fixtures/basic.js2.haml", "test/fixtures/basic.js2.yml", "test/fixtures/curry.js2", "test/fixtures/foo.js2", "test/fixtures/member.js2", "test/fixtures/private.js2", "test/fixtures/property.js2", "test/test_helper.rb", "test/test_js2.rb", "wiki/features.md", "wiki/installation.md"]
+  s.homepage = %q{http://github.com/jeffsu/js2}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Js2", "--main", "README.md"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{js2}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{}
+  s.test_files = ["test/test_helper.rb", "test/test_js2.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

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

@@ -4,11 +4,11 @@ begin
   require 'erb'
   require 'json'
 
-class JS2::HamlParser
+class JS2::Parser::Haml
   attr_accessor :vars
 
   def initialize (haml_engine = nil, vars = nil)
-    @haml_engine = haml_engine || JS2::HamlEngine.new
+    @haml_engine = haml_engine || JS2::Parser::HamlEngine.new
     @vars = vars || Hash.new
   end
 

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

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

data/lib/js2/parser/lexer.rb

@@ -0,0 +1,37 @@
+class JS2::Parser::Lexer
+  def initialize
+    @tokenizer = JS2::Parser::Tokenizer.new
+  end
+
+  def start_node (type, idx, is_static = false)
+    child = @stack.last.add_child(type, idx)
+    @stack.push(child)
+  end
+
+  def stop_node (idx)
+    @last_idx = idx
+    last = @stack.pop()
+    last.stop(idx)
+  end
+
+  def parse (string, factory, file = nil)
+    @string = string
+    @page   = factory.page_node(string, file)
+    @stack  = [ @page ]
+    @last_idx = 0
+
+    @tokenizer.tokenize!(@string, self)
+
+    @page.children.each do |c|
+      c.stop(@last_idx) unless c.stop_idx
+    end
+
+    @page.stop(@last_idx)
+  end
+
+  def parse_file (file, factory)
+    parse(File.read(file), factory, file)
+    return @page
+  end
+end
+