opal 0.4.3 → 0.4.4

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format progress
+--pattern mri_spec/**/*_spec.rb

data/.travis.yml

@@ -7,7 +7,3 @@ rvm:
 
 notifications:
   irc: "irc.freenode.org#opal"
-
-matrix:
-  allow_failures:
-    - rvm: 2.0.0

data/README.md

@@ -63,6 +63,12 @@ visit `http://localhost:9292/` in any web browser.
 
 ## Code Overview
 
+What code is supposed to run where?
+
+* `lib/` code runs inside your ruby env. It compiles ruby to javascript.
+* `corelib/` is the runtime/corelib for our implementation (runs in browser)
+* `stdlib/` is our implementation of ruby stdlib. It is optional (for browser).
+
 ### lib
 
 The `lib` directory holds the opal parser/compiler used to compile ruby

data/Rakefile

@@ -6,6 +6,25 @@ require 'rack'
 require 'webrick'
 require 'opal-sprockets'
 
+# mspec/rubyspec use a top level "language_version" to require relative specs.
+# We can't do this at runtime, so we hijack the method (and make sure we only
+# do this at the top level). We figure out which file we are including, and
+# add it to our require list
+class ::Opal::Parser
+  alias_method :mspec_process_call, :process_call
+
+  def process_call(sexp, level)
+    if sexp[1] == :language_version and @scope.top?
+      lang_type = sexp[2][2][1]
+      target = "rubyspec/language/versions/#{lang_type}_1.9"
+      @requires << target
+      return f("nil")
+    end
+
+    mspec_process_call sexp, level
+  end
+end
+
 class RunSpec
   def initialize(file=nil)
     Opal::Processor.arity_check_enabled = true
@@ -60,11 +79,19 @@ class RunSpec
   end
 end
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:mri_spec) do |t|
+  t.pattern = 'mri_spec/**/*_spec.rb'
+end
+
 desc "Run tests through mspec"
-task :default do
+task :mspec do
   RunSpec.new
 end
 
+task :default => [:mri_spec, :mspec] do
+end
+
 desc "Build specs to build/specs.js and build/specs.min.js"
 task :build_specs do
   require 'uglifier'
@@ -120,8 +147,6 @@ end
 desc "Build opal.js and opal-parser.js to build/"
 task :dist do
   Opal::Processor.arity_check_enabled = false
-  Opal::Processor.source_map_enabled = false
-  Opal::Processor.method_missing_enabled = false
 
   env = Opal::Environment.new
 
@@ -131,9 +156,8 @@ task :dist do
     puts "* building #{lib}..."
 
     src = env[lib].to_s
-    #min = uglify src
-    #gzp = gzip min
-    min = gzp = nil
+    min = uglify src
+    gzp = gzip min
 
     File.open("build/#{lib}.js", 'w+')        { |f| f << src }
     File.open("build/#{lib}.min.js", 'w+')    { |f| f << min } if min

data/bin/opal

@@ -1,86 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'optparse'
-
-options = {}
-parser = OptionParser.new do |opts|
-  opts.banner = 'Usage: opal [options] -- [programfile]'
-
-  opts.on('-v', '--version', 'Display Opal Version') do |v|
-    require 'opal/version'
-    puts "Opal v#{Opal::VERSION}"
-    exit
-  end
-
-  opts.on("-h", "--help", "Show this message") do
-    puts opts
-    exit
-  end
-
-  opts.separator ''
-  opts.separator 'Basic Options:'
-
-  opts.on('-I', '--include DIR',
-          'Append a load path (may be used more than once)') do |i|
-    options[:load_paths] ||= []
-    options[:load_paths] << i
-  end
-
-  opts.on('-e', '--eval SOURCE', String,
-          'One line of script. Several -e\'s allowed. Omit [programfile]') do |source|
-    options[:evals] ||= []
-    options[:evals] << source
-  end
-
-  opts.on('-s', '--sexp', 'Show Sexps') do
-    options[:sexp] = true
-  end
-
-  opts.on('-c', '--compile', 'Compile to JavaScript') do
-    options[:compile] = true
-  end
-
-  opts.on('-s', '--server [PORT]', 'Start a server (default port: 3000)') do |port|
-    options[:server] = port.to_i
-  end
-
-
-  opts.separator ''
-  opts.separator 'Compilation Options:'
-
-  opts.on('-M', '--no-method-missing', 'Disable method missing') do |value|
-    options[:method_missing] = false
-  end
-
-  opts.on('-O', '--no-optimized-operators', 'Disable optimized operators') do |value|
-    options[:optimized_operators_enabled] = false
-  end
-
-  opts.on('-A', '--arity-check', 'Enable arity check') do |value|
-    options[:arity_check] = true
-  end
-
-  opts.on('-C', '--no-const-missing', 'Disable const missing') do |value|
-    options[:const_missing] = false
-  end
-
-  dynamic_require_levels = %w[error warning ignore]
-  opts.on('-D', '--dynamic-require LEVEL', dynamic_require_levels,
-                'Set levelDynamic require severity') do |level|
-    options[:dynamic_require_severity] = level
-  end
-
-  opts.on('-P', '--no-source-map', 'Disable source map') do |value|
-    options[:source_map_enabled] = false
-  end
-
-  opts.on("--irb", "IRB var mode") do |i|
-    options[:irb] = true
-  end
-
-end
-
-parser.parse!
+require 'opal/cli_options'
+options = Opal::CLIOptions.new
+options.parse!
 
 require 'opal/cli'
