opal 0.3.19 → 0.3.20

data/Rakefile

@@ -8,9 +8,8 @@ require 'opal/version'
 Opal::BuilderTask.new do |t|
   t.name         = 'opal'
   t.files        = []
-  t.dependencies = %w[opal-spec]
+  t.dependencies = %w[opal-spec opal-dom]
   t.specs_dir    = 'test'
-  t.specs_main   = 'test/spec_helper'
 end
 
 desc "Build opal.js runtime into ./build"

data/core/alpha.rb

@@ -5,4 +5,5 @@ $/ = "\n"
 
 RUBY_ENGINE   = 'opal'
 RUBY_PLATFORM = 'opal'
-RUBY_VERSION  = '1.9.2'
+RUBY_VERSION  = '1.9.2'
+OPAL_VERSION  = `__opal.version`

data/core/array.rb

@@ -1,6 +1,6 @@
 class Array < `Array`
   %x{
-    def._isArray = true;
+    Array_prototype._isArray = true;
   }
 
   include Enumerable
@@ -25,16 +25,14 @@ class Array < `Array`
           seen   = {};
 
       for (var i = 0, length = this.length; i < length; i++) {
-        var item = this[i],
-            hash = item;
+        var item = this[i];
 
-        if (!seen[hash]) {
+        if (!seen[item]) {
           for (var j = 0, length2 = other.length; j < length2; j++) {
-            var item2 = other[j],
-                hash2 = item2;
+            var item2 = other[j];
 
-            if ((hash === hash2) && !seen[hash]) {
-              seen[hash] = true;
+            if ((item === item2) && !seen[item]) {
+              seen[item] = true;
 
               result.push(item);
             }
@@ -63,7 +61,7 @@ class Array < `Array`
   end
 
   def +(other)
-    `this.slice(0).concat(other.slice(0))`
+    `this.slice().concat(other.slice())`
   end
 
   def <<(object)
@@ -131,7 +129,7 @@ class Array < `Array`
           return this.slice(index, length);
         }
         else {
-          throw RubyException.$new('bad arg for Array#[]');
+          #{ raise "bad arg for Array#[]" };
         }
       }
 
@@ -280,9 +278,9 @@ class Array < `Array`
     self
   end
 
-  def count(object = undefined)
+  def count(object)
     %x{
-      if (object === undefined) {
+      if (object == null) {
         return this.length;
       }
 
@@ -363,8 +361,8 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = this.length, value; i < length; i++) {
-        if ((value = block.call(__context, this[i])) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, this[i])) === __breaker) {
+          return __breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -381,13 +379,9 @@ class Array < `Array`
   def each(&block)
     return enum_for :each unless block_given?
 
-    %x{
-      for (var i = 0, length = this.length; i < length; i++) {
-        if (block.call(__context, this[i]) === __breaker) {
-          return __breaker.$v;
-        }
-      }
-    }
+    `for (var i = 0, length = this.length; i < length; i++) {`
+      yield `this[i]`
+    `}`
 
     self
   end
@@ -395,13 +389,9 @@ class Array < `Array`
   def each_index(&block)
     return enum_for :each_index unless block_given?
 
-    %x{
-      for (var i = 0, length = this.length; i < length; i++) {
-        if (block.call(__context, i) === __breaker) {
-          return __breaker.$v;
-        }
-      }
-    }
+    `for (var i = 0, length = this.length; i < length; i++) {`
+      yield `i`
+    `}`
 
     self
   end
@@ -409,22 +399,18 @@ class Array < `Array`
   def each_with_index(&block)
     return enum_for :each_with_index unless block_given?
 
-    %x{
-      for (var i = 0, length = this.length; i < length; i++) {
-        if (block.call(__context, this[i], i) === __breaker) {
-          return __breaker.$v;
-        }
-      }
-    }
+    `for (var i = 0, length = this.length; i < length; i++) {`
+      yield `this[i]`, `i`
+    `}`
 
     self
   end
 
   def empty?
-    `this.length === 0`
+    `!this.length`
   end
 
-  def fetch(index, defaults = undefined, &block)
+  def fetch(index, defaults, &block)
     %x{
       var original = index;
 
@@ -436,21 +422,21 @@ class Array < `Array`
         return this[index];
       }
 
-      if (defaults !== undefined) {
+      if (defaults != null) {
         return defaults;
       }
 
-      if (block !== null) {
-        return block.call($context, nil, original);
+      if (block !== nil) {
+        return block.call(__context, original);
       }
 
-      throw RubyIndexError.$new('Array#fetch');
+      #{ raise "Array#fetch" };
     }
   end
 
-  def first(count = undefined)
+  def first(count)
     %x{
-      if (count !== undefined) {
+      if (count != null) {
         return this.slice(0, count);
       }
 
@@ -458,7 +444,7 @@ class Array < `Array`
     }
   end
 
-  def flatten(level = undefined)
+  def flatten(level)
     %x{
       var result = [];
 
@@ -466,7 +452,7 @@ class Array < `Array`
         item = this[i];
 
         if (item._isArray) {
-          if (level === undefined) {
+          if (level == null) {
             result = result.concat(#{`item`.flatten});
           }
           else if (level === 0) {
@@ -485,7 +471,7 @@ class Array < `Array`
     }
   end
 
-  def flatten!(level = undefined)
+  def flatten!(level)
     %x{
       var size = this.length;
       #{replace flatten level};
@@ -501,7 +487,7 @@ class Array < `Array`
       for (var i = 0, length = this.length, item; i < length; i++) {
         item = this[i];
 
-        if (#{pattern === `item`}) {
+        if (#{ pattern === `item` }) {
           result.push(item);
         }
       }
@@ -526,17 +512,17 @@ class Array < `Array`
     }
   end
 
-  def index(object = undefined, &block)
+  def index(object, &block)
     return enum_for :index unless block_given? && object == undefined
 
     %x{
-      if (block !== null) {
+      if (block !== nil) {
         for (var i = 0, length = this.length, value; i < length; i++) {
-          if ((value = block.call($context, null, this[i])) === $breaker) {
-            return $breaker.$v;
+          if ((value = block.call(__context, this[i])) === __breaker) {
+            return __breaker.$v;
           }
 
-          if (value !== false && value !== null) {
+          if (value !== false && value !== nil) {
             return i;
           }
         }
@@ -549,28 +535,26 @@ class Array < `Array`
         }
       }
 
-      return null
+      return nil;
     }
   end
 
-  def inject(initial = undefined, &block)
+  def inject(initial, &block)
     return enum_for :inject unless block_given?
 
     %x{
       var result, i;
 
-      if (initial === undefined) {
-        result = this[0];
-        i      = 1;
+      if (initial == null) {
+        result = this[0], i = 1;
       }
       else {
-        result = initial;
-        i      = 0;
+        result = initial, i = 0;
       }
 
       for (var length = this.length, value; i < length; i++) {
-        if ((value = block.call($context, null, result, this[i])) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, result, this[i])) === __breaker) {
+          return __breaker.$v;
         }
 
         result = value;
@@ -587,7 +571,7 @@ class Array < `Array`
           index += this.length + 1;
 
           if (index < 0) {
-            throw RubyIndexError.$new(index + ' is out of bounds');
+            #{ raise "#{index} is out of bounds" };
           }
         }
         if (index > this.length) {
@@ -631,11 +615,11 @@ class Array < `Array`
     return enum_for :keep_if unless block_given?
     %x{
       for (var i = 0, length = this.length, value; i < length; i++) {
-        if ((value = block.call($context, null, this[i])) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, this[i])) === __breaker) {
+          return __breaker.$v;
         }
 
-        if (value === false || value === null) {
+        if (value === false || value === nil) {
           this.splice(i, 1);
 
           length--;
@@ -647,15 +631,15 @@ class Array < `Array`
     self
   end
 
-  def last(count = undefined)
+  def last(count)
     %x{
       var length = this.length;
 
-      if (count === undefined) {
+      if (count == null) {
         return length === 0 ? nil : this[length - 1];
       }
       else if (count < 0) {
-        throw RubyArgError.$new('negative count given');
+        #{ raise "negative count given" };
       }
 
       if (count > length) {
@@ -674,16 +658,16 @@ class Array < `Array`
 
   alias map! collect!
 
-  def pop(count = undefined)
+  def pop(count)
     %x{
       var length = this.length;
 
-      if (count === undefined) {
+      if (count == null) {
         return length === 0 ? nil : this.pop();
       }
 
       if (count < 0) {
-        throw RubyArgError.$new('negative count given');
+        #{ raise "negative count given" };
       }
 
       return count > length ? this.splice(0) : this.splice(length - count, length);
@@ -786,17 +770,17 @@ class Array < `Array`
     self
   end
 
-  def rindex(object = undefined, &block)
-    return enum_for :rindex unless block_given? && object == undefined
+  def rindex(object, &block)
+    return enum_for :rindex unless block_given?
 
     %x{
-      if (block !== null) {
+      if (block !== nil) {
         for (var i = this.length - 1, value; i >= 0; i--) {
-          if ((value = block.call($context, null, this[i])) === $breaker) {
-            return $breaker.$v;
+          if ((value = block.call(__context, this[i])) === __breaker) {
+            return __breaker.$v;
           }
 
-          if (value !== false && value !== null) {
+          if (value !== false && value !== nil) {
             return i;
           }
         }
@@ -809,7 +793,7 @@ class Array < `Array`
         }
       }
 
-      return null;
+      return nil;
     }
   end
 
@@ -822,11 +806,11 @@ class Array < `Array`
       for (var i = 0, length = this.length, item, value; i < length; i++) {
         item = this[i];
 
-        if ((value = block.call($context, null, item)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, item)) === __breaker) {
+          return __breaker.$v;
         }
 
-        if (value !== false && value !== null) {
+        if (value !== false && value !== nil) {
           result.push(item);
         }
       }
@@ -843,11 +827,11 @@ class Array < `Array`
       for (var i = 0, length = original, item, value; i < length; i++) {
         item = this[i];
 
-        if ((value = block.call($context, null, item)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, item)) === __breaker) {
+          return __breaker.$v;
         }
 
-        if (value === false || value === null) {
+        if (value === false || value === nil) {
           this.splice(i, 1);
 
           length--;
@@ -855,29 +839,29 @@ class Array < `Array`
         }
       }
 
-      return this.length === original ? null : this;
+      return this.length === original ? nil : this;
     }
   end
 
-  def shift(count = undefined)
-    `count === undefined ? this.shift() : this.splice(0, count)`
+  def shift(count)
+    `count == null ? this.shift() : this.splice(0, count)`
   end
 
   alias size length
 
   alias slice :[]
 
-  def slice!(index, length = undefined)
+  def slice!(index, length)
     %x{
       if (index < 0) {
         index += this.length;
       }
 
       if (index < 0 || index >= this.length) {
-        return null;
+        return nil;
       }
 
-      if (length !== undefined) {
+      if (length != null) {
         return this.splice(index, index + length);
       }
 
@@ -898,11 +882,11 @@ class Array < `Array`
       for (var i = 0, length = this.length, item, value; i < length; i++) {
         item = this[i];
 
-        if ((value = block.call($context, null, item)) === $breaker) {
-          return $breaker.$v;
+        if ((value = block.call(__context, item)) === __breaker) {
+          return __breaker.$v;
         }
 
-        if (value === false || value === null) {
+        if (value === false || value === nil) {
           return result;
         }
 
@@ -919,6 +903,18 @@ class Array < `Array`
 
   alias to_ary to_a
 
+  def to_json
+    %x{
+      var result = [];
+
+      for (var i = 0, length = this.length; i < length; i++) {
+        result.push(#{ `this[i]`.to_json });
+      }
+
+      return '[' + result.join(', ') + ']';
+    }
+  end
+
   alias to_s inspect
 
   def uniq
@@ -948,7 +944,7 @@ class Array < `Array`
 
       for (var i = 0, length = original, item, hash; i < length; i++) {
         item = this[i];
-        hash = item.$hash();;
+        hash = item.$hash();
 
         if (!seen[hash]) {
           seen[hash] = true;
@@ -985,7 +981,7 @@ class Array < `Array`
         for (var j = 0, jj = others.length; j < jj; j++) {
           o = others[j][i];
 
-          if (o === undefined) {
+          if (o == null) {
             o = nil;
           }
 
@@ -1006,4 +1002,4 @@ class Array < `Array`
       return result;
     }
   end
-end
+end