opal 1.4.1 → 1.5.0.rc1

data/opal/corelib/string.rb

@@ -8,15 +8,6 @@ class ::String < `String`
 
   %x{
     Opal.prop(#{self}.$$prototype, '$$is_string', true);
-
-    Opal.prop(#{self}.$$prototype, '$$cast', function(string) {
-      var klass = this.$$class;
-      if (klass.$$constructor === String) {
-        return string;
-      } else {
-        return new klass.$$constructor(string);
-      }
-    });
   }
 
   def __id__
@@ -66,7 +57,7 @@ class ::String < `String`
       }
 
       if (count === 0) {
-        return self.$$cast('');
+        return '';
       }
 
       var result = '',
@@ -91,7 +82,7 @@ class ::String < `String`
         string += string;
       }
 
-      return self.$$cast(result);
+      return result;
     }
   end
 
@@ -181,7 +172,7 @@ class ::String < `String`
           length = 0;
         }
 
-        return self.$$cast(self.substr(index, length));
+        return self.substr(index, length);
       }
 
 
@@ -189,7 +180,7 @@ class ::String < `String`
         if (length != null) {
           #{::Kernel.raise ::TypeError}
         }
-        return self.indexOf(index) !== -1 ? self.$$cast(index) : nil;
+        return self.indexOf(index) !== -1 ? index : nil;
       }
 
 
@@ -204,17 +195,17 @@ class ::String < `String`
         #{$~ = ::MatchData.new(`index`, `match`)}
 
         if (length == null) {
-          return self.$$cast(match[0]);
+          return match[0];
         }
 
         length = $coerce_to(length, #{::Integer}, 'to_int');
 
         if (length < 0 && -length < match.length) {
-          return self.$$cast(match[length += match.length]);
+          return match[length += match.length];
         }
 
         if (length >= 0 && length < match.length) {
-          return self.$$cast(match[length]);
+          return match[length];
         }
 
         return nil;
@@ -231,7 +222,7 @@ class ::String < `String`
         if (index >= size || index < 0) {
           return nil;
         }
-        return self.$$cast(self.substr(index, 1));
+        return self.substr(index, 1);
       }
 
       length = $coerce_to(length, #{::Integer}, 'to_int');
@@ -244,7 +235,7 @@ class ::String < `String`
         return nil;
       }
 
-      return self.$$cast(self.substr(index, length));
+      return self.substr(index, length);
     }
   end
 
@@ -253,7 +244,7 @@ class ::String < `String`
   end
 
   def capitalize
-    `self.$$cast(self.charAt(0).toUpperCase() + self.substr(1).toLowerCase())`
+    `self.charAt(0).toUpperCase() + self.substr(1).toLowerCase()`
   end
 
   def casecmp(other)
@@ -294,7 +285,7 @@ class ::String < `String`
       var ljustified = #{ljust ((width + `self.length`) / 2).ceil, padstr},
           rjustified = #{rjust ((width + `self.length`) / 2).floor, padstr};
 
-      return self.$$cast(rjustified + ljustified.slice(self.length));
+      return rjustified + ljustified.slice(self.length);
     }
   end
 
@@ -321,7 +312,7 @@ class ::String < `String`
       }
 
       if (result != null) {
-        return self.$$cast(result);
+        return result;
       }
     }
 
@@ -340,7 +331,7 @@ class ::String < `String`
         result = self.substr(0, length - 1);
       }
 
-      return self.$$cast(result);
+      return result;
     }
   end
 
@@ -383,7 +374,7 @@ class ::String < `String`
       if (char_class === null) {
         return self;
       }
-      return self.$$cast(self.replace(new RegExp(char_class, 'g'), ''));
+      return self.replace(new RegExp(char_class, 'g'), '');
     }
   end
 
@@ -394,7 +385,7 @@ class ::String < `String`
       }
 
       if (self.slice(0, prefix.length) === prefix) {
-        return self.$$cast(self.slice(prefix.length));
+        return self.slice(prefix.length);
       } else {
         return self;
       }
@@ -408,7 +399,7 @@ class ::String < `String`
       }
 
       if (self.slice(self.length - suffix.length) === suffix) {
-        return self.$$cast(self.slice(0, self.length - suffix.length));
+        return self.slice(0, self.length - suffix.length);
       } else {
         return self;
       }
