opal 1.6.1 → 1.7.0

data/stdlib/set.rb

@@ -1,258 +1 @@
-# helpers: freeze
-# Portions Copyright (c) 2002-2013 Akinori MUSHA <knu@iDaemons.org>
-class ::Set
-  include ::Enumerable
-
-  def self.[](*ary)
-    new(ary)
-  end
-
-  def initialize(enum = nil, &block)
-    @hash = {}
-
-    return if enum.nil?
-    ::Kernel.raise ::ArgumentError, 'value must be enumerable' unless ::Enumerable === enum
-
-    if block
-      enum.each { |item| add yield(item) }
-    else
-      merge(enum)
-    end
-  end
-
-  def dup
-    result = self.class.new
-    result.merge(self)
-  end
-
-  def -(enum)
-    unless enum.respond_to? :each
-      ::Kernel.raise ::ArgumentError, 'value must be enumerable'
-    end
-
-    dup.subtract(enum)
-  end
-
-  def inspect
-    "#<Set: {#{to_a.join(',')}}>"
-  end
-
-  def ==(other)
-    if equal?(other)
-      true
-    elsif other.instance_of?(self.class)
-      @hash == other.instance_variable_get(:@hash)
-    elsif other.is_a?(::Set) && size == other.size
-      other.all? { |o| @hash.include?(o) }
-    else
-      false
-    end
-  end
-
-  def add(o)
-    @hash[o] = true
-    self
-  end
-
-  def classify(&block)
-    return enum_for(:classify) unless block_given?
-
-    result = ::Hash.new { |h, k| h[k] = self.class.new }
-
-    each { |item| result[yield(item)].add item }
-
-    result
-  end
-
-  def collect!(&block)
-    return enum_for(:collect!) unless block_given?
-    result = self.class.new
-    each { |item| result << yield(item) }
-    replace result
-  end
-
-  def compare_by_identity
-    if @hash.respond_to?(:compare_by_identity)
-      @hash.compare_by_identity
-      self
-    else
-      raise NotImplementedError, "#{self.class.name}\##{__method__} is not implemented"
-    end
-  end
-
-  def compare_by_identity?
-    @hash.respond_to?(:compare_by_identity?) && @hash.compare_by_identity?
-  end
-
-  def delete(o)
-    @hash.delete(o)
-    self
-  end
-
-  def delete?(o)
-    if include?(o)
-      delete(o)
-      self
-    end
-  end
-
-  def delete_if
-    return enum_for(:delete_if) unless block_given?
-    # @hash.delete_if should be faster, but using it breaks the order
-    # of enumeration in subclasses.
-    select { |o| yield o }.each { |o| @hash.delete(o) }
-    self
-  end
-
-  def freeze
-    return self if frozen?
-
-    @hash.freeze
-    `$freeze(self)`
-  end
-
-  def keep_if
-    return enum_for(:keep_if) unless block_given?
-    reject { |o| yield o }.each { |o| @hash.delete(o) }
-    self
-  end
-
-  def reject!(&block)
-    return enum_for(:reject!) unless block_given?
-    before = size
-    delete_if(&block)
-    size == before ? nil : self
-  end
-
-  def select!(&block)
-    return enum_for(:select!) unless block_given?
-    before = size
-    keep_if(&block)
-    size == before ? nil : self
-  end
-
-  def add?(o)
-    if include?(o)
-      nil
-    else
-      add(o)
-    end
-  end
-
-  def each(&block)
-    return enum_for(:each) unless block_given?
-    @hash.each_key(&block)
-    self
-  end
-
-  def empty?
-    @hash.empty?
-  end
-
-  def eql?(other)
-    @hash.eql?(other.instance_eval { @hash })
-  end
-
-  def clear
-    @hash.clear
-    self
-  end
-
-  def include?(o)
-    @hash.include?(o)
-  end
-
-  def merge(enum)
-    enum.each { |item| add item }
-    self
-  end
-
-  def replace(enum)
-    clear
-    merge(enum)
-
-    self
-  end
-
-  def size
-    @hash.size
-  end
-
-  def subtract(enum)
-    enum.each { |item| delete item }
-    self
-  end
-
-  def |(enum)
-    unless enum.respond_to? :each
-      ::Kernel.raise ::ArgumentError, 'value must be enumerable'
-    end
-    dup.merge(enum)
-  end
-
-  %x{
-    function is_set(set) {
-      #{`set`.is_a?(::Set) || ::Kernel.raise(::ArgumentError, 'value must be a set')}
-    }
-  }
-
-  def superset?(set)
-    `is_set(set)`
-    return false if size < set.size
-    set.all? { |o| include?(o) }
-  end
-
-  def proper_superset?(set)
-    `is_set(set)`
-    return false if size <= set.size
-    set.all? { |o| include?(o) }
-  end
-
-  def subset?(set)
-    `is_set(set)`
-    return false if set.size < size
-    all? { |o| set.include?(o) }
-  end
-
-  def proper_subset?(set)
-    `is_set(set)`
-    return false if set.size <= size
-    all? { |o| set.include?(o) }
-  end
-
-  def intersect?(set)
-    `is_set(set)`
-    if size < set.size
-      any? { |o| set.include?(o) }
-    else
-      set.any? { |o| include?(o) }
-    end
-  end
-
-  def disjoint?(set)
-    !intersect?(set)
-  end
-
-  def to_a
-    @hash.keys
-  end
-
-  alias + |
-  alias < proper_subset?
-  alias << add
-  alias <= subset?
-  alias > proper_superset?
-  alias >= superset?
-  alias difference -
-  alias filter! select!
-  alias length size
-  alias map! collect!
-  alias member? include?
-  alias union |
-end
-
-module ::Enumerable
-  def to_set(klass = Set, *args, &block)
-    klass.new(self, *args, &block)
-  end
-end
+# Set has been moved to corelib

