js2 0.0.9 → 0.0.10

data/Changelog

@@ -1,3 +1,10 @@
+== 0.0.10 
+* fixed last child bug
+* added more features to *.js.yml extension
+  * require array of files or classes (added before code in orig file)
+	* include array of files or classes (added after code in orig file)
+	* fixed bug regarding make_compilation feature
+
 == 0.0.9 2009-12-23
 * large 1st move to runtime js2
 

data/Manifest.txt

@@ -28,5 +28,8 @@ lib/js2/sel_decorator.rb
 lib/js2/tokenizer.rl.erb
 lib/js2/tree.rb
 lib/js2/universe.rb
+lib/js2/test/selenium.rb
+lib/js2/test/selenium_element.rb
+lib/js2/test/selenium_helper.rb
 bin/js2
 website/index.txt

data/bin/js2

@@ -35,6 +35,10 @@ op = OptionParser.new do |opts|
     options[:daemonize] = true
   end
 
+  opts.on("-y YAML_FILE", "--yml YAML_FILE", "Use yml config") do |f|
+    options[:yml] = f
+  end
+
   opts.on('-h', "--help", "Help Screen") do 
     puts opts
     exit
@@ -65,6 +69,16 @@ if !dir && File.directory?("./public/javascripts")
   dir = "./public/javascripts" 
 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
+
+  exit
+end
+
 options[:js2_dir]      ||= '.'
 options[:js2_haml_dir] ||= '.'
 options[:write_dir]    ||= '.'

data/lib/javascript/sel_marker.js2

@@ -108,6 +108,7 @@ class JS2.SelMarker {
       var classname = klass['class'].className.match(/\.\w+$/)[0];
       return namespace + classname;
     } else {
+      if (!klass.className) return klass['class'].className;
       return klass.className;
     }
   }

data/lib/js2/file_handler.rb

@@ -1,4 +1,6 @@
 class JS2::FileHandler
+  attr_accessor :read_dir, :write_dir
+
   def initialize (params = {})
     @read_dir  = params[:read_dir]
     @write_dir = params[:write_dir] || @read_dir
@@ -6,6 +8,7 @@ class JS2::FileHandler
     @view_dir  = params[:view_dir]  || @read_dir
     @yml_dir   = params[:read_dir]
 
+    puts self.inspect
     @mtimes = Hash.new
   end
 
@@ -20,8 +23,8 @@ class JS2::FileHandler
   end
 
   def get_yml_files
-    return [] unless @haml_dir
-    return Dir.glob(@haml_dir + '/**/*/*.js2.yml') + Dir.glob(@haml_dir + '/*.js2.yml')
+    return [] unless @yml_dir
+    return Dir.glob(@yml_dir + '/**/*/*.js2.yml') + Dir.glob(@yml_dir + '/*.js2.yml')
   end
 
   def get_files

data/lib/js2/js2.js

