smparkes-envjs 0.0.8 → 0.0.9

data/bin/envjsrb

@@ -3,6 +3,8 @@
 require 'rubygems'
 require 'pathname'
 
+require 'envjs/options'
+
 require 'johnson/tracemonkey'
 require 'johnson/cli'
 require 'envjs/runtime'

data/lib/envjs/env.js

@@ -364,7 +364,7 @@ var print_exception = window.print_exception =
 lambda { |e| \
   estr = e.to_s; \
   estr.gsub!(/(<br \\/>)+/, %( )); \
-  debug(%(Exception: ),estr,%(\n)); \
+  $stderr.print(%(Exception: ),estr,%(\n)); \
   begin; \
   e.stack.to_s.split(%(\n)).each do |line| \
     m = line.match(/(.*)@([^@]*)$/); \
@@ -375,7 +375,7 @@ lambda { |e| \
     if ( s.length > limit ); \
       s = s[0,limit] + %(...); \
     end; \
-    debug(m[2],%( ),s,%(\n)); \
+    $stderr.print(m[2],%( ),s,%(\n)); \
   end; \
   rescue; end; \
 } \
@@ -396,7 +396,7 @@ lambda { |e| \
     if ( s.length > limit ); \
       s = s[0,limit] + %(...); \
     end; \
-    debug(m[2],%( ),s,%(\n)); \
+    $stderr.print(m[2],%( ),s,%(\n)); \
   end; \
   rescue; end; \
 } \
@@ -686,15 +686,12 @@ var Envjs = function(){
         var types, type, src, i, base, 
             docWrites = [],
             write = document.write,
-            writeln = document.writeln;
-        //temporarily replace document write becuase the function
-        //has a different meaning during parsing
-        /*document.write = function(text){
-			docWrites.push(text);
-		};*/
+            writeln = document.writeln,
+            okay = true;
+        var script_type = script.type === null ? "text/javascript" : script.type;
         try{
-	  if(script.type){
-                types = script.type?script.type.split(";"):[];
+            if(script_type){
+                types = script_type?script_type.split(";"):[];
                 for(i=0;i<types.length;i++){
                     if($env.scriptTypes[types[i]]){
 						if(script.src){
@@ -712,9 +709,7 @@ var Envjs = function(){
                             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" );
+                              okay = false;
                             }
                             //lets you register a function to execute 
                             //after the script is loaded
@@ -729,18 +724,23 @@ var Envjs = function(){
                             $env.loadInlineScript(script);
                         }
                     }else{
-                        if(!script.src && script.type == "text/javascript"){
+                        if(!script.src && script_type == "text/javascript"){
                             $env.loadInlineScript(script);
+                        } else {
+                          // load prohbited ...
+                          okay = false;
                         }
                     }
                 }
             }else{
+                // SMP this branch is probably dead ...
                 //anonymous type and anonymous src means inline
                 if(!script.src){
                     $env.loadInlineScript(script);
                 }
             }
         }catch(e){
+            okay = false;
             $env.error("Error loading script.", e);
             $env.onScriptLoadError(script);
         }finally{
@@ -751,6 +751,7 @@ var Envjs = function(){
             document.write = write;
             document.writeln = writeln;*/
         }
+        return okay;
     };
         
     $env.loadInlineScript = $env.loadInlineScript || function(script){};
@@ -4453,61 +4454,6 @@ var DOMImplementation = function() {
     this.errorChecking  = true;       // by default, test for exceptions
 };
 
-/*
-var __endHTMLElement__ = function(node, doc, p){
-    if(node.nodeName.toLowerCase() == 'script'){
-        // unless we're parsing in a window context, don't execute scripts
-        if (doc.parentWindow){
-            p.replaceEntities = true;
-            $env.loadLocalScript(node, p);
-
-            // only fire event if we actually had something to load
-            if (node.src && node.src.length > 0){
-                var event = doc.createEvent();
-                event.initEvent("load");
-                node.dispatchEvent( event, false );
-            }
-        }
-    }
-    else if (node.nodeName.toLowerCase() == 'frame' ||
-             node.nodeName.toLowerCase() == 'iframe'   ){
-
-        if (node.src && node.src.length > 0){
-            $debug("getting content document for (i)frame from " + node.src);
-
-            // any JS here is DOM-instigated, so the JS scope is the window, not the first script
-
-            var save = $master.first_script_window;
-            $master.first_script_window = window;
-
-            $env.loadFrame(node, $env.location(node.src));
-
-            $master.first_script_window = save;
-
-            var event = doc.createEvent();
-            event.initEvent("load");
-            node.dispatchEvent( event, false );
-        }
-    }
-    else if (node.nodeName.toLowerCase() == 'link'){
-        if (node.href && node.href.length > 0){
-            // don't actually load anything, so we're "done" immediately:
-            var event = doc.createEvent();
-            event.initEvent("load");
-            node.dispatchEvent( event, false );
-        }
-    }
-    else if (node.nodeName.toLowerCase() == 'img'){
-        if (node.src && node.src.length > 0){
-            // don't actually load anything, so we're "done" immediately:
-            var event = doc.createEvent();
-            event.initEvent("load");
-            node.dispatchEvent( event, false );
-        }
-    }
-}
-*/
-
 __extend__(DOMImplementation.prototype,{
     // @param  feature : string - The package name of the feature to test.
     //      the legal only values are "XML" and "CORE" (case-insensitive).
@@ -6080,22 +6026,22 @@ __extend__(HTMLDocument.prototype, {
 });
 
 var __elementPopped__ = function(ns, name, node){
-    //print('Element Popped: '+ns+" "+name+ " " );
+    // print('Element Popped: '+ns+" "+name+ " "+ node+" " +node.type+" "+node.nodeName);
     var doc = __ownerDocument__(node);
+    var type = ( node.type === null ) ? "text/javascript" : node.type;
     try{
-        if(node.nodeName.toLowerCase() == 'script' && node.type !== undefined){
+        if(node.nodeName.toLowerCase() == 'script' && type == "text/javascript"){
             //$env.debug("element popped: script\n"+node.xml);
             // unless we're parsing in a window context, don't execute scripts
             if (doc.parentWindow){
                 //p.replaceEntities = true;
-                $env.loadLocalScript(node, null);
-    
+                var okay = $env.loadLocalScript(node, null);
                 // only fire event if we actually had something to load
                 if (node.src && node.src.length > 0){
                     var event = doc.createEvent();
-                    event.initEvent("load");
+                    event.initEvent( okay ? "load" : "error" );
                     node.dispatchEvent( event, false );
-                }
+                  }
             }
         }
         else if (node.nodeName.toLowerCase() == 'frame' ||
@@ -8051,6 +7997,9 @@ __extend__(HTMLScriptElement.prototype, {
     },
     onload: function(event){
         __eval__(this.getAttribute('onload')||'', this);
+    },
+    onerror: function(event){
+        __eval__(this.getAttribute('onerror')||'', this);
     }
 });
 

data/lib/envjs/net/file.rb

@@ -4,6 +4,10 @@ require 'envjs/net'
 
 class Envjs::Net::File < Net::Protocol
 
+  class << self
+    attr_accessor :on_open
+  end
+
   class Get
     attr_accessor :path
     def initialize path
@@ -28,6 +32,8 @@ class Envjs::Net::File < Net::Protocol
   class Response
     def initialize path
       @path = path
+      on_open = Envjs::Net::File.on_open
+      on_open and on_open.call( path )
       @file = File.new @path
       @body = @file.read
       @code = @file.nil? ? "404" : "200";

data/lib/envjs/options.rb

@@ -0,0 +1,11 @@
+require 'optparse'
+
+$envjsrb_deps = nil
+
+OptionParser.new do |o|
+
+  o.on("--deps path") do |path|
+    $envjsrb_deps = path
+  end
+
+end.parse!

data/lib/envjs/runtime.rb

@@ -1,5 +1,8 @@
 require 'envjs'
 require "open-uri"
+require 'rubygems'
+require 'fsdb'
+require 'envjs/net/file'
 
 module Envjs::Runtime
 
@@ -24,6 +27,7 @@ print = function() {
     }
   }
   Ruby.print("\n");
+  Ruby['$stdout'].flush();
 };
 EOJS
 
@@ -77,11 +81,69 @@ EOJS
       # calling this from JS is hosed; the ruby side is confused, maybe because HTTPHeaders is mixed in?
       master.add_req_field = lambda { |r,k,v| r.add_field(k,v) }
 
+      db = lambda do
+        $envjsrb_deps && ( @db ||= FSDB::Database.new $envjsrb_deps )
+      end
+
+      clear_deps = lambda do |w|
+        begin
+        if db.call
+          loc = w
+          begin loc = w.location; rescue; end
+          loc && ( loc = loc.to_s )
+          if ( loc !~ %r((http?s|file|about):) )
+            loc = "file://" + Pathname(loc).realpath.to_s
+          end
+          # $stderr.puts "clear", loc
+          if loc and loc != "about:blank"
+            paths = db.call[loc+".on.yml"] || []
+            paths.each do |path|
+              # $stderr.print "#{path} not by #{loc}\n";
+              db.call[path+".by.yml"].delete loc
+            end
+            # $stderr.print "#{loc} not on anything\n";
+            db.call.delete loc+".on.yml"
+          end
+        end
+        rescue Exception => e; $stderr.puts e; end
+      end
+
+      if $envjsrb_deps
+        Envjs::Net::File.on_open = clear_deps
+      end
+
+      add_dep = lambda do |w, f|
+        if db.call
+          loc = nil
+          begin loc = w.location; rescue; end
+          loc && ( loc = loc.to_s )
+          if ( loc && loc !~ %r((http?s|file|about):) )
+            loc = "file://" + Pathname(loc).realpath.to_s
+          end
+          path = f
+          if ( path !~ %r((http?s|file|about):) )
+            path = "file://" + Pathname(path).realpath.to_s
+          end
+          if loc and loc != "about:blank"
+            on = db.call[loc+".on.yml"] || []
+            on << path
+            db.call[loc+".on.yml"] = on
+            by = db.call[path+".by.yml"] = []
+            by << loc
+            db.call[path+".by.yml"] = by
+            # $stderr.print "#{loc} on #{path}: #{db.call[loc+'.on.yml']}\n"
+            # $stderr.print "#{path} by #{loc}: #{db.call[path+'.by.yml']}\n"
+          end
+        end
+      end
+
       master.load = lambda { |*files|
         if files.length == 2 && !(String === files[1])
           f = files[0]
           w = files[1]
           v = open(f).read.gsub(/\A#!.*$/, '')
+          loc = nil
+          add_dep.call w, f
           evaluate(v, f, 1, w, w, f)
         else
           load *files

data/lib/envjs/runtime.rb.smp

@@ -0,0 +1,133 @@
+require 'envjs'
+
+module Envjs::Runtime
+
+  def self.extended object
+    object.instance_eval do
+
+      @outer = {} # ||= new_split_global_outer
+      @inner = {} # ||= new_split_global_inner( @outer )
+
+      @inner["Johnson"] = global["Johnson"]
+      @inner["Ruby"] = global["Ruby"]
+
+      evaluate <<'EOJS'
+print = function() {
+  var l = arguments.length
+  for( var i = 0; i < l; i++ ) {
+    var s;
+    if ( arguments[i] === null ) {
+      s = "null";
+    } else if ( arguments[i] === undefined  ) {
+      s = "undefined"      
+    } else {
+      s = arguments[i].toString();
+    }
+    Ruby.print(s);
+    if( i < l-1 ) {
+      Ruby.print(" ");
+    }
+  }
+  Ruby.print("\n");
+};
+EOJS
+
+      @inner["print"] = global["print"]
+
+      ( class << self; self; end ).send :define_method, :evaluate do |*args|
+        ( script, file, line, global, scope ) = *args
+        g ||= @inner
+        s ||= @inner
+  p "super"
+        super( script, file, line, g, s )
+      end
+
+
+      # self.global = outer
+      
+      return
+
+      evaluate <<'EOJS'
+print = function() {
+  var l = arguments.length
+  for( var i = 0; i < l; i++ ) {
+    var s;
+    if ( arguments[i] === null ) {
+      s = "null";
+    } else if ( arguments[i] === undefined  ) {
+      s = "undefined"      
+    } else {
+      s = arguments[i].toString();
+    }
+    Ruby.print(s);
+    if( i < l-1 ) {
+      Ruby.print(" ");
+    }
+  }
+  Ruby.print("\n");
+};
+EOJS
+
+      master = global["$master"] = evaluate("new Object")
+      master.symbols = [ "Johnson", "Ruby", "print", "load", "whichInterpreter", "multiwindow" ]
+      # master.symbols = [ "Johnson", "whichInterpreter" ]
+      master.symbols.each { |symbol| master[symbol] = global[symbol] }
+
+      master.whichInterpreter = "Johnson"
+
+if true
+
+      master.multiwindow = true
+
+      master.load = lambda { |*files| load *files }
+
+      master.evaluate = lambda { |script|
+            return evaluate(script, nil, nil, master["inner"], master["inner"])
+      }
+
+      master.global = lambda { global }
+
+      master.new_global = lambda { new_global }
+
+      master.set_global = lambda { |target, s| self.global = target }
+
+      master._new_proxy = lambda { |target| new_proxy target }
+      master._set_proxy_target = lambda { |proxy, target| set_proxy_target proxy, target }
+
+      master.new_split_global_outer = lambda { new_split_global_outer }
+      master.new_split_global_inner = lambda { |outer,_| new_split_global_inner outer }
+
+
+end
+
+      # create an proto window object and proxy
+
+      outer = master["outer"] = new_split_global_outer
+      window = inner = master["inner"] = new_split_global_inner( outer )
+
+      master.symbols.each do |symbol|
+        window[symbol] = master[symbol]
+      end
+
+      master.first_script_window = window
+
+      window["$master"] = master
+
+      self.global = outer
+
+      ( class << self; self; end ).send :define_method, :wait do
+        master["finalize"] && master.finalize.call
+      end
+
+      ( class << self; self; end ).send :define_method, :evaluate do |*args|
+        ( script, file, line, global, scope ) = *args
+        global ||= inner
+        scope ||= inner
+  p "super"
+        super( script, file, line, global, scope )
+      end
+
+    end
+  end
+
+end