opal 1.3.2 → 1.4.0.alpha1

data/opal/corelib/file.rb

@@ -1,6 +1,6 @@
 # helpers: truthy
 
-class File < IO
+class ::File < ::IO
   Separator = SEPARATOR = '/'
   ALT_SEPARATOR = nil
   PATH_SEPARATOR = ':'
@@ -15,7 +15,9 @@ class File < IO
       new_parts = []
 
       path = path.respond_to?(:to_path) ? path.to_path : path
-      basedir ||= Dir.pwd
+      path = ::Opal.coerce_to!(`path`, ::String, :to_str)
+
+      basedir ||= ::Dir.pwd
       path_abs    = `path.substr(0, sep.length) === sep || windows_root_rx.test(path)`
       basedir_abs = `basedir.substr(0, sep.length) === sep || windows_root_rx.test(basedir)`
 
@@ -63,9 +65,9 @@ class File < IO
       sep_chars = `$sep_chars()`
       if `path[0] === '~' || (basedir && basedir[0] === '~')`
         home = Dir.home
-        raise(ArgumentError, "couldn't find HOME environment -- expanding `~'") unless home
+        ::Kernel.raise(::ArgumentError, "couldn't find HOME environment -- expanding `~'") unless home
         leading_sep = `windows_root_rx.test(home) ? '' : #{home.sub(/^([#{sep_chars}]+).*$/, '\1')}`
-        raise(ArgumentError, 'non-absolute home') unless home.start_with?(leading_sep)
+        ::Kernel.raise(::ArgumentError, 'non-absolute home') unless home.start_with?(leading_sep)
 
         home            += sep
         home_path_regexp = /^\~(?:#{sep}|$)/
@@ -74,7 +76,6 @@ class File < IO
       end
       absolute_path(path, basedir)
     end
-    alias realpath expand_path
 
     %x{
       // Coerce a given path to a path string using #to_path and #to_str
@@ -83,7 +84,7 @@ class File < IO
           path = path.$to_path();
         }
 
-        path = #{Opal.coerce_to!(`path`, String, :to_str)};
+        path = #{::Opal.coerce_to!(`path`, ::String, :to_str)};
 
         return path;
       }
@@ -98,21 +99,32 @@ class File < IO
       }
     }
 
-    def dirname(path)
+    def dirname(path, level = 1)
+      return path if level == 0
+      ::Kernel.raise ::ArgumentError, "level can't be negative" if level < 0
+
       sep_chars = `$sep_chars()`
       path = `$coerce_to_path(path)`
       %x{
-        var absolute = path.match(new RegExp(#{"^[#{sep_chars}]"}));
+        var absolute = path.match(new RegExp(#{"^[#{sep_chars}]"})), out;
 
         path = path.replace(new RegExp(#{"[#{sep_chars}]+$"}), ''); // remove trailing separators
         path = path.replace(new RegExp(#{"[^#{sep_chars}]+$"}), ''); // remove trailing basename
         path = path.replace(new RegExp(#{"[#{sep_chars}]+$"}), ''); // remove final trailing separators
 
         if (path === '') {
-          return absolute ? '/' : '.';
+          out = absolute ? '/' : '.';
+        }
+        else {
+          out = path;
         }
 
-        return path;
+        if (level == 1) {
+          return out;
+        }
+        else {
+          return #{dirname(`out`, level - 1)}
+        }
       }
     end
 
@@ -125,7 +137,7 @@ class File < IO
         }
 
         if (suffix !== nil) {
-          suffix = #{Opal.coerce_to!(suffix, String, :to_str)}
+          suffix = #{::Opal.coerce_to!(suffix, ::String, :to_str)}
         } else {
           suffix = null;
         }
@@ -156,7 +168,6 @@ class File < IO
     def exist?(path)
       `Opal.modules[#{path}] != null`
     end
-    alias exists? exist?
 
     def directory?(path)
       files = []
@@ -206,5 +217,8 @@ class File < IO
     def split(path)
       path.split(SEPARATOR)
     end
+
+    alias realpath expand_path
+    alias exists? exist?
   end
 end