opal 0.10.6 → 0.11.0.rc1

data/spec/opal/stdlib/erb/quoted.opalerb

@@ -1 +1 @@
-<div class="foo">hello <%= "there " + @name %></div>
+<div class="foo">hello <%= "there" + " #{@name}" %></div>

data/spec/opal/stdlib/json/parse_spec.rb

@@ -30,4 +30,8 @@ describe "JSON.parse" do
     JSON.parse('{"a": "b"}').should == {"a" => "b"}
     JSON.parse('{"a": null, "b": 10, "c": [true, false]}').should == {"a" => nil, "b" => 10, "c" => [true, false]}
   end
+
+  it "raises ParserError for invalid JSON" do
+    lambda { JSON.parse("invalid_json") }.should raise_error(JSON::ParserError)
+  end
 end

data/spec/opal/stdlib/native/hash_spec.rb

@@ -12,6 +12,7 @@ describe Hash do
         e: [
           {
             f: 'g',
+            h: [null],
           },
         ],
       }
@@ -27,6 +28,7 @@ describe Hash do
       e: [
         {
           f: 'g',
+          h: [nil],
         },
       ],
     }
@@ -34,6 +36,20 @@ describe Hash do
     expect(h).to eq(expected_hash)
   end
 
+  it 'turns Object.create(null) JS objects into a hash' do
+    %x{
+      var obj = Object.create(null);
+      var foo = Object.create(null);
+      var bar = Object.create(null);
+      obj.foo = foo;
+      foo.bar = bar;
+      bar.baz = 'baz';
+    }
+    hash = Hash.new(`obj`)
+
+    expect(hash).to eq({ foo: { bar: { baz: 'baz' } } })
+  end
+
   describe '#to_n' do
     it 'converts a hash with native objects as values' do
       obj = { 'a_key' => `{ key: 1 }` }

data/spec/ruby_specs

@@ -18,6 +18,7 @@ ruby/core/fixnum
 ruby/core/file/basename_spec
 ruby/core/file/dirname_spec
 ruby/core/file/extname_spec
+ruby/core/file/join_spec
 ruby/core/float
 ruby/core/hash
 ruby/core/integer
@@ -82,6 +83,7 @@ ruby/core/proc
 ruby/core/range
 ruby/core/rational
 ruby/core/regexp
+ruby/core/random
 
 ruby/core/string
 !ruby/core/string/crypt_spec
@@ -98,7 +100,6 @@ ruby/core/true
 ruby/core/unboundmethod
 
 ruby/language
-!ruby/language/constants_spec
 !ruby/language/execution_spec
 
 ruby/library/base64

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'opal'
 require 'set'
+require 'opal/platform'
 require 'opal-parser'
 require 'mspec'
 require 'mspec/version'

data/spec/support/rewriters_helper.rb

@@ -0,0 +1,24 @@
+module RewritersHelper
+  def s(type, *children)
+    ::Opal::AST::Node.new(type, children)
+  end
+
+  def rewritten(ast)
+    described_class.new.process(ast)
+  end
+
+  def expect_rewritten(ast)
+    expect(rewritten(ast))
+  end
+
+  def expect_no_rewriting_for(ast)
+    expect_rewritten(ast).to eq(ast)
+  end
+
+  def ast_of(source)
+    buffer = Parser::Source::Buffer.new('(eval)')
+    buffer.source = source
+    parser = Opal::Parser.default_parser
+    parser.parse(buffer)
+  end
+end

data/stdlib/base64.rb

@@ -76,7 +76,9 @@ module Base64
     `decode(string.replace(/\-/g, '+').replace(/_/g, '/'))`
   end
 
-  def self.urlsafe_encode64(string)
-    `encode(string).replace(/\+/g, '-').replace(/\//g, '_')`
+  def self.urlsafe_encode64(string, padding: true)
+    str = `encode(string).replace(/\+/g, '-').replace(/\//g, '_')`
+    str = str.delete("=") unless padding
+    str
   end
 end

data/stdlib/bigdecimal/bignumber.js.rb

