opal 0.3.41 → 0.3.42

data/spec/language/versions/symbol_1.9.rb

@@ -0,0 +1,15 @@
+describe "A Symbol literal" do
+  pending "can be an empty string" do
+    c = :''
+    c.should be_kind_of(Symbol)
+    c.inspect.should == ':""'
+  end
+
+  # These weren't allowed on 1.8
+  pending "can be :!, :!=, or :!~" do
+    %w{'!', '!=', '!~'}.each do |sym|
+      lambda { sym.to_sym }.should_not raise_error(SyntaxError)
+      sym.to_sym.to_s.should == sym
+    end
+  end
+end

data/spec/language/versions/variables_1.9.rb

@@ -0,0 +1,8 @@
+describe "Multiple assignments with splats" do
+  pending "* on the LHS has to be applied to any parameter" do
+    # a, *b, c = 1, 2, 3
+    a.should == 1
+    b.should == [2]
+    c.should == 3
+  end
+end

data/spec/language/while_spec.rb

@@ -1,3 +1,14 @@
+require File.expand_path('../../spec_helper', __FILE__)
+
+# while bool-expr [do]
+#   body
+# end
+#
+# begin
+#   body
+# end while bool-expr
+#
+# expr while bool-expr
 describe "The while expression" do
   it "runs while the expression is true" do
     i = 0
@@ -34,7 +45,7 @@ describe "The while expression" do
     a.should == 123
   end
 
-  it "exectues code in containing variable scope with 'do'" do
+  it "executes code in containing variable scope with 'do'" do
     i = 0
     while i != 1 do
       a = 123
@@ -44,7 +55,7 @@ describe "The while expression" do
     a.should == 123
   end
 
-  it "returns nil is ended when condition became false" do
+  it "returns nil if ended when condition became false" do
     i = 0
     while i < 3
       i += 1
@@ -94,7 +105,7 @@ describe "The while expression" do
     a = []
     i = 0
     j = 0
-    while (i+=1) <3
+    while (i+=1)<3
       a << i
       j+=1
       redo if j<3
@@ -141,6 +152,20 @@ describe "The while modifier" do
   it "returns nil if interrupted by break with no arguments" do
     (break while true).should == nil
   end
+
+  it "skips to end of body with next" do
+    i = 0
+    j = 0
+    ((i+=1) == 3 ? next : j+=i) while i <= 10
+    j.should == 63
+  end
+
+  it "restarts the current iteration without reevaluating condition with redo" do
+    i = 0
+    j = 0
+    (i+=1) == 4 ? redo : j+=i while (i+=1) <= 10
+    j.should == 34
+  end
 end
 
 describe "The while modifier with begin .. end block" do
@@ -163,11 +188,51 @@ describe "The while modifier with begin .. end block" do
     i.should == 6
   end
 
-  it "returns values passed to break if interrupted by break" do
+  it "returns value passed to break if interrupted by break" do
     (begin; break 123; end while true).should == 123
   end
 
   it "returns nil if interrupted by break with no arguments" do
     (begin; break; end while true).should == nil
   end
-end
+
+  pending "runs block at least once (even if the expression is false)" do
+    i = 0
+    begin
+      i += 1
+    end while false
+
+    i.should == 1
+  end
+
+  pending "evaluates condition after block execution" do
+    a = []
+    i = 0
+    begin
+      a << i
+    end while (i+=1)<5
+    a.should == [0, 1, 2, 3, 4]
+  end
+
+  pending "skips to end of body with next" do
+    a = []
+    i = 0
+    begin
+      next if i==3
+      a << i
+    end while (i+=1)<5
+    a.should == [0, 1, 2, 4]
+  end
+
+  pending "restarts the current iteration without reevaluting condition with redo" do
+    a = []
+    i = 0
+    j = 0
+    begin
+      a << i
+      j+=1
+      redo if j<3
+    end while (i+=1)<3
+    a.should == [0, 0, 0, 1, 2]
+  end
+end

data/spec/language/yield_spec.rb

@@ -1,5 +1,11 @@
+require File.expand_path('../../spec_helper', __FILE__)
 require File.expand_path('../fixtures/yield', __FILE__)
 
