opal 0.3.19 → 0.3.20

data/core/basic_object.rb

@@ -25,7 +25,7 @@ class BasicObject
         no_block_given();
       }
 
-      return block.call(this, null, this);
+      return block.call(this, this);
     }
   end
 
@@ -42,13 +42,4 @@ class BasicObject
   def method_missing(symbol, *args)
     raise NoMethodError, "undefined method `#{symbol}` for #{inspect}"
   end
-
-  def singleton_method_added(symbol)
-  end
-
-  def singleton_method_removed(symbol)
-  end
-
-  def singleton_method_undefined(symbol)
-  end
 end

data/core/boolean.rb

@@ -1,6 +1,6 @@
 class Boolean < `Boolean`
   %x{
-    def._isBoolean = true;
+    Boolean_prototype._isBoolean = true;
   }
 
   def &(other)
@@ -19,28 +19,16 @@ class Boolean < `Boolean`
     `(this == true) === other.valueOf()`
   end
 
-  def class
-    `(this == true) ? #{TrueClass} : #{FalseClass}`
-  end
-
   alias singleton_class class
 
-  def to_s
-    `(this == true) ? 'true' : 'false'`
-  end
-end
-
-class TrueClass
-  def self.===(obj)
-    `obj === true`
+  def to_json
+    `this.valueOf() ? 'true' : 'false'`
   end
-end
 
-class FalseClass
-  def self.===(obj)
-    `obj === false`
+  def to_s
+    `(this == true) ? 'true' : 'false'`
   end
 end
 
 TRUE  = true
-FALSE = false
+FALSE = false

data/core/class.rb

@@ -1,10 +1,9 @@
 class Class
   def self.new(sup = Object, &block)
     %x{
-      var klass        = boot_class(sup);
-          klass._name = nil;
-
-      make_metaclass(klass, sup._klass);
+      function AnonClass(){};
+      var klass   = boot_class(sup, AnonClass)
+      klass._name = nil;
 
       sup.$inherited(klass);
 
@@ -17,7 +16,11 @@ class Class
   end
 
   def allocate
-    `new this._alloc()`
+    %x{
+      var obj = new this;
+      obj._id = unique_id++;
+      return obj;
+    }
   end
 
   def new(*args, &block)
@@ -37,11 +40,7 @@ class Class
       var sup = this._super;
 
       if (!sup) {
-        if (this === RubyBasicObject) {
-          return nil;
-        }
-
-        throw RubyRuntimeError.$new('uninitialized class');
+        return nil;
       }
 
       while (sup && (sup._isIClass)) {

data/core/comparable.rb

@@ -22,4 +22,4 @@ module Comparable
   def between?(min, max)
     self > min && self < max
   end
-end
+end

data/core/enumerable.rb

@@ -98,7 +98,7 @@ module Enumerable
     }
   end
 
-  def count(object = undefined, &block)
+  def count(object, &block)
     %x{
       var result = 0;
 
@@ -130,8 +130,8 @@ module Enumerable
     }
   end
 
-  def detect(ifnone = undefined, &block)
-    return enum_for :detect, ifnone unless block
+  def detect(ifnone, &block)
+    return enum_for :detect, ifnone unless block_given?
 
     %x{
       var result = nil;
@@ -161,7 +161,7 @@ module Enumerable
         return ifnone.$call();
       }
 
-      return ifnone === undefined ? nil : ifnone;
+      return ifnone == null ? nil : ifnone;
     }
   end
 
@@ -185,7 +185,7 @@ module Enumerable
   end
 
   def drop_while(&block)