@@ -416,7 +407,7 @@ class ::String < `String`
   end
 
   def downcase
-    `self.$$cast(self.toLowerCase())`
+    `self.toLowerCase()`
   end
 
   def each_line(separator = $/, chomp: false, &block)
@@ -555,7 +546,7 @@ class ::String < `String`
       }
 
       #{$~ = `match_data`}
-      return self.$$cast(result);
+      return result;
     }
   end
 
@@ -682,7 +673,7 @@ class ::String < `String`
         result += padstr;
       }
 
-      return self.$$cast(self + result.slice(0, width));
+      return self + result.slice(0, width);
     }
   end
 
@@ -726,7 +717,7 @@ class ::String < `String`
     %x{
       var i = self.length;
       if (i === 0) {
-        return self.$$cast('');
+        return '';
       }
       var result = self;
       var first_alphanum_char_index = self.search(/[a-zA-Z0-9]/);
@@ -788,7 +779,7 @@ class ::String < `String`
           break;
         }
       }
-      return self.$$cast(result);
+      return result;
     }
   end
 
@@ -939,7 +930,7 @@ class ::String < `String`
           result    = Array(patterns + 1).join(padstr),
           remaining = chars - result.length;
 
-      return self.$$cast(result + padstr.slice(0, remaining) + self);
+      return result + padstr.slice(0, remaining) + self;
     }
   end
 
@@ -1069,24 +1060,17 @@ class ::String < `String`
       result = string.split(pattern);
 
       if (result.length === 1 && result[0] === string) {
-        return [self.$$cast(result[0])];
+        return [result[0]];
       }
 
       while ((i = result.indexOf(undefined)) !== -1) {
         result.splice(i, 1);
       }
 
-      function castResult() {
-        for (i = 0; i < result.length; i++) {
-          result[i] = self.$$cast(result[i]);
-        }
-      }
-
       if (limit === 0) {
         while (result[result.length - 1] === '') {
           result.length -= 1;
         }
-        castResult();
         return result;
       }
 
@@ -1098,18 +1082,15 @@ class ::String < `String`
             result.push('');
           }
         }
-        castResult();
         return result;
       }
 
       if (match !== null && match[0] === '') {
         result.splice(limit - 1, result.length - 1, result.slice(limit - 1).join(''));
-        castResult();
         return result;
       }
 
       if (limit >= result.length) {
-        castResult();
         return result;
       }
 
@@ -1123,7 +1104,6 @@ class ::String < `String`
         match = pattern.exec(string);
       }
       result.splice(limit - 1, result.length - 1, string.slice(index));
-      castResult();
       return result;
     }
   end
@@ -1131,13 +1111,13 @@ class ::String < `String`
   def squeeze(*sets)
     %x{
       if (sets.length === 0) {
-        return self.$$cast(self.replace(/(.)\1+/g, '$1'));
+        return self.replace(/(.)\1+/g, '$1');
       }
       var char_class = char_class_from_char_sets(sets);
       if (char_class === null) {
         return self;
       }
-      return self.$$cast(self.replace(new RegExp('(' + char_class + ')\\1+', 'g'), '$1'));
+      return self.replace(new RegExp('(' + char_class + ')\\1+', 'g'), '$1');
     }
   end
 
@@ -1224,7 +1204,7 @@ class ::String < `String`
         }
       }
 
-      return self.$$cast(result);
+      return result;
     }
   end
 
@@ -1254,11 +1234,7 @@ class ::String < `String`
         return $1 ? $0.toUpperCase() : $0.toLowerCase();
       });
 
-      if (self.constructor === String) {
-        return str;
-      }
-
-      return #{self.class.new `str`};
+      return str;
     }
   end
 
@@ -1339,7 +1315,7 @@ class ::String < `String`
   end
 
   def to_proc
-    method_name = '$' + `self.valueOf()`
+    method_name = `self.valueOf()`
 
     ::Kernel.proc do |*args, &block|
       %x{
@@ -1351,20 +1327,23 @@ class ::String < `String`
 
         if (recv == null) recv = nil;
 
-        var body = recv[#{method_name}];
+        var body = recv['$' + #{method_name}];
 
         if (!body) {
-          return recv.$method_missing.apply(recv, args);
+          body = recv.$method_missing;
+          args[0] = #{method_name};
+        } else {
+          args = args.slice(1);
         }
 
         if (typeof block === 'function') {
           body.$$p = block;
         }
 
-        if (args.length === 1) {
+        if (args.length === 0) {
           return body.call(recv);
         } else {
-          return body.apply(recv, args.slice(1));
+          return body.apply(recv, args);
         }
       }
     end
@@ -1515,7 +1494,7 @@ class ::String < `String`
           new_str += (sub != null ? sub : ch);
         }
       }
-      return self.$$cast(new_str);
+      return new_str;
     }
   end
 
