stupidedi 1.1.0 → 1.2.1

data/spec/examples/ruby/object.example

@@ -68,14 +68,14 @@ describe "Object#bind" do
 end
 
 describe "Object#tap" do
-  let(:object) { mock("object") }
+  let(:object) { double("object") }
 
   it "requires a block argument" do
     lambda { object.tap }.should raise_error(LocalJumpError)
   end
 
   it "yields the object to a block argument" do
-    object.should_receive(:message).with(:argument)
+    expect(object).to receive(:message).with(:argument)
     object.tap{|o| o.message(:argument) }
   end
 
@@ -85,7 +85,7 @@ describe "Object#tap" do
 end
 
 describe "Object#eigenclass" do
-  let(:object) { mock("object") }
+  let(:object) { double("object") }
 
   it "returns a Class" do
     object.eigenclass.should be_a(Class)

data/spec/examples/ruby/symbol.example

@@ -98,20 +98,20 @@ describe "Symbol#call" do
   end
 
   it "sends a message to the first argument" do
-    receiver = mock("object")
-    receiver.should_receive(:message)
+    receiver = double("object")
+    expect(receiver).to receive(:message)
     :message.call(receiver)
   end
 
   it "passes the remaining arguments along" do
-    receiver = mock("object")
-    receiver.should_receive(:message).with("a", "b")
+    receiver = double("object")
+    expect(receiver).to receive(:message).with("a", "b")
     :message.call(receiver, "a", "b")
   end
 
   it "does not flatten the argument list" do
-    receiver = mock("object")
-    receiver.should_receive(:message).with(["a", "b"], "c")
+    receiver = double("object")
+    expect(receiver).to receive(:message).with(["a", "b"], "c")
     :message.call(receiver, ["a", "b"], "c")
   end
 end

data/spec/examples/ruby/to_d.example

@@ -34,7 +34,7 @@ describe Rational do
   describe "#to_d" do
     include QuickCheck::Macro
 
-    property("rational.to_d ≈ rational") do
+    property("rational.to_d ≈ rational", :ruby => "1.8") do
       Rational(integer, integer)
     end.check{|r| r.to_d.should be_within(1e-10).of(r) }
 

data/spec/examples/ruby/try.example

@@ -1,20 +1,20 @@
 require "spec_helper"
 
 describe "Object#try" do
-  let(:object) { mock("object") }
+  let(:object) { double("object") }
 
   it "calls a unary block" do
-    object.should_receive(:message).with(no_args)
+    expect(object).to receive(:message).with(no_args)
     object.try{|o| o.message }
   end
 
   it "calls a unary block" do
-    object.should_receive(:message).with(no_args)
+    expect(object).to receive(:message).with(no_args)
     object.try(&:message)
   end
 
   it "calls a nullary method" do
-    object.should_receive(:message).with(no_args)
+    expect(object).to receive(:message).with(no_args)
     object.try(:message)
   end
 
@@ -27,7 +27,7 @@ describe "Object#try" do
   end
 
   it "calls a unary method" do
-    object.should_receive(:message).with(:argument)
+    expect(object).to receive(:message).with(:argument)
     object.try(:message, :argument)
   end
 
@@ -36,7 +36,7 @@ describe "Object#try" do
   end
 
   it "calls a binary method" do
-    object.should_receive(:message).with(:first, :second)
+    expect(object).to receive(:message).with(:first, :second)
     object.try(:message, :first, :second)
   end
 end

data/spec/examples/stupidedi/reader.example

@@ -21,43 +21,43 @@ describe Stupidedi::Reader do
     end
 
     it "includes uppercase letters" do
-      ('A'..'Z').each{|c| is_basic?(c).should be_true }
+      ('A'..'Z').each{|c| is_basic?(c).should be true }
     end
 
     it "includes digits 0-9" do
