js2 0.1.8 → 0.3.0.pre5

data/lib/js2/rack.rb

@@ -0,0 +1,35 @@
+require 'yaml'
+
+module JS2
+  # this is a hack for now until I can get v8 stable
+  class Rack
+    ROOT = File.expand_path(Dir.getwd)
+
+    DEFAULT_CONFIG = {
+      'in_dir'  => "#{ROOT}/app/js2",
+      'out_dir' => "#{ROOT}/public/javascripts",
+      'bin'     => (`which js2`.chomp rescue nil)
+    }
+
+    def initialize(app)
+      @app = app
+
+      @config = YAML.read_file(ROOT + '/config/js2.yml') rescue DEFAULT_CONFIG
+
+      @in_dir  = @config['in_dir']
+      @out_dir = @config['out_dir']
+      @bin     = @config['bin']
+
+      @valid = @in_dir && @out_dir && !@bin.blank?
+
+      unless @valid
+        puts "JS2 is not configured properly"
+      end
+    end
+
+    def call(env)
+      `#{@bin} compile -r #{@in_dir} #{@out_dir}` if @valid
+      @app.call(env)
+    end
+  end
+end

data/lib/js2.rb

@@ -1,36 +1,25 @@
-module JS2
+begin
+  require 'v8'
+  JSVM = :v8
+rescue
+  begin
+    require 'rhino'
+    JSVM = :rhino
+  rescue
+    raise "Please install a javascript engine gem: rubyracer or rubyrhino"
+  end
 end
 
-module JS2::Parser
-end
 
-module JS2::Standard
-end
-
-module JS2::Util
+module JS2
+  Engine = JSVM == :v8 ? V8::Context : Rhino::Context
+  def self.init_rails
+    dirname = File.dirname(File.expand_path('', __FILE__))
+    require "#{dirname}/js2/rails"
+  end
 end
 
-
-dir = File.dirname(__FILE__)
-
-# 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"
-
-if defined?(Haml)
-  require "#{dir}/js2/util/haml_filter"
+dirname = File.dirname(File.expand_path('', __FILE__))
+%W{ context fs command rack }.each do |f|
+  require "#{dirname}/js2/#{f}"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 1
-  - 8
-  version: 0.1.8
+  - 3
+  - 0
+  - pre5
+  version: 0.3.0.pre5
 platform: ruby
 authors: 
 - Jeff Su
@@ -14,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 -07:00
+date: 2011-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: RubyInline
+  name: therubyracer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,95 +31,31 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Cross-Browser Object Oriented Javascript Compiler
+description: A superset of the Javascript language to make development easier.
 email: me@jeffsu.com
 executables: 
+- js2-ruby
 - js2
 extensions: []
 
-extra_rdoc_files: 
-- README.md
-- CHANGELOG
-- 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
-- lib/js2/util/haml_filter.rb
-- lib/js2/util/jamis.rb
+extra_rdoc_files: []
+
 files: 
-- Manifest
-- README.md
-- Rakefile
-- CHANGELOG
 - bin/js2
-- config/js2.yml
-- js2.gemspec
+- bin/js2-ruby
+- lib/js2/command.rb
+- lib/js2/context.rb
+- lib/js2/fs.rb
+- lib/js2/rack.rb
 - 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
-- lib/js2/util/haml_filter.rb
-- lib/js2/util/jamis.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
+- lib/js2/js2.js
 has_rdoc: true
-homepage: http://github.com/jeffsu/js2
+homepage: http://jeffsu.github.com
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Js2
-- --main
-- README.md
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -132,19 +69,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
       - 1
-      - 2
-      version: "1.2"
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: js2
+rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Cross-Browser Object Oriented Javascript Compiler
-test_files: 
-- test/test_js2.rb
-- test/test_helper.rb
+summary: Javascript Syntactic Sugar
+test_files: []
+

data/CHANGELOG

@@ -1,17 +0,0 @@
-## Version 0.1.8
-* Adding JS2.Observable module to boostrap
-* Fixed "STR2CSTR" bug when used in Ruby 1.9.x
-
-## Version 0.1.7
-* Support for Ruby 1.9.x
-
-## Version 0.1.6
-* Fixed RubyInline dependency
-
-## Version 0.1.4
-* Minor fix in doc directory
-
-## Version 0.1.3
-* Fixed "js2 rdoc" command
-* Added jamis.rb to the Manifest
-* Added javascript to rewrite rdoc to look more like javascript