@@ -1678,12 +1657,12 @@ class ::String < `String`
           }
         }
       }
-      return self.$$cast(new_str);
+      return new_str;
     }
   end
 
   def upcase
-    `self.$$cast(self.toUpperCase())`
+    `self.toUpperCase()`
   end
 
   def upto(stop, excl = false, &block)

data/opal/corelib/time.rb

@@ -21,7 +21,7 @@ class ::Time < `Date`
           #{::Kernel.raise ::TypeError, "can't convert Time into an exact number"}
         }
         result = new Date(seconds.getTime());
-        result.is_utc = seconds.is_utc;
+        result.timezone = seconds.timezone;
         return result;
       }
 
@@ -135,16 +135,12 @@ class ::Time < `Date`
 
   def self.new(year = undefined, month = nil, day = nil, hour = nil, min = nil, sec = nil, utc_offset = nil)
     %x{
-      var args, result;
+      var args, result, timezone;
 
       if (year === undefined) {
         return new Date();
       }
 
-      if (utc_offset !== nil) {
-        #{::Kernel.raise ::ArgumentError, 'Opal does not support explicitly specifying UTC offset for Time'}
-      }
-
       args  = time_params(year, month, day, hour, min, sec);
       year  = args[0];
       month = args[1];
@@ -157,10 +153,51 @@ class ::Time < `Date`
       if (year < 100) {
         result.setFullYear(year);
       }
+
+      if (utc_offset !== nil) {
+        timezone = #{_parse_offset(utc_offset)};
+      }
+
+      if (timezone != null) {
+        result = new Date(result.getTime() - timezone * 3600000 - result.getTimezoneOffset() * 60000);
+        result.timezone = timezone;
+      }
+
       return result;
     }
   end
 
+  # @private
+  def self._parse_offset(utc_offset)
+    %x{
+      var timezone;
+      if (utc_offset.$$is_string) {
+        if (utc_offset == 'UTC') {
+          timezone = 0;
+        }
+        else if(/^[+-]\d\d:[0-5]\d$/.test(utc_offset)) {
+          var sign, hours, minutes;
+          sign = utc_offset[0];
+          hours = +(utc_offset[1] + utc_offset[2]);
+          minutes = +(utc_offset[4] + utc_offset[5]);
+
+          timezone = (sign == '-' ? -1 : 1) * (hours + minutes / 60);
+        }
+        else {
+          // Unsupported: "A".."I","K".."Z"
+          #{::Kernel.raise ::ArgumentError, %'"+HH:MM", "-HH:MM", "UTC" expected for utc_offset: #{utc_offset}'}
+        }
+      }
+      else if (utc_offset.$$is_number) {
+        timezone = utc_offset / 3600;
+      }
+      else {
+        #{::Kernel.raise ::ArgumentError, "Opal doesn't support other types for a timezone argument than Integer and String"}
+      }
+      return timezone;
+    }
+  end
+
   def self.local(year, month = nil, day = nil, hour = nil, min = nil, sec = nil, millisecond = nil, _dummy1 = nil, _dummy2 = nil, _dummy3 = nil)
     # The _dummy args are there only because the MRI version accepts up to 10 arguments
     %x{
@@ -219,7 +256,7 @@ class ::Time < `Date`
       if (year < 100) {
         result.setUTCFullYear(year);
       }
-      result.is_utc = true;
+      result.timezone = 0;
       return result;
     }
   end
@@ -238,7 +275,7 @@ class ::Time < `Date`
         other = #{::Opal.coerce_to!(other, ::Integer, :to_int)};
       }
       var result = new Date(self.getTime() + (other * 1000));
-      result.is_utc = self.is_utc;
+      result.timezone = self.timezone;
       return result;
     }
   end
