opal 0.11.4 → 1.0.0.beta1

data/stdlib/buffer/view.rb

@@ -1,70 +1,108 @@
 class Buffer
+  class View
+    include Native::Wrapper
 
-class View
-  include Native
+    def self.supported?
+      !$$[:DataView].nil?
+    end
 
-  def self.supported?
-    not $$[:DataView].nil?
-  end
+    attr_reader :buffer, :offset
+
+    def initialize(buffer, offset = nil, length = nil)
+      if native?(buffer)
+        super(buffer)
+      elsif offset && length
+        super(`new DataView(#{buffer.to_n}, #{offset.to_n}, #{length.to_n})`)
+      elsif offset
+        super(`new DataView(#{buffer.to_n}, #{offset.to_n})`)
+      else
+        super(`new DataView(#{buffer.to_n})`)
+      end
+
+      @buffer = buffer
+      @offset = offset
+    end
+
+    def length
+      `#{@native}.byteLength`
+    end
 
-  attr_reader :buffer, :offset
+    alias size length
 
-  def initialize(buffer, offset = nil, length = nil)
-    if native?(buffer)
-      super(buffer)
-    elsif offset && length
-      super(`new DataView(#{buffer.to_n}, #{offset.to_n}, #{length.to_n})`)
-    elsif offset
-      super(`new DataView(#{buffer.to_n}, #{offset.to_n})`)
-    else
-      super(`new DataView(#{buffer.to_n})`)
+    def get(offset, bits = 8, type = :unsigned, little = false)
+      `#{@native}["get" + #{Buffer.name_for bits, type}](offset, little)`
     end
 
-    @buffer = buffer
-    @offset = offset
-  end
+    alias [] get
 
-  def length
-    `#@native.byteLength`
-  end
+    def set(offset, value, bits = 8, type = :unsigned, little = false)
+      `#{@native}["set" + #{Buffer.name_for bits, type}](offset, value, little)`
+    end
 
-  alias size length
+    alias []= set
 
-  def get(offset, bits = 8, type = :unsigned, little = false)
-    `#@native["get" + #{Buffer.name_for bits, type}](offset, little)`
-  end
+    def get_int8(offset, little = false)
+      `#{@native}.getInt8(offset, little)`
+    end
 
-  alias [] get
+    def set_int8(offset, value, little = false)
+      `#{@native}.setInt8(offset, value, little)`
+    end
 
-  def set(offset, value, bits = 8, type = :unsigned, little = false)
-    `#@native["set" + #{Buffer.name_for bits, type}](offset, value, little)`
-  end
+    def get_uint8(offset, little = false)
+      `#{@native}.getUint8(offset, little)`
+    end
 
-  alias []= set
+    def set_uint8(offset, value, little = false)
+      `#{@native}.setUint8(offset, value, little)`
+    end
 
-  def get_int8(offset, little = false); `#@native.getInt8(offset, little)`; end
-  def set_int8(offset, value, little = false); `#@native.setInt8(offset, value, little)`; end
+    def get_int16(offset, little = false)
+      `#{@native}.getInt16(offset, little)`
+    end
 
-  def get_uint8(offset, little = false); `#@native.getUint8(offset, little)`; end
-  def set_uint8(offset, value, little = false); `#@native.setUint8(offset, value, little)`; end
+    def set_int16(offset, value, little = false)
+      `#{@native}.setInt16(offset, value, little)`
+    end
 
-  def get_int16(offset, little = false); `#@native.getInt16(offset, little)`; end
-  def set_int16(offset, value, little = false); `#@native.setInt16(offset, value, little)`; end
+    def get_uint16(offset, little = false)
+      `#{@native}.getUint16(offset, little)`
+    end
 
-  def get_uint16(offset, little = false); `#@native.getUint16(offset, little)`; end
-  def set_uint16(offset, value, little = false); `#@native.setUint16(offset, value, little)`; end
+    def set_uint16(offset, value, little = false)
+      `#{@native}.setUint16(offset, value, little)`
+    end
 
-  def get_int32(offset, little = false); `#@native.getInt32(offset, little)`; end
-  def set_int32(offset, value, little = false); `#@native.setInt32(offset, value, little)`; end
+    def get_int32(offset, little = false)
+      `#{@native}.getInt32(offset, little)`
+    end
 
-  def get_uint32(offset, little = false); `#@native.getUint32(offset, little)`; end
-  def set_uint32(offset, value, little = false); `#@native.setUint32(offset, value, little)`; end
+    def set_int32(offset, value, little = false)
+      `#{@native}.setInt32(offset, value, little)`
+    end
 
-  def get_float32(offset, little = false); `#@native.getFloat32(offset, little)`; end
-  def set_float32(offset, value, little = false); `#@native.setFloat32(offset, value, little)`; end
+    def get_uint32(offset, little = false)
+      `#{@native}.getUint32(offset, little)`
+    end
 