+# Note that these specs use blocks defined as { |*a| ... } to capture the
+# arguments with which the block is invoked. This is slightly confusing
+# because the outer Array is a consequence of |*a| but it is necessary to
+# clearly distinguish some behaviors.
+
 describe "The yield call" do
   before :each do
     @y = YieldSpecs::Yielder.new
@@ -9,6 +15,10 @@ describe "The yield call" do
     it "raises a LocalJumpError when the method is not passed a block" do
       lambda { @y.z }.should raise_error(LocalJumpError)
     end
+
+    pending "ignores assignment to the explicit block argument and calls the passed block" do
+      @y.ze { 42 }.should == 42
+    end
   end
 
   describe "taking a single argument" do
@@ -52,7 +62,7 @@ describe "The yield call" do
       @y.r(1) { |*a| a }.should == [1]
     end
 
-    it "passes no arguments when the argument is an empty array" do
+    it "passes no arguments when the argument is an empty Array" do
       @y.r([]) { |*a| a }.should == []
     end
 
@@ -70,8 +80,16 @@ describe "The yield call" do
       @y.r([[]]) { |*a| a }.should == [[]]
     end
 
-    it "passes nil as a value" do
-      @y.r(nil) { |*a| a }.should == [nil]
+    ruby_version_is ""..."1.9" do
+      it "passes nil as a value" do
+        @y.r(nil) { |*a| a }.should == [nil]
+      end
+    end
+
+    ruby_version_is "1.9" do
+      pending "passes no values when give nil as an argument" do
+        @y.r(nil) { |*a| a }.should == []
+      end
     end
   end
 
@@ -95,8 +113,16 @@ describe "The yield call" do
       @y.rs(1, 2, [3, 4, 5]) { |*a| a }.should == [1, 2, 3, 4, 5]
     end
 
-    it "passes nil as the argument value if the splatted argument is nil" do
-      @y.rs(1, 2, nil) { |*a| a }.should == [1, 2, nil]
+    ruby_version_is ""..."1.9" do
+      it "passes nil as the argument value if the splatted argument is nil" do
+        @y.rs(1, 2, nil) { |*a| a }.should == [1, 2, nil]
+      end
+    end
+
+    ruby_version_is "1.9" do
+      pending "does not pass an argument value if the splatted argument is nil" do
+        @y.rs(1, 2, nil) { |*a| a }.should == [1, 2]
+      end
     end
   end
-end
+end

data/spec/ospec/filter.rb

@@ -0,0 +1,32 @@
+class OSpecFilter
+  def self.main
+    @main ||= self.new
+  end
+
+  def initialize
+    @filters = {}
+  end
+
+  def register
+    MSpec.register :exclude, self
+  end
+
+  def ===(description)
+    @filters.has_key? description
+  end
+
+  def register_filters(description, block)
+    instance_eval(&block)
+  end
+
+  def fails(description)
+    @filters[description] = true
+  end
+end
+
+class Object
+  def opal_filter(description, &block)
+    OSpecFilter.main.register_filters(description, block)
+  end
+end
+

data/spec/ospec/main.rb.erb

