envjs 0.2.0 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.3.0 / 2010-03-29
+
+* minor changes for dependences and cleanup
+* Tweak reload on about:blank and default waiting
+
 === 0.1.0 / 2010-03-11
 
 * First Hoe build

data/Manifest.txt

@@ -281,7 +281,5 @@ test/unit/proxy.js
 test/unit/scope.js
 test/unit/timer.js
 test/unit/window.js
-test/vendor/jQuery/README
-test/vendor/prototype-1.6.0.3.js
 test/x.js
 test/y.js

data/Wakefile

@@ -1,24 +1,7 @@
-begin; require 'wake/event_handlers/em'; rescue LoadError; end
-begin; require 'wake/deps'; rescue LoadError; end
+# -*- mode: ruby -*-
 
-watch( %r(.*), :modified, lambda { |md| File.directory? md[0] } ) do |md|
-  File.directory? md[0] and raise Wake::Refresh
-end
-
-watch( %r(env-js.wake), :modified ) do |md|
-  raise Wake::Refresh
-end
-
-watch( %r((^src/.*)\.js$), [:load, :created, :modified], nil, :batch => :js ) do
+watch %r{(^src/.*)\.js$}  do
   cmd = "rake johnson:compile"
   puts cmd
   system cmd
 end
-
-Signal.trap('QUIT') do
-  EM.stop
-end
-
-# Local Variables:
-# mode:ruby
-# End:

data/bin/envjsrb

@@ -138,25 +138,20 @@ if ARGV.length > 0
       uri_s = uri.to_s.sub %r(^file:/([^/])), 'file:///\1'
 
       if uri.scheme == "about" and uri.opaque == "blank"
+        # $stderr.puts "wait before set about"
         RUNTIME.wait
         RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
         about_blank = true
       elsif uri.path =~ /\.x?html?$/ || uri.scheme =~ %r(^https?)
-
-        # this might want to go alway; jazrb does it manually now, which I think was the use case
-        # that wanted this
-        if !about_blank
-          RUNTIME.wait
-          RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
-        end
-
-        RUNTIME.wait
+        # $stderr.puts "wait before set real" if RUNTIME.evaluate("window.location.href") != "about:blank"
+        RUNTIME.wait if RUNTIME.evaluate("window.location.href") != "about:blank"
         # RUNTIME.evaluate("window.location = 'file://#{Pathname.new(file).realpath}'", file, 1)
         RUNTIME.evaluate("window.location = '#{uri_s}'", file, 1)
         about_blank = false
       else
         RUNTIME.top_level_load uri_s
         RUNTIME.load uri_s
+        RUNTIME.top_level_load nil
       end
     end
   rescue Johnson::Error => je
@@ -168,6 +163,14 @@ if ARGV.length > 0
 
   RUNTIME.wait
 
+  if !$wake_info.empty?
+    puts "<wake><![CDATA["
+    puts $wake_info.join("\n")
+    puts "]]></wake>"
+    $stdout.flush
+  end
+
+
 else
 
   prep

data/lib/envjs/env.js

@@ -1868,7 +1868,8 @@ $w.__defineSetter__("location", function(url){
   }
   // print("ft",window.location.href,$location,url);
   }
