opal 0.3.21 → 0.3.22

data/Rakefile

@@ -7,21 +7,35 @@ require 'opal/version'
 require 'opal/rake_task'
 
 Opal::RakeTask.new do |t|
-  t.dependencies = %w(opal-spec opal-dom)
-  t.specs_dir    = 'test'
-  t.files        = []  # we handle this by Opal.runtime instead
+  t.dependencies = %w(opal-spec)
+  t.files        = []   # we handle this by Opal.runtime instead
 end
 
-desc "Build minified runtime, dependencies and specs"
-task :min => :opal do
-  %w(opal opal-dom opal-spec specs).each do |f|
-    File.open("build/#{f}.min.js", 'w+') do |o|
-      puts " * build/#{f}.min.js"
-      o.write uglify(File.read "build/#{f}.js")
-    end
+desc "Build opal-parser ready for browser"
+task :parser do
+  puts " * build/opal-parser.js"
+  File.open('build/opal-parser.js', 'w+') do |o|
+    o.puts Opal::Builder.new(:files => %w(racc.rb strscan.rb), :dir => 'core').build
+    o.puts Opal.build_gem('opal')
+    o.puts File.read('core/browser.js')
   end
 end
 
+desc "Run tests"
+task :test do
+  src = %w(build/opal.js build/opal-spec.js build/opal-parser.js build/specs.js)
+  out = 'build/phantom_runner.js'
+
+  File.open(out, 'w+') do |o|
+    src.each { |s| o.write File.read(s) }
+    o.write "Opal.require('opal-spec/autorun');"
+  end
+
+  sh "phantomjs build/phantom_runner.js"
+end
+
+task :default => :test
+
 desc "Check file sizes for opal.js runtime"
 task :sizes do
   o = File.read 'build/opal.js'
@@ -55,10 +69,6 @@ def gzip(str)
   end
 end
 
-# Test
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new :default
-
 namespace :docs do
   desc "Clone repo"
   task :clone do
@@ -73,7 +83,7 @@ namespace :docs do
     end
   end
 
-  desc "Build README.md => index.html"
+  desc "Build docs"
   task :build do
     require 'redcarpet'
     require 'albino'
@@ -84,17 +94,39 @@ namespace :docs do
       end
     end
 
-    puts 'gh-pages/index.html'
     markdown = Redcarpet::Markdown.new(klass, :fenced_code_blocks => true)
 
     File.open('gh-pages/index.html', 'w+') do |o|
+      puts " * index.html"
       o.write File.read('docs/pre.html')
-      o.write markdown.render(File.read "README.md")
+      o.write markdown.render(File.read "docs/index.md")
       o.write File.read('docs/post.html')
     end
 
-    puts "gh-pages/opal.js"
-    FileUtils.cp 'build/opal.js', 'gh-pages/opal.js'
+    %w(try).each do |src|
+      puts " * src.md"
+      File.open("gh-pages/#{src}.html", 'w+') do |out|
+        out.write File.read("docs/pre.html")
+        out.write File.read("docs/#{src}.html")
+        out.write File.read("docs/post.html")
+      end
+    end
+
+    %w(opal opal-parser).each do |src|
+      puts " * #{src}.js"
+      FileUtils.cp "build/#{src}.js", "gh-pages/#{src}.js"
+    end
+  end
+
+  task :server do
+    require 'rack'
+    server = Class.new(Rack::Server) do
+      def app
+        Rack::Directory.new('gh-pages')
+      end
+    end
+
+    server.new.start
   end
 
   desc "commit and push"

data/config.ru

@@ -0,0 +1,17 @@
+require 'rack'
+
+app = lambda do |env|
+  path = env['PATH_INFO']
+  base_path = File.expand_path('../test/index.html', __FILE__)
+  case path
+  when /\.js/
+    contents = File.read(File.join(File.dirname(base_path), '..', path))
+    [200, {'Content-Type' => 'application/x-javascript'}, [contents]]
+  else
+    system 'rake opal'
+    contents = File.read(base_path)
+    [200, {'Content-Type' => 'text/html'}, [contents]]
+  end 
+end
+
+run app

