js2 0.0.8 → 0.0.9

data/lib/js2/tree.rb

@@ -0,0 +1,340 @@
+class JS2::Node < Array
+  attr_accessor :start_idx, :static
+  SEL = JS2::SelDecorator.new
+
+  def initialize (start_idx, string, static = false)
+    @static      = static
+    @stack       = []
+    @start_idx   = start_idx
+    @current_idx = @start_idx
+    @string      = string
+  end
+
+  def set_child (node)
+    len = node.start_idx - @current_idx
+    if len > 0
+      self << @string[@current_idx, len]
+    end
+
+    self << node
+  end
+
+
+  def stop_child (idx)
+    @current_idx = idx
+  end
+
+  def to_s 
+    ret = []
+    last_idx = self.length - 1
+
+    self.each_with_index do |s, i|
+      if i == 0
+        ret << self.first_string(s)
+      elsif i == last_idx
+        ret << self.last_string(s)
+      else
+        ret << s.to_s
+      end
+    end
+
+    if last_idx == 0
+      ret << self.last_string('')
+    end
+
+    return ret.join('')
+  end
+
+  def first_string (s)
+    return s.to_s
+  end
+
+  def last_string (s)
+    return s.to_s
+  end
+
+  def mark (idx)
+    len = idx - @current_idx
+    if len > 0
+      self << @string[@current_idx, len]
+    end
+
+    @current_idx = idx
+  end
+
+  def stop (idx)
+    len = idx - @current_idx 
+    if len > 0
+      self << @string[@current_idx, len]
+    end
+    self.setup!
+  end
+
+  def setup!
+  end
+
+  def reset
+  end
+end
+
+class JS2::Stuff < JS2::Node
+  def to_s
+    str = super
+    str = SEL.translate(str, nil, false)
+    return str
+  end
+end
+
+class JS2::Class < JS2::Node
+  REGEX = /^(\s*class|module)\s+([\w\.]+)\s+(extends\s+([\w\.]+))?\s*\{(.*)/m
+  attr_accessor :name, :extends
+
+  def setup!
+    m = self[0].match(REGEX)
+    @name    = m[2]
+    @extends = m[4]
+    @start   = m[5]
+  end
+
+  def createName 
+    return 'createClass'
+  end
+
+  def first_string (s)
+    extends = nil
+    if @extends
+      extends = "#{@name}.oo('extends', #{@extends});"
+    end
+    
+    return %|JS2.OO.#{createName}("#{@name}"); #{extends} (function (K) {var self=K; var _super=JS2.OO['super']; #{@start}|
+  end
+
+  def last_string (s)
+    return s.to_s + ")(#{@name});"
+  end
+
+  def to_s
+    str = super
+    str = SEL.translate(str, @name, true)
+    return str
+  end
+end
+
+class JS2::Property < JS2::Node
+  REGEX = /(\s*)property(\s+)([\w+,\s]+\w)(\s*)/
+  def setup!
+    m = first.match(REGEX)
+    @space     = m[1]
+    @mid_space = m[2]
+    @list      = m[3].split(/,/).collect { |i| i.strip }
+    @end_space = m[4]
+  end
+
+  def to_s
+    return %|#{@space}K.oo('property',#{@mid_space}[ #{@list.collect { |i| "'#{i}'" }.join(',')} ]);|
+  end
+end
+
+class JS2::Accessor < JS2::Node
+  REGEX = /(\s*)accessor(\s+)([\w+,\s]+\w)(\s*)/
+  def setup!
+    m = first.match(REGEX)
+    @space     = m[1]
+    @mid_space = m[2]
+    @list      = m[3].split(/,/).collect { |i| i.strip }
+    @end_space = m[4]
+  end
+
+  def to_s
+    return %|#{@space}K.oo('accessor',#{@mid_space}[ #{@list.collect { |i| "'#{i}'" }.join(',')} ]);|
+  end
+
+end
+
+
+class JS2::Foreach < JS2::Node
+  #                   start     var           iterator           array
+  REGEX = /(\s*)foreach\s*\(\s*var\s*([\$\w]+)(\s*:\s*([\$\w]))?\s*in\s*([^\s]+)\s*\)/
+  attr_accessor :iterator, :item, :array
+  @@inc = 0
+
+  def setup!
+    m = first.match(REGEX)
+    @start    = m[1]
+    @item     = m[2]
+    @iterator = m[4]
+    @array    = m[5]
+  end
+
+  def first_string (s)
+    it = iterator
+
+    unless iterator
+      it = 'it' + @@inc.to_s
+      @@inc += 1
+    end
+
+    len = it + '__len'
+    arr = it + '__arr'
+
+    return %(#{@start}for (var #{it}=0,#{@item},#{arr}=#{@array},#{len}=#{arr}.length; (#{@item}=#{arr}[#{it}]) || #{it}<#{len}; #{it}++))
+  end
+
+  def self.reset
+    @@inc = 0
+  end
+
+end
+
+class JS2::Module < JS2::Class
+  def createName
+    return 'createModule'
+  end
+end
+
+class JS2::Private < JS2::Node
+  def to_s
+    return first.sub(/private/m, '// private')
+  end
+end
+
+
+
+class JS2::Include < JS2::Node
+  def first_string (s)
+    return s.sub(/include\s*/, "K.oo('include', ").sub(/;$/, ');');
+  end
+end
+
+class JS2::Member < JS2::Node
+  def first_string (s)
+    method = 'member'
+
+    if s.match(/^(\s*)(static)\s*/)
+      method = 'staticMember'
+      s = s.sub(/static\s*/, '')
+    end
+
+    return s.sub(/var\s*([\$\w]+)/) { "K.oo('#{method}', '" + $1 + "'" }.sub(/;$/, ');').sub(/\s*=/, ', ');
+  end
+end
+
+class JS2::Curry < JS2::Node
+  REGEX       = %r|^curry\s*([^\{]*)?\{(.*)$|m
+  REGEX_WITH  = %r|with\s+\(([^)]*)\)|
+  REGEX_ARGS  = %r|^\s*\(([^)]*)\)|
+
+  def setup!
+    m = first.match(REGEX)
+    @decl = m[1].strip
+    @stop = m[2]
+
+    @args   = ''
+    @in_scoped = ''
+    @scoped    = ''
+
+    if m = @decl.match(REGEX_WITH)
+      in_scoped = m[1].split(',').collect { |v| v.strip }
+      scoped    = in_scoped.collect { |v| v == 'this' ? 'self' : v }
+      if in_scoped.length
+        @scoped =  scoped.join(', ')
+        @in_scoped = in_scoped.join(', ')
+      end
+    end
+
+    if m = @decl.match(%r|^\s*\(([^)]*)\)|)
+      @args = m[1].strip
+    end
+  end
+
+  def first_string (s)
+    return %|(function (#{@scoped}) { return function (#{@args}) {#{@stop}|
+  end
+
+  def last_string (s) 
+    return s + %|})(#{@in_scoped})|
+  end
+end
+
+class JS2::Method < JS2::Node
+  REGEX = /^(\s*)(static\s+)?function\s+([\$\w\.]+)\s*\(([^)]*)\)\s*\{(.*)/m
+  attr_accessor :name, :args
+
+  def setup!
+    m = self[0].match(REGEX)
+    @space  = m[1]
+    @static = m[2]
+    @name   = m[3]
+    @args   = m[4]
+    @start  = m[5]
+  end
+
+  def first_string (s)
+    m = static ? 'staticMember' : 'method'
+    return %|#{@space}K.oo('#{m}', "#{@name}", function (#{args}) {#{@start}|
+  end
+
+  def last_string (s)
+    return %|#{s});|
+  end
+end
+
+class JS2::Ignore < JS2::Node
+  def to_s
+    return ''
+  end
+end
+
+
+
+class JS2::ParserHelper
+  attr_accessor :filename, :classes, :extra
+
+  TYPES = {
+    :CLASS    => JS2::Class,
+    :FOREACH  => JS2::Foreach,
+    :INCLUDE  => JS2::Include,
+    :METHOD   => JS2::Method,
+    :MEMBER   => JS2::Member,
+    :MODULE   => JS2::Module,
+    :STUFF    => JS2::Stuff,
+    :STATIC   => JS2::Ignore,
+    :PRIVATE  => JS2::Private,
+    :CURRY    => JS2::Curry,
+    :PROPERTY => JS2::Property,
+    :ACCESSOR => JS2::Accessor
+  }
+
+  def initialize (code)
+    @code    = code
+    @stack   = [ JS2::Stuff.new(0, @code) ]
+    @classes = []
+    @extra   = []
+  end
+
+  def mark_node (idx)
+    @stack.last.mark(idx)
+  end
+
+  def start_node (type, start_idx, static = false) 
+    klass    = TYPES[type] || JS2::Node
+    new_node = klass.new(start_idx, @code, static)
+    if type == :CLASS || type == :MODULE
+      @classes.push(new_node)
+    end
+
+    @stack.last.set_child(new_node)
+    @stack.push << new_node
+  end
+
+  def stop_node (stop_idx) 
+    last = @stack.pop
+    last.stop(stop_idx) if last
+    @stack.last.stop_child(stop_idx) if @stack.last
+  end
+
+  def to_s 
+    return @stack.collect { |i| i.to_s }.join('') + (extra.empty? ?  '' : ("\n" + extra.join("\n")))
+  end
+end
+

data/lib/js2/universe.rb

@@ -0,0 +1,101 @@
+class JS2::Universe
+  CWD = File.dirname(__FILE__)
+  def initialize (fh, haml_engine)
+    @file_handler = fh
+    @parser       = JS2::Parser.new
+    @haml_parser  = JS2::HamlParser.new(haml_engine) if JS2::HamlParser
+  end
+
+  def write
+    @compilations = Hash.new
+    @class_lookup = {}
+    @tree_lookup  = {}
+    files = @file_handler.get_files
+
+    trees = []
+    files.each do |file|
+      tree = @parser.parse_file(file) 
+      trees << tree
+    end
+
+    trees.each do |tree|
+      tree.classes.each do |c|
+        (@tree_lookup[c.name] ||= []) << tree
+        @class_lookup[c.name] ||= c
+      end
+    end
+
+    if JS2::HamlParser
+      @file_handler.get_haml_files.each do |file|
+        hash = @haml_parser.parse(file) 
+        hash.each_pair do |name,v|
+          if ! @tree_lookup[name] 
+            puts "In #{file}"
+            puts "There is no class found with this name: #{name}"
+          else
+            to_write = v.keys.collect { |k| "#{k.to_json}: #{v[k]}" }.join(',')
+            @tree_lookup[name].first.extra << "#{name}.oo('setHTMLCache', {#{to_write}});"
+          end
+        end
+      end
+    end
+
+    trees.each do |tree|
+      @file_handler.write_file(tree.filename, tree.to_s)
+    end
+
+    @file_handler.get_yml_files.each do |filename|
+      begin
+        yml = YAML.load_file(filename)
+        self.add_yml(yml, filename)
+      rescue Exception => e
+        puts "YAML Error in #{filename}:"
+        puts e.to_s
+        puts e.backtrace.join("\n")
+      end
+    end
+
+    @compilations.each_pair do |filename, hash|
+      @file_handler.write_compilation(filename, hash)
+    end
+
+    js2_file = CWD + '/js2bootstrap.js2'
+    js2_tree = @parser.parse_file(js2_file) 
+    @file_handler.write_file('js2bootstrap.js', js2_tree.to_s, true)
+  end
+
+  def add_yml (yml, filename)
+    yml.each_pair do |klass_name, config|
+      template = config['template']
+      next unless template
+
+      trees = @tree_lookup[klass_name]
+      filename = trees.first.filename
+
+      str = "  (function (K) { K.oo('method',  'getTemplate', function () { return #{template.to_json} }) })(#{klass_name});"
+      to_write = @file_handler.get_js_filename(filename)
+      File.open(to_write, 'a') do |fh|
+        fh << str
+      end
+
+      if config['make_compilation']
+        compilation = [ filename ]
+
+        if config['include']
+          compilation += config['include'].collect { |name| @tree_lookup[name].collect { |t| t.filename } }.flatten
+
+        end
+
+        template.each do |t|
+          klass_name = t['class']
+          trees = @tree_lookup[klass_name]
+          compilation += trees.collect { |t| t.filename }
+        end
+
+        @compilations[filename] = compilation
+      end
+    end
+  end
+
+
+end

data/lib/js2.rb

@@ -1,95 +1,49 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-module Js2
-  VERSION = '0.0.8'
-end
 
 module JS2
-  module Parser
-  end
-  module AST
-  end
-  module Process
-  end
-  module Decorator
-  end
-  module Test
-  end
-
+  VERSION = '0.0.9'
 end
 
-$:.unshift File.dirname(__FILE__)     # For use/testing when no gem is installed
-
-# for others
-require 'js2/processor'
-require 'js2/daemon'
 require 'js2/config'
+require 'js2/daemon'
+require 'js2/processor'
+require 'js2/sel_decorator'
 
-# parser
-require 'js2/parser/fast'
-require 'js2/parser/haml'
-
-# process
-require 'js2/process/haml_engine'
-require 'js2/process/file_handler'
-require 'js2/process/universe'
-
-# ast
-require 'js2/ast/node'
-require 'js2/ast/class_node'
-require 'js2/ast/comment_node'
-require 'js2/ast/haml_node'
-require 'js2/ast/inherited_node'
-require 'js2/ast/stuff_node'
-require 'js2/ast/member_node'
-require 'js2/ast/method_node'
-require 'js2/ast/module_node'
-require 'js2/ast/include_node'
-require 'js2/ast/nodes'
-
-# decorator
-require 'js2/decorator/standard'
-require 'js2/decorator/test'
-require 'js2/decorator/cleanser'
-
-require 'yaml'
-
-# test
-require 'js2/test/selenium'
-require 'js2/test/selenium_helper'
-require 'js2/test/selenium_element'
+require 'js2/tree'
+require 'js2/parser'
+require 'js2/file_handler'
+require 'js2/universe'
 
-module JS2
-  def self.config
-    return @@config
-  end
+$:.unshift File.dirname(__FILE__)
 
-  def self.config_file= (config_file)
-    @@config = YAML.load_file(config_file)
-  end
+begin
+  require 'rubygems'
+  require 'json'
+rescue Exception => e
+  raise "JS2 Requires RubyGems and JSON gems"
+end
 
-  def self.write_files(params)
-    return self.daemon.run(1)
-  end
+begin
+  require 'haml'
+  require 'sass'
+  require 'js2/haml_parser'
+  require 'js2/haml_engine'
+rescue Exception => e
+  puts "HAML is not installed deactivating support"
+end
 
-  def self.daemon (params)
-    return JS2::Process::Daemon.new(params)
-  end
 
-  begin
-    # for haml filter
-    module JS2
-      include Haml::Filters::Base
+if JS2::HamlParser
+  # for haml filter
+  module JS2
+    include Haml::Filters::Base
 
-      def render (text)
-        parser = ::JS2::Parser::Fast.new
-        nodes = parser.parse_string(text)  
-        decorator = ::JS2::Decorator::Test.new
-        return "<script>" + decorator.draw_nodes(nodes) + "</script>"
-      end
+    def render (text)
+      parser = ::JS2::Parser.new
+      tree  = parser.parse(text)  
+      return '<script language="Javascript">' + tree.to_s + "</script>"
     end
-  rescue Exception
-    puts "No haml filter support"
   end
 end

data/lib/tasks/js2.rake

@@ -1,5 +1,5 @@
 namespace :js2 do
-  task :build => :environment do
+  task :build_all => :environment do
     # normal stuff
     CONFIG_FILE = "#{RAILS_ROOT}/config/js2.yml"
     d = JS2::Processor.daemon_from_file(CONFIG_FILE,  RAILS_ENV)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jeff Su
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -08:00
+date: 2010-01-29 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,37 +69,23 @@ files:
 - 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
 has_rdoc: true