smparkes-envjs 0.0.4 → 0.0.5

data/bin/envjsrb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+require 'pathname'
 
 begin
   require 'johnson/tracemonkey'
@@ -23,9 +24,14 @@ RUNTIME.load Envjs::ENVJS
 if ARGV.length > 0
 
   begin
-    ARGV.each do |file|
-      if file =~ /\.x?html?$/
-        RUNTIME.evaluate("window.location = '#{file}'", file, 1)
+    ARGV.each_with_index do |file,i|
+      if file =~ /\.x?html?$/ || file =~ %r(^https?://)
+        if i > 0
+          RUNTIME.wait
+          RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
+        end
+        RUNTIME.wait
+        RUNTIME.evaluate("window.location = 'file://#{Pathname.new(file).realpath}'", file, 1)
       else
         RUNTIME.load file
       end

data/lib/envjs/env.js

@@ -48,11 +48,16 @@
     };
 
     $env.new_window = function(proxy){
+      var swap_script_window = ( $master.first_script_window.window === proxy );
       if(!proxy){
         proxy = $platform.new_split_global_outer();
+        // $master.print("np",proxy);
       }
       $master.proxy = proxy;
       new_window = $platform.new_split_global_inner(proxy,undefined);
+      if(swap_script_window) {
+        $master.first_script_window = new_window;
+      }
       new_window.$master = $master;
       for(var index in $master.symbols) {
         var symbol = $master.symbols[index];
@@ -78,26 +83,34 @@
     };
 
     $env.init_window = function(options){
+      options = options || {};
+
       $platform.init_window(this);
 
       var print = $master.print;
 
       // print("set",this);
       // print("set",this.window);
+      // print("set",options.proxy);
+      // print("set",this === options.proxy);
       if ( !this.window) {
         this.window = this;
       }
       // print("setx",this);
       // print("setx",this.window);
 
-      options = options || {};
-
-      var $w = this;$env.log = function(msg, level){
+      var $w = this;
+      // print("$$w",$w);
+      // print("$$w",$w === this);
+$env.log = function(msg, level){
     print(' '+ (level?level:'LOG') + ':\t['+ new Date()+"] {ENVJS} "+msg);
 };
 
 $env.location = function(path, base){
     // print("loc",path,base);
+    if ( path == "about:blank" ) {
+        return path;
+    }
     var protocol = new RegExp('(^file\:|^http\:|^https\:)');
     var m = protocol.exec(path);
     if(m&&m.length>1){
@@ -123,14 +136,16 @@ $env.location = function(path, base){
         if ( result.substring(0,6) == "file:/" && result[6] != "/" ) {
             result = "file://" + result.substring(5,result.length);
         }
-        if ( true && result.substring(0,7) == "file://" ) {
+        if ( result.substring(0,7) == "file://" ) {
             result = result.substring(7,result.length);
         }
         // print("ZZ",result);
         return result;
     }else{
         //return an absolute url from a url relative to the window location
-        if( ( base = ( ( $master.first_script_window && $master.first_script_window.location ) || window.location) ) &&
+        // print("hi",  $master.first_script_window, $master.first_script_window && $master.first_script_window.location );
+        if( ( base = ( ( $master.first_script_window && $master.first_script_window.location ) || window.location ) ) &&
+            ( base != "about:blank" ) &&
             base.href &&
             (base.href.length > 0) ) {
             base = base.href.substring(0, base.href.lastIndexOf('/'));
@@ -141,6 +156,7 @@ $env.location = function(path, base){
             // print("****",result);
             return result;
         } else {
+            // print("RRR",result);
             return "file://"+Ruby.File.expand_path(path);
         }
     }
@@ -186,23 +202,35 @@ $env.connection = function(xhr, responseHandler, data){
                 }
                 
             }
-        }catch(e){
-            $env.error('failed to open file '+ url, e);
+        } catch (e) {
             connection = null;
             xhr.readyState = 4;
-            xhr.statusText = "Local File Protocol Error";
-            xhr.responseText = "<html><head/><body><p>"+ e+ "</p></body></html>";
+            if(e.toString().match(/Errno::ENOENT/)) {
+                xhr.status = "404";
+                xhr.statusText = "Not Found";
+                xhr.responseText = undefined;
+            } else {
+                xhr.status = "500";
+                xhr.statusText = "Local File Protocol Error";
+                xhr.responseText = "<html><head/><body><p>"+ e+ "</p></body></html>";
+            }
         }
     } else { 
         Ruby.require('net/http');
 
         var req;
+        var path;
+        try {
+            path = url.request_uri();
+        } catch(e) {
+            path = url.path;
+        }
         if ( xhr.method == "GET" ) {
-            req = new Ruby.Net.HTTP.Get( url.request_uri() );
+            req = new Ruby.Net.HTTP.Get( path );
         } else if ( xhr.method == "POST" ) {
-            req = new Ruby.Net.HTTP.Post( url.request_uri() );
+            req = new Ruby.Net.HTTP.Post( path );
         } else if ( xhr.method == "PUT" ) {
-            req = new Ruby.Net.HTTP.Put( url.request_uri() );
+            req = new Ruby.Net.HTTP.Put( path );
         }
 
         for (var header in xhr.headers){
@@ -240,7 +268,7 @@ $env.connection = function(xhr, responseHandler, data){
         }
         
         xhr.readyState = 4;
-        xhr.status = parseInt(connection.responseCode,10) || undefined;
+        xhr.status = parseInt(resp.code,10) || 0;
         xhr.statusText = connection.responseMessage || "";
         
         var contentEncoding = resp["Content-Encoding"] || "utf-8",
@@ -279,22 +307,51 @@ $env.connection = function(xhr, responseHandler, data){
 var extract_line =
     Ruby.eval(
 "lambda { |e| \
-  e.stack.to_s.split(%(\n))[1].match(/:([^:]*)$/)[1]; \
+  begin; \
+    e.stack.to_s.split(%(\n))[1].match(/:([^:]*)$/)[1]; \
+  rescue; %(unknown); end; \
 }");
 
-var print_exception =
+var print_exception = window.print_exception =
+    Ruby.eval(" \
+lambda { |e| \
+  estr = e.to_s; \
+  estr.gsub!(/(<br \\/>)+/, %( )); \
+  print(%(Exception: ),estr,%(\n)); \
+  begin; \
+  e.stack.to_s.split(%(\n)).each do |line| \
+    m = line.match(/(.*)@([^@]*)$/); \
+    m[2] == %(:0) && next; \
+    s = m[1]; \
+    s.gsub!(/(<br \\/>)+/, %( )); \
+    limit = 100; \
+    if ( s.length > limit ); \
+      s = s[0,limit] + %(...); \
+    end; \
+    print(m[2],%( ),s,%(\n)); \
+  end; \
+  rescue; end; \
+} \
+");
+
+var print_exception_trace = window.print_exception_trace =
     Ruby.eval(" \
 lambda { |e| \
-  print(%(Exception: ),e,%(\n)); \
+  estr = e.to_s; \
+  estr.gsub!(/(<br \\/>)+/, %( )); \
+  begin; \
   e.stack.to_s.split(%(\n)).each do |line| \
     m = line.match(/(.*)@([^@]*)$/); \
+    m[2] == %(:0) && next; \
     s = m[1]; \
-    limit = 50; \
+    s.gsub!(/(<br \\/>)+/, %( )); \
+    limit = 100; \
     if ( s.length > limit ); \
       s = s[0,limit] + %(...); \
     end; \
     print(m[2],%( ),s,%(\n)); \
-  end \
+  end; \
+  rescue; end; \
 } \
 ");
 
@@ -387,12 +444,16 @@ $env.makeNewWindowMaybeLoad = function(openingWindow, parentArg, url, outer){
         url: $env.location(url)
     };
 
+    // print("$w",$w);
+    // print("$ww",$w.window);
+    // print("$ww",$w === $w.window);
     var pair = $env.new_window(outer);
     var proxy = pair[0];
     var new_window = pair[1];
     options.proxy = proxy;
     new_window.$options = options;
-    $master.load(Ruby.Envjs.ENVJS, new_window);
+    // print("$w",$w);
+    $master.load($master.Ruby.Envjs.ENVJS, new_window);
     return proxy;
 };
 
@@ -407,7 +468,6 @@ $env.reloadAWindowProxy = function(oldWindowProxy, url){
 $env.sleep = function(n){Ruby.sleep(n/1000.);};
 
 $env.loadIntoFnsScope = function(file) {
-    // print("lifs",load);
     return load(file);
 }
 
@@ -470,8 +530,9 @@ var Envjs = function(){
 	$env.NONE   = 0;
 	
     //set this if you want to get some internal log statements
-    $env.logLevel = $env.DEBUG;
     $env.logLevel = $env.INFO;
+    $env.logLevel = $env.DEBUG;
+    $env.logLevel = $env.WARN;
     
     $env.debug  = function(msg){
 		if($env.logLevel >= $env.DEBUG)
@@ -487,12 +548,16 @@ var Envjs = function(){
     };
     $env.error = function(msg, e){
         if ($env.logLevel >= $env.ERROR) {
-			$env.log(msg + " Line: " + $env.lineSource(e), 'ERROR');
-			$env.log(e || "", 'ERROR');
+          var line = $env.lineSource(e);
+          line != "" && ( line = " Line: "+ line );
+			$env.log(msg + line, 'ERROR');
+                        if(e) {
+  			  $env.log(e || "", 'ERROR');
+                        }
 		}
     };
     
-    $env.info("Initializing Core Platform Env");
+    $env.debug("Initializing Core Platform Env");
 
 
     // if we're running in an environment without env.js' custom extensions
@@ -564,7 +629,7 @@ var Envjs = function(){
     $env.platform       = "";
     
     $env.scriptTypes = {
-        "text/javascript"   :false,
+        "text/javascript"   :true,
         "text/envjs"        :true
     };
     
@@ -597,7 +662,13 @@ var Envjs = function(){
                                 }
                             }
                             base = "" + window.location;
-                            load($env.location(script.src.match(/([^\?#]*)/)[1], base ));
+                            try {                      
+                              load($env.location(script.src.match(/([^\?#]*)/)[1], base ));
+                            } catch(e) {
+                              $env.error("could not load script: " +
+                                         $env.location(script.src.match(/([^\?#]*)/)[1], base ) +
+                                         ": " + e + " thrown" );
+                            }
                             //lets you register a function to execute 
                             //after the script is loaded
                             if($env.afterScriptLoad){
@@ -5024,22 +5095,45 @@ __extend__(DOMDocument.prototype, {
     load: function(url){
 		$debug("Loading url into DOM Document: "+ url + " - (Asynch? "+$w.document.async+")");
         var scripts, _this = this;
-        var xhr = new XMLHttpRequest();
+        var xhr;
+// print("KK",url,url =="about:blank"); 
+        if (url == "about:blank"){
+            xhr = ({
+                open: function(){},
+                send: function(){
+                    this.responseText = "<html><head><title></title></head><body></body></html>";
+                    this.onreadystatechange();
+                },
+                status: 200
+            });
+        } else {
+            xhr = new XMLHttpRequest();
+        }
         xhr.open("GET", url, $w.document.async);
         xhr.onreadystatechange = function(){
-            try{
-        	    _this.loadXML(xhr.responseText);
-            }catch(e){
-                $error("Error Parsing XML - ",e);
+            if (xhr.status != 200) {
+                $error("Could not retrieve XHR content from " + url + ": status code " + xhr.status);
                 _this.loadXML(
-                "<html><head></head><body>"+
-                    "<h1>Parse Error</h1>"+
-                    "<p>"+e.toString()+"</p>"+  
-                "</body></html>");
+                    "<html><head></head><body>"+
+                        "<h1>No File</h1>"+
+                        "</body></html>");
+            } else {
+                try{
+        	    _this.loadXML(xhr.responseText);
+                }catch(e){
+                    $error("Error Parsing XML - ",e);
+                    _this.loadXML(
+                        "<html><head></head><body>"+
+                            "<h1>Parse Error</h1>"+
+                            "<p>"+e.toString()+"</p>"+  
+                            "</body></html>");
+                }
             }
             _this._url = url;
             
+            if ( url != "about:blank" ) {
         	$info("Sucessfully loaded document at "+url);
+            }
 
                 // first fire body-onload event
             var event = document.createEvent();
@@ -5343,6 +5437,11 @@ var __isValidNamespace__ = function(doc, namespaceURI, qualifiedName, isAttribut
 };
 
 $w.Document = DOMDocument;
+
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// End:
 /*
 *	parser.js
 */
@@ -9055,14 +9154,22 @@ $w.__defineGetter__("location", function(url){
 	// to modify the correct portion of the location object
 	// when we navigate the history
 	var setHistory = function( value, locationPart){
-	    $info("adding value to history: " +value);
+            if ( value == "about:blank" ) {
+                return;
+            }
+	    $debug("adding value to history: " +value);
 		$currentHistoryIndex++;
 		$history.push({
 			location: locationPart||"href",
 			value: value
 		});
 	};
-	/*
+
+// Local Variables:
+// espresso-indent-level:4
+// c-basic-offset:4
+// End:
+/*
 *	navigator.js
 *   - requires env
 */
@@ -9214,7 +9321,7 @@ window.clearInterval = window.clearTimeout = function(num){
 
 // FIX: make a priority queue ...
 
-window.$wait = $env.wait = $env.wait || function(wait) {
+window.$wait = $timers.wait = $env.wait = $env.wait || function(wait) {
   var start = Date.now();
   var old_loop_running = $event_loop_running;
   $event_loop_running = true; 
@@ -10383,9 +10490,28 @@ try{
 //   (function(){
 //     function(){
 
-      if ( options.url ) {
-        $w.__loadAWindowsDocument__(options.url);
-      }
+      // User accesible interface ...
+      var Envjs = $w.Envjs = $env.Envjs = function(){
+        if(arguments.length === 2){
+          for ( var i in arguments[1] ) {
+    	    var g = arguments[1].__lookupGetter__(i), 
+            s = arguments[1].__lookupSetter__(i);
+    	    if ( g || s ) {
+    	      if ( g ) $env.__defineGetter__(i, g);
+    	      if ( s ) $env.__defineSetter__(i, s);
+    	    } else
+    	      $env[i] = arguments[1][i];
+          }
+        }
+        if (arguments[0] != null && arguments[0] != "")
+          window.location = arguments[0];
+      };
+      Envjs.$env = $env;
+      Envjs.wait = $env.wait;
+      Envjs.interpreter = window.whichInterpreter;
+      Envjs.evaluate = $env.$master.evaluate;
+  
+      $w.__loadAWindowsDocument__(options.url || "about:blank");
     };
 
     return $env;
@@ -10395,27 +10521,6 @@ try{
   // Initial window setup
   $env.init.call(this);
 
-  // User accesible interface ...
-  Envjs = $env.Envjs = function(){
-    if(arguments.length === 2){
-      for ( var i in arguments[1] ) {
-    	var g = arguments[1].__lookupGetter__(i), 
-            s = arguments[1].__lookupSetter__(i);
-    	if ( g || s ) {
-    	  if ( g ) $env.__defineGetter__(i, g);
-    	  if ( s ) $env.__defineSetter__(i, s);
-    	} else
-    	  $env[i] = arguments[1][i];
-      }
-    }
-    if (arguments[0] != null && arguments[0] != "")
-      window.location = arguments[0];
-  };
-  Envjs.$env = $env;
-  Envjs.wait = $env.wait;
-  Envjs.interpreter = window.whichInterpreter;
-  Envjs.evaluate = $env.$master.evaluate;
-  
 })();
 
 // Local Variables:

data/lib/envjs/net/file.rb

@@ -30,6 +30,7 @@ class Envjs::Net::File < Net::Protocol
       @path = path
       @file = File.new @path
       @body = @file.read
+      @code = @file.nil? ? "404" : "200";
       @file.close
     end
 
@@ -52,15 +53,12 @@ class Envjs::Net::File < Net::Protocol
       @file.nil? ? 404 : 200;
     end
 
-    def code
-      @file.nil? ? "404" : "200";
-    end
 
     def getInputStream
       self
     end
 
-    attr_reader :body
+    attr_reader :body, :code
 
   end
 

data/lib/envjs/runtime.rb

@@ -86,6 +86,8 @@ EOJS
       master.first_script_window = window
 
       window["$master"] = master
+      window["$options"] = evaluate("new Object");
+      window["$options"].proxy = outer
 
       window.load = lambda { |*files|
         files.each do |f|

data/test/unit/events.js

@@ -177,7 +177,7 @@ test("Check that events can be set with addEventListener(), and bubble",
         var elem = document.getElementById('eventsFrame').contentDocument.
           getElementById(id).addEventListener('click', function(event){
             try{
-                ok( event.target === img && this === window,
+                ok( event.target === img && ( ( this === window ) ||  ( this.window === window ) ),
                     "Scope: 'this' refers to the window '" + window + "'");
             }catch(e){print(e);}
         });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smparkes-envjs
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - John Resig
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: envjsrb
 dependencies: 
 - !ruby/object:Gem::Dependency