-      is_basic?('0').should be_true
-      is_basic?('1').should be_true
-      is_basic?('2').should be_true
-      is_basic?('3').should be_true
-      is_basic?('4').should be_true
-      is_basic?('5').should be_true
-      is_basic?('6').should be_true
-      is_basic?('7').should be_true
-      is_basic?('8').should be_true
-      is_basic?('9').should be_true
+      is_basic?('0').should be true
+      is_basic?('1').should be true
+      is_basic?('2').should be true
+      is_basic?('3').should be true
+      is_basic?('4').should be true
+      is_basic?('5').should be true
+      is_basic?('6').should be true
+      is_basic?('7').should be true
+      is_basic?('8').should be true
+      is_basic?('9').should be true
     end
 
     it "includes special characters" do
-      is_basic?('!').should be_true
-      is_basic?('"').should be_true
-      is_basic?('&').should be_true
-      is_basic?("'").should be_true
-      is_basic?('(').should be_true
-      is_basic?(')').should be_true
-      is_basic?('*').should be_true
-      is_basic?('+').should be_true
-      is_basic?(',').should be_true
-      is_basic?('-').should be_true
-      is_basic?('.').should be_true
-      is_basic?('/').should be_true
-      is_basic?(':').should be_true
-      is_basic?(';').should be_true
-      is_basic?('?').should be_true
-      is_basic?('=').should be_true
+      is_basic?('!').should be true
+      is_basic?('"').should be true
+      is_basic?('&').should be true
+      is_basic?("'").should be true
+      is_basic?('(').should be true
+      is_basic?(')').should be true
+      is_basic?('*').should be true
+      is_basic?('+').should be true
+      is_basic?(',').should be true
+      is_basic?('-').should be true
+      is_basic?('.').should be true
+      is_basic?('/').should be true
+      is_basic?(':').should be true
+      is_basic?(';').should be true
+      is_basic?('?').should be true
+      is_basic?('=').should be true
     end
 
     it "includes the space character" do
-      is_basic?(' ').should be_true
+      is_basic?(' ').should be true
     end
   end
 
@@ -79,29 +79,29 @@ describe Stupidedi::Reader do
     end
 
     it "includes lowercase letters" do
-      ('a'..'z').each{|c| is_extended?(c).should be_true }
+      ('a'..'z').each{|c| is_extended?(c).should be true }
     end
 
     it "includes other special characters" do
-      is_extended?('%').should be_true
-      is_extended?('@').should be_true
-      is_extended?('[').should be_true
-      is_extended?(']').should be_true
-      is_extended?('_').should be_true
-      is_extended?('{').should be_true
-      is_extended?('}').should be_true
-      is_extended?('\\').should be_true
-      is_extended?('|').should be_true
-      is_extended?('<').should be_true
-      is_extended?('>').should be_true
-      is_extended?('~').should be_true
-      is_extended?('^').should be_true
-      is_extended?('`').should be_true
+      is_extended?('%').should be true
+      is_extended?('@').should be true
+      is_extended?('[').should be true
+      is_extended?(']').should be true
+      is_extended?('_').should be true
+      is_extended?('{').should be true
+      is_extended?('}').should be true
+      is_extended?('\\').should be true
+      is_extended?('|').should be true
+      is_extended?('<').should be true
+      is_extended?('>').should be true
+      is_extended?('~').should be true
+      is_extended?('^').should be true
+      is_extended?('`').should be true
     end
 
     it "includes national characters" do
-      is_extended?('#').should be_true
-      is_extended?('$').should be_true
+      is_extended?('#').should be true
+      is_extended?('$').should be true
     end
 
     it "includes select language characters" do

data/spec/examples/stupidedi/reader/failure.example

@@ -26,7 +26,7 @@ describe Stupidedi::Reader::Failure do
   # Note: `method` is dynamically scoped (bound by the caller's environment)
   shared_examples_for "wrapped input delegator method" do
     context "when remainder is wrapped" do
-      let(:input) { mock("input", :offset => 400, :line => 90, :column => 10) }
+      let(:input) { double("input", :offset => 400, :line => 90, :column => 10) }
 
       it "returns input.method" do
         mkfailure("reason", input).__send__(method).should ==

data/spec/examples/stupidedi/reader/input/delegated_input.example

@@ -48,7 +48,7 @@ describe Stupidedi::Reader::DelegatedInput do
       property("is true") do
         with(:size, between(1, 25)) { [string, between(0, size - 1)] }
       end.check do |s, n|
