opal 0.3.16 → 0.3.17

data/{core_spec → spec}/core/false/xor_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "FalseClass#^" do
   it "returns false if other is nil or false, otherwise true" do
     (false ^ false).should == false
@@ -8,4 +6,4 @@ describe "FalseClass#^" do
     (false ^ "").should == true
     (false ^ mock('x')).should == true
   end
-end
+end

data/{core_spec → spec}/core/hash/allocate_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash.allocate" do
   it "returns an instance of Hash" do
     hsh = Hash.allocate
@@ -12,4 +10,4 @@ describe "Hash.allocate" do
     hsh[:a] = 1
     hsh.should == { :a => 1 }
   end
-end
+end

data/spec/core/hash/assoc_spec.rb

@@ -0,0 +1,25 @@
+describe "Hash#assoc" do
+  before(:each) do
+    @h = {:apple => :green, :orange => :orange, :grape => :green, :banana => :yellow}
+  end
+
+  it "returns an Array is the argument is == to a key of the Hash" do
+    @h.assoc(:apple).should be_kind_of(Array)
+  end
+
+  it "returns a 2-element Array if the argument is == to a key of the Hash" do
+    @h.assoc(:grape).size.should == 2
+  end
+
+  it "sets the first element of the Array to the located key" do
+    @h.assoc(:banana).first.should == :banana
+  end
+
+  it "sets the last element of the Array to the value of the located key" do
+    @h.assoc(:banana).last.should == :yellow
+  end
+
+  it "returns nil if the argument if not a key of the Hash" do
+    @h.assoc(:green).should be_nil
+  end
+end

data/{core_spec → spec}/core/hash/clear_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#clear" do
   it "removes all key, value pairs" do
     h = {1 => 2, 3 => 4}
@@ -18,4 +16,4 @@ describe "Hash#clear" do
     h.clear
     h["z"].should == "Go fish"
   end
-end
+end

data/{core_spec → spec}/core/hash/clone_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#clone" do
   it "copies instance variable but not the objects they refer to" do
     hash = {'key' => 'value'}
@@ -9,4 +7,4 @@ describe "Hash#clone" do
     clone.should == hash
     clone.object_id.should_not == hash.object_id
   end
-end
+end

data/{core_spec → spec}/core/hash/default_spec.rb

@@ -1,6 +1,4 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#default" do
   it "returns the default value" do
   end
-end
+end

data/{core_spec → spec}/core/hash/delete_if_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#delete_if" do
   it "yields two arguments: key and value" do
     all_args = []
@@ -12,4 +10,4 @@ describe "Hash#delete_if" do
     h.delete_if { |k,v| v % 2 == 1 }.should equal(h)
     h.should == {:b => 2, :d => 4}
   end
-end
+end

data/{core_spec → spec}/core/hash/element_reference_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#[]" do
   it "returns the value for the key" do
     obj = Object.new
@@ -13,4 +11,4 @@ describe "Hash#[]" do
   it "returns nil as default default value" do
     {0 => 0}[5].should == nil
   end
-end
+end

data/{core_spec → spec}/core/hash/element_set_spec.rb

@@ -1,8 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash#[]=" do
   it "associates the key with the value and return the value" do
     h = {:a => 1}
     (h[:b] = 2).should == 2
   end
-end
+end

data/spec/core/hash/merge_spec.rb

