opal · Dec 25, 2013 · Dec 25, 2013 · Dec 25, 2013
Showing with 30 additions and 20 deletions.

+15 −13 opal/corelib/array.rb

+14 −0 opal/corelib/helpers.rb

+1 −0 spec/opal/filters/bugs/arity_check.rb

+0 −7 spec/opal/filters/bugs/array.rb
diff --git a/opal/corelib/array.rb b/opal/corelib/array.rb
@@ -75,8 +75,7 @@ def self.new(size = nil, obj = nil, &block)
   end
 
   def self.try_convert(obj)
-    return nil unless obj.respond_to? :to_ary
-    obj = Opal.coerce_to obj, Array, :to_ary
+    Opal.coerce_to? obj, Array, :to_ary
   end
 
   def &(other)
@@ -1061,21 +1060,24 @@ def length
   alias map! collect!
 
   def pop(count = undefined)
-    %x{
-      var length = self.length;
+    if `count === undefined`
+      return if `self.length === 0`
+      return `self.pop()`
+    end
 
-      if (count == null) {
-        return length === 0 ? nil : self.pop();
-      }
+    count = Opal.coerce_to count, Integer, :to_int
 
-      count = #{Opal.coerce_to `count`, Integer, :to_int};
+    if `count < 0`
+      raise ArgumentError, 'negative array size'
+    end
 
-      if (count < 0) {
-        #{ raise ArgumentError, "negative count given" };
-      }
+    return [] if `self.length === 0`
 
-      return count > length ? self.splice(0, self.length) : self.splice(length - count, length);
-    }
+    if `count > self.length`
+      `self.splice(0, self.length)`
+    else
+      `self.splice(self.length - count, self.length)`
+    end
   end
 
   def push(*objects)

diff --git a/opal/corelib/helpers.rb b/opal/corelib/helpers.rb
@@ -19,6 +19,20 @@ def self.coerce_to!(object, type, method)
     coerced
   end
 
+  def self.coerce_to?(object, type, method)
+    return unless object.respond_to? method
+
+    coerced = coerce_to(object, type, method)
+
+    return if coerced.nil?
+
+    unless type === coerced
+      raise TypeError, "can't convert #{object.class} into #{type} (#{object.class}##{method} gives #{coerced.class}"
+    end
+
+    coerced
+  end
+
   def self.try_convert(object, type, method)
     return object if type === object
 

diff --git a/spec/opal/filters/bugs/arity_check.rb b/spec/opal/filters/bugs/arity_check.rb
@@ -1,3 +1,4 @@
 opal_filter "Wrong arity check" do
   fails "Array#shift passed a number n as an argument raises an ArgumentError if more arguments are passed"
+  fails "Array#pop passed a number n as an argument raises an ArgumentError if more arguments are passed"
 end
diff --git a/spec/opal/filters/bugs/array.rb b/spec/opal/filters/bugs/array.rb
@@ -25,11 +25,8 @@
 
   fails "Array#[]= sets elements in the range arguments when passed ranges"
 
-  fails "Array#eql? ignores array class differences"
   fails "Array#eql? handles well recursive arrays"
-  fails "Array#eql? returns true if corresponding elements are #eql?"
 
-  fails "Array#== compares with an equivalent Array-like object using #to_ary"
   fails "Array#== handles well recursive arrays"
 
   fails "Array#flatten does not call flatten on elements"
@@ -109,8 +106,6 @@
   fails "Array#permutation returns an Enumerator of permutations of given length when called with an argument but no block"
   fails "Array#permutation returns an Enumerator of all permutations when called without a block or arguments"
 
-  fails "Array#pop passed a number n as an argument raises an ArgumentError if more arguments are passed"
-
   fails "Array#product when given an empty block returns self"
   fails "Array#product when given a block will ignore unreasonable numbers of products and yield anyway"
   fails "Array#product when given a block yields all combinations in turn"
@@ -203,8 +198,6 @@
   fails "Array#transpose raises a TypeError if the passed Argument does not respond to #to_ary"
   fails "Array#transpose tries to convert the passed argument to an Array using #to_ary"
 
-  fails "Array.try_convert sends #to_ary to the argument and raises TypeError if it's not a kind of Array"
-
   fails "Array#uniq compares elements based on the value returned from the block"
   fails "Array#uniq compares elements with matching hash codes with #eql?"
   fails "Array#uniq uses eql? semantics"