-  def get_float64(offset, little = false); `#@native.getFloat64(offset, little)`; end
-  def set_float64(offset, value, little = false); `#@native.setFloat64(offset, value, little)`; end
-end
+    def set_uint32(offset, value, little = false)
+      `#{@native}.setUint32(offset, value, little)`
+    end
 
+    def get_float32(offset, little = false)
+      `#{@native}.getFloat32(offset, little)`
+    end
+
+    def set_float32(offset, value, little = false)
+      `#{@native}.setFloat32(offset, value, little)`
+    end
+
+    def get_float64(offset, little = false)
+      `#{@native}.getFloat64(offset, little)`
+    end
+
+    def set_float64(offset, value, little = false)
+      `#{@native}.setFloat64(offset, value, little)`
+    end
+  end
 end

data/stdlib/console.rb

@@ -4,70 +4,70 @@ require 'native'
 #
 # @see https://developer.mozilla.org/en-US/docs/Web/API/console
 class Console
-  include Native
+  include Native::Wrapper
 
   # Clear the console.
   def clear
-    `#@native.clear()`
+    `#{@native}.clear()`
   end
 
   # Print a stacktrace from the call site.
   def trace
-    `#@native.trace()`
+    `#{@native}.trace()`
   end
 
   # Log the passed objects based on an optional initial format.
   def log(*args)
-    `#@native.log.apply(#@native, args)`
+    `#{@native}.log.apply(#{@native}, args)`
   end
 
   # Log the passed objects based on an optional initial format as informational
   # log.
   def info(*args)
-    `#@native.info.apply(#@native, args)`
+    `#{@native}.info.apply(#{@native}, args)`
   end
 
   # Log the passed objects based on an optional initial format as warning.
   def warn(*args)
-    `#@native.warn.apply(#@native, args)`
+    `#{@native}.warn.apply(#{@native}, args)`
   end
 
   # Log the passed objects based on an optional initial format as error.
   def error(*args)
-    `#@native.error.apply(#@native, args)`
+    `#{@native}.error.apply(#{@native}, args)`
   end
 
   # Time the given block with the given label.
   def time(label, &block)
-    raise ArgumentError, "no block given" unless block
+    raise ArgumentError, 'no block given' unless block
 
-    `#@native.time(label)`
+    `#{@native}.time(label)`
 
     begin
       if block.arity == 0
         instance_exec(&block)
       else
-        block.call(self)
+        yield(self)
       end
     ensure
-      `#@native.timeEnd()`
+      `#{@native}.timeEnd()`
     end
   end
 
   # Group the given block.
   def group(*args, &block)
-    raise ArgumentError, "no block given" unless block
+    raise ArgumentError, 'no block given' unless block
 
-    `#@native.group.apply(#@native, args)`
+    `#{@native}.group.apply(#{@native}, args)`
 
     begin
       if block.arity == 0
         instance_exec(&block)
       else
-        block.call(self)
+        yield(self)
       end
     ensure
-      `#@native.groupEnd()`
+      `#{@native}.groupEnd()`
     end
   end
 
@@ -75,16 +75,16 @@ class Console
   def group!(*args, &block)
     return unless block_given?
 
-    `#@native.groupCollapsed.apply(#@native, args)`
+    `#{@native}.groupCollapsed.apply(#{@native}, args)`
 
     begin
       if block.arity == 0
         instance_exec(&block)
       else
-        block.call(self)
+        yield(self)
       end
     ensure
-      `#@native.groupEnd()`
+      `#{@native}.groupEnd()`
     end
   end
 end

data/stdlib/date.rb

@@ -8,9 +8,7 @@ class Date
       @d = d <=> 0
     end
 
-    def d
-      @d
-    end
+    attr_reader :d
 
     def zero?
       false
@@ -40,28 +38,28 @@ class Date
       self.class.new(+d)
     end
 
-    def <=> (other)
+    def <=>(other)
       case other
-        when Infinity;
-          return d <=> other.d
-        when Numeric;
-          return d
-        else
-          begin
-            l, r = other.coerce(self)
-            return l <=> r
-          rescue NoMethodError
-          end
+      when Infinity
+        d <=> other.d
+      when Numeric
+        d
+      else
+        begin
+          l, r = other.coerce(self)
+          l <=> r
+        rescue NoMethodError
+          nil
+        end
       end
-      nil
     end
 
     def coerce(other)
       case other
-        when Numeric
-          return -d, d
-        else
-          super
+      when Numeric
+        [-d, d]
+      else
+        super
       end
     end
 
@@ -77,12 +75,12 @@ class Date
 
   JULIAN          = Infinity.new
   GREGORIAN       = -Infinity.new