@@ -1,4 +1,6 @@
 (function (scope) {
+  if (scope.JS2) return;
+
   var JS2 = {};
   scope.JS2 = JS2;
 

data/lib/js2/js2bootstrap.js2

@@ -1,4 +1,6 @@
 (function (scope) {
+  if (scope.JS2) return;
+
   var JS2 = {};
   scope.JS2 = JS2;
 

data/lib/js2/parser.rb

@@ -1,11 +1,9 @@
-
 #line 1 "tokenizer.rl"
 # Somewhat based on http://www.mozilla.org/js/language/js20-2000-07/formal/lexer-grammar.html
 # Regular Expression Literals determined with these rules:
 #  http://www.mozilla.org/js/language/js20-1999-03-25/tokens.html
 
- 
-#line 414 "tokenizer.rl"
+ #line 414 "tokenizer.rl"
 
 
 require 'rubygems'
@@ -110,7 +108,7 @@ class JS2::Parser
 
 
       
-#line 114 "tokenizer.c"
+#line 112 "tokenizer.c"
 static const unsigned char _dude_actions[] = {
 	0, 1, 1, 1, 2, 1, 3, 1, 
 	4, 1, 5, 1, 6, 1, 7, 1, 
@@ -2469,20 +2467,18 @@ static const int dude_error = -1;
 
 static const int dude_en_main = 452;
 
-
 #line 518 "tokenizer.rl"
       
-#line 2476 "tokenizer.c"
+#line 2473 "tokenizer.c"
 	{
 	cs = dude_start;
 	ts = 0;
 	te = 0;
 	act = 0;
 	}
-
 #line 519 "tokenizer.rl"
       
-#line 2486 "tokenizer.c"
+#line 2482 "tokenizer.c"
 	{
 	int _klen;
 	unsigned int _trans;
@@ -2501,7 +2497,7 @@ _resume:
 #line 1 "tokenizer.rl"
 	{ts = p;}
 	break;
-#line 2505 "tokenizer.c"
+#line 2501 "tokenizer.c"
 		}
 	}
 
@@ -3467,7 +3463,7 @@ _eof_trans:
 	}
 	}
 	break;
-#line 3471 "tokenizer.c"
+#line 3467 "tokenizer.c"
 		}
 	}
 
@@ -3480,7 +3476,7 @@ _again:
 #line 1 "tokenizer.rl"
 	{ts = 0;}
 	break;
-#line 3484 "tokenizer.c"
+#line 3480 "tokenizer.c"
 		}
 	}
 
@@ -3496,7 +3492,6 @@ _again:
 	}
 
 	}
-
 #line 520 "tokenizer.rl"
 
             if (curly_idx) curly_idx--;

data/lib/js2/replace.rb

@@ -99,8 +99,8 @@ module JS2
 end
 
 replacer = Replacer.new
-template = ERB.new(File.read('tokenizer.rl.erb'), 0, "%<>")
+template = ERB.new(File.read('./tokenizer.rl.erb'), 0, "%<>")
 
-File.open('tokenizer.rl', 'w') do |f|
+File.open('./tokenizer.rl', 'w') do |f|
   f << template.result(binding)
 end

data/lib/js2/test/selenium.rb