@@ -1,6 +1,6 @@
 class BigDecimal
   %x{
-    var define = function (f) { Opal.casgn(self, 'BigNumber', f()); };
+    var define = function (f) { Opal.const_set(self, 'BigNumber', f()); };
     define.amd = true;
 
     /* jshint ignore:start */

data/stdlib/date.rb

@@ -1,4 +1,6 @@
 class Date
+  include Comparable
+
   class Infinity < Numeric
     include Comparable
 
@@ -122,7 +124,7 @@ class Date
         // Converts month abbr (nov) to a month number
         function fromMonthAbbr(fn) {
           return function(match) {
-            var abbr = fn(match);
+            var abbr = fn(match).toLowerCase();
             return #{ABBR_MONTHNAMES}.indexOf(abbr) + 1;
           }
         }
@@ -419,29 +421,26 @@ class Date
         return #{self.jd <=> other}
       }
 
-      var a = #@date, b = #{other}.date;
-      a.setHours(0, 0, 0, 0);
-      b.setHours(0, 0, 0, 0);
+      if (#{Date === other}) {
+        var a = #@date, b = #{other}.date;
+        a.setHours(0, 0, 0, 0);
+        b.setHours(0, 0, 0, 0);
 
-      if (a < b) {
-        return -1;
-      }
-      else if (a > b) {
-        return 1;
-      }
-      else {
-        return 0;
+        if (a < b) {
+          return -1;
+        }
+        else if (a > b) {
+          return 1;
+        }
+        else {
+          return 0;
+        }
+      } else {
+        return nil;
       }
     }
   end
 