-        mkinput(s).defined_at?(n).should be_true
+        mkinput(s).defined_at?(n).should be true
       end
     end
 
@@ -56,7 +56,7 @@ describe Stupidedi::Reader::DelegatedInput do
       property("is false") do
         with(:size, between(0, 25)) { [string, size] }
       end.check do |s, n|
-        mkinput(s).defined_at?(n).should be_false
+        mkinput(s).defined_at?(n).should be false
       end
     end
 
@@ -64,7 +64,7 @@ describe Stupidedi::Reader::DelegatedInput do
       property("is false") do
         with(:size, between(0, 25)) { [string, size + integer.abs] }
       end.check do |s, n|
-        mkinput(s).defined_at?(n).should be_false
+        mkinput(s).defined_at?(n).should be false
       end
     end
   end

data/spec/examples/stupidedi/reader/token_reader.example

@@ -302,7 +302,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :IEA
-          value.should have(0).element_toks
+          expect(value.element_toks.size).to eq(0)
           remainder.input.should == "..."
           remainder.should be_stream
         end
@@ -314,7 +314,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :IEA
-          value.should have(2).element_toks
+          expect(value.element_toks.size).to eq(2)
           remainder.input.should == "..."
           remainder.should be_stream
         end
@@ -328,7 +328,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(0).element_toks
+          expect(value.element_toks.size).to eq(0)
           remainder.input.should == "..."
         end
       end
@@ -348,7 +348,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(1).element_toks
+          expect(value.element_toks.size).to eq(1)
           value.element_toks.head.value.should == "O"
         end
       end
@@ -359,7 +359,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(1).element_toks
+          expect(value.element_toks.size).to eq(1)
           value.element_toks.head.value.should == ""
         end
       end
@@ -379,7 +379,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(3).element_toks
+          expect(value.element_toks.size).to eq(3)
           value.element_toks.map(&:value).should == %w(M N O)
         end
       end
@@ -390,7 +390,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(3).element_toks
+          expect(value.element_toks.size).to eq(3)
           value.element_toks.map(&:value).should == ["", "", ""]
         end
       end
@@ -401,7 +401,7 @@ describe Stupidedi::Reader::TokenReader do
         result.should be_defined
         result.map do |value, remainder|
           value.id.should == :ABC
-          value.should have(3).element_toks
+          expect(value.element_toks.size).to eq(3)
           value.element_toks.map(&:value).should == ["", "", "O"]
         end
       end
@@ -432,7 +432,7 @@ describe Stupidedi::Reader::TokenReader do
         result = reader.read_segment
         result.should be_defined
         result.map do |value, remainder|
-          value.should have(4).element_toks
+          expect(value.element_toks.size).to eq(4)
           value.element_toks.map(&:value).should == %w(W X Y Z)
         end
       end
@@ -464,7 +464,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
+            expect(value.element_toks.size).to eq(2)
             value.element_toks.head.value.should == "W^X"
             value.element_toks.last.value.should == "Y^Z"
           end
@@ -486,7 +486,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
+            expect(value.element_toks.size).to eq(2)
             value.element_toks.head.value.should == "W:X"
             value.element_toks.last.value.should == "Y:Z"
           end
@@ -528,13 +528,13 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
+            expect(value.element_toks.size).to eq(3)
             value.element_toks.head.value.should == "W"
 
-            value.element_toks.at(1).should have(1).component_toks
+            expect(value.element_toks.at(1).component_toks.size).to eq(1)
             value.element_toks.at(1).component_toks.head.value.should == "X"
 
-            value.element_toks.at(2).should have(1).component_toks
+            expect(value.element_toks.at(2).component_toks.size).to eq(1)
             value.element_toks.at(2).component_toks.head.value.should == "Y"
           end
         end
@@ -555,14 +555,14 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
+            expect(value.element_toks.size).to eq(3)
             value.element_toks.head.value.should == "W"
 
-            value.element_toks.at(1).should have(2).component_toks
+            expect(value.element_toks.at(1).component_toks.size).to eq(2)
             value.element_toks.at(1).component_toks.head.value.should == "X"
             value.element_toks.at(1).component_toks.last.value.should == "Y"
 