@@ -0,0 +1,119 @@
+begin
+require 'rubygems'
+gem "selenium-client", ">=1.2.16"
+require "selenium/client"
+require "yaml"
+require "json"
+
+
+class JS2::Test::Selenium < Selenium::Client::Driver
+  attr_accessor :reference_dir, :child_selector
+
+  RESET_SEL_MARKER = "if (window.JS2) { window.USE_SEL_MARKER = window.JS2.SEL_MARKER; }"
+
+  class << self
+
+    def logger
+      return @logger || nil
+    end
+
+    def logger= (a_logger)
+      @logger = a_logger
+    end
+
+    def connect (config_file, env = nil)
+      config = YAML.load_file(config_file)
+      config = config[env] if env
+
+      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://www.factual.com',
+
+                       :timeout_in_second         => config[:timeout] || 60,
+                       :highlight_located_element => config['highlight'] || false,
+                       :javascript_framework      => config['framework'] || 'jquery' )
+
+      # hack to get an instance var in.
+      ret.reference_dir = reference_dir
+      ret.child_selector = nil
+      return ret
+    end
+  end
+
+  def get_sel_markers ()
+    json = self.execute("JS2.SEL_MARKER.toJson()")
+    struct = JSON.parse(json)
+    puts YAML::dump(struct)
+  end
+
+  def open!(uri)
+    ret = self.open(uri)
+    self.wait_for_page
+    self.set_sel_marker!
+    return ret
+  end
+
+  def execute (js)
+    puts js
+    return self.js_eval("window.eval(#{js.to_json});")
+  end
+
+  def wait_for_html(html, timeout=15000)
+    js = %{window.document.body.innerHTML.toLowerCase().replace(/[\"\']/g, '').indexOf(#{html.to_json.downcase}) >= 0;}
+    begin
+      self.wait_for_condition(js, timeout)
+      return true
+    rescue Selenium::CommandError
+      return false
+    end
+  end
+
+  def uri 
+    return self.location.sub(%r|^https?://(.*)?/|, '/')
+  end
+
+  def get_helper (klass_name)
+    klass  = klass_name
+    ref_file = %|#{@reference_dir}/#{klass_name}.yml|
+    lookup = if File.exist? ref_file
+      YAML.load_file(ref_file)
+    else
+      Hash.new
+    end
+
+    return JS2::Test::SeleniumHelper.new(klass_name, lookup, self)
+  end
+
+  def child_scope (selector)
+    js = "if (window.JS2) { window.USE_SEL_MARKER = window.JS2.SEL_MARKER."
+    js << selector.split('>').collect { |s| "children.#{s}" }.join('.')
+    js << '};'
+    @keep_selector = js
+    self.set_sel_marker!
+    yield()
+    @keep_selector = nil
+    self.set_sel_marker!
+  end
+
+  def set_sel_marker! 
+    self.execute(@keep_selector || RESET_SEL_MARKER)
+  end
+
+  def scope(klass_name)
+    self.set_sel_marker!
+    helper = get_helper(klass_name)
+    if block_given?
+      yield(helper) 
+    else
+      return helper
+    end
+  end
+
+end
+
+rescue Exception => e
+  warn "No support for selenium"
+end

data/lib/js2/test/selenium_element.rb

@@ -0,0 +1,234 @@
+class JS2::Test::SeleniumElement 
+  attr_accessor :options
+  QUICK_WAIT_FOR = 5
+  AJAX_TIME_OUT  = 60
+  def initialize (sel, klass, key, selector = nil)
+    @sel = sel
+    @key = key
+    @klass = klass
+    @selector = selector
+  end
+
+  def log (str)
+    if JS2::Test::Selenium.logger 
+      JS2::Test::Selenium.logger.info(str)
+    end
+  end
+
+  def raw
+    ret = self.class.new(@sel, @klass, @key, @selector)
+    ret.options[:raw] = true
+    return ret
+  end
+
+  def check 
+    return execute('checked=true')
+  end
+
+  def uncheck 
+    return execute('checked=false')
+  end
+
+  def checked?
+    return execute('checked')
+  end
+
+  def execute (str)
+    wait_for_ajax
+    return @sel.execute(get_js_locator() + '.' + str)
+  end
+
+  def visible?(wait_for = nil)
+    return self.check_attribute(':visible', true, wait_for);
+  end
+
+  def sel_visible?()
+     return @sel.visible?(get_ele())
+  end
+
+  def hidden?(wait_for = nil)
+    return self.check_attribute(':visible', false, wait_for);
+  end
+
+  def find (str, idx = 0)
+    selector = "window.$(#{get_js_locator()}).find(#{str.to_json})[#{idx}]"
+    return self.class.new(@sel, @klass, @key, selector)
+  end
+
+  def filter (str, idx = 0)
+    selector = "window.$(#{get_js_locator()}).filter(#{str.to_json})[#{idx}]"
+    return self.class.new(@sel, @klass, @key, selector)
+  end
+
+  def get (idx)
+    # when jqObjects in //@+ 
+    selector = "#{get_js_locator()}[#{idx}][0]"
+    return self.class.new(@sel, @klass, @key, selector)
+  end
+
+  def [] (idx)
+    selector = "#{get_js_locator()}[#{idx}]"
+    return self.class.new(@sel, @klass, @key, selector)
+  end
+
+  def attr (attr)
+    get_ele()
+    js = %{window.$(#{get_js_locator()}).attr(#{attr.to_json});}
+    return @sel.js_eval(js)
+  end
+
+  def jq_attr (attr)
+    return @sel.execute("window.$(#{get_js_locator()}).#{attr};")
+  end
+
+  def check_attribute (attr, val, wait_for = nil)
+    wait_for ||= QUICK_WAIT_FOR
+    get_ele()
+    js = %{window.$(#{get_js_locator()}).is('#{attr}') == #{val.to_json};}
+    begin
+      log "Waiting for #{@key}.#{attr} to be #{val.to_json}... Waiting #{wait_for} secs."
+      @sel.wait_for_condition(js, wait_for)
+    rescue Selenium::CommandError
+      return false
+    end
+
+    return true
+  end
+
+  def containsp? (str, timeout=QUICK_WAIT_FOR)
+    wait_for_ajax
+    js = %{window.$(#{get_js_locator()}).html().toLowerCase().replace(/[\"\']/g, '').indexOf(#{str.to_json.downcase}) >= 0;}
+    begin
+      @sel.wait_for_condition(js, timeout)
+      return true
+    rescue Selenium::CommandError
+      return false
+    end
+  end
+
+  def contains? (str,timeout=QUICK_WAIT_FOR)
+    wait_for_ajax
+    js = %{window.$(#{get_js_locator()}).html().indexOf(#{str.to_json}) >= 0;}
+    begin
+      @sel.wait_for_condition(js, timeout)
+      return true
+    rescue Selenium::CommandError
+      return false
+    end
+  end
+
+  def click (options = {})
+    @sel.click(get_ele(), options)
+  end
+
+  def text 
+    return @sel.text(get_ele())
+  end
+
+  def get_value
+    return @sel.get_value(get_ele())
+  end
+
+  def click! (options = {})
+    @sel.click(get_ele(), options)
+    @sel.wait_for_page
+  end
+
+  def mouse_up ()
+    trigger("LEFT_MOUSE_UP")
+  end
+
+  def mouse_down ()
+    trigger("LEFT_MOUSE_DOWN")
+  end
+
+  def mouse_over
+    @sel.mouse_over(get_ele())
+  end
+
+  def mouse_out
+    @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)
+    @sel.fire_event(elem, 'blur')
+  end
+
+  def select(params)
+    elem = get_ele()
+    @sel.select(elem, params)
+    @sel.fire_event(elem, 'blur')
+  end
+
+  def html ()
+    wait_for_ajax
+    js = get_js_locator()
+    return @sel.js_eval("#{js}.innerHTML;")
+  end
+
+  private
+
+  def get_locator
+    js = get_js_locator()
+    dom_locator = "dom=#{js};"
+    return dom_locator
+  end
+
+  def get_ele
+    real_locator = get_locator()
+    wait_for_ele()
+
+    return real_locator
+  end
+
+  def get_js_locator
+    if @selector
+      return @selector
+    end
+
+    filtered_locator = @key.to_s
+    int              = ''
+
+    if m = filtered_locator.match(/([^\[\]]+)(\[([^\]]*)\])/)
+      log "filtered: #{filtered_locator} #{m.inspect}"
+      filtered_locator = m[1]
+      int = ', ' + m[3] if m[3]
+    end
+
+    funct   = 'getVal'
+    get_val = "window.USE_SEL_MARKER.#{funct}('#{@klass}', '#{filtered_locator}'#{int})"
+
+    return get_val
+  end
+
+  def wait_for_ele ()
+    real_locator = get_locator
+    puts "waiting for #{real_locator}"
+    wait_for_ajax
+    @sel.wait_for_condition real_locator, QUICK_WAIT_FOR
+    puts "found #{real_locator}"
+  end
+
+  def wait_for_ajax
+    @sel.wait_for_condition('selenium.browserbot.getCurrentWindow().jQuery.active == 0', AJAX_TIME_OUT)
+  end
+
+  def trigger (event)
+    get_ele()
+    @sel.execute("window.$(#{get_js_locator}).trigger(JS2.SEL_EVENTS.#{event})")
+  end
+
+  def method_missing (method, *arg)
+    if @sel.respond_to?(method)
+      return @sel.send(method, get_js_locator, *arg)
+    else
+      raise "Method missing: #{method}"
+    end
+  end
+end

data/lib/js2/test/selenium_helper.rb

@@ -0,0 +1,27 @@
+class JS2::Test::SeleniumHelper
+  attr_accessor :klass, :lookup
+
+  def initialize (klass, lookup, sel)
+    @klass  = klass
+    @lookup = lookup
+    @sel    = sel
+    @all_eles = Hash.new
+  end
+
+  def [] (key, tail = nil)
+    key = key.to_s
+
+    return @all_eles[key] if @all_eles[key] 
+
+    # TODO: support inheritence
+    #raise "invalid key #{key}" unless @lookup[key]
+
+    return @all_eles[key] = JS2::Test::SeleniumElement.new(@sel, @klass, key, tail)
+  end
+
+  def type_form (params = {})
+    params.each_pair do |k,v|
+      self[k].type(v)
+    end
+  end
+end

data/lib/js2/tree.rb

@@ -105,12 +105,23 @@ class JS2::Class < JS2::Node
     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}|
+    return %|JS2.OO.#{createName}("#{@name}"); #{extends} (function (K,Package) {var self=K; var _super=JS2.OO['super']; #{@start}|
   end
 
   def last_string (s)
-    return s.to_s + ")(#{@name});"
+    pkg = @name.split(/\./)
+    pkg.pop()
+
+    if pkg.empty?
+      pkg = 'null'
+    else
+      pkg = pkg.join('.')
+    end
+
+    #pkg = pkg.length > 0 ? pkg : 'null' 
+    return s.to_s + ")(#{@name}, #{pkg});"
   end
 
   def to_s
@@ -323,7 +334,7 @@ class JS2::ParserHelper
       @classes.push(new_node)
     end
 
-    @stack.last.set_child(new_node)
+    @stack.last.set_child(new_node) if @stack.last
     @stack.push << new_node
   end
 

data/lib/js2/universe.rb

@@ -66,8 +66,7 @@ class JS2::Universe
 
   def add_yml (yml, filename)
     yml.each_pair do |klass_name, config|
-      template = config['template']
-      next unless template
+      template = config['template'] || []
 
       trees = @tree_lookup[klass_name]
       filename = trees.first.filename
@@ -79,11 +78,34 @@ class JS2::Universe
       end
 
       if config['make_compilation']
-        compilation = [ filename ]
+        compilation = []
+
+        if config['require']
+          compilation += config['require'].collect do |name| 
+            # if class name 
+            if @tree_lookup[name]
+              @tree_lookup[name].collect { |t| t.filename }
+
+            # assume its just a file name
+            else
+              [ @file_handler.write_dir + '/' + name ]
+            end
+          end.flatten
+        end
 
-        if config['include']
-          compilation += config['include'].collect { |name| @tree_lookup[name].collect { |t| t.filename } }.flatten
+        compilation << filename
 
+        if config['include']
+          compilation += config['include'].collect do |name| 
+            # if class name 
+            if @tree_lookup[name]
+              @tree_lookup[name].collect { |t| t.filename }
+
+            # assume its just a file name
+            else
+              [ @file_handler.write_dir + '/' + name ]
+            end
+          end.flatten
         end
 
         template.each do |t|

data/lib/js2.rb

@@ -3,7 +3,9 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 
 module JS2
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
+  module Test
+  end
 end
 
 require 'js2/config'
@@ -16,6 +18,10 @@ require 'js2/parser'
 require 'js2/file_handler'
 require 'js2/universe'
 
+require 'js2/test/selenium'
+require 'js2/test/selenium_element'
+require 'js2/test/selenium_helper'
+
 $:.unshift File.dirname(__FILE__)
 
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: js2
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jeff Su
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 +08:00
+date: 2010-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,9 @@ files:
 - lib/js2/tokenizer.rl.erb
 - lib/js2/tree.rb
 - lib/js2/universe.rb
+- lib/js2/test/selenium.rb
+- lib/js2/test/selenium_element.rb
+- lib/js2/test/selenium_helper.rb
 - bin/js2
 - website/index.txt
 has_rdoc: true