opal 1.4.1 → 1.5.0.rc1

data/stdlib/date.rb

@@ -1,77 +1,10 @@
+require 'forwardable'
+require 'date/infinity'
+require 'time'
+
 class Date
   include Comparable
-
-  class Infinity < Numeric
-    include Comparable
-
-    def initialize(d = 1)
-      @d = d <=> 0
-    end
-
-    attr_reader :d
-
-    def zero?
-      false
-    end
-
-    def finite?
-      false
-    end
-
-    def infinite?
-      d.nonzero?
-    end
-
-    def nan?
-      d.zero?
-    end
-
-    def abs
-      self.class.new
-    end
-
-    def -@
-      self.class.new(-d)
-    end
-
-    def +@
-      self.class.new(+d)
-    end
-
-    def <=>(other)
-      case other
-      when Infinity
-        d <=> other.d
-      when Numeric
-        d
-      else
-        begin
-          l, r = other.coerce(self)
-          l <=> r
-        rescue NoMethodError
-          nil
-        end
-      end
-    end
-
-    def coerce(other)
-      case other
-      when Numeric
-        [-d, d]
-      else
-        super
-      end
-    end
-
-    def to_f
-      return 0 if @d == 0
-      if @d > 0
-        Float::INFINITY
-      else
-        -Float::INFINITY
-      end
-    end
-  end
+  extend Forwardable
 
   JULIAN          = Infinity.new
   GREGORIAN       = -Infinity.new
@@ -85,6 +18,7 @@ class Date
   class << self
     def wrap(native)
       instance = allocate
+      `#{instance}.start = #{ITALY}`
       `#{instance}.date = #{native}`
       instance
     end
@@ -354,73 +288,12 @@ class Date
         day = 4;
       }
     }
-    @date = `new Date(year, month - 1, day)`
-  end
 