-  ITALY           = 2299161 # 1582-10-15
-  ENGLAND         = 2361222 # 1752-09-14
-  MONTHNAMES      = [nil] + %w(January February March April May June July August September October November December)
-  ABBR_MONTHNAMES = %w(jan feb mar apr may jun jul aug sep oct nov dec)
-  DAYNAMES        = %w(Sunday Monday Tuesday Wednesday Thursday Friday Saturday)
-  ABBR_DAYNAMES   = %w(Sun Mon Tue Wed Thu Fri Sat)
+  ITALY           = 2_299_161 # 1582-10-15
+  ENGLAND         = 2_361_222 # 1752-09-14
+  MONTHNAMES      = [nil] + %w[January February March April May June July August September October November December]
+  ABBR_MONTHNAMES = %w[jan feb mar apr may jun jul aug sep oct nov dec]
+  DAYNAMES        = %w[Sunday Monday Tuesday Wednesday Thursday Friday Saturday]
+  ABBR_DAYNAMES   = %w[Sun Mon Tue Wed Thu Fri Sat]
 
   class << self
     alias civil new
@@ -101,7 +99,7 @@ class Date
             current_month = current_date.getMonth(),
             current_year = current_date.getFullYear(),
             current_wday = current_date.getDay(),
-            full_month_name_regexp = #{MONTHNAMES.compact.join("|")};
+            full_month_name_regexp = #{MONTHNAMES.compact.join('|')};
 
         function match1(match) { return match[1]; }
         function match2(match) { return match[2]; }
