opal · May 18, 2015 · May 18, 2015
Showing with 14 additions and 7 deletions.

+14 −4 opal/corelib/array.rb

+0 −3 spec/filters/bugs/array.rb
diff --git a/opal/corelib/array.rb b/opal/corelib/array.rb
@@ -1780,12 +1780,22 @@ def values_at(*args)
 
   def zip(*others, &block)
     %x{
-      var result = [], size = self.length, part, o;
+      var result = [], size = self.length, part, o, i, j, jj;
 
-      for (var i = 0; i < size; i++) {
+      for (j = 0, jj = others.length; j < jj; j++) {
+        o = others[j];
+        if (!o.$$is_array) {
+          others[j] = #{(
+            Opal.coerce_to?(`o`, Array, :to_ary) ||
+            Opal.coerce_to!(`o`, Enumerator, :each)
+          ).to_a};
+        }
+      }
+
+      for (i = 0; i < size; i++) {
         part = [self[i]];
 
-        for (var j = 0, jj = others.length; j < jj; j++) {
+        for (j = 0, jj = others.length; j < jj; j++) {
           o = others[j][i];
 
           if (o == null) {
@@ -1799,7 +1809,7 @@ def zip(*others, &block)
       }
 
       if (block !== nil) {
-        for (var i = 0; i < size; i++) {
+        for (i = 0; i < size; i++) {
           block(result[i]);
         }
 

diff --git a/spec/filters/bugs/array.rb b/spec/filters/bugs/array.rb
@@ -140,9 +140,6 @@
 
   fails "Array#uniq! compares elements based on the value returned from the block"
 
-  fails "Array#zip calls #to_ary to convert the argument to an Array"
-  fails "Array#zip uses #each to extract arguments' elements when #to_ary fails"
-
   fails "Array#hash returns the same fixnum for arrays with the same content"
 
   fails "Array#partition returns in the left array values for which the block evaluates to true"