opal 0.5.2 → 0.5.4

data/opal/core/string.rb

@@ -2,7 +2,6 @@ class String
   include Comparable
 
   `def._isString = true`
-  `var native_string = "".constructor;`
 
   def self.try_convert(what)
     what.to_str
@@ -11,7 +10,7 @@ class String
   end
 
   def self.new(str = '')
-    `new native_string(str)`
+    `new String(str)`
   end
 
   def %(data)
@@ -45,30 +44,27 @@ class String
   end
 
   def +(other)
-    %x{
-      if (other._isString) {
-        return self + other;
-      }
-    }
+    other = Opal.coerce_to other, String, :to_str
 
-    unless other.respond_to? :to_str
-      raise TypeError, "no implicit conversion of #{other.class.name} into String"
-    end
-
-    `self + #{other.to_str}`
+    `self + #{other.to_s}`
   end
 
   def <=>(other)
-    %x{
-      if (other._isString) {
-        return self > other ? 1 : (self < other ? -1 : 0);
-      }
-    }
-
     if other.respond_to? :to_str
-      other = other.to_str
+      other = other.to_str.to_s
 
       `self > other ? 1 : (self < other ? -1 : 0)`
+    else
+      %x{
+        var cmp = #{other <=> self};
+
+        if (cmp === nil) {
+          return nil;
+        }
+        else {
+          return cmp > 0 ? -1 : (cmp < 0 ? 1 : 0);
+        }
+      }
     end
   end
 
@@ -147,27 +143,26 @@ class String
   end
 
   def casecmp(other)
-    %x{
-      if (other._isString) {
-        return #{`self.toLowerCase()` <=> `other.toLowerCase()`};
-      }
-    }
-
-    unless other.respond_to? :to_str
-      raise TypeError, "no implicit conversion of #{other.class.name} into String"
-    end
+    other = Opal.coerce_to(other, String, :to_str).to_s
 
-    `self.toLowerCase()` <=> `#{other.to_str}.toLowerCase()`
+    `self.toLowerCase()` <=> `other.toLowerCase()`
   end
 
   def center(width, padstr = ' ')
-    return self if `width === self.length`
+    width  = Opal.coerce_to(width, Integer, :to_int)
+    padstr = Opal.coerce_to(padstr, String, :to_str).to_s
+
+    if padstr.empty?
+      raise ArgumentError, 'zero width padding'
+    end
+
+    return self if `width <= self.length`
 
     %x{
-      var ljustified = #{ljust ((width + @length) / 2).floor, padstr},
-          rjustified = #{rjust ((width + @length) / 2).ceil, padstr};
+      var ljustified = #{ljust ((width + @length) / 2).ceil, padstr},
+          rjustified = #{rjust ((width + @length) / 2).floor, padstr};
 
-      return ljustified + rjustified.slice(self.length);
+      return rjustified + ljustified.slice(self.length);
     }
   end
 
@@ -178,13 +173,7 @@ class String
   def chomp(separator = $/)
     return self if `separator === nil || self.length === 0`
 