@@ -269,7 +267,7 @@ class Date
           },
           {
             // ddd
-            regexp: new RegExp("^(" + #{DAYNAMES.join("|")} + ")$", 'i'),
+            regexp: new RegExp("^(" + #{DAYNAMES.join('|')} + ")$", 'i'),
             year: current_year,
             month: current_month,
             day: fromDayName(match1)
@@ -349,6 +347,13 @@ class Date
   end
 
   def initialize(year = -4712, month = 1, day = 1, start = ITALY)
+    %x{
+      // Because of Gregorian reform calendar goes from 1582-10-04 to 1582-10-15.
+      // All days in between end up as 4 october.
+      if (year === 1582 && month === 10 && day > 4 && day < 15) {
+        day = 4;
+      }
+    }
     @date = `new Date(year, month - 1, day)`
   end
 
@@ -356,11 +361,11 @@ class Date
     %x{
       if (date.$$is_number) {
         var result = #{clone};
-        result.date.setDate(#@date.getDate() - date);
+        result.date.setDate(#{@date}.getDate() - date);
         return result;
       }
       else if (date.date) {
-        return Math.round((#@date - #{date}.date) / (1000 * 60 * 60 * 24));
+        return Math.round((#{@date} - #{date}.date) / (1000 * 60 * 60 * 24));
       }
       else {
         #{raise TypeError};
@@ -372,7 +377,7 @@ class Date
     %x{
       if (date.$$is_number) {
         var result = #{clone};
-        result.date.setDate(#@date.getDate() + date);
+        result.date.setDate(#{@date}.getDate() + date);
         return result;
       }
       else {
@@ -383,7 +388,7 @@ class Date
 
   def <(other)
     %x{
-      var a = #@date, b = #{other}.date;
+      var a = #{@date}, b = #{other}.date;
       a.setHours(0, 0, 0, 0);
       b.setHours(0, 0, 0, 0);
       return a < b;
@@ -392,7 +397,7 @@ class Date
 
   def <=(other)
     %x{
-      var a = #@date, b = #{other}.date;
+      var a = #{@date}, b = #{other}.date;
       a.setHours(0, 0, 0, 0);
       b.setHours(0, 0, 0, 0);
       return a <= b;
@@ -401,7 +406,7 @@ class Date
 
   def >(other)
     %x{
-      var a = #@date, b = #{other}.date;
+      var a = #{@date}, b = #{other}.date;
       a.setHours(0, 0, 0, 0);
       b.setHours(0, 0, 0, 0);
       return a > b;
@@ -410,7 +415,7 @@ class Date
 
   def >=(other)
     %x{
-      var a = #@date, b = #{other}.date;
+      var a = #{@date}, b = #{other}.date;
       a.setHours(0, 0, 0, 0);
       b.setHours(0, 0, 0, 0);
       return a >= b;
@@ -420,11 +425,11 @@ class Date
   def <=>(other)
     %x{
       if (other.$$is_number) {
-        return #{self.jd <=> other}
+        return #{jd <=> other}
       }
 
       if (#{Date === other}) {
-        var a = #@date, b = #{other}.date;
+        var a = #{@date}, b = #{other}.date;
         a.setHours(0, 0, 0, 0);
         b.setHours(0, 0, 0, 0);
 
@@ -470,11 +475,11 @@ class Date
   alias eql? ==
 
   def clone
-    Date.wrap(`new Date(#@date.getTime())`)
+    Date.wrap(`new Date(#{@date}.getTime())`)
   end
 
   def day
-    `#@date.getDate()`
+    `#{@date}.getDate()`
   end
 
   def friday?
@@ -485,9 +490,9 @@ class Date
     %x{
     //Adapted from http://www.physics.sfasu.edu/astro/javascript/julianday.html
 
-    var mm = #@date.getMonth() + 1,
-        dd = #@date.getDate(),
-        yy = #@date.getFullYear(),
+    var mm = #{@date}.getMonth() + 1,
+        dd = #{@date}.getDate(),
+        yy = #{@date}.getFullYear(),
         hr = 12, mn = 0, sc = 0,
         ggg, s, a, j1, jd;
 
@@ -518,7 +523,7 @@ class Date
   end
 
   def julian?
-    `#@date < new Date(1582, 10 - 1, 15, 12)`
+    `#{@date} < new Date(1582, 10 - 1, 15, 12)`
   end
 
   def monday?
@@ -526,41 +531,49 @@ class Date
   end
 
   def month
-    `#@date.getMonth() + 1`
+    `#{@date}.getMonth() + 1`
   end
 
   def next
     self + 1
   end
 
-  def next_day(n=1)
+  def next_day(n = 1)
     self + n
   end
 
-  def next_month
+  def next_month(n = 1)
     %x{
       var result = #{clone}, date = result.date, cur = date.getDate();
       date.setDate(1);
-      date.setMonth(date.getMonth() + 1);
+      date.setMonth(date.getMonth() + n);
       date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
       return result;
     }
   end
 
-  def prev_day(n=1)
+  def next_year(years = 1)
+    self.class.new(year + years, month, day)
+  end
+
+  def prev_day(n = 1)
     self - n
   end
 
-  def prev_month
+  def prev_month(n = 1)
     %x{
       var result = #{clone}, date = result.date, cur = date.getDate();
       date.setDate(1);
-      date.setMonth(date.getMonth() - 1);
+      date.setMonth(date.getMonth() - n);
       date.setDate(Math.min(cur, days_in_month(date.getFullYear(), date.getMonth())));
       return result;
     }
   end
 
+  def prev_year(years = 1)
+    self.class.new(year - years, month, day)
+  end
+
   def saturday?
     wday == 6
   end
@@ -571,11 +584,11 @@ class Date
         return #{to_s};
       }
 
-      return #@date.$strftime(#{format});
+      return #{@date}.$strftime(#{format});
     }
   end
 
-  alias_method :succ, :next
+  alias succ next
 
   def sunday?
     wday == 0
@@ -587,13 +600,21 @@ class Date
 
   def to_s
     %x{
-      var d = #@date, year = d.getFullYear(), month = d.getMonth() + 1, day = d.getDate();
+      var d = #{@date}, year = d.getFullYear(), month = d.getMonth() + 1, day = d.getDate();
       if (month < 10) { month = '0' + month; }
       if (day < 10) { day = '0' + day; }
       return year + '-' + month + '-' + day;
     }
   end
 
+  def to_time
+    Time.new(year, month, day)
+  end
+
+  def to_n
+    @date
+  end
+
   def tuesday?
     wday == 2
   end
@@ -601,21 +622,19 @@ class Date
   def step(limit, step = 1, &block)
     steps_count = (limit - self).to_i
 
-    if (steps_count * step) < 0
-      steps = []
-    else
-      if steps_count < 0
-        steps = (0..-steps_count).step(step.abs).map { |i| -i } .reverse
-      else
-        steps = (0..steps_count).step(step.abs)
-      end
-    end
+    steps = if steps_count * step < 0
+              []
+            elsif steps_count < 0
+              (0..-steps_count).step(step.abs).map(&:-@) .reverse
+            else
+              (0..steps_count).step(step.abs)
+            end
 
     result = steps.map { |i| self + i }
 
 
     if block_given?
-      result.each {|i| yield(i)}
+      result.each { |i| yield(i) }
       self
     else
       result
@@ -631,7 +650,7 @@ class Date
   end
 
   def wday
-    `#@date.getDay()`
+    `#{@date}.getDay()`
   end
 
   def wednesday?
@@ -639,16 +658,16 @@ class Date
   end
 
   def year
-    `#@date.getFullYear()`
+    `#{@date}.getFullYear()`
   end
 
   def cwday
-    `#@date.getDay() || 7;`
+    `#{@date}.getDay() || 7`
   end
 
   def cweek
     %x{
-      var d = new Date(#@date);
+      var d = new Date(#{@date});
       d.setHours(0,0,0);
       d.setDate(d.getDate()+4-(d.getDay()||7));
       return Math.ceil((((d-new Date(d.getFullYear(),0,1))/8.64e7)+1)/7);