@@ -0,0 +1,37 @@
+describe "Hash#merge" do
+  it "returns a new hash by combining self with the contents of other" do
+    h = {1 => :a, 2 => :b, 3 => :c}.merge(:a => 1, :c => 2)
+    h.should == {:c => 2, 1 => :a, 2 => :b, :a => 1, 3 => :c}
+  end
+
+  it "sets any duplicate key to the value of the block if passed a block" do
+    h1 = {:a => 2, :b => 1, :d => 5}
+    h2 = {:a => -2, :b => 4, :c => -3}
+    r = h1.merge(h2) { |k,x,y| nil }
+    r.should == {:a => nil, :b => nil, :c => -3, :d => 5}
+
+    r = h1.merge(h2) { |k,x,y| "#{k}:#{x+2*y}" }
+    r.should == {:a => "a:-2", :b => "b:9", :c => -3, :d => 5}
+
+    r = h1.merge(h1) { |k,x,y| :x }
+    r.should == {:a => :x, :b => :x, :d => :x}
+  end
+end
+
+describe "Hash#merge" do
+  it "adds the entries from other, overwriting duplicate keys. Returns self" do
+    h = {:_1 => 'a', :_2 => '3'}
+    h.merge(:_1 => '9', :_9 => 2).should equal(h)
+    h.should == {:_1 => "9", :_2 => "3", :_9 => 2}
+  end
+
+  it "sets any duplicate key to the value of block if passed a block" do
+    h1 = {:a => 2, :b => -1}
+    h2 = {:a => -2, :c => 1}
+    h1.merge(h2) { |k,x,y| 3.14 }.should equal(h1)
+    h1.should == {:c => 1, :b => -1, :a => 3.14}
+
+    h1.merge(h1) { nil }
+    h1.should == {:a => nil, :b => nil, :c => nil}
+  end
+end

data/{core_spec → spec}/core/hash/new_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Hash.new" do
   it "creates an empty Hash if passed no arguments" do
     Hash.new.should == {}
@@ -10,4 +8,4 @@ describe "Hash.new" do
     Hash.new(5).default.should == 5
     Hash.new({}).default.should == {}
   end
-end
+end

data/{core_spec → spec}/core/matchdata/to_a_spec.rb

@@ -1,7 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "MatchData#to_a" do
   it "returns an array of matches" do
     /(.)(.)(\d+)(\d)/.match("THX1138").to_a.should == ["HX1138", "H", "X", "113", "8"]
   end
-end
+end

data/{core_spec → spec}/core/nil/and_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#&" do
   it "returns false" do
     (nil & nil).should == false
@@ -8,5 +6,4 @@ describe "NilClass#&" do
     (nil & "").should == false
     (nil & mock('x')).should == false
   end
-end
-
+end

data/{core_spec → spec}/core/nil/inspect_spec.rb

@@ -1,8 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#inspect" do
   it "returns the string 'nil'" do
     nil.inspect.should == "nil"
   end
-end
-
+end

data/{core_spec → spec}/core/nil/nil_spec.rb

@@ -1,8 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#nil?" do
   it "returns true" do
     nil.nil?.should == true
   end
-end
-
+end

data/{core_spec → spec}/core/nil/or_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#|" do
   it "returns false if other is nil or false, otherwise true" do
     (nil | nil).should == false
@@ -8,5 +6,4 @@ describe "NilClass#|" do
     (nil | "").should == true
     (nil | 'x').should == true
   end
-end
-
+end

data/{core_spec → spec}/core/nil/to_a_spec.rb

@@ -1,8 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#to_a" do
   it "returns an empty array" do
     nil.to_a.should == []
   end
-end
-
+end

data/{core_spec → spec}/core/nil/to_f_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#to_f" do
   it "returns 0.0" do
     nil.to_f.should == 0.0
@@ -8,5 +6,4 @@ describe "NilClass#to_f" do
   it "does not cause NilClass to be coerced to Float" do
     (0.0 == nil).should == false
   end
-end
-
+end

data/{core_spec → spec}/core/nil/to_i_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#to_i" do
   it "returns 0" do
     nil.to_i.should == 0
@@ -8,5 +6,4 @@ describe "NilClass#to_i" do
   it "does not cause NilClass to be coerced to Fixnum" do
     (0 == nil).should == false
   end
-end
-
+end

data/{core_spec → spec}/core/nil/to_s_spec.rb

@@ -1,8 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#to_s" do
   it "returns the string ''" do
     nil.to_s.should == ""
   end
-end
-
+end

data/{core_spec → spec}/core/nil/xor_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "NilClass#^" do
   it "returns false if other is nil or false, otherwise true" do
     (nil ^ nil).should == false
@@ -8,5 +6,4 @@ describe "NilClass#^" do
     (nil ^ "").should == true
     (nil ^ 'x').should == true
   end