-  def -(date)
-    %x{
-      if (date.$$is_number) {
-        var result = #{clone};
-        result.date.setDate(#{@date}.getDate() - date);
-        return result;
-      }
-      else if (date.date) {
-        return Math.round((#{@date} - #{date}.date) / (1000 * 60 * 60 * 24));
-      }
-      else {
-        #{raise TypeError};
-      }
-    }
-  end
-
-  def +(date)
-    %x{
-      if (date.$$is_number) {
-        var result = #{clone};
-        result.date.setDate(#{@date}.getDate() + date);
-        return result;
-      }
-      else {
-        #{raise TypeError};
-      }
-    }
-  end
-
-  def <(other)
-    %x{
-      var a = #{@date}, b = #{other}.date;
-      a.setHours(0, 0, 0, 0);
-      b.setHours(0, 0, 0, 0);
-      return a < b;
-    }
-  end
-
-  def <=(other)
-    %x{
-      var a = #{@date}, b = #{other}.date;
-      a.setHours(0, 0, 0, 0);
-      b.setHours(0, 0, 0, 0);
-      return a <= b;
-    }
-  end
-
-  def >(other)
-    %x{
-      var a = #{@date}, b = #{other}.date;
-      a.setHours(0, 0, 0, 0);
-      b.setHours(0, 0, 0, 0);
-      return a > b;
-    }
+    @date = `new Date(year, month - 1, day)`
+    @start = start
   end
 
-  def >=(other)
-    %x{
-      var a = #{@date}, b = #{other}.date;
-      a.setHours(0, 0, 0, 0);
-      b.setHours(0, 0, 0, 0);
-      return a >= b;
-    }
-  end
+  attr_reader :start
 
   def <=>(other)
     %x{
@@ -428,10 +301,10 @@ class Date
         return #{jd <=> other}
       }
 
-      if (#{Date === other}) {
+      if (#{::Date === other}) {
         var a = #{@date}, b = #{other}.date;
-        a.setHours(0, 0, 0, 0);
-        b.setHours(0, 0, 0, 0);
+        if (!Opal.is_a(#{self}, #{::DateTime})) a.setHours(0, 0, 0, 0);
+        if (!Opal.is_a(#{other}, #{::DateTime})) b.setHours(0, 0, 0, 0);
 
         if (a < b) {
           return -1;
@@ -449,40 +322,28 @@ class Date
   end
 
   def >>(n)
-    %x{
-      if (!n.$$is_number) {
-        #{raise TypeError};
-      }
+    `if (!n.$$is_number) #{raise ::TypeError}`
 
-      var result = #{clone}, date = result.date, cur = date.getDate();
-      date.setDate(1);
-      date.setMonth(date.getMonth() + n);
-      date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
-      return result;
-    }
+    self << -n
   end
 
   def <<(n)
-    %x{
-      if (!n.$$is_number) {
-        #{raise TypeError};
-      }
+    `if (!n.$$is_number) #{raise ::TypeError}`
 
-      return #{self >> `-n`};
-    }
+    prev_month(n)
   end
 
   def clone
-    Date.wrap(`new Date(#{@date}.getTime())`)
+    date = Date.wrap(@date.dup)
+    `date.start = #{@start}`
+    date
   end
 
-  def day
-    `#{@date}.getDate()`
-  end
+  def_delegators :@date, :sunday?, :monday?, :tuesday?, :wednesday?, :thursday?, :friday?, :saturday?,
+    :day, :month, :year, :wday, :yday
 
-  def friday?
-    wday == 5
-  end
+  alias mday day
+  alias mon month
 
   def jd
     %x{
@@ -524,56 +385,71 @@ class Date
     `#{@date} < new Date(1582, 10 - 1, 15, 12)`
   end
 
-  def monday?
-    wday == 1
-  end
-
-  def month
-    `#{@date}.getMonth() + 1`
+  def new_start(start)
+    new_date = clone
+    `new_date.start = start`
+    new_date
   end
 
   def next
     self + 1
   end
 
-  def next_day(n = 1)
-    self + n
-  end
-
-  def next_month(n = 1)
+  def -(date)
     %x{
-      var result = #{clone}, date = result.date, cur = date.getDate();
-      date.setDate(1);
-      date.setMonth(date.getMonth() + n);
-      date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
-      return result;
+      if (date.date) {
+        return Math.round((#{@date} - #{date}.date) / (1000 * 60 * 60 * 24));
+      }
     }
+    prev_day(date)
   end
 
-  def next_year(years = 1)
-    self.class.new(year + years, month, day)
+  def +(date)
+    next_day(date)
   end
 
   def prev_day(n = 1)
-    self - n
+    %x{
+      if (n.$$is_number) {
+        var result = #{clone};
+        result.date.setDate(#{@date}.getDate() - n);
+        return result;
+      }
+      else {
+        #{raise ::TypeError};
+      }
+    }
+  end
+
+  def next_day(n = 1)
+    `if (!n.$$is_number) #{raise ::TypeError}`
+    prev_day(-n)
   end
 
   def prev_month(n = 1)
     %x{
+      if (!n.$$is_number) #{raise ::TypeError}
       var result = #{clone}, date = result.date, cur = date.getDate();
       date.setDate(1);
       date.setMonth(date.getMonth() - n);
-      date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
+      date.setDate(Math.min(cur, #{Date._days_in_month(`date.getFullYear()`, `date.getMonth()`)}));
       return result;
     }
   end
 
+  def next_month(n = 1)
+    `if (!n.$$is_number) #{raise ::TypeError}`
+    prev_month(-n)
+  end
+
   def prev_year(years = 1)
+    `if (!years.$$is_number) #{raise ::TypeError}`
     self.class.new(year - years, month, day)
   end
 
-  def saturday?
-    wday == 6
+  def next_year(years = 1)
+    `if (!years.$$is_number) #{raise ::TypeError}`
+    prev_year(-years)
   end
 
   def strftime(format = '')
@@ -582,18 +458,10 @@ class Date
         return #{to_s};
       }
 
-      return #{@date}.$strftime(#{format});
+      return #{@date.strftime(format)}
     }
   end
 
-  def sunday?
-    wday == 0
-  end
-
-  def thursday?
-    wday == 4
-  end
-
   def to_s
     %x{
       var d = #{@date}, year = d.getFullYear(), month = d.getMonth() + 1, day = d.getDate();
@@ -607,12 +475,16 @@ class Date
     Time.new(year, month, day)
   end
 
-  def to_n
-    @date
+  def to_date
+    self
+  end
+
+  def to_datetime
+    DateTime.new(year, month, day)
   end
 
-  def tuesday?
-    wday == 2
+  def to_n
+    @date
   end
 
   def step(limit, step = 1, &block)
@@ -621,7 +493,7 @@ class Date
     steps = if steps_count * step < 0
               []
             elsif steps_count < 0
-              (0..-steps_count).step(step.abs).map(&:-@) .reverse
+              (0..-steps_count).step(step.abs).map(&:-@).reverse
             else
               (0..steps_count).step(step.abs)
             end
@@ -645,18 +517,6 @@ class Date
     step(min, -1, &block)
   end
 
-  def wday
-    `#{@date}.getDay()`
-  end
-
-  def wednesday?
-    wday == 3
-  end
-
-  def year
-    `#{@date}.getFullYear()`
-  end
-
   def cwday
     `#{@date}.getDay() || 7`
   end
@@ -670,13 +530,16 @@ class Date
     }
   end
 
-  %x{
-    function days_in_month(year, month) {
+  def self._days_in_month(year, month)
+    %x{
       var leap = ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0);
-      return [31, (leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month]
+      return [31, (leap ? 29 : 28), 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
     }
-  }
+  end
 
   alias eql? ==
   alias succ next
 end
+
+require 'date/date_time'
+require 'date/formatters'

data/stdlib/opal/repl_js.rb

@@ -1,5 +1,5 @@
 require 'opal/platform'
-require 'opal/replutils'
+require 'opal-replutils'
 require 'json'
 
 REPLUtils.js_repl

data/stdlib/{opal/replutils.rb → opal-replutils.rb}

@@ -43,7 +43,7 @@ module REPLUtils
     out
   end
 
-  def eval_and_print(func, mode, colorize)
+  def eval_and_print(func, mode, colorize, binding = nil)
     printer = if colorize
                 ->(i) do
                   ColorPrinter.default(i)
@@ -61,11 +61,11 @@ module REPLUtils
               end
 
     %x{
-      var $_result = eval(func);
+      var $_result = binding === nil ? eval(func) : binding.$js_eval(func);
 
       if (mode == 'silent') return nil;
 
-      if (typeof $_result === 'null') {
+      if ($_result === null) {
         return "=> null";
       }
       else if (typeof $_result === 'undefined') {

data/stdlib/time.rb

@@ -3,7 +3,44 @@ class Time
     `new Date(Date.parse(str))`
   end
 
-  def iso8601
-    strftime('%FT%T%z')
+  def self.def_formatter(name, format, on_utc: false, utc_tz: nil, tz_format: nil, fractions: false, on: self)
+    on.define_method name do |fdigits = 0|
+      case self
+      when defined?(::DateTime) && ::DateTime
+        date = on_utc ? new_offset(0) : self
+      when defined?(::Date) && ::Date
+        date = ::Time.utc(year, month, day)
+      when ::Time
+        date = on_utc ? getutc : self
+      end
+      str = date.strftime(format)
+      str += date.strftime(".%#{fdigits}N") if fractions && fdigits > 0
+      if utc_tz
+        str += utc ? utc_tz : date.strftime(tz_format)
+      elsif tz_format
+        str += date.strftime(tz_format)
+      end
+      str
+    end
+  end
+
+  def_formatter :rfc2822, '%a, %d %b %Y %T ', utc_tz: '-00:00', tz_format: '%z'
+  alias rfc822 rfc2822
+  def_formatter :httpdate, '%a, %d %b %Y %T GMT', on_utc: true
+  def_formatter :xmlschema, '%FT%T', utc_tz: 'Z', tz_format: '%:z', fractions: true
+  alias iso8601 xmlschema
+
+  def to_date
+    Date.wrap(self)
+  end
+
+  def to_datetime
+    DateTime.wrap(self)
+  end
+
+  def to_time
+    self
   end
 end
+
+require 'date'

data/stdlib/uri.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module URI
+  def self.decode_www_form(str, enc = undefined, separator: '&', use__charset_: false, isindex: false)
+    raise ArgumentError, "the input of #{name}.#{__method__} must be ASCII only string" unless str.ascii_only?
+
+    %x{
+      var ary = [], key, val;
+      if (str.length == 0)
+        return ary;
+      if (enc)
+        #{enc = Encoding.find(enc)};
+
+      var parts = str.split(#{separator});
+      for (var i = 0; i < parts.length; i++) {
+        var string = parts[i];
+        var splitIndex = string.indexOf('=')
+
+        if (splitIndex >= 0) {
+          key = string.substr(0, splitIndex);
+          val = string.substr(splitIndex + 1);
+        } else {
+          key = string;
+          val = '';
+        }
+
+        if (isindex) {
+          if (splitIndex < 0) {
+            key = '';
+            val = string;
+          }
+          isindex = false;
+        }
+
+        key = decodeURIComponent(key.replace(/\+/g, ' '));
+        if (val) {
+          val = decodeURIComponent(val.replace(/\+/g, ' '));
+        } else {
+          val = '';
+        }
+
+        if (enc) {
+          key = #{`key`.force_encoding(enc)}
+          val = #{`val`.force_encoding(enc)}
+        }
+
+        ary.push([key, val]);
+      }
+
+      return ary;
+    }
+  end
+end

data/tasks/performance/asciidoctor_test.rb.erb

@@ -1,6 +1,8 @@
 JAVASCRIPT_IO_MODULE="nodejs" if RUBY_ENGINE == 'opal'
 require "asciidoctor"
-puts Asciidoctor.convert(DATA.read)
+data = DATA.read
+100.times { Asciidoctor.convert(data) }
+puts Asciidoctor.convert(data)
 
 __END__
 <%= File.read('asciidoctor/benchmark/sample-data/mdbasics.adoc') %>

data/tasks/performance/optimization_status.rb

@@ -27,7 +27,7 @@ klasses = [
 
     return (optstatus & (1 << 6)) ? "[INTERPRETED]" : "[COMPILED]";
   }
-  
+
   function triggerOptAndGetStatus(fn) {
     // using try/catch to avoid having to call functions properly
     try {
@@ -52,6 +52,7 @@ optimization_status = Hash[klasses.map do |klass|
   methods -= [:product, :exit, :exit!, :at_exit]
   opt_status = Hash[methods.map do |method|
     method_func = `#{klass.instance_method(method)}.method`
+    method_func = `#{method_func}.$$proxy_target || #{method_func}`
     [method, `triggerOptAndGetStatus(#{method_func})`]
   end]
   by_status_grouped = opt_status.group_by {|method, status| status }
@@ -74,4 +75,4 @@ optimization_status.sort_by {|klass,_| klass.name}.each do |klass, statuses|
   end
 end
 
-puts 'done!'
+puts 'done!'