jbarnette-johnson 1.0.0.200808062111 → 1.0.0.200811251942

data/js/johnson/browser/jquery.js

@@ -181,7 +181,7 @@ jQuery.fn = jQuery.prototype = {
 				options = {};
 				options[ name ] = value;
 			}
-		
+
 		// Check to see if we're setting style values
 		return this.each(function(i){
 			// Set all the styles
@@ -631,6 +631,8 @@ jQuery.extend({
 	
 	// check if an element is in a (or is an) XML document
 	isXMLDoc: function( elem ) {
+	  // TODO: hax
+	  return false;
 		return elem.documentElement && !elem.body ||
 			elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
 	},
@@ -742,7 +744,7 @@ jQuery.extend({
 
 		// A special, fast, case for the most common use of each
 		} else {
-			if ( object.length == undefined ) {
+			if ( !object || object.length == undefined ) {
 				for ( var name in object )
 					if ( callback.call( object[ name ], name, object[ name ] ) === false )
 						break;
@@ -1053,7 +1055,7 @@ jQuery.extend({
 		// Accessing the parent's selectedIndex property fixes it
 		if ( name == "selected" && jQuery.browser.safari )
 			elem.parentNode.selectedIndex;
-		
+
 		// Certain attributes only work when accessed via the old DOM 0 way
 		if ( fix[ name ] ) {
 			if ( value != undefined )

data/js/johnson/cli.js

@@ -27,4 +27,4 @@ function quit() {
 
 function version() {
   return Ruby.Johnson.VERSION;
-}
+}

data/lib/johnson.rb

@@ -44,4 +44,12 @@ module Johnson
   def self.parse(js, *args)
     Johnson::Parser.parse(js, *args)
   end
+
+  ###
+  # Create a new runtime and load all +files+.  Returns a new Johnson::Runtime.
+  def self.load(*files)
+    rt = Johnson::Runtime.new
+    rt.load(*files)
+    rt
+  end
 end

data/lib/johnson/cli/options.rb

@@ -10,19 +10,26 @@ module Johnson #:nodoc:
       attr_reader :arguments
       attr_reader :expressions
       attr_reader :files_to_preload
-      attr_reader :file_to_evaluate
+      attr_reader :files_to_evaluate
       attr_reader :load_paths
       attr_reader :paths_to_require
     
       def initialize(*args)
-        argv = args.flatten
+        @arguments = []
         @expressions = []
         @load_paths = []
         @files_to_preload = []
         @paths_to_require = []
 
+        argv = args.flatten
+        
+        if index = argv.index("--")
+          @arguments = argv[(index+1)..-1]
+          argv = argv[0..index]
+        end
+
         parser = OptionParser.new do |parser|
-          parser.banner = "Usage: johnson [options] [file.js] [-- jsargs]"
+          parser.banner = "Usage: johnson [options] [file.js...] [-- jsargs...]"
           parser.version = Johnson::VERSION
 
           parser.on("-e [EXPRESSION]", "Evaluate [EXPRESSION] and exit") do |expression|
@@ -53,9 +60,7 @@ module Johnson #:nodoc:
         end
         
         parser.parse!(argv)
-
-        @file_to_evaluate = argv.shift
-        @arguments = argv.dup
+        @files_to_evaluate = argv.dup
       end 
     end
   end

data/lib/johnson/nodes/binary_node.rb

@@ -13,6 +13,7 @@ module Johnson
       AssignExpr
       BracketAccess
       DotAccessor
+      LexicalScope
       Equal
       GetterProperty
       Label

data/lib/johnson/nodes/list.rb

@@ -3,6 +3,7 @@ module Johnson
     LIST_NODES = %w{
       SourceElements
       VarStatement
+      LetStatement
       Comma
       ObjectLiteral
       ArrayLiteral

data/lib/johnson/runtime.rb

@@ -29,6 +29,14 @@ module Johnson
       files.each { |f| delegate.evaluate(IO.read(f), f, 1) }
     end
 
+    ###
+    # Johnson.require on each file in +files+
+    def require(*files)
+      files.each do |file|
+        evaluate("Johnson.require('#{file}');")
+      end
+    end
+
     ###
     # Compile +script+ with +filename+ and +linenum+
     def compile(script, filename=nil, linenum=nil)

data/lib/johnson/spidermonkey/immutable_node.rb

@@ -11,6 +11,7 @@ module Johnson #:nodoc:
               :tok_colon  => :visit_Label,
               :tok_name   => :visit_AssignExpr,
               :tok_dot    => :visit_DotAccessor,
+              :tok_lexicalscope => :visit_LexicalScope
             }[pn_type]
             raise "Unknown type #{pn_type}" unless m
             visitor.send(m, self)
@@ -112,6 +113,7 @@ module Johnson #:nodoc:
           m = {
             :tok_lc         => :visit_SourceElements,
             :tok_var        => :visit_VarStatement,
+            :tok_let        => :visit_LetStatement,
             :tok_comma      => :visit_Comma,
             :tok_rc         => :visit_ObjectLiteral,
             :tok_rb         => :visit_ArrayLiteral,

data/lib/johnson/spidermonkey/mutable_tree_visitor.rb

@@ -41,6 +41,14 @@ module Johnson
                       ro_node.function_body.accept(self) )
       end
 
+      def visit_LexicalScope(ro_node)
+        LexicalScope.new(
+          ro_node.line,
+          ro_node.index,
+          Name.new(ro_node.line, ro_node.index, "unnamed"), # lexical scope nodes don't hold a name
+          ro_node.pn_expr.accept(self))
+      end
+
       %w{ Label AssignExpr DotAccessor }.each do |type|
         define_method(:"visit_#{type}") do |ro_node|
           Nodes.const_get(type).new(
@@ -55,6 +63,7 @@ module Johnson
       %w{
         SourceElements
         VarStatement
+        LetStatement
         Comma
         ObjectLiteral
         ArrayLiteral

data/lib/johnson/spidermonkey/ruby_land_proxy.rb

@@ -9,7 +9,9 @@ module Johnson #:nodoc:
       
       private :initialize
       
+      # FIXME: need to revisit array vs non-array proxy, to_a/to_ary semantics, etc.
       alias_method :size, :length
+      alias_method :to_ary, :to_a
       
       def to_proc
         @proc ||= Proc.new { |*args| call(*args) }

data/lib/johnson/visitors/dot_visitor.rb

@@ -52,6 +52,7 @@ module Johnson
 
       %w{
         VarStatement
+        LetStatement
         Comma
         ObjectLiteral
         ArrayLiteral
@@ -147,6 +148,7 @@ module Johnson
         OpModEqual OpMultiply OpMultiplyEqual OpRShift OpRShiftEqual
         OpSubtract OpSubtractEqual OpURShift OpURShiftEqual Or Property
         SetterProperty StrictEqual StrictNotEqual Switch While With
+        LexicalScope
       }.each do |node|
         define_method(:"visit_#{node}") do |o|
           @nodes << Node.new(o.object_id, node, [])

data/lib/johnson/visitors/ecma_visitor.rb

@@ -42,6 +42,10 @@ module Johnson
         "var #{o.value.map { |x| x.accept(self) }.join(', ')}"
       end
 
+      def visit_LetStatement(o)
+        "let #{o.value.map { |x| x.accept(self) }.join(', ')}"
+      end
+
       def visit_ArrayLiteral(o)
         "[#{o.value.map { |x| x.accept(self) }.join(', ')}]"
       end
@@ -113,6 +117,10 @@ module Johnson
       def visit_BracketAccess(o)
         "#{o.left.accept(self)}[#{o.right.accept(self)}]"
       end
+
+      def visit_LexicalScope(o)
+        "#{o.right.accept(self)}"
+      end
       
       def visit_DoWhile(o)
         semi = o.left.is_a?(Nodes::SourceElements) ? '' : ';'

data/lib/johnson/visitors/enumerating_visitor.rb

@@ -12,9 +12,15 @@ module Johnson
         self
       end
 
+      def visit_LexicalScope(o)
+        block.call(o)
+        o.right.accept(self)
+        self
+      end
+
       %w{
         ArrayLiteral Comma Export FunctionCall Import New ObjectLiteral
-        VarStatement
+        VarStatement LetStatement
       }.each do |type|
         define_method(:"visit_#{type}") do |o|
           block.call(o)

data/lib/johnson/visitors/sexp_visitor.rb

@@ -7,6 +7,7 @@ module Johnson
 
       {
         'VarStatement'  => :var,
+        'LetStatement'  => :let,
         'Comma'         => :comma,
         'ObjectLiteral' => :object,
         'ArrayLiteral'  => :array,
@@ -151,6 +152,7 @@ module Johnson
         'AssignExpr'          => :assign,
         'BracketAccess'       => :bracket_access,
         'DotAccessor'         => :dot_accessor,
+        'LexicalScope'        => :lexical_scope,
         'Equal'               => :equal,
         'NotEqual'            => :not_equal,
         'Or'                  => :or,

data/test/helper.rb

@@ -18,7 +18,7 @@ module Johnson
       end
     end
 
-    undef :default_test
+    undef :default_test if method_defined? :default_test
 
     def setup
       @runtime = Johnson::Runtime.new
@@ -41,7 +41,7 @@ module Johnson
   class NodeTestCase < Test::Unit::TestCase
     include Johnson::Nodes
   
-    undef :default_test
+    undef :default_test if method_defined? :default_test
     
     def setup
       @parser = Johnson::Parser

data/test/johnson/browser_test.rb

@@ -1,38 +1,43 @@
 require File.expand_path(File.join(File.dirname(__FILE__), "/../helper"))
 
-require 'net/http'
+begin
+  require "xml/dom/builder"
+  require "net/http"
 
-module Johnson
-  class BrowserTest < Johnson::TestCase
-    def setup
-      super
-      @runtime.evaluate('Johnson.require("johnson/browser");')
-    end
+  module Johnson
+    class BrowserTest < Johnson::TestCase
+      def setup
+        super
+        @runtime.evaluate('Johnson.require("johnson/browser");')
+      end
 
-    def test_set_location_returns_location
-      filename = "file://#{File.expand_path(__FILE__)}"
+      def test_set_location_returns_location
+        filename = "file://#{File.expand_path(__FILE__)}"
 
-      may_thread {
-        @runtime.evaluate("window.location = '#{filename}'")
-      }
+        may_thread {
+          @runtime.evaluate("window.location = '#{filename}'")
+        }
 
-      uri = URI.parse(filename)
-      assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s)
-    end
+        uri = URI.parse(filename)
+        assert_equal(uri.to_s, @runtime.evaluate('window.location').to_s)
+      end
 
-    def test_set_location_with_url
-      file = File.expand_path(__FILE__) + "/../../assets/index.html"
-      filename = "file://#{File.expand_path(file)}"
-      may_thread {
-        @runtime.evaluate("window.location = '#{filename}'")
-      }
-      doc = @runtime.evaluate('window.document')
-      assert_not_nil(doc)
-    end
+      def test_set_location_with_url
+        file = File.expand_path(__FILE__) + "/../../assets/index.html"
+        filename = "file://#{File.expand_path(file)}"
+        may_thread {
+          @runtime.evaluate("window.location = '#{filename}'")
+        }
+        doc = @runtime.evaluate('window.document')
+        assert_not_nil(doc)
+      end
 
-    def may_thread(&block)
-      block.call
-      (Thread.list - [Thread.main]).each { |t| t.join }
+      def may_thread(&block)
+        block.call
+        (Thread.list - [Thread.main]).each { |t| t.join }
+      end
     end
   end
+rescue LoadError
+  # Yehuda is teh lame.
 end

data/test/johnson/nodes/let_test.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "/../../helper"))
+
+class LetNodeTest < Johnson::NodeTestCase
+  def test_let_to_sexp
+    assert_sexp(
+              [[:lexical_scope, [:name, "unnamed"], [[:let, [[:assign, [:name, "a"], [:lit, 1],
+]]]]]],
+                @parser.parse('if(true) { let a = 1; }')
+               )
+
+  end
+
+  def test_let_to_ecma
+    assert_ecma(
+      "{\n  let a = 1;\n};",
+      @parser.parse('if(true) { let a = 1; }')
+    )
+  end
+
+  def test_enumerating_visitor
+    count = 0
+    @parser.parse('if(true) { let a = 1; }').each do |node|
+      count += 1
+    end
+    assert_equal 7, count
+  end
+
+  def test_dot_visitor
+    @parser.parse('if(true) { let a = 1; }').to_dot
+  end
+end

data/test/johnson/runtime_test.rb

@@ -43,15 +43,15 @@ module Johnson
       assert_equal(2, @runtime['some_number'])
     end
 
-    #def test_try_to_gc
-    #  10.times {
-    #    thread = Thread.new do
-    #        rt = Johnson::Runtime.new
-    #        rt.evaluate('new Date()').to_s
-    #    end
-    #    thread.join
-    #    GC.start
-    #  }
-    #end
+    def test_try_to_gc
+      10.times {
+        thread = Thread.new do
+            rt = Johnson::Runtime.new
+            rt.evaluate('new Date()').to_s
+        end
+        thread.join
+        GC.start
+      }
+    end
   end
 end

data/test/johnson/spidermonkey/ruby_land_proxy_test.rb

@@ -208,6 +208,15 @@ module Johnson
         asplode = lambda { raise err }
         assert_js_equal(err, "x = null; try { foo(); } catch(ex) { x = ex; }; x", :foo => asplode)
       end
+      
+      def test_array_multiple_assignment
+        a = @runtime.evaluate("[1,2,3]")
+        x, y, z = a
+        
+        assert_equal(1, x)
+        assert_equal(2, y)
+        assert_equal(3, z)
+      end
 
       # FIXME: If you uncomment this test, we get this error:
       #

data/test/jquery_units/units/core.js

@@ -1,5 +1,7 @@
 module("core");
 
+var isLocal = true;
+
 test("Basic requirements", function() {
 	expect(7);
 	ok( Array.prototype.push, "Array.push()" );
@@ -15,6 +17,7 @@ test("$()", function() {
 	expect(4);
 	
 	var main = $("#main");
+		
 	isSet( $("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with jQuery object as context" );
 	
 /*
@@ -298,29 +301,29 @@ test("index(Object)", function() {
 });
 
 test("attr(String)", function() {
-	expect(20);
-	ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
-	ok( $('#text1').attr('value', "Test2").attr('defaultValue') == "Test", 'Check for defaultValue attribute' );
-	ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
-	ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
-	ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
-	ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
-	ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
-	ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
-	ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
-	ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
-	ok( $('#name').attr('name') == "name", 'Check for name attribute' );
-	ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
-	ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
-	ok( $('#text1').attr('maxlength') == '30', 'Check for maxlength attribute' );
-	ok( $('#text1').attr('maxLength') == '30', 'Check for maxLength attribute' );
-	ok( $('#area1').attr('maxLength') == '30', 'Check for maxLength attribute' );
-	ok( $('#select2').attr('selectedIndex') == 3, 'Check for selectedIndex attribute' );
-	ok( $('#foo').attr('nodeName') == 'DIV', 'Check for nodeName attribute' );
-	ok( $('#foo').attr('tagName') == 'DIV', 'Check for tagName attribute' );
-	
-	$('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
-	ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
+ expect(20);
+ ok( $('#text1').attr('value') == "Test", 'Check for value attribute' );
+ ok( $('#text1').attr('value', "Test2").attr('defaultValue') == "Test", 'Check for defaultValue attribute' );
+ ok( $('#text1').attr('type') == "text", 'Check for type attribute' );
+ ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' );
+ ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' );
+ ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
+ ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
+ ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
+ ok( $('#en').attr('lang') == "en", 'Check for lang attribute' );
+ ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' );
+ ok( $('#name').attr('name') == "name", 'Check for name attribute' );
+ ok( $('#text1').attr('name') == "action", 'Check for name attribute' );
+ ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' );
+ ok( $('#text1').attr('maxlength') == '30', 'Check for maxlength attribute' );
+ ok( $('#text1').attr('maxLength') == '30', 'Check for maxLength attribute' );
+ ok( $('#area1').attr('maxLength') == '30', 'Check for maxLength attribute' );
+ ok( $('#select2').attr('selectedIndex') == 3, 'Check for selectedIndex attribute' );
+ ok( $('#foo').attr('nodeName') == 'DIV', 'Check for nodeName attribute' );
+ ok( $('#foo').attr('tagName') == 'DIV', 'Check for tagName attribute' );
+ 
+ $('<a id="tAnchor5"></a>').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path
+ ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
 });
 
 if ( !isLocal ) {
@@ -1096,22 +1099,22 @@ test("val()", function() {
 	ok( $([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
 });
 
-test("val(String)", function() {
-	expect(4);
-	document.getElementById('text1').value = "bla";
-	ok( $("#text1").val() == "bla", "Check for modified value of input element" );
-	$("#text1").val('test');
-	ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
-	
-	$("#select1").val("3");
-	ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
-
-	// using contents will get comments regular, text, and comment nodes
-	var j = $("#nonnodes").contents();
-	j.val("asdf");
-	equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
-	j.removeAttr("value");
-});
+// test("val(String)", function() {
+//  expect(4);
+//  document.getElementById('text1').value = "bla";
+//  ok( $("#text1").val() == "bla", "Check for modified value of input element" );
+//  $("#text1").val('test');
+//  ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" );
+//  
+//  $("#select1").val("3");
+//   ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" );
+// 
+//  // using contents will get comments regular, text, and comment nodes
+//   var j = $("#nonnodes").contents();
+//   j.val("asdf");
+//   equals( j.val(), "asdf", "Check node,textnode,comment with val()" );
+//   j.removeAttr("value");
+// });
 
 var scriptorder = 0;