opal 0.4.3 → 0.4.4

data/corelib/{opal/enumerator.rb → enumerator.rb}

@@ -4,14 +4,14 @@ class Enumerator
   def initialize(obj, method = :each, *args)
     @object = obj
     @method = method
-    @args = args
+    @args   = args
   end
 
   def each(&block)
     return enum_for :each unless block_given?
 
-    @object.__send__(@method, *@args) do |e|
-      block.call e
+    @object.__send__(@method, *@args) do |*e|
+      block.call(*e)
     end
   end
 

data/corelib/{opal/error.rb → error.rb}

@@ -43,6 +43,7 @@ class StandardError < Exception; end
     class StopIteration < IndexError; end
     class KeyError < IndexError; end
   class RangeError < StandardError; end
+  class IOError < StandardError; end
 
 class ScriptError < Exception; end
   class SyntaxError < ScriptError; end

data/corelib/{opal/hash.rb → hash.rb}

@@ -2,9 +2,13 @@ class Hash
   include Enumerable
 
   %x{
-    var __hash = Opal.hash = function() {
+    var $hash = Opal.hash = function() {
+      if (arguments.length == 1 && arguments[0]._klass == Hash) {
+        return arguments[0];
+      }
+
       var hash   = new Hash._alloc,
-          args   = __slice.call(arguments),
+          args   = $slice.call(arguments),
           keys   = [],
           assocs = {};
 
@@ -30,7 +34,7 @@ class Hash
   # compile time, so they are just added here by the constructor
   # function
   %x{
-    var __hash2 = Opal.hash2 = function(keys, map) {
+    var $hash2 = Opal.hash2 = function(keys, map) {
       var hash = new Hash._alloc;
       hash.keys = keys;
       hash.map = map;
@@ -38,23 +42,26 @@ class Hash
     };
   }
 
-  `var __hasOwn = {}.hasOwnProperty`
+  `var $hasOwn = {}.hasOwnProperty`
 
   def self.[](*objs)
-    `__hash.apply(null, objs)`
+    `$hash.apply(null, objs)`
   end
 
   def self.allocate
-    `__hash()`
+    %x{
+      var hash = new #{self}._alloc;
+      hash.map = {};
+      hash.keys = [];
+      return hash;
+    }
   end
 
-  def self.new(defaults = undefined, &block)
+  def initialize(defaults = undefined, &block)
     %x{
-      var hash = __hash();
-
       if (defaults != null) {
         if (defaults.constructor == Object) {
-          var map = hash.map, keys = hash.keys;
+          var map = #{self}.map, keys = #{self}.keys;
 
           for (var key in defaults) {
             keys.push(key);
@@ -62,14 +69,14 @@ class Hash
           }
         }
         else {
-          hash.none = defaults;
+          #{self}.none = defaults;
         }
       }
       else if (block !== nil) {
-          hash.proc = block;
+          #{self}.proc = block;
       }
 
-      return hash;
+      return #{self};
     }
   end
 
@@ -124,7 +131,7 @@ class Hash
     %x{
       var map = #{self}.map;
 
-      if (!__hasOwn.call(map, key)) {
+      if (!$hasOwn.call(map, key)) {
         #{self}.keys.push(key);
       }
 
@@ -160,7 +167,7 @@ class Hash
 
   def clone
     %x{
-      var result = __hash(),
+      var result = $hash(),
           map    = #{self}.map,
           map2   = result.map,
           keys2  = result.keys;
@@ -206,14 +213,16 @@ class Hash
   end
 
   def delete_if(&block)
+    return enum_for :delete_if unless block
+
     %x{
       var map = #{self}.map, keys = #{self}.keys, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key];
 
-        if ((value = block(key, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key, obj)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
@@ -232,15 +241,15 @@ class Hash
   alias dup clone
 
   def each(&block)
+    return enum_for :each unless block
+
     %x{
       var map = #{self}.map, keys = #{self}.keys;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i];
 
-        if (block(key, map[key]) === __breaker) {
-          return __breaker.$v;
-        }
+        #{yield [`key`, `map[key]`]};
       }
 
       return #{self};
@@ -248,14 +257,16 @@ class Hash
   end
 
   def each_key(&block)
+    return enum_for :each_key unless block
+
     %x{
       var keys = #{self}.keys;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i];
 
-        if (block(key) === __breaker) {
-          return __breaker.$v;
+        if (block(key) === $breaker) {
+          return $breaker.$v;
         }
       }
 
@@ -266,12 +277,14 @@ class Hash
   alias each_pair each
 
   def each_value(&block)
+    return enum_for :each_value unless block
+
     %x{
       var map = #{self}.map, keys = #{self}.keys;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        if (block(map[keys[i]]) === __breaker) {
-          return __breaker.$v;
+        if (block(map[keys[i]]) === $breaker) {
+          return $breaker.$v;
         }
       }
 
@@ -280,9 +293,7 @@ class Hash
   end
 
   def empty?
-    %x{
-      return #{self}.keys.length === 0;
-    }
+    `#{self}.keys.length === 0`
   end
 
   alias eql? ==
@@ -298,8 +309,8 @@ class Hash
       if (block !== nil) {
         var value;
 
-        if ((value = block(key)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key)) === $breaker) {
+          return $breaker.$v;
         }
 
         return value;
@@ -403,8 +414,13 @@ class Hash
       var inspect = [], keys = #{self}.keys, map = #{self}.map;
 
       for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
-        inspect.push(#{`key`.inspect} + '=>' + #{`map[key]`.inspect});
+        var key = keys[i], val = map[key];
+
+        if (val === #{self}) {
+          inspect.push(#{`key`.inspect} + '=>' + '{...}');
+        } else {
+          inspect.push(#{`key`.inspect} + '=>' + #{`map[key]`.inspect});
+        }
       }
 
       return '{' + inspect.join(', ') + '}';
@@ -413,7 +429,7 @@ class Hash
 
   def invert
     %x{
-      var result = __hash(), keys = #{self}.keys, map = #{self}.map,
+      var result = $hash(), keys = #{self}.keys, map = #{self}.map,
           keys2 = result.keys, map2 = result.map;
 
       for (var i = 0, length = keys.length; i < length; i++) {
@@ -428,14 +444,16 @@ class Hash
   end
 
   def keep_if(&block)
+    return enum_for :keep_if unless block
+
     %x{
       var map = #{self}.map, keys = #{self}.keys, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key];
 
-        if ((value = block(key, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key, obj)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -472,7 +490,7 @@ class Hash
   def merge(other, &block)
     %x{
       var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), keys2 = result.keys, map2 = result.map;
+          result = $hash(), keys2 = result.keys, map2 = result.map;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i];
@@ -563,15 +581,17 @@ class Hash
   end
 
   def reject(&block)
+    return enum_for :reject unless block
+
     %x{
       var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), map2 = result.map, keys2 = result.keys;
+          result = $hash(), map2 = result.map, keys2 = result.keys;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key], value;
 
-        if ((value = block(key, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key, obj)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -599,15 +619,17 @@ class Hash
   end
 
   def select(&block)
+    return enum_for :select unless block
+
     %x{
       var keys = #{self}.keys, map = #{self}.map,
-          result = __hash(), map2 = result.map, keys2 = result.keys;
+          result = $hash(), map2 = result.map, keys2 = result.keys;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key], value;
 
-        if ((value = block(key, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key, obj)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
@@ -621,14 +643,16 @@ class Hash
   end
 
   def select!(&block)
+    return enum_for :select! unless block
+
     %x{
       var map = #{self}.map, keys = #{self}.keys, value, result = nil;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key];
 
-        if ((value = block(key, obj)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(key, obj)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -681,19 +705,6 @@ class Hash
     self
   end
 
-  def to_json
-    %x{
-      var inspect = [], keys = #{self}.keys, map = #{self}.map;
-
-      for (var i = 0, length = keys.length; i < length; i++) {
-        var key = keys[i];
-        inspect.push(#{`key`.to_json} + ': ' + #{`map[key]`.to_json});
-      }
-
-      return '{' + inspect.join(', ') + '}';
-    }
-  end
-
   def to_n
     %x{
       var result = {}, keys = #{self}.keys, map = #{self}.map, bucket, value;

data/corelib/io.rb

@@ -0,0 +1,39 @@
+class IO
+  SEEK_SET = 0
+  SEEK_CUR = 1
+  SEEK_END = 2
+
+  module Writable
+    def <<(string)
+      write(string)
+
+      self
+    end
+
+    def print(*args)
+      write args.map { |arg| String(arg) }.join($,)
+    end
+
+    def puts(*args)
+      write args.map { |arg| String(arg) }.join($/)
+    end
+  end
+
+  module Readable
+    def readbyte
+      getbyte
+    end
+
+    def readchar
+      getc
+    end
+
+    def readline(sep = $/)
+      raise NotImplementedError
+    end
+
+    def readpartial(integer, outbuf = nil)
+      raise NotImplementedError
+    end
+  end
+end

data/corelib/{opal/kernel.rb → kernel.rb}

@@ -20,16 +20,12 @@ module Kernel
     `#{self} == other`
   end
 
-  def as_json
-    nil
-  end
-
   def method(name)
     %x{
       var recv = #{self},
           meth = recv['$' + name],
           func = function() {
-            return meth.apply(recv, __slice.call(arguments, 0));
+            return meth.apply(recv, $slice.call(arguments, 0));
           };
 
       if (!meth) {
@@ -58,19 +54,29 @@ module Kernel
     }
   end
 
-  def Array(object)
+  def Array(object, func = undefined, length = :length)
     %x{
-      if (object === nil) {
+      if (object == null || object === nil) {
         return [];
       }
-      else if (object.$to_ary) {
+      else if (#{native?(object)} && object[length] != null) {
+        var result = [];
+
+        for (var i = 0, length = object[length]; i < length; i++) {
+          result.push(func ? object[func](i) : object[i]);
+        }
+
+        return result;
+      }
+      else if (#{object.respond_to? :to_ary}) {
         return #{object.to_ary};
       }
-      else if (object.$to_a) {
+      else if (#{object.respond_to? :to_a}) {
         return #{object.to_a};
       }
-
-      return [object];
+      else {
+        return [object];
+      }
     }
   end
 
@@ -81,7 +87,7 @@ module Kernel
   def define_singleton_method(name, &body)
     %x{
       if (body === nil) {
-        no_block_given();
+        throw new Error("no block given");
       }
 
       var jsid   = '$' + name;
@@ -259,7 +265,7 @@ module Kernel
   end
 
   def instance_variable_defined?(name)
-    `__hasOwn.call(#{self}, name.substr(1))`
+    `#{self}.hasOwnProperty(name.substr(1))`
   end
 
   def instance_variable_get(name)
@@ -288,6 +294,10 @@ module Kernel
     }
   end
 
+  def Integer(str)
+    `parseInt(str)`
+  end
+
   def is_a?(klass)
     %x{
       var search = #{self}._klass;
@@ -345,20 +355,12 @@ module Kernel
   end
 
   def puts(*strs)
-    %x{
-      for (var i = 0; i < strs.length; i++) {
-        if(strs[i] instanceof Array) {
-          #{ puts *`strs[i]` }
-        } else {
-          __opal.puts(#{ `strs[i]`.to_s });
-        }
-      }
-    }
-    nil
+    $stdout.puts(*strs)
   end
 
   def p(*args)
-    `console.log.apply(console, args);`
+    args.each { |obj| $stdout.puts obj.inspect }
+
     args.length <= 1 ? args[0] : args
   end
 
@@ -393,7 +395,10 @@ module Kernel
   end
 
   def respond_to?(name)
-    `!!#{self}['$' + name]`
+    %x{
+      var body = #{self}['$' + name];
+      return (!!body) && !body.rb_stub;
+    }
   end
 
   alias send        __send__
@@ -406,14 +411,16 @@ module Kernel
           return #{self}._singleton;
         }
 
-        var meta = new __opal.Class._alloc;
-        meta._klass = __opal.Class;
+        var meta = new $opal.Class._alloc;
+        meta._klass = $opal.Class;
         #{self}._singleton = meta;
         // FIXME - is this right? (probably - methods defined on
         // class' singleton should also go to subclasses?)
         meta._proto = #{self}.constructor.prototype;
         meta._isSingleton = true;
 
+        meta._scope = #{self}._scope;
+
         return meta;
       }
 
@@ -436,6 +443,7 @@ module Kernel
         meta._proto = #{self};
         #{self}._singleton = meta;
         meta._klass = orig_class._klass;
+        meta._scope = orig_class._scope;
 
         return meta;
       }
@@ -453,10 +461,6 @@ module Kernel
     self
   end
 
-  def to_json
-    to_s.to_json
-  end
-
   def to_proc
     self
   end