@@ -253,7 +290,7 @@ class ::Time < `Date`
         other = #{::Opal.coerce_to!(other, ::Integer, :to_int)};
       }
       var result = new Date(self.getTime() - (other * 1000));
-      result.is_utc = self.is_utc;
+      result.timezone = self.timezone;
       return result;
     }
   end
@@ -283,8 +320,22 @@ class ::Time < `Date`
     strftime '%a %b %e %H:%M:%S %Y'
   end
 
-  def day
-    `self.is_utc ? self.getUTCDate() : self.getDate()`
+  [
+    [:year, 'getFullYear', 'getUTCFullYear'],
+    [:mon, 'getMonth', 'getUTCMonth', 1],
+    [:wday, 'getDay', 'getUTCDay'],
+    [:day, 'getDate', 'getUTCDate'],
+    [:hour, 'getHours', 'getUTCHours'],
+    [:min, 'getMinutes', 'getUTCMinutes'],
+    [:sec, 'getSeconds', 'getUTCSeconds'],
+  ].each do |method, getter, utcgetter, difference = 0|
+    define_method method do
+      %x{
+        return difference + ((self.timezone != null) ?
+          (new Date(self.getTime() + self.timezone * 3600000))[utcgetter]() :
+          self[getter]())
+      }
+    end
   end
 
   def yday
@@ -319,18 +370,24 @@ class ::Time < `Date`
     other.is_a?(::Time) && (self <=> other).zero?
   end
 
-  def friday?
-    `#{wday} == 5`
+  [
+    [:sunday?, 0],
+    [:monday?, 1],
+    [:tuesday?, 2],
+    [:wednesday?, 3],
+    [:thursday?, 4],
+    [:friday?, 5],
+    [:saturday?, 6]
+  ].each do |method, weekday|
+    define_method method do
+      `#{wday} === weekday`
+    end
   end
 
   def hash
     `'Time:' + self.getTime()`
   end
 
-  def hour
-    `self.is_utc ? self.getUTCHours() : self.getHours()`
-  end
-
   def inspect
     if utc?
       strftime '%Y-%m-%d %H:%M:%S UTC'
@@ -339,30 +396,10 @@ class ::Time < `Date`
     end
   end
 
-  def min
-    `self.is_utc ? self.getUTCMinutes() : self.getMinutes()`
-  end
-
-  def mon
-    `(self.is_utc ? self.getUTCMonth() : self.getMonth()) + 1`
-  end
-
-  def monday?
-    `#{wday} == 1`
-  end
-
-  def saturday?
-    `#{wday} == 6`
-  end
-
-  def sec
-    `self.is_utc ? self.getUTCSeconds() : self.getSeconds()`
-  end
-
   def succ
     %x{
       var result = new Date(self.getTime() + 1000);
-      result.is_utc = self.is_utc;
+      result.timezone = self.timezone;
       return result;
     }
   end