data/tasks/benchmarking.rake

@@ -1,3 +1,6 @@
+require_relative '../lib/opal/version'
+require_relative '../lib/opal/cli_runners'
+
 namespace :bench do
   directory "tmp/bench"
 
@@ -6,19 +9,37 @@ namespace :bench do
     "tmp/bench/#{index}_#{name.gsub('.', '-')}.txt"
   }
 
-  desc "Benchmark Opal"
-  task :opal => "tmp/bench" do |t, args|
-    require 'opal/version'
-    files = Array(args[:files]) + args.extras
-    report = report_file_for["opal-#{Opal::VERSION}"]
-    sh "bundle exec opal benchmark/run.rb #{files.join(" ")} | tee #{report}"
+  runners = Opal::CliRunners.registered_runners.sort.reject { |r| r == 'Compiler' }
+  runners.each do |runner|
+    desc "Benchmark Opal with #{runner}"
+    runner_dc = runner.downcase
+    task_name = "opal_#{runner_dc}".to_sym
+    task task_name => "tmp/bench" do |t, args|
+      files = Array(args[:files]) + args.extras
+      report = report_file_for["opal-#{runner_dc}-#{Opal::VERSION}"]
+      sh "bundle exec ruby benchmark/run.rb --#{runner_dc} #{files.join(" ")} | tee #{report}"
+    end
   end
 
   desc "Benchmark Ruby"
   task :ruby => "tmp/bench" do |t, args|
     files = Array(args[:files]) + args.extras
     report = report_file_for["ruby-#{RUBY_VERSION}"]
-    sh "bundle exec ruby benchmark/run.rb #{files.join(" ")} | tee #{report}"
+    sh "bundle exec ruby benchmark/run.rb --ruby #{files.join(" ")} | tee #{report}"
+  end
+
+  desc "Benchmark Ruby vs Opal Node"
+  task :ruby_vs_opal => "tmp/bench" do |t, args|
+    files = Array(args[:files]) + args.extras
+    report = report_file_for["ruby-#{RUBY_VERSION}-vs-opal-node-#{Opal::VERSION}"]
+    sh "bundle exec ruby benchmark/run.rb --ruby --node #{files.join(" ")} | tee #{report}"
+  end
+
+  desc "Benchmark All Engines"
+  task :all => "tmp/bench" do |t, args|
+    files = Array(args[:files]) + args.extras
+    report = report_file_for["ruby-#{RUBY_VERSION}-vs-opal-all-#{Opal::VERSION}"]
+    sh "bundle exec ruby benchmark/run.rb --ruby --node --chrome --firefox #{files.join(" ")} | tee #{report}"
   end
 
   desc "Delete all benchmark results"
@@ -26,6 +47,21 @@ namespace :bench do
     sh "rm tmp/bench/*"
   end
 
+  def results_to_f(results)
+    ips = results.compact
+    ips.each_with_index do |i, idx|
+      factor = case i[-1]
+               when 'G' then 1_000_000_000
+               when 'M' then 1_000_000
+               when 'k' then 1_000
+               else
+                 1
+               end
+      ips[idx] = (factor > 1 ? i[0..-2].to_f : i.to_f) * factor
+    end
+    ips
+  end
+
   desc "Combined report of all benchmark results"
   task :report do |t, args|
     files = Array(args[:files]) + args.extras