-Opal::CLI.new ARGV.first, options
+cli = Opal::CLI.new ARGV.first, options.options
+cli.run
+

data/corelib/{opal/array.rb → array.rb}

@@ -26,7 +26,7 @@ class Array
           arr = [];
 
       if (!obj) {
-        if (size['$to_ary'] && typeof(size['$to_ary']) == 'function'){
+        if (#{size.respond_to? :to_ary}) {
           if (size['$is_a?'](Array))
             return size;
           return size['$to_ary']();
@@ -36,7 +36,7 @@ class Array
       if (typeof(arguments[0]) == 'number')
         size = arguments[0];
       else {
-        if (arguments[0]['$to_int'] && typeof(arguments[0]['$to_int']) == 'function' ) {
+        if (#{`arguments[0]`.respond_to? :to_int}) {
           size = arguments[0]['$to_int']();
           if (typeof(size) == 'number') {
             if (size % 1 !== 0) {
@@ -66,8 +66,8 @@ class Array
       else {
         for (var i = 0, value; i < size; i++) {
           value = block(i);
-          if (value === __breaker) {
-            return __breaker.$v;
+          if (value === $breaker) {
+            return $breaker.$v;
           }
           arr[i] = block(i);
         }
@@ -159,7 +159,7 @@ class Array
           result = [];
 
      if (typeof(b) == "object" && !(b._isArray))  {
-        if (b['$to_ary'] && typeof(b['$to_ary']) == "function") {
+        if (#{other.respond_to? :to_ary}) {
           b = b['$to_ary']();
         } else {
           #{raise TypeError.new("can't convert to Array. Array#-") };
@@ -222,16 +222,11 @@ class Array
         tmp1 = #{self}[i];
         tmp2 = #{other}[i];
 
-        //recursive
-        if (tmp1 && (typeof(tmp1.indexOf) == "function") &&
-            (typeof(tmp2.indexOf) == "function") &&  tmp2 &&
-            (tmp1.indexOf(tmp2) == tmp2.indexOf(tmp1))) {
-          if (tmp1.indexOf(tmp1) == tmp2.indexOf(tmp2)) {
-            continue;
-          }
+        if (tmp1._isArray && tmp2._isArray && (tmp1 === #{self})) {
+          continue;
         }
 
-        if (!#{`#{self}[i]` == `other[i]`}) {
+        if (!(#{`tmp1` == `tmp2`})) {
           return false;
         }
 
@@ -343,8 +338,8 @@ class Array
 
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(#{self}[i])) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(#{self}[i])) === $breaker) {
+          return $breaker.$v;
         }
 
         result.push(value);
@@ -357,8 +352,8 @@ class Array
   def collect!(&block)
     %x{
       for (var i = 0, length = #{self}.length, val; i < length; i++) {
-        if ((val = block(#{self}[i])) === __breaker) {
-          return __breaker.$v;
+        if ((val = block(#{self}[i])) === $breaker) {
+          return $breaker.$v;
         }
 
         #{self}[i] = val;
@@ -465,8 +460,8 @@ class Array
   def delete_if(&block)
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(#{self}[i])) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(#{self}[i])) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
@@ -490,19 +485,20 @@ class Array
   def each(&block)
     return enum_for :each unless block_given?
 
-    if block.arity > 0
-      %x{
-        for (var i = 0, length = #{self}.length; i < length; i++) {
-          if (block.apply(null, #{self}[i]._isArray ? #{self}[i] : [#{self}[i]]) === __breaker) return __breaker.$v;
+    %x{
+      if (block.length > 1) {
+        for (var i = 0, length = #{self}.length, el; i < length; i++) {
+          el = #{self}[i];
+          if (!el._isArray) el = [el];
+
+          if (block.apply(null, el) === $breaker) return $breaker.$v;
         }
-      }
-    else
-      %x{
+      } else {
         for (var i = 0, length = #{self}.length; i < length; i++) {
-          #{yield `#{self}[i]`};
+          if (block(#{self}[i]) === $breaker) return $breaker.$v;
         }
       }
-    end
+    }
 
     self
   end
@@ -633,8 +629,8 @@ class Array
       }
       else if (block !== nil) {
         for (var i = 0, length = #{self}.length, value; i < length; i++) {
-          if ((value = block(#{self}[i])) === __breaker) {
-            return __breaker.$v;
+          if ((value = block(#{self}[i])) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value !== false && value !== nil) {
@@ -705,8 +701,8 @@ class Array
   def keep_if(&block)
     %x{
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(#{self}[i])) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(#{self}[i])) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -730,7 +726,7 @@ class Array
       }
 
       if (typeof(count) == 'object') {
-        if (typeof(count['$to_int']) == 'function') {
+        if (#{count.respond_to? :to_int}) {
           count = count['$to_int']();
         }
         else {
@@ -808,8 +804,8 @@ class Array
       var result = [];
 
       for (var i = 0, length = #{self}.length, value; i < length; i++) {
-        if ((value = block(#{self}[i])) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(#{self}[i])) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -854,8 +850,8 @@ class Array
     %x{
       if (block !== nil) {
         for (var i = #{self}.length - 1, value; i >= 0; i--) {
-          if ((value = block(#{self}[i])) === __breaker) {
-            return __breaker.$v;
+          if ((value = block(#{self}[i])) === $breaker) {
+            return $breaker.$v;
           }
 
           if (value !== false && value !== nil) {
@@ -882,8 +878,8 @@ class Array
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block(item)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(item)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value !== false && value !== nil) {
@@ -957,13 +953,13 @@ class Array
       if (block !== nil) {
         var result = copy.sort(function(x, y) {
           var result = block(x, y);
-          if (result === __breaker) {
-            t_break.push(__breaker.$v);
+          if (result === $breaker) {
+            t_break.push($breaker.$v);
           }
           if (result === nil) {
             t_arg_error = true;
           }
-          if ((result != null) && result['$<=>'] && typeof(result['$<=>']) == "function") {
+          if ((result != null) && #{ `result`.respond_to? :<=> }) {
             result = result['$<=>'](0);
           }
           if (result !== -1 && result !== 0 && result !== 1) {
@@ -1034,8 +1030,8 @@ class Array
       for (var i = 0, length = #{self}.length, item, value; i < length; i++) {
         item = #{self}[i];
 
-        if ((value = block(item)) === __breaker) {
-          return __breaker.$v;
+        if ((value = block(item)) === $breaker) {
+          return $breaker.$v;
         }
 
         if (value === false || value === nil) {
@@ -1055,18 +1051,6 @@ class Array
 
   alias to_ary to_a
 
-  def to_json
-    %x{
-      var result = [];
-
-      for (var i = 0, length = #{self}.length; i < length; i++) {
-        result.push(#{ `#{self}[i]`.to_json });
-      }
-
-      return '[' + result.join(', ') + ']';
-    }
-  end
-
   def to_n
     %x{
       var result = [], obj

data/corelib/{opal/basic_object.rb → basic_object.rb}

@@ -26,7 +26,7 @@ class BasicObject
   def instance_eval(&block)
     %x{
       if (block === nil) {
-        no_block_given();
+        throw new Error("no block given");
       }
 
       var block_self = block._s, result;
@@ -42,7 +42,7 @@ class BasicObject
   def instance_exec(*args, &block)
     %x{
       if (block === nil) {
-        no_block_given();
+        throw new Error("no block given");
       }
 
       var block_self = block._s, result;

data/corelib/{opal/boolean.rb → boolean.rb}

@@ -17,16 +17,8 @@ class Boolean
     `(#{self} == true) === other.valueOf()`
   end
 
-  def as_json
-    self
-  end
-
   alias singleton_class class
 
-  def to_json
-    `(#{self} == true) ? 'true' : 'false'`
-  end
-
   def to_s
     `(#{self} == true) ? 'true' : 'false'`
   end