opal 0.3.26 → 0.3.27

data/.gitignore

@@ -3,9 +3,4 @@
 .yardoc
 .bundle
 Gemfile.lock
-pkg/*
-/gh-pages
-/examples/**/*.js
-/build
-Gemfile.local
-Gemfile.local.lock
+build

data/.travis.yml

@@ -2,7 +2,4 @@ language: ruby
 
 rvm:
   - 1.8.7
-  - 1.9.3
-
-before_script:
-  - "bundle exec rake opal"
+  - 1.9.3

data/Gemfile

@@ -10,5 +10,5 @@ end
 
 # running tests on command line
 group :testing do
-  gem 'opal-spec'
+  gem 'opal-spec', :git => 'git://github.com/opal/opal-spec.git'
 end

data/README.md

@@ -14,16 +14,11 @@ See the website, [http://opal.github.com](http://opal.github.com).
 
 ## Running tests
 
-Build the runtime, tests and dependencies:
+Build the runtime, tests and dependencies, and then run the tests all in one
+go:
 
 ```
-rake opal
-```
-
-Run tests using phantom.js runner:
-
-```
-rake test
+$ rake
 ```
 
 Alternatively, after building, you can open `spec/index.html` in any

data/Rakefile

@@ -1,6 +1,4 @@
 require 'bundler/setup'
-
-require 'opal/version'
 require 'opal/rake_task'
 
 Opal::RakeTask.new do |t|
@@ -9,7 +7,8 @@ Opal::RakeTask.new do |t|
   t.parser       = true # we want to also build opal-parser.js (used in specs)
 end
 
-task :default => 'opal:test'
+# build runtime, dependencies and specs, then run the tests
+task :default => %w[opal opal:test]
 
 desc "Check file sizes for opal.js runtime"
 task :sizes do
@@ -42,4 +41,28 @@ def gzip(str)
     i.close_write
     return i.read
   end
+end
+
+# For testing just specific sections of opal
+desc "Build each test case"
+task :test_cases do
+  FileUtils.mkdir_p 'build/test_cases'
+
+  sources = Dir['spec/core/*', 'spec/language', 'spec/lib', 'spec/opal']
+
+  sources.each do |c|
+    dest = "build/test_cases/#{File.basename c}"
+    FileUtils.mkdir_p dest
+    File.open("#{dest}/specs.js", "w+") do |out|
+      out.puts Opal.build_files(c)
+    end
+
+    File.open("#{dest}/index.html", "w+") do |out|
+      out.puts File.read("spec/test_case.html")
+    end
+  end
+
+  File.open("build/test_cases/runner.js", "w+") do |out|
+    out.puts Opal.parse(File.read("spec/spec_helper.rb"))
+  end
 end

data/core/array.rb

@@ -11,7 +11,7 @@ class Array < `Array`
     }
   end
 
