opal 0.3.18 → 0.3.19

data/core/error.rb

@@ -1,4 +1,4 @@
-class Exception
+class Exception < `Error`
   def initialize(message = '')
     %x{
       if (Error.captureStackTrace) {
@@ -38,3 +38,17 @@ class Exception
 
   alias to_s message
 end
+
+class StandardError < Exception; end
+class RuntimeError < Exception; end
+class LocalJumpError < StandardError; end
+class TypeError < StandardError; end
+class NameError < StandardError; end
+class NoMethodError < NameError; end
+class ArgumentError < StandardError; end
+class ScriptError < Exception; end
+class LoadError < ScriptError; end
+class IndexError < StandardError; end
+class KeyError < IndexError; end
+class RangeError < StandardError; end
+class NotImplementedError < Exception; end

data/core/file.rb

@@ -0,0 +1,85 @@
+class File
+  # Regexp to split path into dirname, basename and extname
+  PATH_RE = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/
+
+  def self.expand_path(path, base = undefined)
+    %x{
+      if (!base) {
+        base = '';
+      }
+
+      path = #{ join(base, path) };
+
+      var parts = path.split('/'), result = [], path;
+
+      for (var i = 0, ii = parts.length; i < ii; i++) {
+        part = parts[i];
+
+        if (part === '..') {
+          result.pop();
+        }
+        else if (part === '.' || part === '') {
+          // ignore?
+        }
+        else {
+          result.push(part);
+        }
+      }
+
+      return result.join('/');
+    }
+  end
+
+  def self.join(*paths)
+    %x{
+      var result = [];
+
+      for (var i = 0, length = paths.length; i < length; i++) {
+        var part = paths[i];
+
+        if (part != '') {
+          result.push(part);
+        }
+      }
+
+      return result.join('/');
+    }
+  end
+
+  def self.dirname(path)
+    %x{
+      var dirname = #{PATH_RE}.exec(path)[1];
+
+      if (!dirname) {
+        return '.';
+      }
+      else if (dirname === '/') {
+        return dirname;
+      }
+      else {
+        return dirname.substring(0, dirname.length - 1);
+      }
+    }
+  end
+
+  def self.extname(path)
+    %x{
+      var extname = #{PATH_RE}.exec(path)[3];
+
+      if (!extname || extname === '.') {
+        return '';
+      }
+      else {
+        return extname;
+      }
+    }
+  end
+
+  def self.basename(path, suffix)
+    ""
+  end
+
+  def self.exist?(path)
+    `!!factories[#{ expand_path path }]`
+  end
+end

data/core/hash.rb

@@ -4,7 +4,7 @@ class Hash
   %x{
     var hash_class = this;
 
-    Opal.hash = function() {
+    var __hash = Opal.hash = function() {
       var hash    = new hash_class._alloc(),
           args    = __slice.call(arguments),
           assocs  = {};
@@ -13,7 +13,7 @@ class Hash
       hash.none   = nil;
       hash.proc   = nil;
 
-      if (args.length == 1 && args[0]._flags & T_ARRAY) {
+      if (args.length == 1 && args[0]._isArray) {
         args = args[0];
 
         for (var i = 0, length = args.length, key; i < length; i++) {
@@ -38,21 +38,21 @@ class Hash
   }
 
   def self.[](*objs)
-    `$opal.hash.apply(null, objs)`
+    `__hash.apply(null, objs)`
   end
 
   def self.allocate
-    `Opal.hash()`
+    `__hash()`
   end
 
   def self.new(defaults = undefined, &block)
     %x{
-      var hash = Opal.hash();
+      var hash = __hash();
 
-      if (defaults != undefined) {
+      if (defaults != null) {
         hash.none = defaults;
       }
-      else if (block != null) {
+      else if (block !== nil) {
         hash.proc = block;
       }
 
@@ -134,7 +134,7 @@ class Hash
 
   def clone
     %x{
-      var result = Opal.hash(),
+      var result = __hash(),
           map    = this.map,
           map2   = result.map;
 
@@ -199,6 +199,8 @@ class Hash
     }
   end
 
+  alias dup clone
+
   def each(&block)
     return enum_for :each unless block_given?
 
@@ -208,7 +210,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block.call($context, null, bucket[0], bucket[1]) === $breaker) {
+        if (block.call(__context, bucket[0], bucket[1]) === __breaker) {
           return $breaker.$v;
         }
       }
@@ -226,8 +228,8 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block.call($context, null, bucket[0]) === $breaker) {
-          return $breaker.$v;
+        if (block.call(__context, bucket[0]) === __breaker) {
+          return __breaker.$v;
         }
       }
 
@@ -246,8 +248,8 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block.call($context, null, bucket[1]) === $breaker) {
-          return $breaker.$v;
+        if (block.call(__context, bucket[1]) === __breaker) {
+          return __breaker.$v;
         }
       }
 
@@ -271,17 +273,21 @@ class Hash
     %x{
       var bucket = this.map[key];
 
-      if (block !== null) {
+      if (bucket) {
+        return bucket[1];
+      }
+
+      if (block !== nil) {
         var value;
 
-        if ((value = block.call($context, null, key)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, key)) === __breaker) {
+          return __breaker.$v;
         }
 
         return value;
       }
 
-      if (defaults !== undefined) {
+      if (defaults != null) {
         return defaults;
       }
 
@@ -301,8 +307,8 @@ class Hash
 
         result.push(key);
 
-        if (value._flags & T_ARRAY) {
-          if (level === undefined || level === 1) {
+        if (value._isArray) {
+          if (level == null || level === 1) {
             result.push(value);
           }
           else {
@@ -338,6 +344,43 @@ class Hash
     `this._id`
   end
 
+  alias include? has_key?
+
+  def index(object)
+    %x{
+      for (var assoc in this.map) {
+        var bucket = this.map[assoc];
+
+        if (#{object == `bucket[1]`}) {
+          return bucket[0];
+        }
+      }
+
+      return nil;
+    }
+  end
+
+  def indexes(*keys)
+    %x{
+      var result = [], map = this.map, bucket;
+
+      for (var i = 0, length = keys.length; i < length; i++) {
+        var key = keys[i];
+
+        if (bucket = map[key]) {
+          result.push(bucket[1]);
+        }
+        else {
+          result.push(this.none);
+        }
+      }
+
+      return result;
+    }
+  end
+
+  alias indices indexes
+
   def inspect
     %x{
       var inspect = [],
@@ -354,34 +397,44 @@ class Hash
 
   def invert
     %x{
-      var result = $opal.hash(),
+      var result = __hash(),
           map    = this.map,
           map2   = result.map;
 
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        map2[bucket[1]] = [bucket[0], bucket[1]];
+        map2[bucket[1]] = [bucket[1], bucket[0]];
       }
 
       return result;
     }
   end
 
-  def key(object)
+  def keep_if(&block)
+    return enum_for :keep_if unless block_given?
+
     %x{
-      for (var assoc in this.map) {
-        var bucket = this.map[assoc];
+      var map = this.map, value;
 
-        if (#{object == `bucket[1]`}) {
-          return bucket[0];
+      for (var assoc in map) {
+        var bucket = map[assoc];
+
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+          return $breaker.$v;
+        }
+
+        if (value === false || value === nil) {
+          delete map[assoc];
         }
       }
 
-      return null;
+      return this;
     }
   end
 
+  alias key index
+
   alias key? has_key?
 
   def keys
@@ -412,7 +465,7 @@ class Hash
 
   def merge(other, &block)
     %x{
-      var result = Opal.hash(),
+      var result = __hash(),
           map    = this.map,
           map2   = result.map;
 
@@ -424,7 +477,7 @@ class Hash
 
       map = other.map;
 
-      if (block === null) {
+      if (block === nil) {
         for (var assoc in map) {
           var bucket = map[assoc];
 
@@ -452,7 +505,7 @@ class Hash
       var map  = this.map,
           map2 = other.map;
 
-      if (block == null || block === nil) {
+      if (block === nil) {
         for (var assoc in map2) {
           var bucket = map2[assoc];
 
@@ -487,7 +540,30 @@ class Hash
         }
       }
 
-      return null;
+      return nil;
+    }
+  end
+
+  def reject(&block)
+    return enum_for :reject unless block_given?
+
+    %x{
+      var map = this.map, result = __hash(), map2 = result.map;
+
+      for (var assoc in map) {
+        var bucket = map[assoc],
+            value;
+
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+          return __breaker.$v;
+        }
+
+        if (value === false || value === nil) {
+          map2[bucket[0]] = [bucket[0], bucket[1]];
+        }
+      }
+
+      return result;
     }
   end
 
@@ -498,13 +574,74 @@ class Hash
       for (var assoc in other.map) {
         var bucket = other.map[assoc];
 
-        map[assoc] = [bucket[0], bucket[1]];
+        map[bucket[0]] = [bucket[0], bucket[1]];
       }
 
       return this;
     }
   end
 
+  def select(&block)
+    return enum_for :select unless block_given?
+
+    %x{
+      var map = this.map, result = __hash(), map2 = result.map;
+
+      for (var assoc in map) {
+        var bucket = map[assoc],
+            value;
+
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+          return __breaker.$v;
+        }
+
+        if (value !== false && value !== nil) {
+          map2[bucket[0]] = [bucket[0], bucket[1]];
+        }
+      }
+
+      return result;
+    }
+  end
+
+  def select!(&block)
+    return enum_for :select! unless block_given?
+
+    %x{
+      var map = this.map, result = nil;
+
+      for (var assoc in map) {
+        var bucket = map[assoc],
+            value;
+
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
+          return __breaker.$v;
+        }
+
+        if (value === false || value === nil) {
+          delete map[assoc];
+          result = this;
+        }
+      }
+
+      return result;
+    }
+  end
+
+  def shift
+    %x{
+      var map = this.map;
+
+      for (var assoc in map) {
+        var bucket = map[assoc];
+        delete map[assoc];
+        return [bucket[0], bucket[1]];
+      }
+
+      return nil;
+    }
+  end
+
   alias size length
 
   def to_a
@@ -530,6 +667,23 @@ class Hash
 
   alias update merge!
 
+  def value?(value)
+    %x{
+      var map = this.map;
+
+      for (var assoc in map) {
+        var v = map[assoc][1];
+        if (#{`v` == value}) {
+          return true;
+        }
+      }
+
+      return false;
+    }
+  end
+
+  alias values_at indexes
+
   def values
     %x{
       var map    = this.map,