opal 0.3.44 → 0.4.0

data/opal/opal/boolean.rb

@@ -30,6 +30,10 @@ class Boolean
   def to_s
     `(#{self} == true) ? 'true' : 'false'`
   end
+
+  def to_n
+    self
+  end
 end
 
 TrueClass = Boolean

data/opal/opal/class.rb

@@ -19,6 +19,11 @@ class Class
     }
   end
 
+  def self.bridge_class(name, constructor)
+    `__opal.bridge(name, constructor)`
+  end
+
+
   def allocate
     %x{
       var obj = new #{self};
@@ -32,6 +37,10 @@ class Class
     self
   end
 
+  def alias_native(mid, jsid)
+    `#{self}.prototype['$' + mid] = #{self}.prototype[jsid]`
+  end
+
   def ancestors
     %x{
       var parent = #{self},
@@ -62,11 +71,11 @@ class Class
 
       klass.$included_modules.push(module);
 
-      if (!module.$included_in) {
-        module.$included_in = [];
+      if (!module._included_in) {
+        module._included_in = [];
       }
 
-      module.$included_in.push(klass);
+      module._included_in.push(klass);
 
       var donator   = module.prototype,
           prototype = klass.prototype,
@@ -81,7 +90,7 @@ class Class
         prototype._smethods.push.apply(prototype._smethods, methods);  
       }
 
-      if (klass.$included_in) {
+      if (klass._included_in) {
         __opal.donate(klass, methods.slice(), true);
       }
     }
@@ -255,7 +264,7 @@ class Class
       #{self}.prototype[jsid] = block;
       __opal.donate(#{self}, [jsid]);
 
-      return nil;
+      return null;
     }
   end
 

data/opal/opal/enumerable.rb

@@ -10,11 +10,11 @@ module Enumerable
           for(var i = 0; i < arguments.length; i ++) {
             args[i] = arguments[i];
           }
-          
+
           if ((value = block.apply(#{self}, args)) === __breaker) {
             return __breaker.$v;
           }
-             
+
           if (value === false || value === nil) {
             result = false;
             __breaker.$v = nil;
@@ -25,7 +25,7 @@ module Enumerable
       }
       else {
         proc = function(obj) {
-          if ((obj === false || obj === nil) && arguments.length < 2) {  
+          if ((obj === false || obj === nil) && arguments.length < 2) {
             result = false;
             __breaker.$v = nil;
 
@@ -41,7 +41,7 @@ module Enumerable
     }
   end
 
-  def any?(&block) 
+  def any?(&block)
     %x{
       var result = false, proc;
 
@@ -52,7 +52,7 @@ module Enumerable
           for(var i = 0; i < arguments.length; i ++) {
             args[i] = arguments[i];
           }
-          
+
           if ((value = block.apply(#{self}, args)) === __breaker) {
             return __breaker.$v;
           }
@@ -70,7 +70,7 @@ module Enumerable
           if ((obj !== false && obj !== nil) || arguments.length >= 2) {
             result      = true;
             __breaker.$v = nil;
-            
+
             return __breaker;
           }
         }
@@ -90,7 +90,7 @@ module Enumerable
       var proc = function() {
         var obj = __slice.call(arguments), value;
 
-        if ((value = block.apply(null, obj)) === __breaker) {
+        if ((value = block.apply(nil, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -111,7 +111,7 @@ module Enumerable
       var proc = function() {
         var obj = __slice.call(arguments), value;
 
-        if ((value = block.apply(null, [result].concat(obj))) === __breaker) {
+        if ((value = block.apply(nil, [result].concat(obj))) === __breaker) {
           result = __breaker.$v;
           __breaker.$v = nil;
 
@@ -532,6 +532,66 @@ module Enumerable
     }
   end
 
+  def none?(&block)
+    %x{
+      var result = true, proc;
+
+      if (block !== nil) {
+        proc = function(obj) {
+          var value;
+          var args = [];
+          for(var i = 0; i < arguments.length; i ++) {
+            args[i] = arguments[i];
+          }
+
+          if ((value = block.apply(#{self}, args)) === __breaker) {
+            return __breaker.$v;
+          }
+
+          if (value !== false && value !== nil) {
+            result = false;
+            __breaker.$v = nil;
+
+            return __breaker;
+          }
+        }
+      }
+      else {
+        proc = function(obj) {
+          if (arguments.length == 1 && (obj !== false && obj !== nil)) {
+            result = false;
+            __breaker.$v = nil;
+
+            return __breaker;
+          }
+          else {
+            for (var i = 0, length = arguments.length; i < length; i++) {
+              if (arguments[i] !== false && arguments[i] !== nil) {
+                result = false;
+                __breaker.$v = nil;
+
+                return __breaker;
+              }
+            }
+          }
+        };
+      }
+
+      #{self}.$each._p = proc;
+      #{self}.$each();
+
+      return result;
+    }
+  end
+
+  def sort_by &block
+    map { |*f|
+      # FIXME: this should probably belongs to somewhere more
+      f = `#{f}.length === 1 ? #{f}[0] : #{f}`
+      `[#{block.call(f)}, #{f}]`
+    }.sort.map { |f| `#{f}[1]` }
+  end
+
   alias select find_all
 
   alias take first

data/opal/opal/error.rb

@@ -4,7 +4,7 @@ class Exception
   def self.new(message = '')
     %x{
       var err = new Error(message);
-      err._klass = #{self};
+      err.constructor = #{self};
       err.name = #{self}._name;
       return err;
     }

data/opal/opal/hash.rb

@@ -48,28 +48,25 @@ class Hash
     `__hash()`
   end
 
-  def self.from_native(obj)
-    %x{
-      var hash = __hash(), map = hash.map, keys = hash.keys;
-
-      for (var key in obj) {
-        keys.push(key);
-        map[key] = obj[key];
-      }
-
-      return hash;
-    }
-  end
-
   def self.new(defaults = undefined, &block)
     %x{
       var hash = __hash();
 
       if (defaults != null) {
-        hash.none = defaults;
+        if (defaults.constructor == Object) {
+          var map = hash.map, keys = hash.keys;
+
+          for (var key in defaults) {
+            keys.push(key);
+            map[key] = defaults[key];
+          }
+        }
+        else {
+          hash.none = defaults;
+        }
       }
       else if (block !== nil) {
-        hash.proc = block;
+          hash.proc = block;
       }
 
       return hash;
@@ -697,15 +694,15 @@ class Hash
     }
   end
 
-  def to_native
+  def to_n
     %x{
       var result = {}, keys = #{self}.keys, map = #{self}.map, bucket, value;
 
       for (var i = 0, length = keys.length; i < length; i++) {
         var key = keys[i], obj = map[key];
 
-        if (obj.$to_native) {
-          result[key] = #{`obj`.to_native};
+        if (obj.$to_n) {
+          result[key] = #{`obj`.to_n};
         }
         else {
           result[key] = obj;

data/opal/opal/kernel.rb

@@ -36,7 +36,7 @@ module Kernel
         #{ raise NameError };
       }
 
-      func._klass = #{Method};
+      func.constructor = #{Method};
       return func;
     }
   end
@@ -60,7 +60,10 @@ module Kernel
 
   def Array(object)
     %x{
-      if (object.$to_ary) {
+      if (object === nil) {
+        return [];
+      }
+      else if (object.$to_ary) {
         return #{object.to_ary};
       }
       else if (object.$to_a) {
@@ -72,7 +75,7 @@ module Kernel
   end
 
   def class
-    `#{self}._klass`
+    `#{self}.constructor`
   end
 
   def define_singleton_method(name, &body)
@@ -252,7 +255,7 @@ module Kernel
   end
 
   def instance_of?(klass)
-    `#{self}._klass === klass`
+    `#{self}.constructor === klass`
   end
 
   def instance_variable_defined?(name)
@@ -287,7 +290,7 @@ module Kernel
 
   def is_a?(klass)
     %x{
-      var search = #{self}._klass;
+      var search = #{self}.constructor;
 
       while (search) {
         if (search === klass) {
@@ -392,7 +395,7 @@ module Kernel
         }
 
         var meta = new __opal.Class;
-        meta._klass = __opal.Class;
+        meta.constructor = __opal.Class;
         #{self}._singleton = meta;
         meta.prototype = #{self};
         meta._isSingleton = true;
@@ -401,7 +404,7 @@ module Kernel
       }
 
       if (typeof(#{self}) === 'function') {
-        return #{self}._klass;
+        return #{self}.constructor;
       }
 
       if (#{self}._singleton) {
@@ -409,7 +412,7 @@ module Kernel
       }
 
       else {
-        var orig_class = #{self}._klass,
+        var orig_class = #{self}.constructor,
             class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
 
         var Singleton = function () {};
@@ -418,7 +421,7 @@ module Kernel
 
         meta.prototype = #{self};
         #{self}._singleton = meta;
-        meta._klass = orig_class._klass;
+        meta.constructor = orig_class.constructor;
 
         return meta;
       }
@@ -445,6 +448,17 @@ module Kernel
   end
 
   def to_s
-    `return "#<" + #{self}._klass._name + ":" + #{self}._id + ">";`
+    `return "#<" + #{self}.constructor._name + ":" + #{self}._id + ">";`
+  end
+
+  alias to_str to_s
+
+  def freeze
+    @___frozen___ = true
+    self
+  end
+
+  def frozen?
+    @___frozen___ || false
   end
 end

data/opal/opal/native.rb

@@ -0,0 +1,31 @@
+class Native
+  def self.try_convert(value)
+    %x{
+      if (value == null) {
+        return null;
+      }
+
+      if (value.$to_n) {
+        return value.$to_n()
+      }
+      else if (!value.$object_id) {
+        return value;
+      }
+      else {
+        return null;
+      }
+    }
+  end
+
+  def initialize(native)
+    if (native = Native.try_convert(native)).nil?
+      raise ArgumentError, "the passed value isn't a native"
+    end
+
+    @native = native
+  end
+
+  def to_n
+    @native
+  end
+end

data/opal/opal/nil_class.rb

@@ -53,11 +53,16 @@ class NilClass
     'null'
   end
 
-  def to_native
-    `null`
+  def to_n
+    `nil`
   end
 
   def to_s
     ''
   end
+
+  def object_id
+    `#{NilClass}._id || (#{NilClass}._id = Opal.uid())`
+  end
+  alias hash object_id
 end

data/opal/opal/numeric.rb

@@ -76,7 +76,7 @@ class Numeric
   end
 
   def ==(other)
-    `#{self} == other`
+    `!!(other._isNumber) && #{self} == Number(other)`
   end
 
   def <=>(other)
@@ -189,6 +189,10 @@ class Numeric
     `#{self}.toString()`
   end
 
+  def to_n
+    self
+  end
+
   def upto(finish, &block)
     return enum_for :upto, finish unless block_given?
 
@@ -206,6 +210,11 @@ class Numeric
   def zero?
     `#{self} == 0`
   end
+
+  def size
+    # Just a stub, JS is 32bit for bitwise ops though
+    4
+  end
 end
 
 Fixnum = Numeric