smparkes-envjs 0.0.9 → 0.0.10

data/lib/envjs/net/cgi.rb

@@ -0,0 +1,94 @@
+require 'net/protocol'
+
+require 'envjs/net'
+
+class Envjs::Net::CGI
+
+  def save_and_set k, v
+    @saved[k] = ENV[k]
+    ENV[k] = v
+  end
+
+  def restore
+    @saved.keys.each do |k|
+      ENV[k] = @saved[k]
+    end
+    @saved = {}
+  end
+
+  def initialize xhr, data
+    if (match = %r((.*\.php)(\?(.*))?).match xhr.url).nil?
+      raise "Not CGI"
+    end
+
+    @saved = {}
+
+    begin
+
+      # p match[0]
+
+      path = match[1]
+      path.sub! %r(^file://), ""
+
+      save_and_set( "GATEWAY_INTERFACE", "CGI/1.1" )
+
+      save_and_set( "REQUEST_METHOD", xhr["method"] )
+      if ( match[3] )
+        save_and_set( "QUERY_STRING", match[3] )
+      end
+
+      if ct = xhr["headers"]["Content-Type"]
+        save_and_set( "CONTENT_TYPE", ct )
+      end
+
+      if data
+        save_and_set( "CONTENT_LENGTH", data.length.to_s )
+      end
+
+      xhr["headers"].each do |k,v|
+        k.gsub!("-","_")
+        k = "HTTP_"  + k
+        save_and_set( k, v )
+      end
+
+      result = nil
+
+      save_and_set( "PATH_INFO",  path )
+      save_and_set( "PATH_TRANSLATED",  path )
+      save_and_set( "REDIRECT_STATUS", "200" )
+
+      open("|php-cgi", "r+") do |php|
+        if data
+          php.write data
+          php.flush
+        end
+        result = php.read
+      end
+
+      result && result = result.split("\r\n")
+      @headers = {}
+      while line = result.shift
+        break if line == ""
+        match = /([^:]*):\s*(.*)/.match line
+        @headers[match[1]]=match[2]
+      end
+      # p "q", result.join("\r\n")
+      @body = result.join("\r\n")
+    ensure
+      restore
+    end
+
+  end
+
+  def each 
+    @headers.each do |k,v|
+      yield k, v
+    end
+  end
+
+  def finish
+  end
+
+  attr_reader :body
+
+end

data/lib/envjs/net/file.rb

@@ -29,6 +29,10 @@ class Envjs::Net::File < Net::Protocol
   def finish
   end
 
+  def request request
+    Response.new request.path
+  end
+
   class Response
     def initialize path
       @path = path
@@ -68,8 +72,4 @@ class Envjs::Net::File < Net::Protocol
 
   end
 
-  def request request
-    Response.new request.path
-  end
-
 end

data/lib/envjs/runtime.rb

@@ -71,7 +71,7 @@ puts = function() {
 EOJS
 
       master = global["$master"] = evaluate("new Object")
-      master.symbols = [ "Johnson", "Ruby", "print", "debug", "puts", "load", "whichInterpreter", "multiwindow" ]
+      master.symbols = [ "Johnson", "Ruby", "print", "debug", "puts", "load", "reload", "whichInterpreter", "multiwindow" ]
       master.symbols.each { |symbol| master[symbol] = global[symbol] }
 
       master.whichInterpreter = "Johnson"
@@ -85,58 +85,83 @@ EOJS
         $envjsrb_deps && ( @db ||= FSDB::Database.new $envjsrb_deps )
       end
 
+      top_level_js = nil
+
+      add_dep = nil
+
       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
+          if db.call
+            loc = w
+            begin loc = w.location; rescue; end
+            loc && ( loc = loc.to_s )
+            if ( loc !~ %r((http?s|file|about):) )
+              begin
+                loc = "file://" + Pathname(loc).realpath.to_s
+              rescue Errno::ENOENT; end
+            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
-            # $stderr.print "#{loc} not on anything\n";
-            db.call.delete loc+".on.yml"
           end
-        end
-        rescue Exception => e; $stderr.puts e; end
+          add_dep.call( nil, loc )
+        rescue Exception => e; $stderr.puts e, e.class; $stderr.puts e.backtrace; 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
+          begin loc = w.location; rescue Exception; 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
+            begin
+              path = "file://" + Pathname(path).realpath.to_s
+            rescue Errno::ENOENT
+              return
+            end
+          end
+          if !loc || loc == "about:blank"
+            tll = "file://" + Pathname(top_level_js).realpath.to_s
+            if ( tll != path ) 
+              loc = tll
+            end
           end
           if loc and loc != "about:blank"
             on = db.call[loc+".on.yml"] || []
             on << path
+            on.uniq!
             db.call[loc+".on.yml"] = on
-            by = db.call[path+".by.yml"] = []
+            by = db.call[path+".by.yml"] || []
             by << loc
+            by.uniq!
             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"
+            # $stderr.print "#{loc} on #{path}: #{db.call[loc+'.on.yml'].join(' ')}\n"
+            # $stderr.print "#{path} by #{loc}: #{db.call[path+'.by.yml'].join(' ')}\n"
           end
         end
       end
 
+      (class << self; self; end).send :define_method, :top_level_load do |path|
+        # $stderr.print "tll #{path}\n"
+        top_level_js = path
+        clear_deps.call( path )
+      end
+
       master.load = lambda { |*files|
         if files.length == 2 && !(String === files[1])
           f = files[0]
@@ -150,6 +175,19 @@ EOJS
         end
       }
 
+      master.reload = 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
+          reevaluate(v, f, 1, w, w, f)
+        else
+          reload *files
+        end
+      }
+
       master.evaluate = lambda { |v,w|
         evaluate(v,"inline",1,w,w);
       }
@@ -178,6 +216,12 @@ EOJS
         end
       }
 