@@ -373,6 +410,9 @@ class ::Time < `Date`
 
   def zone
     %x{
+      if (self.timezone === 0) return "UTC";
+      else if (self.timezone != null) return nil;
+
       var string = self.toString(),
           result;
 
@@ -395,30 +435,30 @@ class ::Time < `Date`
   def getgm
     %x{
       var result = new Date(self.getTime());
-      result.is_utc = true;
+      result.timezone = 0;
       return result;
     }
   end
 
   def gmtime
     %x{
-      self.is_utc = true;
+      self.timezone = 0;
       return self;
     }
   end
 
   def gmt?
-    `self.is_utc === true`
+    `self.timezone === 0`
   end
 
   def gmt_offset
-    `self.is_utc ? 0 : -self.getTimezoneOffset() * 60`
+    `(self.timezone != null) ? self.timezone * 60 : -self.getTimezoneOffset() * 60`
   end
 
   def strftime(format)
     %x{
       return format.replace(/%([\-_#^0]*:{0,2})(\d+)?([EO]*)(.)/g, function(full, flags, width, _, conv) {
-        var result = "",
+        var result = "", jd, c, s,
             zero   = flags.indexOf('0') !== -1,
             pad    = flags.indexOf('-') === -1,
             blank  = flags.indexOf('_') !== -1,
@@ -534,7 +574,7 @@ class ::Time < `Date`
             break;
 
           case 'z':
-            var offset  = self.getTimezoneOffset(),
+            var offset  = (self.timezone == null) ? self.getTimezoneOffset() : (-self.timezone * 60),
                 hours   = Math.floor(Math.abs(offset) / 60),
                 minutes = Math.abs(offset) % 60;
 
@@ -633,6 +673,28 @@ class ::Time < `Date`
             result += #{strftime('%H:%M:%S')};
             break;
 
+          // Non-standard: JIS X 0301 date format
+          case 'J':
+            jd = #{to_date.jd};
+            if (jd < 2405160) {
+              result += #{strftime('%Y-%m-%d')};
+              break;
+            }
+            else if (jd < 2419614)
+              c = 'M', s = 1867;
+            else if (jd < 2424875)
+              c = 'T', s = 1911;
+            else if (jd < 2447535)
+              c = 'S', s = 1925;
+            else if (jd < 2458605)
+              c = 'H', s = 1988;
+            else
+              c = 'R', s = 2018;
+
+            result += #{format '%c%02d', `c`, year - `s`};
+            result += #{strftime('-%m-%d')};
+            break;
+
           default:
             return full;
         }
@@ -655,14 +717,6 @@ class ::Time < `Date`
     }
   end
 
-  def sunday?
-    `#{wday} == 0`
-  end
-
-  def thursday?
-    `#{wday} == 4`
-  end
-
   def to_a
     [sec, min, hour, day, month, year, wday, yday, isdst, zone]
   end
@@ -675,22 +729,6 @@ class ::Time < `Date`
     `parseInt(self.getTime() / 1000, 10)`
   end
 
-  def tuesday?
-    `#{wday} == 2`
-  end
-
-  def wday
-    `self.is_utc ? self.getUTCDay() : self.getDay()`
-  end
-
-  def wednesday?
-    `#{wday} == 3`
-  end
-
-  def year
-    `self.is_utc ? self.getUTCFullYear() : self.getFullYear()`
-  end
-
   def cweek_cyear
     jan01 = ::Time.new(year, 1, 1)
     jan01_wday = jan01.wday

data/opal/opal/full.rb

@@ -5,4 +5,3 @@
 ::Object.require 'corelib/pattern_matching/base'
 ::Object.autoload :PatternMatching, 'corelib/pattern_matching'
 ::Object.autoload :TracePoint, 'corelib/trace_point'
-::Object.require 'corelib/binding'

data/opal/opal.rb

@@ -10,7 +10,7 @@
 ::Object.autoload :Rational, 'corelib/rational'
 ::Object.require 'corelib/time'
 ::Object.autoload :Struct, 'corelib/struct'
-::Object.require 'corelib/dir'
+::Object.autoload :Dir, 'corelib/dir'
 ::Object.autoload :File, 'corelib/file'
 
 ::Object.require 'corelib/process/base'
@@ -18,3 +18,6 @@
 ::Object.autoload :Random, 'corelib/random'
 
 ::Object.require 'corelib/unsupported'
+
+::Object.require 'corelib/binding'
+::Object.require 'corelib/irb'

data/spec/filters/bugs/date.rb

@@ -20,9 +20,7 @@ opal_filter "Date" do
   fails "Date#julian converts a date object into another with the Julian calendar"
   fails "Date#julian? marks a day before the calendar reform as Julian"
   fails "Date#ld determines the Modified Julian day"
-  fails "Date#mday determines the day of the month"
   fails "Date#mjd determines the Modified Julian day"
-  fails "Date#mon determines the month"
   fails "Date#new_start converts a date object into another with a new calendar reform"
   fails "Date#parse coerces using to_str" # ArgumentError: invalid date
   fails "Date#parse parses a day name into a Date object"
@@ -72,7 +70,6 @@ opal_filter "Date" do
   fails "Date#valid_date? handles negative months and days"
   fails "Date#valid_date? returns false if it is not a valid civil date"
   fails "Date#valid_date? returns true if it is a valid civil date"
-  fails "Date#yday determines the year"
   fails "Date._iso8601 returns an empty hash if the argument is a invalid Date" # NoMethodError: undefined method `_iso8601' for Date
   fails "Date._rfc3339 returns an empty hash if the argument is a invalid Date" # NoMethodError: undefined method `_rfc3339' for Date
   fails "Date.iso8601 parses YYYY-MM-DD into a Date object" # NoMethodError: undefined method `iso8601' for Date