opal 0.3.22 → 0.3.25

data/core/boolean.rb

@@ -22,7 +22,7 @@ class Boolean < `Boolean`
   alias singleton_class class
 
   def to_json
-    `#{self}.valueOf() ? 'true' : 'false'`
+    `(#{self} == true) ? 'true' : 'false'`
   end
 
   def to_s

data/core/browser.js

@@ -9,7 +9,14 @@
     for (var i = 0, script; i < all.length; i++) {
       script = all[i];
       if (script.type === 'text/ruby') {
-        runRuby(script.innerHTML);
+        if (script.src) {
+          request(script.src, function(result) {
+            runRuby(result);
+          });
+        }
+        else {
+          runRuby(script.innerHTML);
+        }
       }
       else if (script.type === 'text/erb') {
         runERB(script.innerHTML);
@@ -22,6 +29,25 @@
     eval('(' + js + ')()');
   }
 
+  function request(url, callback) {
+    var xhr = new (window.ActiveXObject || XMLHttpRequest)('Microsoft.XMLHTTP');
+    xhr.open('GET', url, true);
+    if ('overrideMimeType' in xhr) {
+      xhr.overrideMimeType('text/plain');
+    }
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState === 4) {
+        if (xhr.status === 0 || xhr.status === 200) {
+          callback(xhr.responseText);
+        }
+        else {
+          throw new Error('Could not load ruby at: ' + url);
+        }
+      }
+    };
+    xhr.send(null);
+  }
+
   if (window.addEventListener) {
     window.addEventListener('DOMContentLoaded', findRubyScripts, false);
   }

data/core/class.rb

@@ -39,13 +39,7 @@ class Class
 
   def superclass
     %x{
-      var sup = #{self}._super;
-
-      if (!sup) {
-        return nil;
-      }
-
-      return sup;
+      return #{self}._super || nil;
     }
   end
 end

data/core/enumerable.rb

@@ -76,8 +76,6 @@ module Enumerable
   end
 
   def collect(&block)