-  def self.new(size, obj = nil)
+  def self.new(size, obj = nil, &block)
     %x{
       var arr = [];
 
@@ -21,8 +21,15 @@ class Array < `Array`
         }
       }
       else {
-        for (var i = 0; i < size; i++) {
-          arr[i] = obj;
+        if (block === nil) {
+          for (var i = 0; i < size; i++) {
+            arr[i] = obj;
+          }
+        }
+        else {
+          for (var i = 0; i < size; i++) {
+            arr[i] = block.call(__context, i);
+          }
         }
       }
 
@@ -63,7 +70,7 @@ class Array < `Array`
 
       var result = [];
 
-      for (var i = 0, length = #{self}.length; i < length; i++) {
+      for (var i = 0; i < other; i++) {
         result = result.concat(#{self});
       }
 
@@ -121,7 +128,6 @@ class Array < `Array`
     }
   end
 
-  # TODO: does not yet work with ranges
   def [](index, length = undefined)
     %x{
       var size = #{self}.length;
@@ -169,7 +175,6 @@ class Array < `Array`
     }
   end
 
-  # TODO: need to expand functionality
   def []=(index, value)
     %x{
       var size = #{self}.length;
@@ -209,7 +214,7 @@ class Array < `Array`
   end
 
   def clear
-    `#{self}.splice(0);`
+    `#{self}.splice(0, #{self}.length)`
 
     self
   end
@@ -365,22 +370,6 @@ class Array < `Array`
     `#{self}.slice(number)`
   end
 
-  def drop_while(&block)
-    %x{
-      for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, #{self}[i])) === __breaker) {
-          return __breaker.$v;
-        }
-
-        if (value === false || value === nil) {
-          return #{self}.slice(i);
-        }
-      }
-
-      return [];
-    }
-  end
-
   alias dup clone
 
   def each(&block)
@@ -399,14 +388,6 @@ class Array < `Array`
     self
   end
 
-  def each_with_index(&block)
-    `for (var i = 0, length = #{self}.length; i < length; i++) {`
-      yield `#{self}[i]`, `i`
-    `}`
-
-    self
-  end
-
   def empty?
     `!#{self}.length`
   end
@@ -481,22 +462,6 @@ class Array < `Array`
     }
   end
 
-  def grep(pattern)
-    %x{
-      var result = [];
-
-      for (var i = 0, length = #{self}.length, item; i < length; i++) {
-        item = #{self}[i];
-
-        if (#{ pattern === `item` }) {
-          result.push(item);
-        }
-      }
-
-      return result;
-    }
-  end
-
   def hash
     `#{self}._id || (#{self}._id = unique_id++)`
   end
@@ -513,11 +478,18 @@ class Array < `Array`
     }
   end
 