+      window.reload = lambda { |*files|
+        files.each do |f|
+          master.reload.call f, window
+        end
+      }
+
       ( class << self; self; end ).send :define_method, :wait do
         master["finalize"] && master.finalize.call
         master.timers && master.timers.wait
@@ -206,6 +250,18 @@ EOJS
         evaluate_compiled_script(compiled_script,scope)
       end
 
+      ( class << self; self; end ).send :define_method, :reevaluate do |*args|
+        ( script, file, line, global, scope, fn ) = *args
+        # print "eval in " + script[0,50].inspect + (scope ? scope.toString() : "nil") + "\n"
+        global = nil
+        scope ||= inner
+        compiled_script = compile(script, file, line, global)
+        if fn
+          scripts[fn] = compiled_script
+        end
+        evaluate_compiled_script(compiled_script,scope)
+      end
+
       @envjs = inner
 
       ( class << self; self; end ).send :define_method, :"[]" do |key|

data/test/call-load-test.js

@@ -13,5 +13,3 @@ test("window.location= following Envjs() initialization flagged as error",
      function(){
     expect(0);
 });
-
-//Envjs.wait();

data/test/firebug/firebug.css

@@ -0,0 +1,209 @@
+
+html, body {
+    margin: 0;
+    background: #FFFFFF;
+    font-family: Lucida Grande, Tahoma, sans-serif;
+    font-size: 11px;
+    overflow: hidden;
+}
+
+a {
+    text-decoration: none;
+}
+
+a:hover {
+    text-decoration: underline;
+}
+
+.toolbar {
+    height: 14px;
+    border-top: 1px solid ThreeDHighlight;
+    border-bottom: 1px solid ThreeDShadow;
+    padding: 2px 6px;
+    background: ThreeDFace;
+}
+
+.toolbarRight {
+    position: absolute;
+    top: 4px;
+    right: 6px;
+}
+
+#log {
+    overflow: auto;
+    position: absolute;
+    left: 0;
+    width: 100%;
+}
+
+#commandLine {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 18px;
+    border: none;
+    border-top: 1px solid ThreeDShadow;
+}
+
+/************************************************************************************************/
+
+.logRow {
+    position: relative;
+    border-bottom: 1px solid #D7D7D7;
+    padding: 2px 4px 1px 6px;
+    background-color: #FFFFFF;
+}
+
+.logRow-command {
+    font-family: Monaco, monospace;
+    color: blue;
+}
+
+.objectBox-null {
+    padding: 0 2px;
+    border: 1px solid #666666;
+    background-color: #888888;
+    color: #FFFFFF;
+}
+
+.objectBox-string {
+    font-family: Monaco, monospace;
+    color: red;
+    white-space: pre;
+}
+
+.objectBox-number {
+    color: #000088;
+}
+
+.objectBox-function {
+    font-family: Monaco, monospace;
+    color: DarkGreen;
+}
+
+.objectBox-object {
+    color: DarkGreen;
+    font-weight: bold;
+}
+
+/************************************************************************************************/
+
+.logRow-info,
+.logRow-error,
+.logRow-warning {
+    background: #FFFFFF no-repeat 2px 2px;
+    padding-left: 20px;
+    padding-bottom: 3px;
+}
+
+.logRow-info {
+    background-image: url(infoIcon.png);
+}
+
+.logRow-warning {
+    background-color: cyan;
+    background-image: url(warningIcon.png);
+}
+
+.logRow-error {
+    background-color: LightYellow;
+    background-image: url(errorIcon.png);
+}
+
+.errorMessage {
+    vertical-align: top;
+    color: #FF0000;
+}
+
+.objectBox-sourceLink {
+    position: absolute;
+    right: 4px;
+    top: 2px;
+    padding-left: 8px;
+    font-family: Lucida Grande, sans-serif;
+    font-weight: bold;
+    color: #0000FF;
+}
+
+/************************************************************************************************/
+
+.logRow-group {
+    background: #EEEEEE;
+    border-bottom: none;
+}
+
+.logGroup {
+    background: #EEEEEE;
+}
+
+.logGroupBox {
+    margin-left: 24px;
+    border-top: 1px solid #D7D7D7;
+    border-left: 1px solid #D7D7D7;
+}
+
+/************************************************************************************************/
+
+.selectorTag,
+.selectorId,
+.selectorClass {
+    font-family: Monaco, monospace;
+    font-weight: normal;
+}
+
+.selectorTag {
+    color: #0000FF;
+}
+
+.selectorId {
+    color: DarkBlue;
+}
+
+.selectorClass {
+    color: red;
+}
+
+/************************************************************************************************/
+
+.objectBox-element {
+    font-family: Monaco, monospace;
+    color: #000088;
+}
+
+.nodeChildren {
+    margin-left: 16px;
+}
+
+.nodeTag {
+    color: blue;
+}
+
+.nodeValue {
+    color: #FF0000;
+    font-weight: normal;
+}
+
+.nodeText,
+.nodeComment {
+    margin: 0 2px;
+    vertical-align: top;
+}
+
+.nodeText {
+    color: #333333;
+}
+
+.nodeComment {
+    color: DarkGreen;
+}
+
+/************************************************************************************************/
+
+.propertyNameCell {
+    vertical-align: top;
+}
+
+.propertyName {
+    font-weight: bold;
+}

data/test/firebug/firebug.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <title>Firebug</title>
+    <link rel="stylesheet" type="text/css" href="firebug.css">
+</head>
+
+<body>
+    <div id="toolbar" class="toolbar">
+        <a href="#" onclick="parent.console.clear()">Clear</a>
+        <span class="toolbarRight">
+            <a href="#" onclick="parent.console.close()">Close</a>
+        </span>
+    </div>
+    <div id="log"></div>
+    <input type="text" id="commandLine">
+    
+    <script>parent.onFirebugReady(document);</script>
+</body>
+</html>