@@ -41,8 +77,13 @@ namespace :bench do
       report_name = File.basename(file, File.extname(file))
       report_results = {}
       File.read(file).each_line do |line|
-        benchmark_name, benchmark_result = line.split(" ")
-        report_results[benchmark_name] = benchmark_result
+        benchmark_name, benchmark_result_a, benchmark_result_b, benchmark_result_c = line.split(" ")
+        if benchmark_result_b == "i/s"
+          benchmark_result_b = benchmark_result_c = nil
+        elsif benchmark_result_c == "i/s"
+          benchmark_result_c = nil
+        end
+        report_results[benchmark_name] = [benchmark_result_a, benchmark_result_b, benchmark_result_c]
         benchmark_names << benchmark_name
       end
       reports << [report_name, report_results]
@@ -66,17 +107,19 @@ namespace :bench do
         results_string = ""
 
         if report_results[benchmark_name]
-          sec = report_results[benchmark_name].to_f
-
-          if report_name != base_report_name && base_report_results[benchmark_name]
-            base_sec = base_report_results[benchmark_name].to_f
-            delta_percent = -((1 - sec/base_sec)*100)
-            results_string << format("%+0.2f%%", delta_percent).rjust(10).ljust(12)
-          else
-            results_string << (" "*14)
+          ips = results_to_f(report_results[benchmark_name])
+          base_ips = report_name != base_report_name && base_report_results[benchmark_name] ? results_to_f(base_report_results[benchmark_name]) : []
+
+          ips.each_with_index do |i, idx|
+            if base_ips[idx]
+              delta_percent = -((1 - i/base_ips[idx])*100)
+              results_string << format("%+0.2f%%", delta_percent).rjust(10).ljust(12)
+            else
+              results_string << (" "*14)
+            end
+
+            results_string << format("%0.3f i/s", i).rjust(9)
           end
-
-          results_string << format("%0.3fms", sec).rjust(9)
         end
         results_string << ' | '
         row << results_string

data/tasks/performance.rake

@@ -3,7 +3,7 @@
 require_relative "#{__dir__}/../lib/opal/util"
 require_relative "#{__dir__}/../lib/opal/os"
 
-OS = Opal::OS
+OS = Opal::OS unless defined? OS
 
 class Timing
   def initialize(tries: 31, &block)

data/tasks/testing.rake

@@ -1,7 +1,9 @@
 require_relative "#{__dir__}/../lib/opal/os"
+require_relative "#{__dir__}/../lib/opal/cli_runners"
+
 require 'rspec/core/rake_task'
 
-OS = Opal::OS
+OS = Opal::OS unless defined? OS
 
 RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = 'spec/lib/**/*_spec.rb'