-            value.element_toks.at(2).should have(2).component_toks
+            expect(value.element_toks.at(2).component_toks.size).to eq(2)
             value.element_toks.at(2).component_toks.head.value.should == "M"
             value.element_toks.at(2).component_toks.last.value.should == "N"
           end
@@ -584,7 +584,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
+            expect(value.element_toks.size).to eq(3)
             value.element_toks.head.value.should == "W"
             value.element_toks.at(1).component_toks.map(&:value).should == ["X", "", "Z"]
             value.element_toks.at(2).component_toks.map(&:value).should == %w(M N O P)
@@ -607,7 +607,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
+            expect(value.element_toks.size).to eq(3)
             value.element_toks.head.value.should == "W"
             value.element_toks.at(1).component_toks.map(&:value).should == %w(X^Y Z)
             value.element_toks.at(2).component_toks.map(&:value).should == %w(M N^O)
@@ -633,7 +633,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
+            expect(value.element_toks.size).to eq(2)
             value.element_toks.head.value.should == ""
           # value.element_toks.last.should have(0).element_toks
           end
@@ -655,8 +655,8 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
-            value.element_toks.last.should have(1).element_toks
+            expect(value.element_toks.size).to eq(2)
+            expect(value.element_toks.last.element_toks.size).to eq(1)
             value.element_toks.last.element_toks.head.value.should == "X"
           end
         end
@@ -668,8 +668,8 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
-            value.element_toks.last.should have(2).element_toks
+            expect(value.element_toks.size).to eq(2)
+            expect(value.element_toks.last.element_toks.size).to eq(2)
             value.element_toks.last.element_toks.head.value.should == "X"
             value.element_toks.last.element_toks.last.value.should == "Y"
           end
@@ -682,8 +682,8 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(2).element_toks
-            value.element_toks.last.should have(3).element_toks
+            expect(value.element_toks.size).to eq(2)
+            expect(value.element_toks.last.element_toks.size).to eq(3)
             value.element_toks.last.element_toks.map(&:value).should == %w(X Y Z)
           end
         end
@@ -715,7 +715,7 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
+            expect(value.element_toks.size).to eq(3)
           # value.element_toks.at(1).should have(0).element_toks
           end
         end
@@ -727,10 +727,10 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
-            value.element_toks.at(1).should have(1).element_toks
-            value.element_toks.at(1).element_toks.should have(1).element_toks
-            value.element_toks.at(1).element_toks.head.should have(2).component_toks
+            expect(value.element_toks.size).to eq(3)
+            # value.element_toks.at(1).should have(1).element_tok
+            expect(value.element_toks.at(1).element_toks.size).to eq(1)
+            expect(value.element_toks.at(1).element_toks.head.component_toks.size).to eq(2)
             value.element_toks.at(1).element_toks.head.component_toks.head.value.should == "A"
             value.element_toks.at(1).element_toks.head.component_toks.last.value.should == "B"
           end
@@ -743,8 +743,8 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
-            value.element_toks.at(1).element_toks.head.should have(2).component_toks
+            expect(value.element_toks.size).to eq(3)
+            expect(value.element_toks.at(1).element_toks.head.component_toks.size).to eq(2)
             value.element_toks.at(1).element_toks.head.component_toks.head.value.should == "A"
             value.element_toks.at(1).element_toks.head.component_toks.last.value.should == "B"
             value.element_toks.at(1).element_toks.last.component_toks.head.value.should == "C"
@@ -759,8 +759,8 @@ describe Stupidedi::Reader::TokenReader do
           result = reader.read_segment
           result.should be_defined
           result.map do |value, remainder|
-            value.should have(3).element_toks
-            value.element_toks.at(1).element_toks.head.should have(2).component_toks
+            expect(value.element_toks.size).to eq(3)
+            expect(value.element_toks.at(1).element_toks.head.component_toks.size).to eq(2)
             value.element_toks.at(1).element_toks.at(0).component_toks.head.value.should == "A"
             value.element_toks.at(1).element_toks.at(0).component_toks.last.value.should == "B"
             value.element_toks.at(1).element_toks.at(1).component_toks.head.value.should == "C"