-    return enum_for :drop_while unless block
+    return enum_for :drop_while unless block_given?
 
     %x{
       var result = [];
@@ -212,7 +212,7 @@ module Enumerable
   end
 
   def each_with_index(&block)
-    return enum_for :each_with_index unless block
+    return enum_for :each_with_index unless block_given?
 
     %x{
       var index = 0;
@@ -234,7 +234,7 @@ module Enumerable
   end
 
   def each_with_object(object, &block)
-    return enum_for :each_with_object unless block
+    return enum_for :each_with_object unless block_given?
 
     %x{
       this.$each._p = function(obj) {
@@ -268,7 +268,7 @@ module Enumerable
   alias find detect
 
   def find_all(&block)
-    return enum_for :find_all unless block
+    return enum_for :find_all unless block_given?
 
     %x{
       var result = [];
@@ -295,7 +295,7 @@ module Enumerable
     }
   end
 
-  def find_index(object = undefined, &block)
+  def find_index(object, &block)
     %x{
       var proc, result = nil, index = 0;
 
@@ -336,7 +336,7 @@ module Enumerable
     }
   end
 
-  def first(number = undefined)
+  def first(number)
     %x{
       var result = [],
           current = 0,
@@ -400,4 +400,4 @@ module Enumerable
   alias take first
 
   alias to_a entries
-end
+end

data/core/enumerator.rb

@@ -75,7 +75,7 @@ class Enumerator
   end
 
   def each(&block)
-    return self unless block
+    return self unless block_given?
 
     @object.__send__ @method, *@args, &block
   end
@@ -115,12 +115,4 @@ class Enumerator
     @cache   = nil
     @current = nil
   end
-end
-
-module Kernel
-  def enum_for (method = :each, *args)
-    Enumerator.new(self, method, *args)
-  end
-
-  alias to_enum enum_for
-end
+end

data/core/error.rb

@@ -1,30 +1,22 @@
 class Exception < `Error`
-  def initialize(message = '')
-    %x{
-      if (Error.captureStackTrace) {
-        Error.captureStackTrace(this);
-      }
+  attr_reader :message
 
-      this.message = message;
-    }
+  def initialize(message = '')
+    @message = message
   end
 
   def backtrace
     %x{
-      if (this._bt !== undefined) {
-        return this._bt;
-      }
-
       var backtrace = this.stack;
 
       if (typeof(backtrace) === 'string') {
-        return this._bt = backtrace.split("\\n");
+        return backtrace.split("\\n");
       }
       else if (backtrace) {
-        this._bt = backtrace;
+        return backtrace;
       }
 
-      return this._bt = ["No backtrace available"];
+      return ["No backtrace available"];
     }
   end
 
@@ -32,23 +24,16 @@ class Exception < `Error`
     "#<#{self.class}: '#{message}'>"
   end
 
-  def message
-    `this.message`
-  end
-
   alias to_s message
 end
 
-class StandardError < Exception; end
-class RuntimeError < Exception; end
-class LocalJumpError < StandardError; end
-class TypeError < StandardError; end
-class NameError < StandardError; end
-class NoMethodError < NameError; end
-class ArgumentError < StandardError; end
-class ScriptError < Exception; end
-class LoadError < ScriptError; end
-class IndexError < StandardError; end
-class KeyError < IndexError; end
-class RangeError < StandardError; end
-class NotImplementedError < Exception; end
+StandardError   = Exception
+RuntimeError    = Exception
+LocalJumpError  = Exception
+TypeError       = Exception
+NameError       = Exception
+NoMethodError   = Exception
+ArgumentError   = Exception
+IndexError      = Exception
+KeyError        = Exception
+RangeError      = Exception

data/core/hash.rb

@@ -2,35 +2,18 @@ class Hash
   include Enumerable
 
   %x{
-    var hash_class = this;
+    __hash = Opal.hash = function() {
+      var hash   = new Hash,
+          args   = __slice.call(arguments),
+          assocs = {};
 
-    var __hash = Opal.hash = function() {
-      var hash    = new hash_class._alloc(),
-          args    = __slice.call(arguments),
-          assocs  = {};
+      hash.map   = assocs;
+      hash.none  = nil;
+      hash.proc  = nil;
 
-      hash.map    = assocs;
-      hash.none   = nil;
-      hash.proc   = nil;
-
-      if (args.length == 1 && args[0]._isArray) {
-        args = args[0];
-
-        for (var i = 0, length = args.length, key; i < length; i++) {
-          key = args[i][0];
-
-          assocs[key] = [key, args[i][1]];
-        }
-      }
-      else if (arguments.length % 2 == 0) {
-        for (var i = 0, length = args.length, key; i < length; i++) {
-          key = args[i];
-
-          assocs[key] = [key, args[++i]];
-        }
-      }
-      else {
-        throw RubyArgError.$new('odd number of arguments for Hash');
+      for (var i = 0, length = args.length, key; i < length; i++) {
+        key = args[i];
+        assocs[key] = [key, args[++i]];
       }
 
       return hash;
@@ -45,7 +28,7 @@ class Hash
     `__hash()`
   end
 
-  def self.new(defaults = undefined, &block)
+  def self.new(defaults, &block)
     %x{
       var hash = __hash();
 
@@ -211,7 +194,7 @@ class Hash
         var bucket = map[assoc];
 
         if (block.call(__context, bucket[0], bucket[1]) === __breaker) {
-          return $breaker.$v;
+          return __breaker.$v;
         }
       }
 
@@ -269,7 +252,7 @@ class Hash
 
   alias eql? ==
 
-  def fetch(key, defaults = undefined, &block)
+  def fetch(key, defaults, &block)
     %x{
       var bucket = this.map[key];
 
@@ -291,11 +274,11 @@ class Hash
         return defaults;
       }
 
-      throw RubyKeyError.$new('key not found');
+      #{ raise "key not found" };
     }
   end
 
-  def flatten(level = undefined)
+  def flatten(level)
     %x{
       var map    = this.map,
           result = [];
@@ -421,7 +404,7 @@ class Hash
         var bucket = map[assoc];
 
         if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
-          return $breaker.$v;
+          return __breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -488,7 +471,7 @@ class Hash
         for (var assoc in map) {
           var bucket = map[assoc], key = bucket[0], val = bucket[1];
 
-          if (map2.hasOwnProperty(assoc)) {
+          if (__hasOwn.call(map2, assoc)) {
             val = block.call(__context, key, map2[assoc][1], val);
           }
 
@@ -516,7 +499,7 @@ class Hash
         for (var assoc in map2) {
           var bucket = map2[assoc], key = bucket[0], val = bucket[1];
 
-          if (map.hasOwnProperty(assoc)) {
+          if (__hasOwn.call(map, assoc)) {
             val = block.call(__context, key, map[assoc][1], val);
           }
 
@@ -663,6 +646,19 @@ class Hash
     self
   end
 
+  def to_json
+    %x{
+      var parts = [], map = this.map, bucket;
+
+      for (var assoc in map) {
+        bucket = map[assoc];
+        parts.push(#{ `bucket[0]`.to_json } + ': ' + #{ `bucket[1]`.to_json });
+      }
+
+      return '{' + parts.join(', ') + '}';
+    }
+  end
+
   alias to_s inspect
 
   alias update merge!
@@ -696,4 +692,4 @@ class Hash
       return result;
     }
   end
-end
+end

data/core/json.rb

@@ -0,0 +1,50 @@
+`var json_parse = JSON.parse;`
+
+module JSON
+  def self.parse(source)
+    `return to_opal(json_parse(source));`
+  end
+
+  %x{
+    function to_opal(value) {
+      switch (typeof value) {
+        case 'string':
+          return value;
+
+        case 'number':
+          return value;
+
+        case 'boolean':
+          return !!value;
+
+        case 'null':
+          return nil;
+
+        case 'object':
+          if (!value) return nil;
+
+          if (value._isArray) {
+            var arr = [];
+
+            for (var i = 0, ii = value.length; i < ii; i++) {
+              arr.push(to_opal(value[i]));
+            }
+
+            return arr;
+          }
+          else {
+            var hash = #{ {} }, v, map = hash.map;
+
+            for (var k in value) {
+              if (__hasOwn.call(value, k)) {
+                v = to_opal(value[k]);
+                map[k] = [k, v];
+              }
+            }
+          }
+
+          return hash;
+      }
+    };
+  }
+end