data/core/array.rb

@@ -1,6 +1,7 @@
-`Array.prototype._isArray = true`
-
 class Array < `Array`
+  %x{
+    Array_prototype._isArray = true;
+  }
 
   include Enumerable
 
@@ -14,21 +15,19 @@ class Array < `Array`
     }
   end
 
-  def self.allocate
-    %x{
-      var arr = [];
-      arr.$k  = #{self};
-      arr.$m  = #{self}.$m_tbl;
-      return arr;
-    }
-  end
-
   def self.new(size, obj = nil)
     arr = allocate
 
     %x{
-      for (var i = 0; i < size; i++) {
-        arr[i] = obj;
+      if (size && size._isArray) {
+        for (var i = 0; i < size.length; i++) {
+          arr[i] = size[i];
+        }
+      }
+      else {
+        for (var i = 0; i < size; i++) {
+          arr[i] = obj;
+        }
       }
     }
 
@@ -230,7 +229,7 @@ class Array < `Array`
       var result = [];
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, #{self}[i])) === __breaker) {
+        if ((value = block.call(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -246,7 +245,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = #{self}.length, val; i < length; i++) {
-        if ((val = block(__context, #{self}[i])) === __breaker) {
+        if ((val = block.call(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -356,7 +355,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, #{self}[i])) === __breaker) {
+        if ((value = block.call(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -381,7 +380,7 @@ class Array < `Array`
 
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -447,7 +446,7 @@ class Array < `Array`
       }
 
       if (block !== nil) {
-        return block.call(__context, original);
+        return block(__context, original);
       }
 
       #{ raise "Array#fetch" };
@@ -533,12 +532,13 @@ class Array < `Array`
   end
 
   def index(object, &block)
-    return enum_for :index unless block_given? && object == undefined
-
     %x{
+      if (block === nil && object == null) {
+        return #{enum_for :index};
+      }
       if (block !== nil) {
         for (var i = 0, length = #{self}.length, value; i < length; i++) {
-          if ((value = block(__context, '', #{self}[i])) === __breaker) {
+          if ((value = block.call(__context, '', #{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -573,7 +573,7 @@ class Array < `Array`
       }
 
       for (var length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, result, #{self}[i])) === __breaker) {
+        if ((value = block(__context, result, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -609,12 +609,20 @@ class Array < `Array`
 
   def inspect
     %x{
-      var inspect = [];
+      var i, inspect, el, el_insp, length, object_id;
 
-      for (var i = 0, length = #{self}.length; i < length; i++) {
-        inspect.push(#{`#{self}[i]`.inspect});
-      }
+      inspect = [];
+      object_id = #{object_id};
+      length = #{self}.length;
+
+      for (i = 0; i < length; i++) {
+        el = #{self[`i`]};
+
+        // Check object_id to ensure it's not the same array get into an infinite loop
+        el_insp = #{`el`.object_id} === object_id ? '[...]' : #{`el`.inspect};
 
+        inspect.push(el_insp);
+      }
       return '[' + inspect.join(', ') + ']';
     }
   end
@@ -635,7 +643,7 @@ class Array < `Array`
     return enum_for :keep_if unless block_given?
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block.call(__context, #{self}[i])) === __breaker) {
+        if ((value = block(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -727,7 +735,7 @@ class Array < `Array`
       var result = [];
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, #{self}[i])) === __breaker) {
+        if ((value = block.call(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -746,7 +754,7 @@ class Array < `Array`
       var original = #{self}.length;
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, #{self}[i])) === __breaker) {
+        if ((value = block.call(__context, #{self}[i])) === __breaker) {
           return __breaker.$v;
         }
 
@@ -796,7 +804,7 @@ class Array < `Array`
     %x{
       if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
-          if ((value = block.call(__context, #{self}[i])) === __breaker) {
+          if ((value = block(__context, #{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -826,7 +834,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block.call(__context, item)) === __breaker) {
+        if ((value = block(__context, item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -847,7 +855,7 @@ class Array < `Array`
       for (var i = 0, length = original, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block.call(__context, item)) === __breaker) {
+        if ((value = block(__context, item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -902,7 +910,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block.call(__context, item)) === __breaker) {
+        if ((value = block(__context, item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -1013,7 +1021,7 @@ class Array < `Array`
 
       if (block !== nil) {
         for (var i = 0; i < size; i++) {
-          block(__context, result[i]);
+          block.call(__context, result[i]);
         }
 
         return nil;

data/core/basic_object.rb

@@ -8,13 +8,13 @@ class BasicObject
 
   def __send__(symbol, *args, &block)
     %x{
-      var meth = #{self}.$m[symbol];
+      var meth = #{self}['$' + symbol];
 
       if (!meth) {
         return #{ method_missing symbol };
       }
 
-      return meth.apply(null, [#{self}].concat(args));
+      return meth.apply(#{self}, args);
     }
   end
 
@@ -29,7 +29,7 @@ class BasicObject
         no_block_given();
       }
 
-      return block(#{self});
+      return block.call(#{self});
     }
   end
 
@@ -39,7 +39,7 @@ class BasicObject
         no_block_given();
       }
 
-      return block.apply(this, args);
+      return block.apply(#{self}, args);
     }
   end
 

data/core/browser.js

@@ -0,0 +1,31 @@
+(function() {
+  // quick exit if not insde browser
+  if (typeof(window) === 'undefined' || typeof(document) === 'undefined') {
+    return;
+  }
+
+  function findRubyScripts() {
+    var all = document.getElementsByTagName('script');
+    for (var i = 0, script; i < all.length; i++) {
+      script = all[i];
+      if (script.type === 'text/ruby') {
+        runRuby(script.innerHTML);
+      }
+      else if (script.type === 'text/erb') {
+        runERB(script.innerHTML);
+      }
+    }
+  }
+
+  function runRuby(source) {
+    var js = Opal.Opal.Parser.$new().$parse(source);
+    eval('(' + js + ')()');
+  }
+
+  if (window.addEventListener) {
+    window.addEventListener('DOMContentLoaded', findRubyScripts, false);
+  }
+  else {
+    window.attachEvent('onload', findRubyScripts);
+  }
+})();

data/core/class.rb

@@ -5,10 +5,10 @@ class Class
       var klass   = boot_class(sup, AnonClass)
       klass._name = nil;
 
-      #{ sup.inherited `klass` };
+      sup.$inherited(klass);
 
       if (block !== nil) {
-        block(klass, '');
+        block.call(klass);
       }
 
       return klass;
@@ -17,7 +17,7 @@ class Class
 
   def allocate
     %x{
-      var obj = [];
+      var obj = new #{self};
       obj._id = unique_id++;
       return obj;
     }
@@ -25,11 +25,11 @@ class Class
 
   def new(*args, &block)
     %x{
-      var obj = new self;
+      var obj = new #{self};
       obj._id = unique_id++;
-      obj.$m.initialize._p  = block;
+      obj.$initialize._p  = block;
 
-      obj.$m.initialize.apply(null, [obj].concat(args));
+      obj.$initialize.apply(obj, args);
       return obj;
     }
   end
@@ -39,7 +39,7 @@ class Class
 
   def superclass
     %x{
-      var sup = #{self}.$s;
+      var sup = #{self}._super;
 
       if (!sup) {
         return nil;

data/core/enumerable.rb

@@ -1,13 +1,13 @@
 module Enumerable
   def all?(&block)
     %x{
-      var result = true, proc, each = #{self}.$m.each;
+      var result = true, proc;
 
       if (block !== nil) {
-        proc = function(s, obj) {
+        proc = function(obj) {
           var value;
 
-          if ((value = block(__context, obj)) === __breaker) {
+          if ((value = block.call(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -20,7 +20,7 @@ module Enumerable
         }
       }
       else {
-        proc = function(s, obj) {
+        proc = function(obj) {
           if (obj === false || obj === nil) {
             result = false;
             __breaker.$v = nil;
@@ -30,8 +30,8 @@ module Enumerable
         }
       }
 
-      each._p = proc;
-      each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -39,13 +39,13 @@ module Enumerable
 
   def any?(&block)
     %x{
-      var result = false, proc, each = #{self}.$m.each;
+      var result = false, proc;
 
       if (block !== nil) {
-        proc = function(s, obj) {
+        proc = function(obj) {
           var value;
 
-          if ((value = block(__context, obj)) === __breaker) {
+          if ((value = block.call(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -58,7 +58,7 @@ module Enumerable
         }
       }
       else {
-        proc = function(s, obj) {
+        proc = function(obj) {
           if (obj !== false && obj !== nil) {
             result      = true;
             __breaker.$v = nil;
@@ -68,8 +68,8 @@ module Enumerable
         }
       }
 
-      each._p = proc;
-      each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -79,20 +79,20 @@ module Enumerable
     return enum_for :collect unless block_given?
 
     %x{
-      var result = [], each = #{self}.$m.each;
+      var result = [];
 
       var proc = function() {
-        var obj = __slice.call(arguments, 1), value;
+        var obj = __slice.call(arguments), value;
 
-        if ((value = block.apply(null, [__context].concat(obj))) === __breaker) {
+        if ((value = block.apply(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
         result.push(value);
       };
 
-      each._p = proc;
-      each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -100,19 +100,19 @@ module Enumerable
 
   def count(object, &block)
     %x{
-      var result = 0, each = #{self}.$m.each;
+      var result = 0;
 
       if (object != null) {
-        block = function(s, obj) { return #{ `obj` == `object` }; };
+        block = function(obj) { return #{ `obj` == `object` }; };
       }
       else if (block === nil) {
         block = function() { return true; };
       }
 
-      var proc = function(s, obj) {
+      var proc = function(obj) {
         var value;
 
-        if ((value = block(__context, obj)) === __breaker) {
+        if ((value = block.call(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -121,8 +121,8 @@ module Enumerable
         }
       }
 
-      each._p = proc;
-      each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -132,12 +132,12 @@ module Enumerable
     return enum_for :detect, ifnone unless block_given?
 
     %x{
-      var result = nil, each = #{self}.$m.each;
+      var result = nil;
 
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block(__context, obj)) === __breaker) {
+        if ((value = block.call(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -149,7 +149,7 @@ module Enumerable
         }
       };
 
-      each(#{self});
+      #{self}.$each();
 
       if (result !== nil) {
         return result;
@@ -166,10 +166,9 @@ module Enumerable
   def drop(number)
     %x{
       var result  = [],
-          current = 0,
-          each    = #{self}.$m.each;
+          current = 0;
 
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         if (number < current) {
           result.push(e);
         }
@@ -177,7 +176,7 @@ module Enumerable
         current++;
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return result;
     }
@@ -187,12 +186,12 @@ module Enumerable
     return enum_for :drop_while unless block_given?
 
     %x{
-      var result = [], each = #{self}.$m.each;
+      var result = [];
 
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block(__context, obj)) === __breaker) {
+        if ((value = block.call(__context, obj)) === __breaker) {
           return __breaker;
         }
 
@@ -205,7 +204,7 @@ module Enumerable
         return __breaker;
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return result;
     }
@@ -215,19 +214,19 @@ module Enumerable
     return enum_for :each_with_index unless block_given?
 
     %x{
-      var index = 0, each = #{self}.$m.each;
+      var index = 0;
 
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block(__context, obj, index)) === __breaker) {
+        if ((value = block.call(__context, obj, index)) === __breaker) {
           return __breaker.$v;
         }
 
         index++;
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return nil;
     }
@@ -237,17 +236,15 @@ module Enumerable
     return enum_for :each_with_object unless block_given?
 
     %x{
-      var each = #{self}.$m.each;
-
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block(__context, obj, object)) === __breaker) {
+        if ((value = block.call(__context, obj, object)) === __breaker) {
           return __breaker.$v;
         }
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return object;
     }
@@ -255,13 +252,13 @@ module Enumerable
 
   def entries
     %x{
-      var result = [], each = #{self}.$m.each;
+      var result = [];
 
-      each._p = function(m, obj) {
+      #{self}.$each._p = function(obj) {
         result.push(obj);
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return result;
     }
@@ -273,12 +270,12 @@ module Enumerable
     return enum_for :find_all unless block_given?
 
     %x{
-      var result = [], each = #{self}.$m.each;
+      var result = [];
 
-      each._p = function(s, obj) {
+      #{self}.$each._p = function(obj) {
         var value;
 
-        if ((value = block(__context, obj)) === __breaker) {
+        if ((value = block.call(__context, obj)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -287,7 +284,7 @@ module Enumerable
         }
       };
 
-      each(#{self});
+      #{self}.$each();
 
       return result;
     }
@@ -295,10 +292,10 @@ module Enumerable
 
   def find_index(object, &block)
     %x{
-      var proc, result = nil, index = 0, each = #{self}.$m.each;
+      var proc, result = nil, index = 0;
 
       if (object != null) {
-        proc = function (s, obj) { 
+        proc = function (obj) { 
           if (#{ `obj` == `object` }) {
             result = index;
             return __breaker;
@@ -309,10 +306,10 @@ module Enumerable
       else if (block === nil) {
         return #{ enum_for 'find_index' };
       } else {
-        proc = function(s, obj) {
+        proc = function(obj) {
           var value;
 
-          if ((value = block(__context, obj)) === __breaker) {
+          if ((value = block.call(__context, obj)) === __breaker) {
             return __breaker.$v;
           }
 
@@ -326,8 +323,8 @@ module Enumerable
         };
       }
 
-      #{self}.$m.each._p = proc;
-      #{self}.$m.each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -337,16 +334,15 @@ module Enumerable
     %x{
       var result = [],
           current = 0,
-          proc,
-          each = #{self}.$m.each;
+          proc;
 
       if (number == null) {
         result = nil;
-        proc = function(s, obj) {
+        proc = function(obj) {
             result = obj; return __breaker;
           };
       } else {
-        proc = function(s, obj) {
+        proc = function(obj) {
             if (number <= current) {
               return __breaker;
             }
@@ -357,8 +353,8 @@ module Enumerable
           };
       }
 
-      each._p = proc;
-      each(#{self});
+      #{self}.$each._p = proc;
+      #{self}.$each();
 
       return result;
     }
@@ -366,21 +362,21 @@ module Enumerable
 
   def grep(pattern, &block)
     %x{
-      var result = [], each = #{self}.$m.each;
+      var result = [];
 
-      each._p = (block !== nil
-        ? function(s, obj) {
+      #{self}.$each._p = (block !== nil
+        ? function(obj) {
             var value = #{pattern === `obj`};
 
             if (value !== false && value !== nil) {
-              if ((value = block(__context, obj)) === __breaker) {
+              if ((value = block.call(__context, obj)) === __breaker) {
                 return __breaker.$v;
               }
 
               result.push(value);
             }
           }
-        : function(s, obj) {
+        : function(obj) {
             var value = #{pattern === `obj`};
 
             if (value !== false && value !== nil) {
@@ -388,7 +384,7 @@ module Enumerable
             }
           });
 
-      each(#{self});
+      #{self}.$each();
 
       return result;
     }