@@ -0,0 +1,18 @@
+<% require_asset 'opal' %>
+<% require_asset 'opal-parser' %>
+<% require_asset 'mspec' %>
+<% require_asset 'ospec/runner' %>
+
+# Load all opal filters
+<% Dir.glob('spec/filters/*.rb').each do |s| %>
+  <% require_asset s.sub(/^spec\//, '').sub(/\.rb$/, '') %>
+<% end %>
+
+# This file just greps for all spec files in spec/ and requires them
+<% Dir.glob('spec/**/*_spec.{rb,opal}').each do |s| %>
+  <% require_asset s.sub(/^spec\//, '').sub(/\.(rb|opal)$/, '') %>
+<% end %>
+
+# All specs have been run, so we notify mspec that we are done
+OSpecRunner.main.did_finish
+

data/spec/ospec/phantom.rb

@@ -0,0 +1,97 @@
+class PhantomFormatter
+  def initialize(out=nil)
+    @exception = @failure = false
+    @exceptions = []
+    @count = 0
+    @examples = 0
+
+    @current_state = nil
+  end
+
+  def register
+    MSpec.register :exception, self
+    MSpec.register :before,    self
+    MSpec.register :after,     self
+    MSpec.register :start,     self
+    MSpec.register :finish,    self
+    MSpec.register :abort,     self
+    MSpec.register :enter,     self
+  end
+
+  def green(str)
+    `console.log('\\033[32m' + str + '\\033[0m')`
+  end
+
+  def red(str)
+    `console.log('\\033[31m' + str + '\\033[0m')`
+  end
+
+  def log(str)
+    `console.log(str)`
+  end
+
+  def exception?
+    @exception
+  end
+
+  def failure?
+    @failure
+  end
+
+  def enter(describe); end
+
+  def before(state=nil)
+    @current_state = nil
+    @failure = @exception = false
+  end
+
+  def exception(exception)
+    @count += 1
+    @failure = @exception ? @failure && exception.failure? : exception.failure?
+    @exception = true
+    @exceptions << exception
+  end
+
+  def after(state = nil)
+    @current_state = nil
+    @examples += 1
+  end
+
+  def start
+    @start_time = Time.now.to_f
+  end
+
+  def finish
+    time = Time.now.to_f - @start_time
+
+    if @exceptions.empty?
+      log "\nFinished"
+      green "#{@examples} examples, #{@count} failures (time taken: #{time})"
+
+      finish_with_code 0
+    else
+      log "\nFailures:"
+
+      @exceptions.each_with_index do |exception, idx|
+        log "\n  #{idx + 1}. #{exception.description}"
+        red "\n    #{exception.message}"
+      end
+
+      log "\nFinished"
+      red "#{@examples} examples, #{@count} failures (time taken: #{time})"
+
+      finish_with_code(1)
+    end
+  end
+
+  def finish_with_code(code)
+    %x{
+      if (typeof(phantom) !== 'undefined') {
+        return phantom.exit(code);
+      }
+      else {
+        window.OPAL_SPEC_CODE = code;
+      }
+    }
+  end
+end

data/spec/ospec/runner.rb

@@ -0,0 +1,95 @@
+require 'ospec/phantom'
+require 'ospec/filter'
+
+# stdlib
+require 'opal/date'
+require 'opal/enumerator'
+
+ENV = {}
+
+class File
+  def self.expand_path(*a); nil; end
+end
+
+class ExceptionState
+  def initialize(state, location, exception)
+    @exception = exception
+
+    @description = location ? ["An exception occurred during: #{location}"] : []
+    if state
+      @description << "\n" unless @description.empty?
+      @description << state.description
+      @describe = state.describe
+      @it = state.it
+      @description = @description.join ""
+    else
+      @describe = @it = ""
+    end
+  end
+end
+
+module Kernel
+  def opal_eval(str)
+    code = Opal::Parser.new.parse str
+    `eval(#{code})`
+  end
+
+  def opal_parse(str, file='(string)')
+    Opal::Grammar.new.parse str, file
+  end
+
+  def opal_eval_compiled(javascript)
+    `eval(javascript)`
+  end
+
+  def eval(str)
+    opal_eval str
+  end
+end
+
+module Kernel
+  # FIXME: remove
+  def ruby_version_is(*); end
+  def pending(*); end
+end
+
+module MSpec
+  def self.opal_runner
+    @env = Object.new
+    @env.extend MSpec
+  end
+end
+
+class OSpecRunner
+  def self.main
+    @main ||= self.new
+  end
+
+  def initialize
+    register
+    run
+  end
+
+  def register
+    formatter = PhantomFormatter.new
+    formatter.register
+
+    OSpecFilter.main.register
+  end
+
+  def run
+    MSpec.opal_runner
+  end
+
+  def will_start
+    MSpec.actions :start
+  end
+
+  def did_finish
+    MSpec.actions :finish
+  end
+end
+
+# As soon as this file loads, tell the runner the specs are starting
+OSpecRunner.main.will_start
+