-end
-
+end

data/{core_spec → spec}/core/numeric/equal_value_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Numeric#==" do
   it "returns true if self has the same value as other" do
     (1 == 1).should == true
@@ -8,4 +6,4 @@ describe "Numeric#==" do
     (9 == 9.0).should == true
     (9 == 9.01).should == false
   end
-end
+end

data/{core_spec → spec}/core/regexp/match_spec.rb

@@ -1,6 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../shared/match', __FILE__)
-
 describe "Regexp#=~ on a successful match" do
   it "returns the index of the first character of the matching region" do
     (/(.)(.)(.)/ =~ "abc").should == 0
@@ -21,3 +18,13 @@ describe "Regexp#match on a successful match" do
     $~.should be_nil
   end
 end
+
+describe :regexp_match do
+  it "returns nil if there is no match" do
+    /xyz/.match("abxyc").should be_nil
+  end
+
+  it "returns nil if the object is nil" do
+    /xyz/.match(nil).should be_nil
+  end
+end

data/{core_spec → spec}/core/symbol/to_proc_spec.rb

@@ -1,8 +1,6 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "Symbol#to_proc" do
   it "returns a new Proc" do
     proc = :to_s.to_proc
     proc.should be_kind_of(Proc)
   end
-end
+end

data/{core_spec → spec}/core/true/and_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "TrueClass#&" do
   it "returns false if other is nil or false, otherwise true" do
     (true & true).should == true
@@ -8,4 +6,4 @@ describe "TrueClass#&" do
     (true & "").should == true
     (true & mock('x')).should == true
   end
-end
+end

data/{core_spec → spec}/core/true/inspect_spec.rb

@@ -1,7 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "TrueClass#inspect" do
   it "returns the string 'true'" do
     true.inspect.should == "true"
   end
-end
+end

data/{core_spec → spec}/core/true/or_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "TrueClass#|" do
   it "returns true" do
     (true | true).should == true
@@ -8,4 +6,4 @@ describe "TrueClass#|" do
     (true | "").should == true
     (true | mock('x')).should == true
   end
-end
+end

data/{core_spec → spec}/core/true/to_s_spec.rb

@@ -1,7 +1,5 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "TrueClass#to_s" do
   it "returns the string 'true'" do
     true.to_s.should == "true"
   end
-end
+end

data/{core_spec → spec}/core/true/xor_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-
 describe "TrueClass#^" do
   it "returns true if other is nil or false, otherwise false" do
     (true ^ true).should == false
@@ -8,4 +6,4 @@ describe "TrueClass#^" do
     (true ^ "").should == false
     (true ^ mock('x')).should == false
   end
-end
+end

data/spec/index.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+  <title></title>
+</head>
+<body>
+  <script type="text/javascript" src="../build/opal.js"></script>
+  <script type="text/javascript" src="../build/opal-spec.js"></script>
+  <script type="text/javascript" src="../build/opal.specs.js"></script>
+</body>
+</html>

data/{core_spec → spec}/language/alias_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
 class AliasObject
   attr :foo
   attr_reader :baz
@@ -22,4 +20,4 @@ describe "The alias keyword" do
     end
     @obj.__value.should == 5
   end
-end
+end

data/{core_spec → spec}/language/and_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
 describe "The '&&' statement" do
   it "short-circuits evaluation at the first condition to be false" do
     x = nil
@@ -58,5 +56,4 @@ describe "The 'and' statement" do
     (true and ()).should be_nil
     (() and ()).should be_nil
   end
-end
-
+end

data/{core_spec → spec}/language/array_spec.rb

@@ -1,5 +1,3 @@
-require File.expand_path('../../spec_helper', __FILE__)
-
 describe "Array literals" do
   it "[] should return a new array populated with the given elements" do
     array = [1, 'a', nil]
@@ -64,5 +62,4 @@ describe "The unpacking splat operator (*)" do
     splatted_array = [3, 4, 5]
     [1, 2, *splatted_array].should == [1, 2, 3, 4, 5]
   end
-end
-
+end