-    return enum_for :collect unless block_given?
-
     %x{
       var result = [];
 
@@ -129,8 +127,6 @@ module Enumerable
   end
 
   def detect(ifnone, &block)
-    return enum_for :detect, ifnone unless block_given?
-
     %x{
       var result = nil;
 
@@ -183,8 +179,6 @@ module Enumerable
   end
 
   def drop_while(&block)
-    return enum_for :drop_while unless block_given?
-
     %x{
       var result = [];
 
@@ -211,8 +205,6 @@ module Enumerable
   end
 
   def each_with_index(&block)
-    return enum_for :each_with_index unless block_given?
-
     %x{
       var index = 0;
 
@@ -233,8 +225,6 @@ module Enumerable
   end
 
   def each_with_object(object, &block)
-    return enum_for :each_with_object unless block_given?
-
     %x{
       #{self}.$each._p = function(obj) {
         var value;
@@ -267,8 +257,6 @@ module Enumerable
   alias find detect
 
   def find_all(&block)
-    return enum_for :find_all unless block_given?
-
     %x{
       var result = [];
 
@@ -303,9 +291,7 @@ module Enumerable
           index += 1;
         };
       }
-      else if (block === nil) {
-        return #{ enum_for 'find_index' };
-      } else {
+      else {
         proc = function(obj) {
           var value;
 
@@ -390,6 +376,8 @@ module Enumerable
     }
   end
 
+  alias select find_all
+
   alias take first
 
   alias to_a entries

data/core/error.rb

@@ -3,9 +3,7 @@ class Exception < `Error`
 
   def self.new(message = '')
     %x{
-      var err = #{allocate};
-      err.message = message;
-      return err;
+      return new Error(message);
     }
   end
 
@@ -20,7 +18,7 @@ class Exception < `Error`
         return backtrace;
       }
 
-      return ["No backtrace available"];
+      return [];
     }
   end
 

data/core/hash.rb

@@ -176,8 +176,6 @@ class Hash
   end
 
   def delete_if(&block)
-    return enum_for :delete_if unless block_given?
-
     %x{
       var map = #{self}.map;
 
@@ -201,8 +199,6 @@ class Hash
   alias dup clone
 
   def each(&block)
-    return enum_for :each unless block_given?
-
     %x{
       var map = #{self}.map;
 
@@ -219,8 +215,6 @@ class Hash
   end
 
   def each_key(&block)
-    return enum_for :each_key unless block_given?
-
     %x{
       var map = #{self}.map;
 
@@ -239,8 +233,6 @@ class Hash
   alias each_pair each
 
   def each_value(&block)
-    return enum_for :each_value unless block_given?
-
     %x{
       var map = #{self}.map;
 
@@ -411,8 +403,6 @@ class Hash
   end
 
   def keep_if(&block)
-    return enum_for :keep_if unless block_given?
-
     %x{
       var map = #{self}.map, value;
 
@@ -544,8 +534,6 @@ class Hash
   end
 
   def reject(&block)
-    return enum_for :reject unless block_given?
-
     %x{
       var map = #{self}.map, result = __hash(), map2 = result.map;
 
@@ -581,8 +569,6 @@ class Hash
   end
 
   def select(&block)
-    return enum_for :select unless block_given?
-
     %x{
       var map = #{self}.map, result = __hash(), map2 = result.map;
 
@@ -604,8 +590,6 @@ class Hash
   end
 
   def select!(&block)
-    return enum_for :select! unless block_given?
-
     %x{
       var map = #{self}.map, result = nil;
 
@@ -677,11 +661,18 @@ class Hash
 
   def to_native
     %x{
-      var result = {}, map = #{self}.map, bucket;
+      var result = {}, map = #{self}.map, bucket, value;
 
       for (var assoc in map) {
         bucket = map[assoc];
-        result[bucket[0]] = #{ `bucket[1]`.to_json };
+        value  = bucket[1];
+
+        if (value.$to_native) {
+          result[assoc] = #{ `value`.to_native };
+        }
+        else {
+          result[assoc] = value;
+        }
       }
 
       return result;

data/core/json.rb

@@ -5,6 +5,11 @@ module JSON
     `return to_opal(json_parse(source));`
   end
 
+  # Raw js object => opal object
+  def self.from_object(js_object)
+    `return to_opal(js_object)`
+  end
+
   %x{
     function to_opal(value) {
       switch (typeof value) {

data/core/kernel.rb

@@ -12,8 +12,6 @@ module Kernel
   end
 
   def Array(object)
-    return [] unless object
-
     %x{
       if (object.$to_ary) {
         return #{object.to_ary};
@@ -22,14 +20,7 @@ module Kernel
         return #{object.to_a};
       }
 
-      var length = object.length || 0,
-          result = [];
-
-      while (length--) {
-        result[length] = object[length];
-      }
-
-      return result;
+      return [object];
     }
   end
 
@@ -130,8 +121,6 @@ module Kernel
   end
 
   def loop(&block)
-    return enum_for :loop unless block_given?
-
     `while (true) {`
       yield
     `}`
@@ -160,7 +149,7 @@ module Kernel
   def puts(*strs)
     %x{
       for (var i = 0; i < strs.length; i++) {
-        console.log(#{ `strs[i]`.to_s });
+        __opal.puts(#{ `strs[i]`.to_s });
       }
     }
     nil
@@ -217,8 +206,6 @@ module Kernel
   end
 
   def tap(&block)
-    `if (block === nil) no_block_given();`
-
     yield self
     self
   end
@@ -234,10 +221,4 @@ module Kernel
   def to_s
     `return "#<" + #{self}._klass._name + ":" + #{self}._id + ">";`
   end
-
-  def enum_for (method = :each, *args)
-    Enumerator.new(self, method, *args)
-  end
-
-  alias to_enum enum_for
 end

data/core/load_order

@@ -5,20 +5,18 @@ basic_object
 kernel
 object
 top_self
-boolean
 nil_class
-enumerable
-enumerator
+boolean
+error
+regexp
 comparable
+enumerable
 array
 hash
 string
 numeric
 proc
 range
-error
-regexp
 time
-struct
 json
-erb
+templates

data/core/nil_class.rb

@@ -41,6 +41,10 @@ class NilClass
     'null'
   end
 
+  def to_native
+    `null`
+  end
+
   def to_s
     ''
   end

data/core/numeric.rb

@@ -104,8 +104,6 @@ class Numeric < `Number`
   end
 
   def downto(finish, &block)
-    return enum_for :downto, finish unless block_given?
-
     %x{
       for (var i = #{self}; i >= finish; i--) {
         if (block.call(__context, i) === __breaker) {
@@ -162,8 +160,6 @@ class Numeric < `Number`
   alias succ next
 
   def times(&block)
-    return enum_for :times unless block_given?
-
     %x{
       for (var i = 0; i <= #{self}; i++) {
         if (block.call(__context, i) === __breaker) {
@@ -192,8 +188,6 @@ class Numeric < `Number`
   end
 
   def upto(finish, &block)
-    return enum_for :upto, finish unless block_given?
-
     %x{
       for (var i = 0; i <= finish; i++) {
         if (block.call(__context, i) === __breaker) {

data/core/object.rb

@@ -1,15 +1,11 @@
 class Object
-  include Kernel
+  # Kernel included inside runtime.js
 
   # FIXME
   def methods
     []
   end
 
-  alias private_methods methods
-  alias protected_methods methods
-  alias public_methods methods
-
   # FIXME
   def singleton_methods
     []

data/core/proc.rb

@@ -10,10 +10,6 @@ class Proc < `Function`
     block
   end
 
-  def to_proc
-    self
-  end
-
   def call(*args)
     `#{self}.apply(#{self}._s, #{args})`
   end

data/core/range.rb

@@ -14,6 +14,9 @@ class Range
     };
   }
 
+  attr_reader :begin
+  attr_reader :end
+
   def initialize(min, max, exclude = false)
     @begin   = min
     @end     = max
@@ -21,9 +24,13 @@ class Range
   end
 
   def ==(other)
-    return false unless Range === other
+    %x{
+      if (!other._isRange) {
+        return false;
+      }
 
-    exclude_end? == other.exclude_end? && `#{self}.begin` == other.begin && `#{self}.end` == other.end
+      return #{self}.exclude === other.exclude && #{self}.begin == other.begin && #{self}.end == other.end;
+    }
   end
 
   # FIXME: currently hardcoded to assume range holds numerics
@@ -31,17 +38,11 @@ class Range
     `return obj >= #{self}.begin && (#{self}.exclude ? obj < #{self}.end : obj <= #{self}.end)`
   end
 
-  def begin
-    `#{self}.begin`
-  end
-
   def cover?(value)
     `#{self}.begin` <= value && value <= (exclude_end? ? `#{self}.end` - 1 : `#{self}.end`)
   end
 
   def each
-    return enum_for :each unless block_given?
-
     current = min
 
     while current != max
@@ -55,10 +56,6 @@ class Range
     self
   end
 
-  def end
-    `#{self}.end`
-  end
-
   def eql?(other)
     return false unless Range === other
 
@@ -81,8 +78,6 @@ class Range
   alias member? include?
 
   def step(n = 1)
-    return enum_for :step, n unless block_given?
-
     raise NotImplementedError
   end
 
@@ -90,7 +85,5 @@ class Range
     `#{self}.begin + (#{self}.exclude ? '...' : '..') + #{self}.end`
   end
 
-  def inspect
-    `#{self}.begin + (#{self}.exclude ? '...' : '..') + #{self}.end`
-  end
+  alias inspect to_s
 end