envjs 0.1.0 → 0.1.1

data/bin/envjsrb

@@ -12,7 +12,7 @@ require 'envjs/runtime'
 RUNTIME = js = Johnson::Runtime.new
 RUNTIME.extend Envjs::Runtime
 
-RUNTIME.load Envjs::ENVJS
+# RUNTIME.load Envjs::ENVJS
 
 EXIT_VERBS = [nil] + %w(exit quit)
   
@@ -124,24 +124,40 @@ if ARGV.length > 0
   begin
     about_blank = true
     ARGV.each do |file|
-      if file == "about:blank"
+
+      uri = URI.parse file
+
+      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'
+
+      if uri.scheme == "about" and uri.opaque == "blank"
         RUNTIME.wait
         RUNTIME.evaluate("window.location = 'about:blank'", "(comand line)", 1)
         about_blank = true
-      elsif file =~ /\.x?html?$/ || file =~ %r(^https?://)
+      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
-        RUNTIME.evaluate("window.location = 'file://#{Pathname.new(file).realpath}'", file, 1)
+        # RUNTIME.evaluate("window.location = 'file://#{Pathname.new(file).realpath}'", file, 1)
+        RUNTIME.evaluate("window.location = '#{uri_s}'", file, 1)
         about_blank = false
       else
         RUNTIME.become_first_script_window
-        RUNTIME.top_level_load file
-        RUNTIME.load file
+        RUNTIME.top_level_load uri_s
+        RUNTIME.load uri_s
       end
     end
   rescue Johnson::Error => je

data/lib/envjs/env.js

@@ -127,9 +127,14 @@ $env.location = function(path, base){
             base.path = path;
             base = base + "";
         } else {
+            // debug("bb", base);
+            // base = base + Ruby.URI.parse(path);
+            b = Ruby.eval("lambda { |a,b| a+b; }");
+            base = b(base,path);
+            // base.path = base.path.substring(0, base.path.lastIndexOf('/'));
+            // base.path = base.path + '/' + path;
             base = base + "";
-            base = base.substring(0, base.lastIndexOf('/'));
-            base = base + '/' + path;
+            // debug("bbb", base);
         }
         var result = base;
         // ? This path only used for files?

data/lib/envjs/runtime.rb

@@ -1,6 +1,6 @@
 require 'envjs'
 require "open-uri"
-require 'rubygems'
+require 'pathname'
 begin
   require 'fsdb'
 rescue LoadError; end
@@ -90,7 +90,7 @@ EOJS
       top_level_js = nil
 
       add_dep = nil
-
+      
       clear_deps = lambda do |w|
         begin
           if db.call
@@ -138,7 +138,20 @@ EOJS
             end
           end
           if !loc || loc == "about:blank"
-            tll = "file://" + Pathname(top_level_js).realpath.to_s
+            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
@@ -168,7 +181,25 @@ EOJS
         if files.length == 2 && !(String === files[1])
           f = files[0]
           w = files[1]
-          v = open(f).read.gsub(/\A#!.*$/, '')
+
+          # Hmmm ...
+          uri = URI.parse f
+
+          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'
+
+          if uri.scheme == "file"
+            uri_s = uri.path
+          end
+
+          v = open(uri_s).read.gsub(/\A#!.*$/, '')
           loc = nil
           add_dep.call w, f
           evaluate(v, f, 1, w, w, f)
@@ -177,6 +208,35 @@ EOJS
         end
       }
 
+      def load *files
+        files.map { |f|
+          # Hmmm ...
+
+          uri = URI.parse f
+          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'
+          
+          if uri.scheme == "file"
+            super uri.path
+          else
+            raise "hell 1"
+          end
+
+          # v = open(uri_s).read.gsub(/\A#!.*$/, '')
+          # loc = nil
+          # add_dep.call w, f
+          # evaluate(v, f, 1, w, w, f)
+          # evaluate(File.read(f).gsub(/\A#!.*$/, ''), f, 1)
+
+        }.last
+      end
+
       master.reload = lambda { |*files|
         if files.length == 2 && !(String === files[1])
           f = files[0]
@@ -274,6 +334,8 @@ EOJS
         @envjs[k] = v
       end
 
+      load Envjs::ENVJS
+
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: envjs
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Resig
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-25 00:00:00 -08:00
+date: 2010-02-05 00:00:00 -08:00
 default_executable: envjsrb
 dependencies: 
 - !ruby/object:Gem::Dependency