opal 0.10.0.beta3 → 0.10.0.beta4

data/spec/opal/core/runtime/truthy_spec.rb

@@ -34,4 +34,30 @@ describe "Opal truthyness" do
     
     is_falsey.should be_true
   end
+
+  it "should consider false, nil, null, and undefined as not truthy" do
+    called = nil
+    [`false`, `nil`, `null`, `undefined`].each do |v|
+      if v
+        called = true
+      end
+    end
+
+    called.should be_nil
+  end
+
+  it "should true as truthy" do
+    if `true`
+      called = true
+    end
+
+    called.should be_true
+  end
+
+  it "should handle logic operators correctly for false, nil, null, and undefined" do
+    (`false` || `nil` || `null` || `undefined` || 1).should == 1
+    [`false`, `nil`, `null`, `undefined`].each do |v|
+      `#{1 && v} === #{v}`.should == true
+    end
+  end
 end

data/spec/ruby_specs

@@ -100,9 +100,6 @@ ruby/core/unboundmethod
 ruby/language
 !ruby/language/constants_spec
 !ruby/language/execution_spec
-!ruby/language/next_spec
-!ruby/language/return_spec
-!ruby/language/yield_spec
 
 ruby/library/base64
 ruby/library/bigdecimal

data/stdlib/date.rb

@@ -338,6 +338,10 @@ class Date
     def today
       wrap `new Date()`
     end
+
+    def gregorian_leap?(year)
+      `(new Date(#{year}, 1, 29).getMonth()-1) === 0`
+    end
   end
 
   def initialize(year = -4712, month = 1, day = 1, start = ITALY)