-  def index(object, &block)
+  def index(object=undefined, &block)
     %x{
-      if (block !== nil) {
+      if (object != null) {
+        for (var i = 0, length = #{self}.length; i < length; i++) {
+          if (#{`#{self}[i]` == object}) {
+            return i;
+          }
+        }
+      }
+      else if (block !== nil) {
         for (var i = 0, length = #{self}.length, value; i < length; i++) {
-          if ((value = block.call(__context, '', #{self}[i])) === __breaker) {
+          if ((value = block.call(__context, #{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -526,41 +498,11 @@ class Array < `Array`
           }
         }
       }
-      else {
-        for (var i = 0, length = #{self}.length; i < length; i++) {
-          if (#{`#{self}[i]` == object}) {
-            return i;
-          }
-        }
-      }
 
       return nil;
     }
   end
 
-  def inject(initial, &block)
-    %x{
-      var result, i;
-
-      if (initial == null) {
-        result = #{self}[0], i = 1;
-      }
-      else {
-        result = initial, i = 0;
-      }
-
-      for (var length = #{self}.length, value; i < length; i++) {
-        if ((value = block(__context, result, #{self}[i])) === __breaker) {
-          return __breaker.$v;
-        }
-
-        result = value;
-      }
-
-      return result;
-    }
-  end
-
   def insert(index, *objects)
     %x{
       if (objects.length > 0) {
@@ -619,7 +561,7 @@ class Array < `Array`
   def keep_if(&block)
     %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;
         }
 
@@ -674,7 +616,7 @@ class Array < `Array`
         #{ raise "negative count given" };
       }
 
-      return count > length ? #{self}.splice(0) : #{self}.splice(length - count, length);
+      return count > length ? #{self}.splice(0, #{self}.length) : #{self}.splice(length - count, length);
     }
   end
 
@@ -744,7 +686,7 @@ class Array < `Array`
 
   def replace(other)
     %x{
-      #{self}.splice(0);
+      #{self}.splice(0, #{self}.length);
       #{self}.push.apply(#{self}, other);
       return #{self};
     }
@@ -770,7 +712,7 @@ class Array < `Array`
     %x{
       if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
-          if ((value = block(__context, #{self}[i])) === __breaker) {
+          if ((value = block.call(__context, #{self}[i])) === __breaker) {
             return __breaker.$v;
           }
 
@@ -798,7 +740,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block(__context, item)) === __breaker) {
+        if ((value = block.call(__context, item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -854,12 +796,12 @@ class Array < `Array`
         index += #{self}.length;
       }
 
-      if (index < 0 || index >= #{self}.length) {
-        return nil;
+      if (length != null) {
+        return #{self}.splice(index, length);
       }
 
-      if (length != null) {
-        return #{self}.splice(index, index + length);
+      if (index < 0 || index >= #{self}.length) {
+        return nil;
       }
 
       return #{self}.splice(index, 1)[0];
@@ -877,7 +819,7 @@ class Array < `Array`
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block(__context, item)) === __breaker) {
+        if ((value = block.call(__context, item)) === __breaker) {
           return __breaker.$v;
         }
 
@@ -958,7 +900,7 @@ class Array < `Array`
 
   def unshift(*objects)
     %x{
-      for (var i = 0, length = objects.length; i < length; i++) {
+      for (var i = objects.length - 1; i >= 0; i--) {
         #{self}.unshift(objects[i]);
       }
 

data/core/boolean.rb

@@ -28,7 +28,4 @@ class Boolean < `Boolean`
   def to_s
     `(#{self} == true) ? 'true' : 'false'`
   end
-end
-
-TRUE  = true
-FALSE = false
+end

data/core/class.rb

@@ -81,63 +81,12 @@ class Class
     self
   end
 
-  # Private helper function to define attributes
-  %x{
-    function define_attr(klass, name, getter, setter) {
-      if (getter) {
-        klass.prototype['$' + name] = function() {
-          var res = this[name];
-          return res == null ? nil : res;
-        };
-
-        klass._donate([name]);
-      }
-
-      if (setter) {
-        klass.prototype['$' + name + '='] = function(val) {
-          return this[name] = val;
-        };
-
-        klass._donate([name]);
-      }
-    }
-  }
-
-  def attr_accessor(*attrs)
-    %x{
-      for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(#{self}, attrs[i], true, true);
-      }
-
-      return nil;
-    }
-  end
-
-  def attr_reader(*attrs)
-    %x{
-      for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(#{self}, attrs[i], true, false);
-      }
-
-      return nil;
-    }
-  end
-
-  def attr_writer(*attrs)
-    %x{
-      for (var i = 0, length = attrs.length; i < length; i++) {
-        define_attr(#{self}, attrs[i], false, true);
-      }
+  # handled by parser
+  def attr_accessor(*); end
 
-      return nil;
-    }
-  end
-
-  def attr(name, setter = false)
-    `define_attr(#{self}, name, true, setter)`
-
-    self
-  end
+  alias attr_reader attr_accessor
+  alias attr_writer attr_accessor
+  alias attr attr_accessor
 
   def define_method(name, &block)
     %x{
@@ -175,9 +124,22 @@ class Class
     }
   end
 
-  # FIXME
-  def instance_methods
-    []
+  def instance_methods(include_super = false)
+    %x{
+      var methods = [], proto = #{self}.prototype;
+
+      for (var prop in #{self}.prototype) {
+        if (!include_super && !proto.hasOwnProperty(prop)) {
+          continue;
+        }
+
+        if (prop.charAt(0) === '$') {
+          methods.push(prop.substr(1));
+        }
+      }
+
+      return methods;
+    }
   end
 
   def included(mod)
@@ -213,20 +175,12 @@ class Class
     }
   end
 
-  def singleton_class
-    %x{
-      if (#{self}._singleton) {
-        return #{self}._singleton;
-      }
-
-      var meta = new __opal.Class;
-      #{self}._singleton = meta;
-      meta.prototype = #{self};
-
-      return meta;
-    }
+  def public(*)
   end
 
+  alias private public
+  alias protected public
+
   def superclass
     %x{
       return #{self}._super || nil;