@@ -283,8 +285,8 @@ Use PATTERN environment variable to manually set the glob for specs:
   bundle exec rake mspec_nodejs PATTERN=spec/ruby/core/module/class_variable*_spec.rb
   bundle exec rake mspec_nodejs PATTERN=spec/ruby/core/numeric/**_spec.rb
 DESC
-
-platforms = %w[nodejs opalopal_nodejs server chrome gjs quickjs]
+runners = Opal::CliRunners.to_h.keys.map(&:to_s).reject { |r| r == 'compiler' }
+platforms = (%w[opalopal_nodejs] + runners).sort
 node_platforms = %w[nodejs opalopal_nodejs]
 mspec_suites = %w[ruby opal]
 minitest_suites = %w[cruby]

data/test/nodejs/test_file.rb

@@ -130,10 +130,25 @@ class TestNodejsFile < Test::Unit::TestCase
     refute(File.directory?('test/nodejs/fixtures/hello.rb'),              'test/nodejs/fixtures/hello.rb should not be a directory')
   end
 
+  # Let's not ship our repo with symlinks, but create them on the go
+  def with_symlinks(&block)
+    dir_symlink = 'test/nodejs/fixtures/symlink-to-directory'
+    file_symlink = 'test/nodejs/fixtures/symlink-to-file'
+    
+    File.symlink('.', dir_symlink)
+    File.symlink('hello.rb', file_symlink)
+    block.call(dir_symlink, file_symlink)
+  ensure
+    File.unlink(dir_symlink)
+    File.unlink(file_symlink)
+  end
+
   def test_directory_check_with_symlinks
-    assert(File.directory?('test/nodejs/fixtures/symlink-to-directory'),  'test/nodejs/fixtures/symlink-to-directory should be a directory')
-    assert(File.directory?('test/nodejs/fixtures/symlink-to-directory/'), 'test/nodejs/fixtures/symlink-to-directory/ should be a directory')
-    refute(File.directory?('test/nodejs/fixtures/symlink-to-file'),       'test/nodejs/fixtures/symlink-to-file should not be a directory')
+    with_symlinks do |dir_symlink, file_symlink|
+      assert(File.directory?(dir_symlink),     dir_symlink+' should be a directory')
+      assert(File.directory?(dir_symlink+'/'), dir_symlink+'/ should be a directory')
+      refute(File.directory?(file_symlink),    file_symlink+' should not be a directory')
+    end
   end unless windows_platform?
 
   def test_file_check
@@ -144,16 +159,20 @@ class TestNodejsFile < Test::Unit::TestCase
   end
 
   def test_file_check_with_symlinks
-    refute(File.file?('test/nodejs/fixtures/symlink-to-directory'),  'test/nodejs/fixtures/symlink-to-directory should not be a file')
-    refute(File.file?('test/nodejs/fixtures/symlink-to-directory/'), 'test/nodejs/fixtures/symlink-to-directory/ should not be a file')
-    assert(File.file?('test/nodejs/fixtures/symlink-to-file'),       'test/nodejs/fixtures/symlink-to-file should be a file')
+    with_symlinks do |dir_symlink, file_symlink|
+      refute(File.file?(dir_symlink),     dir_symlink+' should not be a file')
+      refute(File.file?(dir_symlink+'/'), dir_symlink+'/ should not be a file')
+      assert(File.file?(file_symlink),    file_symlink+' should be a file')
+    end
   end unless windows_platform?
 
   def test_file_symlink?
-    assert(File.symlink?('test/nodejs/fixtures/symlink-to-file'))
-    assert(File.symlink?('test/nodejs/fixtures/symlink-to-directory'))
-    refute(File.symlink?('test/nodejs/fixtures'))
-    refute(File.symlink?('test/nodejs/fixtures/hello.rb'))
+    with_symlinks do |dir_symlink, file_symlink|
+      assert(File.symlink?(file_symlink))
+      assert(File.symlink?(dir_symlink))
+      refute(File.symlink?('test/nodejs/fixtures'))
+      refute(File.symlink?('test/nodejs/fixtures/hello.rb'))
+    end
   end unless windows_platform?
 
   def test_file_readable

data/test/opal/http_server.rb

@@ -3,50 +3,67 @@ require 'sinatra'
 cat_image = File.open(File.join(File.dirname(__FILE__), 'cat.png'), 'rb').read
 
 get '/' do
+  headers \
+    'Access-Control-Allow-Origin' => '*'
   'Ready!'
 end
 
 get '/plain_text' do
   status 200
-  headers \
-    'Content-Type' => 'text/plain'
+  headers(
+    'Content-Type' => 'text/plain',
+    'Access-Control-Allow-Origin' => '*' )
   body 'plain text'
 end
 
 
 get '/no_header' do
   status 200
-  headers \
-    'Content-Type' =>  ''
+  headers(
+    'Content-Type' =>  '',
+    'Access-Control-Allow-Origin' => '*')
   body 'no header'
 end
 
 get '/html' do
   status 200
-  headers \
-    'Content-Type' => 'text/html; charset=utf-8'
+  headers(
+    'Content-Type' => 'text/html; charset=utf-8',
+    'Access-Control-Allow-Origin' => '*')
   body '<body>'
 end
 
 get '/png' do
   status 200
-  headers \
-    'Content-Type' => 'image/png'
+  headers(
+    'Content-Type' => 'image/png',
+    'Access-Control-Allow-Origin' => '*')
   body cat_image
 end
 
 get '/404' do
   status 404
+  headers \
+    'Access-Control-Allow-Origin' => '*'
 end
 
 get '/500' do
   status 500
+  headers \
+    'Access-Control-Allow-Origin' => '*'
 end
 
 get '/last_modified' do
   status 200
-  headers \
-    'Content-Type' => 'text/plain',
-    'Last-Modified' => 'Wed, 21 Oct 2015 07:28:00 GMT'
+  headers(
+       'Content-Type' => 'text/plain',
+       'Last-Modified' => 'Wed, 21 Oct 2015 07:28:00 GMT',
+       'Access-Control-Allow-Origin' => '*')
   body 'Look Ma, I have a Last-Modified header'
 end
+
+get '/*' do
+  status 404
+  headers \
+    'Access-Control-Allow-Origin' => '*'
+end

data/test/opal/unsupported_and_bugs.rb

@@ -41,4 +41,5 @@ end
 class TestBenchmark
   # sleep is unsupported if not awaited
   unsupported :test_realtime_output
-end
+  bug :test_bugs_ruby_dev_40906_can_add_in_place_the_time_of_execution_of_the_block_given
+end