@@ -411,6 +415,10 @@ class Date
 
   def <=>(other)
     %x{
+      if (other.$$is_number) {
+        return #{self.jd <=> other}
+      }
+
       var a = #@date, b = #{other}.date;
       a.setHours(0, 0, 0, 0);
       b.setHours(0, 0, 0, 0);
@@ -601,6 +609,19 @@ class Date
     `#@date.getFullYear()`
   end
 
+  def cwday
+    `#@date.getDay() || 7;`
+  end
+
+  def cweek
+    %x{
+      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);
+    }
+  end
+
   %x{
     function days_in_month(year, month) {
       var leap = ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0);

data/stdlib/native.rb

@@ -59,7 +59,7 @@ module Native
       if (prop instanceof Function) {
         var converted = new Array(args.length);
 
-        for (var i = 0, length = args.length; i < length; i++) {
+        for (var i = 0, l = args.length; i < l; i++) {
           var item = args[i],
               conv = #{try_convert(`item`)};
 

data/stdlib/nodejs/file.rb

@@ -1,3 +1,26 @@
+%x{
+  var warnings = {};
+  function handle_unsupported_feature(message) {
+    switch (Opal.config.unsupported_features_severity) {
+    case 'error':
+      #{Kernel.raise NotImplementedError, `message`}
+      break;
+    case 'warning':
+      warn(message)
+      break;
+    default: // ignore
+      // noop
+    }
+  }
+  function warn(string) {
+    if (warnings[string]) {
+      return;
+    }
+    warnings[string] = true;
+    #{warn(`string`)};
+  }
+}
+
 class File < IO
   include ::IO::Writable
   include ::IO::Readable
@@ -35,14 +58,6 @@ class File < IO
     end
   end
 
-  def self.basename(path, ext = undefined)
-    `__path__.basename(#{path}, #{ext})`
-  end
-
-  def self.dirname(path)
-    `__path__.dirname(#{path})`
-  end
-
   def self.join(*paths)
     `__path__.join.apply(__path__, #{paths})`
   end
@@ -80,16 +95,20 @@ class File < IO
     File::Stat.new(path)
   end
 
+  def self.mtime path
+    `__fs__.statSync(#{path}).mtime`
+  end
+
   # Instance Methods
 
   def initialize(path, flags)
     binary_flag_regexp = /b/
     encoding_flag_regexp = /:(.*)/
     # binary flag is unsupported
-    warn "Binary flag (b) is unsupported by Node.js openSync method, removing flag." if flags.match(binary_flag_regexp)
+    `handle_unsupported_feature("Binary flag (b) is unsupported by Node.js openSync method, removing flag.")` if flags.match(binary_flag_regexp)
     flags = flags.gsub(binary_flag_regexp, '')
     # encoding flag is unsupported
-    warn "Encoding flag (:encoding) is unsupported by Node.js openSync method, removing flag." if flags.match(encoding_flag_regexp)
+    `handle_unsupported_feature("Encoding flag (:encoding) is unsupported by Node.js openSync method, removing flag.")` if flags.match(encoding_flag_regexp)
     flags = flags.gsub(encoding_flag_regexp, '')
     @path = path
     @flags = flags
@@ -109,6 +128,10 @@ class File < IO
   def close
     `__fs__.closeSync(#{@fd})`
   end
+
+  def mtime
+    `__fs__.statSync(#{@path}).mtime`
+  end
 end
 
 class File::Stat
@@ -120,9 +143,11 @@ class File::Stat
     @path = path
   end
 
-
   def file?
     `__fs__.statSync(#{@path}).isFile()`
   end
 
+  def mtime
+    `__fs__.statSync(#{@path}).mtime`
+  end
 end

data/stdlib/nodejs/io.rb

@@ -1,3 +1,58 @@
+class IO
+
+  @__fs__ = node_require :fs
+  `var __fs__ = #{@__fs__}`
+
+  attr_reader :eof
+  attr_reader :lineno
+
+  def initialize
+    @eof = false
+    @lineno = 0
+  end
+
+  def read
+    if @eof
+      ''
+    else
+      res = `__fs__.readFileSync(#{@path}).toString()`
+      @eof = true
+      @lineno = res.size
+      res
+    end
+  end
+
+  def each_line(separator = $/, &block)
+    if @eof
+      return block_given? ? self : [].to_enum
+    end
+
+    if block_given?
+      lines = File.read(@path)
+      %x{
+        self.eof = false;
+        self.lineno = 0;
+        var chomped  = #{lines.chomp},
+            trailing = lines.length != chomped.length,
+            splitted = chomped.split(separator);
+        for (var i = 0, length = splitted.length; i < length; i++) {
+          self.lineno += 1;
+          if (i < length - 1 || trailing) {
+            #{yield `splitted[i] + separator`};
+          }
+          else {
+            #{yield `splitted[i]`};
+          }
+        }
+        self.eof = true;
+      }
+      self
+    else
+      read.each_line
+    end
+  end
+end
+
 STDOUT.write_proc = -> (string) {`process.stdout.write(string)`}
 STDERR.write_proc = -> (string) {`process.stderr.write(string)`}
 

data/stdlib/pathname.rb

@@ -166,6 +166,49 @@ class Pathname
 
   alias :to_str :to_path
   alias :to_s :to_path
+
+  SAME_PATHS = if File::FNM_SYSCASE.nonzero?
+    # Avoid #zero? here because #casecmp can return nil.
+    proc {|a, b| a.casecmp(b) == 0}
+  else
+    proc {|a, b| a == b}
+  end
+
+  def relative_path_from(base_directory)
+    dest_directory = self.cleanpath.to_s
+    base_directory = base_directory.cleanpath.to_s
+    dest_prefix = dest_directory
+    dest_names = []
+    while r = chop_basename(dest_prefix)
+      dest_prefix, basename = r
+      dest_names.unshift basename if basename != '.'
+    end
+    base_prefix = base_directory
+    base_names = []
+    while r = chop_basename(base_prefix)
+      base_prefix, basename = r
+      base_names.unshift basename if basename != '.'
+    end
+    unless SAME_PATHS[dest_prefix, base_prefix]
+      raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
+    end
+    while !dest_names.empty? &&
+          !base_names.empty? &&
+          SAME_PATHS[dest_names.first, base_names.first]
+      dest_names.shift
+      base_names.shift
+    end
+    if base_names.include? '..'
+      raise ArgumentError, "base_directory has ..: #{base_directory.inspect}"
+    end
+    base_names.fill('..')
+    relpath_names = base_names + dest_names
+    if relpath_names.empty?
+      Pathname.new('.')
+    else
+      Pathname.new(File.join(*relpath_names))
+    end
+  end
 end
 
 module Kernel

data/stdlib/promise.rb

@@ -353,7 +353,7 @@ class Promise
     def initialize(depth, block)
       @depth = depth
 
-      super success: -> {
+      super success: proc {
         trace = Trace.it(self).reverse
         trace.pop
 

data/tasks/testing.rake

@@ -8,7 +8,7 @@ RSpec::Core::RakeTask.new(:rspec) do |t|
   t.pattern = 'spec/lib/**/*_spec.rb'
 end
 
-module Testing
+module MSpecSuite
   extend self
 
   def stubs
@@ -125,9 +125,9 @@ DESC
     url      = "http://localhost:#{port}/"
 
     mkdir_p File.dirname(filename)
-    Testing.write_file filename, Testing.specs(ENV.to_hash.merge 'SUITE' => suite)
+    MSpecSuite.write_file filename, MSpecSuite.specs(ENV.to_hash.merge 'SUITE' => suite)
 
-    Testing.stubs.each {|s| ::Opal::Config.stubbed_files << s }
+    MSpecSuite.stubs.each {|s| ::Opal::Config.stubbed_files << s }
 
     Opal::Config.arity_check_enabled = true
     Opal::Config.freezing_stubs_enabled = true
@@ -157,10 +157,10 @@ DESC
 
       filename = "tmp/mspec_#{platform}.rb"
       mkdir_p File.dirname(filename)
-      bm_filepath = Testing.bm_filepath if ENV['BM']
-      Testing.write_file filename, Testing.specs(ENV.to_hash.merge 'SUITE' => suite), bm_filepath
+      bm_filepath = MSpecSuite.bm_filepath if ENV['BM']
+      MSpecSuite.write_file filename, MSpecSuite.specs(ENV.to_hash.merge 'SUITE' => suite), bm_filepath
 
-      stubs = Testing.stubs.map{|s| "-s#{s}"}.join(' ')
+      stubs = MSpecSuite.stubs.map{|s| "-s#{s}"}.join(' ')
 
       sh "ruby -rbundler/setup -r#{__dir__}/testing/mspec_special_calls "\
          "bin/opal -gmspec #{include_paths} #{stubs} -R#{platform} -Dwarning -A #{filename}"
@@ -199,47 +199,71 @@ task :jshint do
   end
 end
 
+
+module MinitestSuite
+  extend self
+
+  def build_js_command(files, options = {})
+    includes = options.fetch(:includes, [])
+    js_filename = options.fetch(:js_filename, [])
+
+    includes << 'vendored-minitest'
+    include_paths = includes.map {|i| " -I#{i}"}.join
+
+    requires = files.map{|f| "require '#{f}'"}
+    rb_filename = js_filename.sub(/\.js$/, '.rb')
+    mkdir_p File.dirname(rb_filename)
+    File.write rb_filename, requires.join("\n")
+
+    stubs = "-soptparse -sio/console -stimeout -smutex_m -srubygems -stempfile -smonitor"
+
+    "ruby -rbundler/setup bin/opal #{include_paths} #{stubs} -Dwarning -A #{rb_filename} -c > #{js_filename}"
+  end
+end
+
 task :cruby_tests do
   if ENV.key? 'FILES'
-    files = Dir[ENV['FILES'] || 'test/test_*.rb']
-    include_paths = '-Itest -I. -Itmp -Ilib'
+    files = Dir[ENV['FILES']]
+    includes = %w[test . tmp lib]
   else
-    include_paths = '-Itest/cruby/test -Itest'
-    test_dir = Pathname("#{__dir__}/../test/cruby/test")
+    includes = %w[test test/cruby/test]
     files = %w[
       benchmark/test_benchmark.rb
       ruby/test_call.rb
       opal/test_keyword.rb
       base64/test_base64.rb
       opal/unsupported_and_bugs.rb
-    ].flat_map do |path|
-      if path.end_with?('.rb')
-        path
-      else
-        glob = test_dir.join(path+"/test_*.rb").to_s
-        size = test_dir.to_s.size
-        Dir[glob].map { |file| file[size+1..-1] }
-      end
-    end
+    ]
   end
-  include_paths << ' -Ivendored-minitest'
 
-  requires = files.map{|f| "require '#{f}'"}
-  filename = 'tmp/cruby_tests.rb'
   js_filename = 'tmp/cruby_tests.js'
-  mkdir_p File.dirname(filename)
-  File.write filename, requires.join("\n")
-
-  stubs = "-soptparse -sio/console -stimeout -smutex_m -srubygems -stempfile -smonitor"
-
-  puts "== Running: #{files.join ", "}"
+  build_js_command = MinitestSuite.build_js_command(
+    %w[
+      opal/platform
+      opal-parser
+    ] + files,
+    includes: includes,
+    js_filename: js_filename,
+  )
+  sh build_js_command
+  sh "NODE_PATH=stdlib/nodejs/node_modules node #{js_filename}"
+end
 
-  sh "ruby -rbundler/setup "\
-     "bin/opal #{include_paths} #{stubs} -ropal/platform -ropal-parser -Dwarning -A #{filename} -c > #{js_filename}"
+task :test_nodejs do
+  js_filename = 'tmp/test_nodejs.js'
+  build_js_command = MinitestSuite.build_js_command(
+    %w[
+      opal-parser.rb
+      test_file.rb
+    ],
+    includes: %w[test/nodejs],
+    js_filename: js_filename,
+  )
+  sh build_js_command
   sh "NODE_PATH=stdlib/nodejs/node_modules node #{js_filename}"
 end
 
 task :mspec    => [:mspec_phantomjs, :mspec_nodejs, :mspec_sprockets_phantomjs]
-task :minitest => [:cruby_tests]
+task :minitest => [:cruby_tests, :test_nodejs]
 task :test_all => [:rspec, :mspec, :minitest]
 

data/test/nodejs/test_file.rb

@@ -0,0 +1,30 @@
+# Copied from cruby and modified to skip unsupported syntaxes
+require 'test/unit'
+require 'nodejs'
+require 'nodejs/file'
+
+class TestNodejsFile < Test::Unit::TestCase
+  def test_write_read
+    path = '/tmp/testing_nodejs_file_implementation'
+    contents = 'foobar'
+    assert !File.exist?(path)
+    File.write path, contents
+
+    assert_equal(contents, File.read(path))
+  end
+
+  def test_read_file
+    File.write('tmp/foo', 'bar')
+    assert_equal("bar", File.read('tmp/foo'))
+  end
+
+  def test_read_each_line
+    File.write('tmp/bar', "one\ntwo")
+    file = File.new('tmp/bar', 'r')
+    lines = []
+    file.each_line do |line|
+      lines << line
+    end
+    assert_equal(lines.length, 2)
+  end
+end