opal · Apr 26, 2015 · Apr 26, 2015 · Apr 27, 2015
Showing with 25 additions and 27 deletions.

+15 −10 opal/corelib/kernel.rb

+2 −0 spec/filters/bugs/kernel.rb

+1 −0 spec/filters/unsupported/private_methods.rb

+1 −0 spec/rubyspecs

+6 −17 stdlib/native.rb
diff --git a/opal/corelib/kernel.rb b/opal/corelib/kernel.rb
@@ -56,20 +56,25 @@ def methods(all = true)
     }
   end
 
-  def Array(object, *args, &block)
+  def Array(object)
     %x{
-      if (object == null || object === nil) {
+      var coerced;
+
+      if (object === nil) {
         return [];
       }
-      else if (#{object.respond_to? :to_ary}) {
-        return #{object.to_ary};
-      }
-      else if (#{object.respond_to? :to_a}) {
-        return #{object.to_a};
-      }
-      else {
-        return [object];
+
+      if (object.$$is_array) {
+        return object;
       }
+
+      coerced = #{Opal.coerce_to?(object, Array, :to_ary)};
+      if (coerced !== nil) { return coerced; }
+
+      coerced = #{Opal.coerce_to?(object, Array, :to_a)};
+      if (coerced !== nil) { return coerced; }
+
+      return [object];
     }
   end
 

diff --git a/spec/filters/bugs/kernel.rb b/spec/filters/bugs/kernel.rb
@@ -1,2 +1,4 @@
 opal_filter "Kernel" do
+  fails "Kernel.Array does not call #to_a on an Array" #something funky with the spec itself
+  fails "Kernel#Array does not call #to_a on an Array" #something funky with the spec itself
 end
diff --git a/spec/filters/unsupported/private_methods.rb b/spec/filters/unsupported/private_methods.rb
@@ -40,6 +40,7 @@
 
   fails "Math#atanh is a private instance method"
 
+  fails "Kernel has private instance method Array()"
   fails "Kernel#Integer is a private method"
   fails "Kernel#Float is a private method"
   fails "Kernel#format is a private method"

diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -48,6 +48,7 @@ corelib/core/exception/new_spec
 corelib/core/exception/reason_spec
 corelib/core/exception/to_s_spec
 
+corelib/core/kernel/Array_spec
 corelib/core/kernel/comparison_spec
 corelib/core/kernel/eql_spec
 corelib/core/kernel/equal_spec

diff --git a/stdlib/native.rb b/stdlib/native.rb
@@ -141,24 +141,13 @@ def Native(obj)
     end
   end
 
+  alias_method :_Array, :Array
+
   def Array(object, *args, &block)
-    %x{
-      if (object == null || object === nil) {
-        return [];
-      }
-      else if (#{native?(object)}) {
-        return #{Native::Array.new(object, *args, &block).to_a};
-      }
-      else if (#{object.respond_to? :to_ary}) {
-        return #{object.to_ary};
-      }
-      else if (#{object.respond_to? :to_a}) {
-        return #{object.to_a};
-      }
-      else {
-        return [object];
-      }
-    }
+    if native?(object)
+      return Native::Array.new(object, *args, &block).to_a
+    end
+    return _Array(object)
   end
 end