opal 0.3.21 → 0.3.22

data/core/erb.rb

@@ -0,0 +1,30 @@
+# A really small ERB implementation for Opal.
+class ERB
+
+  # @private Stores all registered instances
+  @templates = {}
+  def self.[]=(name, instance)
+    @templates[name] = instance
+  end
+
+  def self.[](name)
+    @templates[name]
+  end
+
+  def initialize(name, &body)
+    ERB[name] = self
+    @body = body
+  end
+
+  # Run this erb template against the given context. Unlike ERB, opals
+  # implementation uses a normal object as a context.
+  #
+  #   view = UserView.new
+  #   ERB[:user_view].result(view)
+  #
+  # @param [Object] context
+  # @result [String]
+  def result(context)
+    context.instance_eval &@body
+  end
+end

data/core/error.rb

@@ -3,9 +3,8 @@ class Exception < `Error`
 
   def self.new(message = '')
     %x{
-      var err = new Error(message);
-      err.$m  = #{self}.$m_tbl;
-      err.$k  = #{self};
+      var err = #{allocate};
+      err.message = message;
       return err;
     }
   end

data/core/hash.rb

@@ -8,8 +8,6 @@ class Hash
           assocs = {};
 
       hash.map   = assocs;
-      hash.none  = nil;
-      hash.proc  = nil;
 
       for (var i = 0, length = args.length, key; i < length; i++) {
         key = args[i];
@@ -28,6 +26,18 @@ class Hash
     `__hash()`
   end
 
+  def self.from_native(obj)
+    %x{
+      var hash = __hash(), map = hash.map;
+
+      for (var key in obj) {
+        map[key] = [key, obj[key]]
+      }
+
+      return hash;
+    }
+  end
+
   def self.new(defaults, &block)
     %x{
       var hash = __hash();
@@ -81,7 +91,13 @@ class Hash
         return bucket[1];
       }
 
-      return #{self}.none;
+      var proc = #{@proc};
+
+      if (proc !== nil) {
+        return #{ `proc`.call self, key };
+      }
+
+      return #{@none};
     }
   end
 
@@ -130,19 +146,19 @@ class Hash
   end
 
   def default
-    `#{self}.none`
+    @none
   end
 
   def default=(object)
-    `#{self}.none = object`
+    @none = object
   end
 
   def default_proc
-    `#{self}.proc`
+    @proc
   end
 
   def default_proc=(proc)
-    `#{self}.proc = proc`
+    @proc = proc
   end
 
   def delete(key)