data/Manifest

@@ -1,45 +0,0 @@
-Manifest
-README.md
-Rakefile
-CHANGELOG
-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
-lib/js2/util/haml_filter.rb
-lib/js2/util/jamis.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

@@ -1,75 +0,0 @@
-[JS2](http://github.com/jeffsu/js2) - Friendly Cross Browser Object Oriented Javascript
-=======================================================================================
-
-JS2 is a way to write classes in a more familiar way for programmers who are used to syntax in languages such as: Java, Ruby, C++, etc...
-The main motivation is to provide a clean and a less verbose syntax for creating classes, inheritance and modules in Javascript.  JS2 plays
-nicely with most of the popular frameworks including: jQuery and prototype.  It also provides some syntactic sugar on the repetative aspects
-of Javascript.
-
-Sample Syntax:
-    class Rectangle {
-      property height;
-      property width;
-    
-      function area () {
-        return this.height * this.width;
-      }
-    }
-    
-    class Square extends Rectangle {
-      function area () {
-        return this.width * this.width;
-      }
-    }
-    
-    var s = new Square();
-
-* [Installation](http://github.com/jeffsu/js2/blob/master/wiki/installation.md)
-* [Language Features and Examples](http://github.com/jeffsu/js2/blob/master/wiki/features.md)
-* [Compiler Features](http://github.com/jeffsu/js2/blob/master/wiki/compiler.md)
-* [Source](http://github.com/jeffsu/js2)
-
-Things You need to run JS2
---------------------------
-* Ruby - language used to parse js2 and generate javascript
-* Ruby Gems - ruby package manager
-  * js2
-  * RubyInline
-  * haml (optional)
-
-Quick Start Guide
------------------
-Create a js2 file (foo.js2):
-    class Person {
-      function speak() {
-        alert("Hello! I'm a person!");
-      }
-
-      function walk() {
-        alert("Walking!");
-      }
-    }
-
-    class Student extends Person {
-      function speak() {
-        alert("Hello, I'm a student!");
-      }
-    }
-
-    var person  = new Person();
-    var student = new Student();
-
-    person.speak();
-    student.speak();
-    person.walk();
-    student.walk();
-
-Run js2 in the same directory
-    js2 compile
-
-You should now see these files in that directory:
-* foo.js2
-* foo.js
-* js2bootstrap.js
-
-Include these js2bootstrap.js and foo.js (make sure js2bootstrap.js is included first) in your html page.

data/Rakefile

@@ -1,28 +0,0 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-
-JS2_VERSION = '0.1.8'
-Echoe.new('js2', JS2_VERSION) do |p|
-  p.summary        = "Cross-Browser Object Oriented Javascript Compiler"
-  p.description    = "Cross-Browser Object Oriented Javascript Compiler"
-  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 = []
-
-  p.runtime_dependencies = ["RubyInline"]
-end
-
-namespace :js2 do
-  task :compile do
-    system("cd ./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
-

data/config/js2.yml

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

data/js2.gemspec

@@ -1,36 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{js2}
-  s.version = "0.1.8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jeff Su"]
-  s.date = %q{2010-10-21}
-  s.default_executable = %q{js2}
-  s.description = %q{Cross-Browser Object Oriented Javascript Compiler}
-  s.email = %q{me@jeffsu.com}
-  s.executables = ["js2"]
-  s.extra_rdoc_files = ["README.md", "CHANGELOG", "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", "lib/js2/util/haml_filter.rb", "lib/js2/util/jamis.rb"]
-  s.files = ["Manifest", "README.md", "Rakefile", "CHANGELOG", "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", "lib/js2/util/haml_filter.rb", "lib/js2/util/jamis.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.7}
-  s.summary = %q{Cross-Browser Object Oriented Javascript Compiler}
-  s.test_files = ["test/test_js2.rb", "test/test_helper.rb"]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<RubyInline>, [">= 0"])
-    else
-      s.add_dependency(%q<RubyInline>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<RubyInline>, [">= 0"])
-  end
-end

data/lib/js2/parser/haml.rb

@@ -1,145 +0,0 @@
-begin
-  require 'rubygems'
-  require 'haml'
-  require 'erb'
-  require 'json'
-
-class JS2::Parser::Haml
-  attr_accessor :vars
-
-  def initialize (haml_engine = nil, vars = nil)
-    @haml_engine = haml_engine || JS2::Parser::HamlEngine.new
-    @vars = vars || Hash.new
-  end
-
-  def parse_out_js (file)
-    padding = nil
-    js = []
-
-    File.read(file).split(/\r?\n/).each do |line|
-      if m = line.match(/^(\s*):js2/)
-        padding = m[1]
-      elsif padding 
-        if m = line.match(/^#{padding}/)
-          js << line
-        elsif ! line.match(/^\s*$/)
-          padding = nil
-        end
-      end
-    end
-
-    return js.join("\n")
-  end
-
-  def parse (file)
-    erb = ERB.new(File.read(file))
-    str = erb.result(binding)
-
-    lines  = str.split(/\r?\n/)
-    result = Hash.new
-
-    klass = Hash.new
-    key   = nil
-
-    until lines.empty?
-      line = lines.shift()
-
-      if m = line.match(/^\.?([\w\.]+)/)
-        klass = Hash.new
-        result[m[1]] = klass
-
-      elsif m = line.match(/^  sass(.*)/)
-        key = 'sass'
-        klass[key] = [ [ ], '', true ]
-
-      elsif m = line.match(/^  \.?([\w]+)(\(([^)]+)\))?/)
-        key = m[1]
-        klass[key] = [ [], m[3] ] 
-      elsif key
-        if key == 'sass' && ! klass[key][2]
-          klass[key][0] << line.sub(/^  /, '')
-        else
-          klass[key][0] << line.sub(/^    /, '')
-        end
-      end
-    end
-
-    result.keys.each do |class_name|
-      klass = result[class_name]
-      klass.each_pair do |key, array|
-        if key == 'sass'
-          unless array[2]
-            array[0].unshift ".#{class_name.sub(/\.\w+$/, '').sub(/\./, '')}"
-          end
-
-          klass[key] = sassify(array[0].join("\n"))
-        else
-          klass[key] = functionize(array[0].join("\n"), array[1])
-        end
-      end
-    end
-
-    return result
-  rescue Exception => e
-    puts file
-    raise e
-  end
-
-  private
-
-  def sassify (string)
-    begin
-      css = @haml_engine.sassify(string)
-    rescue Exception => e
-      puts "Error Processing SASS:"
-      puts string
-      puts e.backtrace.join("\n")
-      raise e
-    end
-    return css.gsub(/\n/, '').to_json
-  end
-
-  def functionize (string, params)
-    begin
-      html = @haml_engine.hamlize(string)
-    rescue Exception => e
-      puts "Error Processing HAML:"
-      puts string
-      puts e.backtrace.join("\n")
-      raise e
-    end
-
-    if params
-      return functionize_with_params(html, params)
-    end
-
-    counter = 0
-    segments = html.split(%r|#\w+#|).collect { |seg| seg.to_json }
-    ret = Array.new
-    segments.each_with_index do |seg, i|
-      ret.push(seg)
-      ret.push(%{arguments[#{i}]}) if (segments.length-1) > i
-    end
-    return %{function(){return #{ret.join('+')}}}
-  end
-
-
-  def functionize_with_params (string, params) 
-    args = []
-    string.gsub!(/#([^#]+)#/) do |m|
-      args << m.gsub(/#/, '')
-      '###'
-    end
-
-    segments = string.split(%r|###|).collect { |seg| seg.to_json }
-    ret = segments.zip(args).flatten.reject { |a| a.nil? }.join('+');
-    return %{function(#{params}){return #{ret}}}
-  end
-
-
-end
-rescue Exception
-  puts "HAML is not supported"
-
-
-end

data/lib/js2/parser/haml_engine.rb

@@ -1,19 +0,0 @@
-begin
-  require 'rubygems'
-  require 'haml'
-  require 'sass'
-  require 'json'
-rescue Exception
-  puts "HAML is not supported"
-end
-
-
-class JS2::Parser::HamlEngine
-  def hamlize (string)
-    return Haml::Engine.new(string, { :ugly => true }).render(self).gsub(/\n/, '')
-  end
-
-  def sassify (string)
-    return Sass::Engine.new(string, { :ugly => true }).render
-  end
-end

data/lib/js2/parser/lexer.rb

@@ -1,37 +0,0 @@
-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
-