-  def ==(other)
-    %x{
-      var a = #@date, b = other.date;
-      return (a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate());
-    }
-  end
-
   def >>(n)
     %x{
       if (!n.$$is_number) {

data/stdlib/json.rb

@@ -1,7 +1,20 @@
 module JSON
+  class JSONError < StandardError
+  end
+
+  class ParserError < JSONError
+  end
+
   %x{
-    var $parse  = JSON.parse,
-        $hasOwn = Opal.hasOwnProperty;
+    var $hasOwn = Opal.hasOwnProperty;
+
+    function $parse(source) {
+      try {
+        return JSON.parse(source);
+      } catch (e) {
+        #{raise JSON::ParserError, `e.message`};
+      }
+    };
 
     function to_opal(value, options) {
       var klass, arr, hash, i, ii, k;
@@ -41,8 +54,7 @@ module JSON
             }
 
             if (!options.parse && (klass = #{`hash`[JSON.create_id]}) != nil) {
-              klass = Opal.get(klass);
-              return #{`klass`.json_create(`hash`)};
+              return #{::Object.const_get(`klass`).json_create(`hash`)};
             }
             else {
               return hash;

data/stdlib/nashorn/file.rb

@@ -10,4 +10,19 @@ class File
         return data.join("\n");
       )
   end
+
+  def self.file? path
+    %x(
+      var Files = Java.type('java.nio.file.Files');
+      return Files.exists(path) && Files.isRegularFile(path);
+    )
+  end
+
+  def self.readable? path
+    %x(
+      var Files = Java.type('java.nio.file.Files');
+      return Files.exists(path) && Files.isReadable(path);
+    )
+  end
+
 end

data/stdlib/native.rb

@@ -12,6 +12,9 @@
 #   do_later = $$[:setTimeout] # Accessing the "setTimeout" property
 #   do_later.call(->{ puts :hello}, 500)
 #
+# `$$` and `$global` wrap `Opal.global`, which the Opal JS runtime
+# sets to the global `this` object.
+#
 module Native
   def self.is_a?(object, klass)
     %x{
@@ -81,7 +84,7 @@ module Native
   def self.proc(&block)
     raise LocalJumpError, "no block given" unless block
 
-    Kernel.proc {|*args|
+    ::Kernel.proc {|*args|
       args.map! { |arg| Native(arg) }
       instance = Native(`this`)
 
@@ -189,8 +192,8 @@ module Native
   end
 
   def initialize(native)
-    unless Kernel.native?(native)
-      Kernel.raise ArgumentError, "#{native.inspect} isn't native"
+    unless ::Kernel.native?(native)
+      ::Kernel.raise ArgumentError, "#{native.inspect} isn't native"
     end
 
     @native = native
@@ -245,7 +248,7 @@ class Native::Object < BasicObject
   include ::Native
 
   def ==(other)
-    `#@native === #{Native.try_convert(other)}`
+    `#@native === #{::Native.try_convert(other)}`
   end
 
   def has_key?(name)
@@ -284,7 +287,7 @@ class Native::Object < BasicObject
   end
 
   def []=(key, value)
-    native = Native.try_convert(value)
+    native = ::Native.try_convert(value)
 
     if `#{native} === nil`
       `#@native[key] = #{value}`
@@ -295,7 +298,7 @@ class Native::Object < BasicObject
 
   def merge!(other)
     %x{
-      other = #{Native.convert(other)};
+      other = #{::Native.convert(other)};
 
       for (var prop in other) {
         #@native[prop] = other[prop];
@@ -306,7 +309,7 @@ class Native::Object < BasicObject
   end
 
   def respond_to?(name, include_all = false)
-    Kernel.instance_method(:respond_to?).bind(self).call(name, include_all)
+    ::Kernel.instance_method(:respond_to?).bind(self).call(name, include_all)
   end
 
   def respond_to_missing?(name, include_all = false)
@@ -343,7 +346,7 @@ class Native::Object < BasicObject
   end
 
   def to_a(options = {}, &block)
-    Native::Array.new(@native, options, &block).to_a
+    ::Native::Array.new(@native, options, &block).to_a
   end
 
   def inspect
@@ -526,7 +529,9 @@ class Hash
 
   def initialize(defaults = undefined, &block)
     %x{
-      if (defaults != null && defaults.constructor === Object) {
+      if (defaults != null &&
+           (defaults.constructor === undefined ||
+             defaults.constructor === Object)) {
         var smap = self.$$smap,
             keys = self.$$keys,
             key, value;
@@ -534,15 +539,19 @@ class Hash
         for (key in defaults) {
           value = defaults[key];
 
-          if (value && value.constructor === Object) {
+          if (value &&
+               (value.constructor === undefined ||
+                 value.constructor === Object)) {
             smap[key] = #{Hash.new(`value`)};
           } else if (value && value.$$is_array) {
             value = value.map(function(item) {
-              if (item && item.constructor === Object) {
+              if (item &&
+                   (item.constructor === undefined ||
+                     item.constructor === Object)) {
                 return #{Hash.new(`item`)};
               }
 
-              return item;
+              return #{Native(`item`)};
             });
             smap[key] = value
           } else {

data/stdlib/nodejs/dir.rb

@@ -21,7 +21,7 @@ class Dir
       %x{
         var result = [];
         var entries = __fs__.readdirSync(#{dirname});
-        for (var i = 0; i < entries.length; i++) {
+        for (var i = 0, ii = entries.length; i < ii; i++) {
           result.push(entries[i]);
         }
         return result;

data/stdlib/nodejs/file.rb

@@ -19,6 +19,20 @@
     warnings[string] = true;
     #{warn(`string`)};
   }
+  function executeIOAction(action) {
+    try {
+      return action();
+    } catch (error) {
+      if (error.code === 'EACCES' ||
+          error.code === 'EISDIR' ||
+          error.code === 'EMFILE' ||
+          error.code === 'ENOENT' ||
+          error.code === 'EPERM') {
+        throw Opal.IOError.$new(error.message)
+      }
+      throw error;
+    }
+  }
 }
 
 class File < IO
@@ -30,18 +44,22 @@ class File < IO
   `var __fs__ = #{@__fs__}`
   `var __path__ = #{@__path__}`
 
+  if `__path__.sep !== #{Separator}`
+    ALT_SEPARATOR = `__path__.sep`
+  end
+
   def self.read path
-    `__fs__.readFileSync(#{path}).toString()`
+    `return executeIOAction(function(){return __fs__.readFileSync(#{path}).toString()})`
   end
 
   def self.write path, data
-    `__fs__.writeFileSync(#{path}, #{data})`
+    `executeIOAction(function(){return __fs__.writeFileSync(#{path}, #{data})})`
     data.size
   end
 
   def self.exist? path
     path = path.path if path.respond_to? :path
-    `__fs__.existsSync(#{path})`
+    `return executeIOAction(function(){return __fs__.existsSync(#{path})})`
   end
 
   def self.realpath(pathname, dir_string = nil, cache = nil, &block)
@@ -49,12 +67,12 @@ class File < IO
     if block_given?
       `
       __fs__.realpath(#{pathname}, #{cache}, function(error, realpath){
-        if (error) #{raise error.message}
+        if (error) Opal.IOError.$new(error.message)
         else #{block.call(`realpath`)}
       })
       `
     else
-      `__fs__.realpathSync(#{pathname}, #{cache})`
+      `return executeIOAction(function(){return __fs__.realpathSync(#{pathname}, #{cache})})`
     end
   end
 
@@ -63,18 +81,29 @@ class File < IO
   end
 
   def self.directory? path
-    return nil unless exist? path
-    `!!__fs__.lstatSync(path).isDirectory()`
+    return false unless exist? path
+    `return executeIOAction(function(){return !!__fs__.lstatSync(path).isDirectory()})`
   end
 
   def self.file? path
-    return nil unless exist? path
-    `!!__fs__.lstatSync(path).isFile()`
+    return false unless exist? path
+    `return executeIOAction(function(){return !!__fs__.lstatSync(path).isFile()})`
+  end
+
+  def self.readable? path
+    return false unless exist? path
+    %{
+      try {
+        __fs__.accessSync(path, __fs__.R_OK);
+        return true;
+      } catch (error) {
+        return false;
+      }
+    }
   end
 
   def self.size path
-    return nil unless exist? path
-    `__fs__.lstatSync(path).size`
+    `return executeIOAction(function(){return __fs__.lstatSync(path).size})`
   end
 
   def self.open path, flags
@@ -96,12 +125,12 @@ class File < IO
   end
 
   def self.mtime path
-    `__fs__.statSync(#{path}).mtime`
+    `return executeIOAction(function(){return __fs__.statSync(#{path}).mtime})`
   end
 
   # Instance Methods
 
-  def initialize(path, flags)
+  def initialize(path, flags = 'r')
     binary_flag_regexp = /b/
     encoding_flag_regexp = /:(.*)/
     # binary flag is unsupported
@@ -112,25 +141,25 @@ class File < IO
     flags = flags.gsub(encoding_flag_regexp, '')
     @path = path
     @flags = flags
-    @fd = `__fs__.openSync(path, flags)`
+    @fd = `executeIOAction(function(){return __fs__.openSync(path, flags)})`
   end
 
   attr_reader :path
 
   def write string
-    `__fs__.writeSync(#{@fd}, #{string})`
+    `executeIOAction(function(){return __fs__.writeSync(#{@fd}, #{string})})`
   end
 
   def flush
-    `__fs__.fsyncSync(#@fd)`
+    `executeIOAction(function(){return __fs__.fsyncSync(#@fd)})`
   end
 
   def close
-    `__fs__.closeSync(#{@fd})`
+    `executeIOAction(function(){return __fs__.closeSync(#{@fd})})`
   end
 
   def mtime
-    `__fs__.statSync(#{@path}).mtime`
+    `return executeIOAction(function(){return __fs__.statSync(#{@path}).mtime})`
   end
 end
 
@@ -144,10 +173,10 @@ class File::Stat
   end
 
   def file?
-    `__fs__.statSync(#{@path}).isFile()`
+    `return executeIOAction(function(){return __fs__.statSync(#{@path}).isFile()})`
   end
 
   def mtime
-    `__fs__.statSync(#{@path}).mtime`
+    `return executeIOAction(function(){return __fs__.statSync(#{@path}).mtime})`
   end
 end