-  if( !$location || $location == "about:blank" ) {
+  // debug("l",url,$w.location);
+  if( !$location || ( $location == "about:blank" && url !== "about:blank" ) ) {
     // $w.__loadAWindowsDocument__(url);
     $env.load(url);
   } else {
@@ -2326,13 +2327,11 @@ $w.dispatchEvent = function(event, bubbles){
 };
 
 $w.__defineGetter__('onerror', function(){
-  return function(){
-   //$w.dispatchEvent('error');
-  };
+    return $onerror;
 });
 
 $w.__defineSetter__('onerror', function(fn){
-  //$w.addEventListener('error', fn);
+    return $onerror = fn;
 });
 
 /*$w.__defineGetter__('onload', function(){

data/lib/envjs/event_loop.js

@@ -7,9 +7,9 @@
   var $env = {};
   $env.sync = function(f){return f;};
   $env.error = function(s){
-    print("timer error: "+s);
+    debug("timer error: "+s);
     if (s.stack) {
-      print("timer error: "+s.stack);
+      debug("timer error: "+s.stack);
     }
   };
   $env.sleep = function(t){ Ruby.sleep(t/1000.); };

data/lib/envjs/net/file.rb

@@ -4,10 +4,6 @@ require 'envjs/net'
 
 class Envjs::Net::File < Net::Protocol
 
-  class << self
-    attr_accessor :on_open
-  end
-
   class Get
     attr_accessor :path
     def initialize path
@@ -36,8 +32,6 @@ 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

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

data/lib/envjs/runtime.rb

@@ -1,11 +1,10 @@
 require 'envjs'
 require "open-uri"
 require 'pathname'
-begin
-  require 'fsdb'
-rescue LoadError; end
 require 'envjs/net/file'
 
+$wake_info = []
+
 module Envjs::Runtime
 
   def self.extended object
@@ -103,6 +102,7 @@ debug = function() {
     }
   }
   Ruby['$stderr'].print("\n");
+  Ruby['$stderr'].flush();
 };
 EOJS
 
@@ -141,98 +141,20 @@ 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
-
       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):) )
-              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
-          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 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):) )
-            begin
-              path = "file://" + Pathname(path).realpath.to_s
-            rescue Errno::ENOENT
-              return
-            end
-          end
-          if !loc || loc == "about:blank"
-            uri = URI.parse top_level_js
-            if uri.scheme == nil
-              uri.scheme = "file"
-              begin
-                uri.path = Pathname.new(uri.path).realpath.to_s
-              rescue Errno::ENOENT; end
-              uri = URI.parse uri.to_s
-            end
-            uri_s = uri.to_s.sub %r(^file:/([^/])), 'file:///\1'
-
-            # tll = "file://" + Pathname(top_level_js).realpath.to_s
-
-            tll = uri_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 << loc
-            by.uniq!
-            db.call[path+".by.yml"] = by
-            # $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
+        if $envjsrb_wake
+          $wake_info << "##file://#{f}"
         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 )
+        if $envjsrb_wake
+          $wake_info << "##{path}" if path
+        end
       end
 
       master.load = lambda { |*files|
@@ -270,7 +192,7 @@ EOJS
         end
       }
 
-      def load *files
+      ( class << self; self; end ).send :define_method, :load do |*files|
         files.map { |f|
           # Hmmm ...
 
@@ -285,11 +207,22 @@ EOJS
           uri_s = uri.to_s.sub %r(^file:/([^/])), 'file:///\1'
           
           if uri.scheme == "file"
-            super uri.path
+            begin
+              super uri.path
+            rescue Exception => e
+              if outer["$inner"]["onerror"]
+                # outer["$inner"]["onerror"].call e
+                evaluate("function(fn,scope,e){fn.call(scope,e)}").call(outer["$inner"]["onerror"], outer["$inner"], e)
+              else
+                raise e
+              end
+            end
           elsif uri.scheme == "data"
             raise "implement 1"
+          elsif uri.scheme == "javascript"
+            evaluate(URI.decode(uri.opaque),URI.decode(uri_s),1)
           else
-            raise "hell 1"
+            raise "hell 1: " + uri.inspect
           end
 
           # v = open(uri_s).read.gsub(/\A#!.*$/, '')
@@ -391,22 +324,6 @@ EOJS
 
       master.load.call Envjs::EVENT_LOOP, global
       
-if false
-      static_outer = new_split_global_outer
-      static_inner = new_split_global_inner static_outer
-      
-      master.symbols.each do |symbol|
-        static_inner[symbol] = master[symbol]
-      end
-
-      static_inner["$inner"] = static_inner
-      static_inner["$master"] = master
-
-      master.load.call Envjs::STATIC, static_inner
-
-      master["static"] = static_inner
-end
-if true
       static = new_global
       
       master.symbols.each do |symbol|
@@ -418,9 +335,7 @@ if true
       # fake it ...
       static["isInner"] = true
       master.load.call Envjs::STATIC, static
-
       master["static"] = static
-end
 
       master.load.call Envjs::ENVJS, inner
 

data/lib/envjs/static.js

@@ -18991,6 +18991,7 @@ __extend__(XPathResult.prototype, {
 });
 
 
+var alert = $error;
 // ENVJS changes:
 // DOM_ => DOMNode.
 // case insensitive test on node names

data/lib/envjs.rb

@@ -1,6 +1,6 @@
 module Envjs
 
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
   def self.js_exception_stack e
     result = %(Exception: )+e.to_s

data/src/window/event.js

@@ -224,13 +224,11 @@ $w.dispatchEvent = function(event, bubbles){
 };
 
 $w.__defineGetter__('onerror', function(){
-  return function(){
-   //$w.dispatchEvent('error');
-  };
+    return $onerror;
 });
 
 $w.__defineSetter__('onerror', function(fn){
-  //$w.addEventListener('error', fn);
+    return $onerror = fn;
 });
 
 /*$w.__defineGetter__('onload', function(){

data/src/window/location.js

@@ -34,7 +34,8 @@ $w.__defineSetter__("location", function(url){
   }
   // print("ft",window.location.href,$location,url);
   }
-  if( !$location || $location == "about:blank" ) {
+  // debug("l",url,$w.location);
+  if( !$location || ( $location == "about:blank" && url !== "about:blank" ) ) {
     // $w.__loadAWindowsDocument__(url);
     $env.load(url);
   } else {

data/src/xpath/implementation.js

@@ -1,3 +1,4 @@
+var alert = $error;
 // ENVJS changes:
 // DOM_ => DOMNode.
 // case insensitive test on node names

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Resig
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -08:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,9 +43,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 4
-        - 1
-        version: 0.4.1
+        - 5
+        - 0
+        version: 0.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -375,8 +375,6 @@ files:
 - test/unit/scope.js
 - test/unit/timer.js
 - test/unit/window.js
-- test/vendor/jQuery/README
-- test/vendor/prototype-1.6.0.3.js
 - test/x.js
 - test/y.js
 has_rdoc: true

data/test/vendor/jQuery/README

@@ -1,2 +0,0 @@
-Note: To avoid adding to Git an entire jQuery development tree for each tag we want to test,
-the bin/test-jquery.sh script will checkout the tag into this directory.