@@ -169,7 +185,7 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = block(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -193,7 +209,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block(__context, bucket[0], bucket[1]) === __breaker) {
+        if (block.call(__context, bucket[0], bucket[1]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -211,7 +227,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block(__context, bucket[0]) === __breaker) {
+        if (block.call(__context, bucket[0]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -231,7 +247,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if (block(__context, bucket[1]) === __breaker) {
+        if (block.call(__context, bucket[1]) === __breaker) {
           return __breaker.$v;
         }
       }
@@ -263,7 +279,7 @@ class Hash
       if (block !== nil) {
         var value;
 
-        if ((value = block(__context, key)) === __breaker) {
+        if ((value = block.call(__context, key)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -403,7 +419,7 @@ class Hash
       for (var assoc in map) {
         var bucket = map[assoc];
 
-        if ((value = block(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -472,7 +488,7 @@ class Hash
           var bucket = map[assoc], key = bucket[0], val = bucket[1];
 
           if (__hasOwn.call(map2, assoc)) {
-            val = block(__context, key, map2[assoc][1], val);
+            val = block.call(__context, key, map2[assoc][1], val);
           }
 
           map2[assoc] = [key, val];
@@ -500,7 +516,7 @@ class Hash
           var bucket = map2[assoc], key = bucket[0], val = bucket[1];
 
           if (__hasOwn.call(map, assoc)) {
-            val = block(__context, key, map[assoc][1], val);
+            val = block.call(__context, key, map[assoc][1], val);
           }
 
           map[assoc] = [key, val];
@@ -537,7 +553,7 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = block(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -574,7 +590,7 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = block(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -597,7 +613,7 @@ class Hash
         var bucket = map[assoc],
             value;
 
-        if ((value = block(__context, bucket[0], bucket[1])) === __breaker) {
+        if ((value = block.call(__context, bucket[0], bucket[1])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -659,6 +675,19 @@ class Hash
     }
   end
 
+  def to_native
+    %x{
+      var result = {}, map = #{self}.map, bucket;
+
+      for (var assoc in map) {
+        bucket = map[assoc];
+        result[bucket[0]] = #{ `bucket[1]`.to_json };
+      }
+
+      return result;
+    }
+  end
+
   alias to_s inspect
 
   alias update merge!

data/core/kernel.rb

@@ -34,7 +34,7 @@ module Kernel
   end
 
   def class
-    `return #{self}.$k`
+    `return #{self}._klass`
   end
 
   def define_singleton_method(name, &body)
@@ -43,12 +43,11 @@ module Kernel
         no_block_given();
       }
 
-      #{ self.singleton_class };
+      var jsid   = '$' + name;
+      body._jsid = jsid;
+      body._sup  = #{self}[jsid]
 
-      body._jsid = name;
-      body._sup  = #{self}.$m[name]
-
-      #{self}.$m[name] = body;
+      #{self}[jsid] = body;
 
       return #{self};
     }
@@ -77,7 +76,7 @@ module Kernel
   end
 
   def instance_of?(klass)
-    `#{self}.$k === klass`
+    `#{self}._klass === klass`
   end
 
   def instance_variable_defined?(name)
@@ -110,14 +109,14 @@ module Kernel
 
   def is_a?(klass)
     %x{
-      var search = #{self}.$k;
+      var search = #{self}._klass;
 
       while (search) {
         if (search === klass) {
           return true;
         }
 
-        search = search.$s;
+        search = search._super;
       }
 
       return false;
@@ -153,7 +152,7 @@ module Kernel
       if (block === nil) {
         no_block_given();
       }
-
+      block.is_lambda = false;
       return block;
     }
   end
@@ -187,13 +186,13 @@ module Kernel
   end
 
   def respond_to?(name)
-    `!!#{self}.$m[name]`
+    `!!#{self}['$' + name]`
   end
 
   def singleton_class
     %x{
       if (!#{self}._isObject) {
-        return #{self}.$k;
+        return #{self}._klass;
       }
 
       if (#{self}._singleton) {
@@ -201,16 +200,16 @@ module Kernel
       }
 
       else {
-        var orig_class = #{self}.$k,
+        var orig_class = #{self}._klass,
             class_id   = "#<Class:#<" + orig_class._name + ":" + orig_class._id + ">>";
 
         function Singleton() {};
         var meta = boot_class(orig_class, Singleton);
         meta._name = class_id;
 
-        #{self}.$m = meta.$m_tbl;
+        meta.prototype = #{self};
         #{self}._singleton = meta;
-        meta.$k = orig_class.$k;
+        meta._klass = orig_class._klass;
 
         return meta;
       }
@@ -233,7 +232,7 @@ module Kernel
   end
 
   def to_s
-    `return "#<" + #{self}.$k._name + ":" + #{self}._id + ">";`
+    `return "#<" + #{self}._klass._name + ":" + #{self}._id + ">";`
   end
 
   def enum_for (method = :each, *args)

data/core/load_order

@@ -20,4 +20,5 @@ error
 regexp
 time
 struct
-json
+json
+erb

data/core/module.rb

@@ -1,26 +1,7 @@
 class Module
-  def ===(object)
-    %x{
-      if (object == null) {
-        return false;
-      }
-
-      var search = object.$k;
-
-      while (search) {
-        if (search === #{self}) {
-          return true;
-        }
-
-        search = search._super;
-      }
-
-      return false;
-    }
-  end
 
   def alias_method(newname, oldname)
-    `#{self}.$m_tbl[newname] = #{self}.$m_tbl[oldname]`
+    `#{self}.prototype['$' + newname] = #{self}.prototype['$' + oldname]`
     self
   end
 
@@ -60,15 +41,17 @@ class Module
 
       module.$included_in.push(klass);
 
-      var donator   = module.$m_tbl,
-          target    = klass.$m_tbl;
+      var donator   = module.prototype,
+          prototype = klass.prototype,
+          methods   = module._methods;
 
-      for (var meth in donator) {
-        target[meth] = donator[meth];
+      for (var i = 0, length = methods.length; i < length; i++) {
+        var method = methods[i];
+        prototype[method] = donator[method];
       }
 
       if (klass.$included_in) {
-       // klass._donate(methods.slice(), true);
+        klass._donate(methods.slice(), true);
       }
     }
 
@@ -79,8 +62,8 @@ class Module
   %x{
     function define_attr(klass, name, getter, setter) {
       if (getter) {
-        klass.$m_tbl[name] = function() {
-          var res = #{self}[name];
+        klass.prototype['$' + name] = function() {
+          var res = this[name];
           return res == null ? nil : res;
         };
 
@@ -88,8 +71,8 @@ class Module
       }
 
       if (setter) {
-        klass.$m_tbl[name + '='] = function(val) {
-          return #{self}[name] = val;
+        klass.prototype['$' + name + '='] = function(val) {
+          return this[name] = val;
         };
 
         klass._donate([name]);
@@ -139,11 +122,12 @@ class Module
         no_block_given();
       }
 
-      block._jsid = name;
-      block._sup = #{self}.$m_tbl[name];
+      var jsid    = '$' + name;
+      block._jsid = jsid;
+      block._sup  = #{self}.prototype[jsid];
 
-      #{self}.$m_tbl[name] = block;
-      #{self}._donate([name]);
+      #{self}.prototype[jsid] = block;
+      #{self}._donate([jsid]);
 
       return nil;
     }
@@ -182,7 +166,7 @@ class Module
         no_block_given();
       }
 
-      return block(#{self});
+      return block.call(#{self});
     }
   end
 
@@ -202,11 +186,9 @@ class Module
 
       var meta = new __opal.Class;
       #{self}._singleton = meta;
-      meta.$m_tbl = #{self}.$m;
+      meta.prototype = #{self};
 
       return meta;
     }
   end
-
-  alias to_s name
 end

data/core/numeric.rb

@@ -144,7 +144,7 @@ class Numeric < `Number`
   end
 
   def nonzero?
-    `#{self}.valueOf() === 0 ? nil : #{self}`
+    `#{self} === 0 ? nil : #{self}`
   end
 
   def odd?
@@ -208,4 +208,6 @@ class Numeric < `Number`
   def zero?
     `#{self} == 0`
   end
-end
+end
+
+Fixnum = Numeric