opal · Nov 9, 2013 · Nov 9, 2013 · Nov 9, 2013
Showing with 52 additions and 17 deletions.

+40 −13 opal/core/enumerator.rb

+2 −2 opal/core/kernel.rb

+10 −2 stdlib/native.rb
diff --git a/opal/core/enumerator.rb b/opal/core/enumerator.rb
@@ -1,20 +1,35 @@
 class Enumerator
   include Enumerable
 
-  def initialize(obj = undefined, method = :each, *args, &block)
+  def self.for(object, method = :each, *args, &block)
+    %x{
+      var obj = #{allocate};
+
+      obj.object = object;
+      obj.size   = block;
+      obj.method = method;
+      obj.args   = args;
+
+      return obj;
+    }
+
+  end
+
+  def initialize(*, &block)
     if block
-      @size   = obj
       @object = Generator.new(&block)
       @method = :each
-    else
-      if `obj === undefined`
-        raise ArgumentError, "wrong number of arguments (0 for 1+)"
-      end
+      @args   = nil
+      @size   = `arguments[0] || nil`
 
+      if @size
+        @size = Opal.coerce_to @size, Integer, :to_int
+      end
+    else
+      @object = `arguments[0]`
+      @method = `arguments[1] || "each"`
+      @args   = `$slice.call(arguments, 2)`
       @size   = nil
-      @object = obj
-      @method = method
-      @args   = args
     end
   end
 
@@ -25,7 +40,7 @@ def each(&block)
   end
 
   def size
-    Proc === @size ? @size.call : @size
+    Proc === @size ? @size.call(*@args) : @size
   end
 
   def with_index(offset = 0, &block)
@@ -107,15 +122,21 @@ def initialize(&block)
 
     def yield(*values)
       %x{
-        if ($opal.$yieldX(#@block, values) === $breaker) {
+        var value = $opal.$yieldX(#@block, values);
+
+        if (value === $breaker) {
           throw $breaker;
         }
+
+        return value;
       }
+    end
+
+    def <<(*values)
+      self.yield(*values)
 
       self
     end
-
-    alias << yield
   end
 
   class Lazy < self
@@ -220,6 +241,10 @@ def drop_while(&block)
       }
     end
 
+    def enum_for(method = :each, *args, &block)
+      self.class.for(self, method, *args, &block)
+    end
+
     def find_all(&block)
       unless block
         raise ArgumentError, 'tried to call lazy select without a block'
@@ -346,6 +371,8 @@ def take_while(&block)
       }
     end
 
+    alias to_enum enum_for
+
     def inspect
       "#<#{self.class.name}: #{@enumerator.inspect}>"
     end

diff --git a/opal/core/kernel.rb b/opal/core/kernel.rb
@@ -114,8 +114,8 @@ def dup
     copy
   end
 
-  def enum_for(method = :each, *args)
-    Enumerator.new self, method, *args
+  def enum_for(method = :each, *args, &block)
+    Enumerator.for(self, method, *args, &block)
   end
 
   def equal?(other)

diff --git a/stdlib/native.rb b/stdlib/native.rb
@@ -425,13 +425,21 @@ class Hash
   def initialize(defaults = undefined, &block)
     %x{
       if (defaults != null) {
-        if (defaults.constructor == Object) {
+        if (defaults.constructor === Object) {
           var map  = self.map,
               keys = self.keys;
 
           for (var key in defaults) {
+            var value = defaults[key];
+
+            if (value && value.constructor === Object) {
+              map[key] = #{Hash.new(`value`)};
+            }
+            else {
+              map[key] = #{Native(`defaults[key]`)};
+            }
+
             keys.push(key);
-            map[key] = #{Native(`defaults[key]`)};
           }
         }
         else {