-    if `separator._isString == null`
-      unless separator.respond_to? :to_str
-        raise TypeError, "no implicit conversion of #{separator.class.name} into String"
-      end
-
-      separator = separator.to_str
-    end
+    separator = Opal.coerce_to!(separator, String, :to_str).to_s
 
     %x{
       if (separator === "\\n") {
@@ -206,7 +195,20 @@ class String
   end
 
   def chop
-    `self.substr(0, self.length - 1)`
+    %x{
+      var length = self.length;
+
+      if (length <= 1) {
+        return "";
+      }
+
+      if (self.charAt(length - 1) === "\\n" && self.charAt(length - 2) === "\\r") {
+        return self.substr(0, length - 2);
+      }
+      else {
+        return self.substr(0, length - 1);
+      }
+    }
   end
 
   def chr
@@ -323,44 +325,53 @@ class String
   end
 
   def index(what, offset = nil)
-    %x{
-      if (!(what._isString || what._isRegexp)) {
-        #{raise TypeError, "type mismatch: #{what.class} given"};
-      }
+    if String === what
+      what = what.to_s
+    elsif what.respond_to? :to_str
+      what = what.to_str.to_s
+    elsif not Regexp === what
+      raise TypeError, "type mismatch: #{what.class} given"
+    end
 
-      var result = -1;
+    result = -1
+
+    if offset
+      offset = Opal.coerce_to offset, Integer, :to_int
+
+      %x{
+        var size = self.length;
 
-      if (offset !== nil) {
         if (offset < 0) {
-          offset = offset + self.length;
+          offset = offset + size;
         }
 
-        if (offset > self.length) {
+        if (offset > size) {
           return nil;
         }
+      }
 
-        if (what._isRegexp) {
-          result = #{(what =~ `self.substr(offset)`) || -1}
-        }
-        else {
-          result = self.substr(offset).indexOf(what);
-        }
+      if Regexp === what
+        result = (what =~ `self.substr(offset)`) || -1
+      else
+        result = `self.substr(offset).indexOf(what)`
+      end
 
+      %x{
         if (result !== -1) {
           result += offset;
         }
       }
-      else {
-        if (what._isRegexp) {
-          result = #{(what =~ self) || -1}
-        }
-        else {
-          result = self.indexOf(what);
-        }
-      }
+    else
+      if Regexp === what
+        result = (what =~ self) || -1
+      else
+        result = `self.indexOf(what)`
+      end
+    end
 
-      return result === -1 ? nil : result;
-    }
+    unless `result === -1`
+      result
+    end
   end
 
   def inspect
@@ -400,6 +411,13 @@ class String
   end
 
   def ljust(width, padstr = ' ')
+    width  = Opal.coerce_to(width, Integer, :to_int)
+    padstr = Opal.coerce_to(padstr, String, :to_str).to_s
+
+    if padstr.empty?
+      raise ArgumentError, 'zero width padding'
+    end
+
     return self if `width <= self.length`
 
     %x{
@@ -439,7 +457,7 @@ class String
       }
 
       var initial = #{self}.substr(0, #{self}.length - 1);
-      var last    = native_string.fromCharCode(#{self}.charCodeAt(#{self}.length - 1) + 1);
+      var last    = String.fromCharCode(#{self}.charCodeAt(#{self}.length - 1) + 1);
 
       return initial + last;
     }
@@ -466,7 +484,7 @@ class String
   def rindex(search, offset = undefined)
     %x{
       var search_type = (search == null ? Opal.NilClass : search.constructor);
-      if (search_type != native_string && search_type != RegExp) {
+      if (search_type != String && search_type != RegExp) {
         var msg = "type mismatch: " + search_type + " given";
         #{raise TypeError.new(`msg`)};
       }
@@ -481,7 +499,7 @@ class String
           offset = #{self}.length + offset;
         }
 
-        if (search_type == native_string) {
+        if (search_type == String) {
           result = #{self}.lastIndexOf(search, offset);
         }
         else {
@@ -492,7 +510,7 @@ class String
         }
       }
       else {
-        if (search_type == native_string) {
+        if (search_type == String) {
           result = #{self}.lastIndexOf(search);
         }
         else {
@@ -508,6 +526,13 @@ class String
   end
 
   def rjust(width, padstr = ' ')
+    width  = Opal.coerce_to(width, Integer, :to_int)
+    padstr = Opal.coerce_to(padstr, String, :to_str).to_s
+
+    if padstr.empty?
+      raise ArgumentError, 'zero width padding'
+    end
+
     return self if `width <= self.length`
 
     %x{
@@ -658,7 +683,7 @@ class String
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (#{self}.constructor === native_string) {
+      if (#{self}.constructor === String) {
         return str;
       }
 
@@ -761,7 +786,7 @@ class String
           var start = last_from.charCodeAt(0) + 1;
           var end = char.charCodeAt(0);
           for (var c = start; c < end; c++) {
-            from_chars_expanded.push(native_string.fromCharCode(c));
+            from_chars_expanded.push(String.fromCharCode(c));
           }
           from_chars_expanded.push(char);
           in_range = null;
@@ -807,7 +832,7 @@ class String
               var start = last_from.charCodeAt(0) + 1;
               var end = char.charCodeAt(0);
               for (var c = start; c < end; c++) {
-                to_chars_expanded.push(native_string.fromCharCode(c));
+                to_chars_expanded.push(String.fromCharCode(c));
               }
               to_chars_expanded.push(char);
               in_range = null;
@@ -896,7 +921,7 @@ class String
           var start = last_from.charCodeAt(0) + 1;
           var end = char.charCodeAt(0);
           for (var c = start; c < end; c++) {
-            from_chars_expanded.push(native_string.fromCharCode(c));
+            from_chars_expanded.push(String.fromCharCode(c));
           }
           from_chars_expanded.push(char);
           in_range = null;
@@ -942,7 +967,7 @@ class String
               var start = last_from.charCodeAt(0) + 1;
               var end = char.charCodeAt(0);
               for (var c = start; c < end; c++) {
-                to_chars_expanded.push(native_string.fromCharCode(c));
+                to_chars_expanded.push(String.fromCharCode(c));
               }
               to_chars_expanded.push(char);
               in_range = null;

data/opal/opal.rb

@@ -1,4 +1,5 @@
 require 'core/runtime'
+require 'core/helpers'
 require 'core/module'
 require 'core/class'
 require 'core/basic_object'
@@ -47,75 +48,5 @@ $SAFE    = 0
 RUBY_PLATFORM       = 'opal'
 RUBY_ENGINE         = 'opal'
 RUBY_VERSION        = '1.9.3'
-RUBY_ENGINE_VERSION = '0.5.2'
-RUBY_RELEASE_DATE   = '2013-11-11'
-
-module Opal
-  def self.coerce_to(object, type, method)
-    return object if type === object
-
-    unless object.respond_to? method
-      raise TypeError, "no implicit conversion of #{object.class} into #{type}"
-    end
-
-    object.__send__ method
-  end
-
-  def self.coerce_to!(object, type, method)
-    coerced = coerce_to(object, type, method)
-
-    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
-
-    if object.respond_to? method
-      object.__send__ method
-    end
-  end
-
-  def self.compare(a, b)
-    compare = a <=> b
-
-    if `compare === nil`
-      raise ArgumentError, "comparison of #{a.class.name} with #{b.class.name} failed"
-    end
-
-    compare
-  end
-
-  def self.truthy?(value)
-    if value
-      true
-    else
-      false
-    end
-  end
-
-  def self.falsy?(value)
-    if value
-      false
-    else
-      true
-    end
-  end
-
-  def self.destructure(args)
-    %x{
-      if (args.length == 1) {
-        return args[0];
-      }
-      else if (args._isArray) {
-        return args;
-      }
-      else {
-        return $slice.call(args);
-      }
-    }
-  end
-end
+RUBY_ENGINE_VERSION = '0.5.4'
+RUBY_RELEASE_DATE   = '2013-11-20'

data/spec/filters/bugs/array.rb

@@ -31,35 +31,11 @@ opal_filter "Array" do
   fails "Array#delete may be given a block that is executed if no element matches object"
   fails "Array#delete returns the last element in the array for which object is equal under #=="
 
-  fails "Array#drop_while removes elements from the start of the array until the block returns false"
-  fails "Array#drop_while removes elements from the start of the array until the block returns nil"
-  fails "Array#drop_while removes elements from the start of the array while the block evaluates to true"
-
   fails "Array#dup creates a new array containing all elements or the original"
 
-  fails "Array#[] tries to convert the passed argument to an Integer using #to_int"
-  fails "Array#[] accepts Range instances having a negative m and both signs for n with [m..n] and [m...n]"
-  fails "Array#[] tries to convert Range elements to Integers using #to_int with [m..n] and [m...n]"
-  fails "Array#[] returns nil if range start is not in the array with [m..n]"
-  fails "Array#[] raises a RangeError when the start index is out of range of Fixnum"
-  fails "Array#[] raises a RangeError when the start index is out of range of Fixnum"
-  fails "Array#[] raises a RangeError when the length is out of range of Fixnum"
-  fails "Array#[] raises a RangeError when the length is out of range of Fixnum"
   fails "Array.[] can unpack 2 or more nested referenced array"
 
-  fails "Array#[]= calls to_ary on its rhs argument for multi-element sets"
-  fails "Array#[]= raises an IndexError when passed indexes out of bounds"
-  fails "Array#[]= tries to convert Range elements to Integers using #to_int with [m..n] and [m...n]"
-
-  fails "Array#[]= with [m..n] accepts Range subclasses"
-  fails "Array#[]= with [m..n] inserts the other section at m if m > n"
-  fails "Array#[]= with [m..n] replaces the section if m < 0 and n > 0"
-  fails "Array#[]= with [m..n] replaces the section if m and n < 0"
-  fails "Array#[]= with [m..n] just sets the section defined by range to nil if m and n < 0 and the rhs is nil"
-
   fails "Array#[]= sets elements in the range arguments when passed ranges"
-  fails "Array#[]= calls to_int on its start and length arguments"
-  fails "Array#[]= does nothing if the section defined by range has negative width and the rhs is an empty array"
 
   fails "Array#eql? ignores array class differences"
   fails "Array#eql? handles well recursive arrays"
@@ -213,6 +189,7 @@ opal_filter "Array" do
   fails "Array#values_at returns an array of elements in the ranges when passes ranges"
   fails "Array#values_at properly handles recursive arrays"
   fails "Array#values_at calls to_int on arguments of ranges when passes ranges"
+  fails "Array#values_at does not return subclass instance on Array subclasses"
 
   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"
@@ -225,13 +202,8 @@ opal_filter "Array" do
   fails "Array#hash returns the same hash for equal recursive arrays"
   fails "Array#hash returns the same fixnum for arrays with the same content"
 
-  fails "Array#initialize_copy tries to convert the passed argument to an Array using #to_ary"
-  fails "Array#initialize_copy does not make self dependent to the original array"
-  fails "Array#initialize_copy returns self"
-  fails "Array#initialize_copy properly handles recursive arrays"
-  fails "Array#initialize_copy replaces the elements with elements from other array"
-
   fails "Array#partition properly handles recursive arrays"
   fails "Array#partition returns in the left array values for which the block evaluates to true"
   fails "Array#partition returns two arrays"
+  fails "Array#partition does not return subclass instances on Array subclasses"
 end