rr 0.10.9 → 0.10.10

data/CHANGES

@@ -1,3 +1,6 @@
+0.10.10
+- Suite passes for Ruby 1.9.1
+
 0.10.9
 - Fixed 1.8.6 bug for real
 
@@ -14,7 +17,6 @@
 - Fixed Bug - Can't stub attribute methods on a BelongsToAssociation (http://github.com/btakita/rr/issues#issue/24)
 
 0.10.5
-- Fixed issues with Ruby 1.9
 - Fixed stack overflow caused by double include in Test::Unit adapter [http://github.com/btakita/rr/issues#issue/16]. Identified by Dave Myron (http://github.com/contentfree)
 - Fixed warnings (Patch by Bryan Helmkamp)
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 10
-:patch: 9
+:patch: 10
 :major: 0

data/lib/rr/adapters/rr_methods.rb

@@ -50,7 +50,7 @@ module RR
       # that succeeds when passed an argument of a certain type.
       #   mock(object).method_name(is_a(String)) {return_value}
       #   object.method_name("A String") # passes
-          def is_a(klass)
+      def is_a(klass)
         RR::WildcardMatchers::IsA.new(klass)
       end
 
@@ -80,7 +80,7 @@ module RR
       def duck_type(*args)
         RR::WildcardMatchers::DuckType.new(*args)
       end
-      
+
       # Sets up a HashIncluding wildcard ArgumentEqualityExpectation
       # that succeeds when the passed argument contains at least those keys
       # and values of the expectation.
@@ -99,9 +99,10 @@ module RR
         expectation_proc ||= block
         RR::WildcardMatchers::Satisfy.new(expectation_proc)
       end
-      
+
       def spy(subject)
-        methods_to_stub = subject.public_methods - ["methods", "==", "__send__", "__id__"]
+        methods_to_stub = subject.public_methods.map {|method_name| method_name.to_sym} -
+          [:methods, :==, :__send__, :__id__, :object_id]
         methods_to_stub.each do |method|
           stub.proxy(subject, method)
         end
@@ -110,7 +111,7 @@ module RR
       def received(subject)
         RR::SpyVerificationProxy.new(subject)
       end
-      
+
       instance_methods.each do |name|
         alias_method "rr_#{name}", name
       end

data/lib/rr/adapters/test_unit.rb

@@ -5,7 +5,7 @@ module RR
       def self.included(mod)
         RR.trim_backtrace = true
         mod.class_eval do
-          unless instance_methods.include?('setup_with_rr')
+          unless instance_methods.detect {|method_name| method_name.to_sym == :setup_with_rr}
             alias_method :setup_without_rr, :setup
             def setup_with_rr
               setup_without_rr

data/lib/rr/double_definitions/child_double_definition_creator.rb

@@ -19,7 +19,7 @@ module RR
       def add_strategy(subject, method_name, definition_eval_block, &block)
         super do
           block.call
-          parent_double_definition.implemented_by(lambda {subject})
+          parent_double_definition.implemented_by(lambda {|*args|subject})
         end
       end
     end

data/lib/rr/double_definitions/double_definition.rb

@@ -254,8 +254,8 @@ module RR
           if implementation
             install_method_callback implementation
           else
-            install_method_callback(lambda do
-              return *args
+            install_method_callback(lambda do |*lambda_args|
+              args.first
             end)
           end
           self
@@ -288,11 +288,12 @@ module RR
         
         protected
         def install_method_callback(block)
-          return unless block
-          if implementation_is_original_method?
-            after_call(&block)
-          else
-            implemented_by block
+          if block
+            if implementation_is_original_method?
+              after_call(&block)
+            else
+              implemented_by block
+            end
           end
         end
       end

data/lib/rr/double_definitions/strategies/strategy.rb

@@ -58,7 +58,8 @@ module RR
         end
 
         def reimplementation
-          definition.returns(&handler)
+          rv = definition.returns(&handler)
+
         end
 
         def subject

data/lib/rr/injections/double_injection.rb

@@ -99,8 +99,10 @@ module RR
       end
 
       protected
-      def subject_is_proxy_for_method?(method_name)
-        !(class << @subject; self; end).instance_methods.include?(method_name.to_s)
+      def subject_is_proxy_for_method?(method_name_in_question)
+        !(class << @subject; self; end).
+          instance_methods.
+          detect {|method_name| method_name.to_sym == method_name_in_question.to_sym}
       end
 
       def deferred_bind_method
@@ -116,7 +118,7 @@ module RR
       end
 
       def bind_method
-        subject = @subject.is_a?(Class) && !@subject.name.empty? ? @subject.name : "self"
+        subject = @subject.is_a?(Class) && !@subject.name.to_s.empty? ? @subject.name : "self"
         subject_class.class_eval(<<-METHOD, __FILE__, __LINE__ + 1)
         def #{@method_name}(*args, &block)
           arguments = MethodArguments.new(args, block)

data/lib/rr/injections/injection.rb

@@ -5,8 +5,10 @@ module RR
 
       attr_reader :subject
 
-      def subject_has_method_defined?(method_name)
-        @subject.methods.include?(method_name.to_s) || @subject.protected_methods.include?(method_name.to_s) || @subject.private_methods.include?(method_name.to_s)
+      def subject_has_method_defined?(method_name_in_question)
+        @subject.methods.detect {|method_name| method_name.to_sym == method_name_in_question.to_sym} ||
+          @subject.protected_methods.detect {|method_name| method_name.to_sym == method_name_in_question.to_sym} ||
+          @subject.private_methods.detect {|method_name| method_name.to_sym == method_name_in_question.to_sym}
       end
 
       def subject_has_original_method?

data/spec/api/mock/mock_spec.rb

@@ -148,7 +148,7 @@ describe "mock" do
   end
 
   it "mocks methods without letters" do
-    mock(subject) == 55
+    mock(subject, :==).with(55)
 
     subject == 55
     lambda do

data/spec/api/spy/spy_spec.rb

@@ -2,17 +2,18 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
 
 describe "spy" do
   attr_reader :subject
-    before(:each) do
-      @subject = Object.new
-      extend RR::Adapters::RRMethods
-    end
+  before(:each) do
+    @subject = Object.new
+    extend RR::Adapters::RRMethods
+  end
 
-    after(:each) do
-      RR.reset
-    end
+  after(:each) do
+    RR.reset
+  end
 
   it "should record all method invocations" do
     subject = Object.new
+
     def subject.something
     end
 
@@ -44,5 +45,5 @@ describe "spy" do
         received(subject).pig_rabbit("bacon", "bunny meat").call
       end.should raise_error(RR::Errors::SpyVerificationErrors::SpyVerificationError)
     end
-  end  
+  end
 end

data/spec/rr/adapters/rr_methods_argument_matcher_spec.rb

@@ -7,11 +7,11 @@ module RR
         it_should_behave_like "RR::Adapters::RRMethods"
 
         it "returns an Anything matcher" do
-          anything.should == WildcardMatchers::Anything.new
+          anything.should == RR::WildcardMatchers::Anything.new
         end
 
         it "rr_anything returns an Anything matcher" do
-          rr_anything.should == WildcardMatchers::Anything.new
+          rr_anything.should == RR::WildcardMatchers::Anything.new
         end
       end
 
@@ -19,11 +19,11 @@ module RR
         it_should_behave_like "RR::Adapters::RRMethods"
 
         it "returns an IsA matcher" do
-          is_a(Integer).should == WildcardMatchers::IsA.new(Integer)
+          is_a(Integer).should == RR::WildcardMatchers::IsA.new(Integer)
         end
 
         it "rr_is_a returns an IsA matcher" do
-          rr_is_a(Integer).should == WildcardMatchers::IsA.new(Integer)
+          rr_is_a(Integer).should == RR::WildcardMatchers::IsA.new(Integer)
         end
       end
 
@@ -31,11 +31,11 @@ module RR
         it_should_behave_like "RR::Adapters::RRMethods"
 
         it "returns an Numeric matcher" do
-          numeric.should == WildcardMatchers::Numeric.new
+          numeric.should == RR::WildcardMatchers::Numeric.new
         end
 
         it "rr_numeric returns an Numeric matcher" do
-          rr_numeric.should == WildcardMatchers::Numeric.new
+          rr_numeric.should == RR::WildcardMatchers::Numeric.new
         end
       end
 
@@ -43,11 +43,11 @@ module RR
         it_should_behave_like "RR::Adapters::RRMethods"
 
         it "returns an Boolean matcher" do
-          boolean.should == WildcardMatchers::Boolean.new
+          boolean.should == RR::WildcardMatchers::Boolean.new
         end
 
         it "rr_boolean returns an Boolean matcher" do
-          rr_boolean.should == WildcardMatchers::Boolean.new
+          rr_boolean.should == RR::WildcardMatchers::Boolean.new
         end
       end
 
@@ -55,11 +55,11 @@ module RR
         it_should_behave_like "RR::Adapters::RRMethods"
 
         it "returns a DuckType matcher" do
-          duck_type(:one, :two).should == WildcardMatchers::DuckType.new(:one, :two)
+          duck_type(:one, :two).should == RR::WildcardMatchers::DuckType.new(:one, :two)
         end
 
         it "rr_duck_type returns a DuckType matcher" do
-          rr_duck_type(:one, :two).should == WildcardMatchers::DuckType.new(:one, :two)
+          rr_duck_type(:one, :two).should == RR::WildcardMatchers::DuckType.new(:one, :two)
         end
       end
     end

data/spec/rr/adapters/rr_methods_creator_spec.rb

@@ -27,14 +27,14 @@ module RR
 
           context "when passing no args" do
             it "returns a DoubleDefinitionCreator" do
-              call_strategy.class.should == DoubleDefinitions::DoubleDefinitionCreator
+              call_strategy.class.should == RR::DoubleDefinitions::DoubleDefinitionCreator
             end
           end
 
           context "when passed a method_name argument" do
             it "creates a mock Double for method" do
               double_definition = mock(subject, :foobar).returns {:baz}
-              double_definition.times_matcher.should == TimesCalledMatchers::IntegerMatcher.new(1)
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::IntegerMatcher.new(1)
               double_definition.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
               double_definition.argument_expectation.expected_arguments.should == []
               subject.foobar.should == :baz
@@ -51,14 +51,14 @@ module RR
 
           context "when passing no args" do
             it "returns a DoubleDefinitionCreator" do
-              call_strategy.class.should == DoubleDefinitions::DoubleDefinitionCreator
+              call_strategy.class.should == RR::DoubleDefinitions::DoubleDefinitionCreator
             end
           end
 
           context "when passed a method_name argument" do
             it "creates a stub Double for method when passed a method_name argument" do
               double_definition = stub(subject, :foobar).returns {:baz}
-              double_definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
               double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
               subject.foobar.should == :baz
             end
@@ -74,19 +74,19 @@ module RR
 
           context "when passing no args" do
             it "returns a DoubleDefinitionCreator" do
-              call_strategy.class.should == DoubleDefinitions::DoubleDefinitionCreator
+              call_strategy.class.should == RR::DoubleDefinitions::DoubleDefinitionCreator
             end
           end
 
           context "when passed a method_name argument_expectation" do
             it "creates a mock Double for method" do
               double_definition = dont_allow(subject, :foobar)
-              double_definition.times_matcher.should == TimesCalledMatchers::NeverMatcher.new
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::NeverMatcher.new
               double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
 
               lambda do
                 subject.foobar
-              end.should raise_error(Errors::TimesCalledError)
+              end.should raise_error(RR::Errors::TimesCalledError)
               RR.reset
             end
           end

data/spec/rr/adapters/rr_methods_times_matcher_spec.rb

@@ -1,17 +1,13 @@
 require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
 
-module RR
-module Adapters
-  describe RRMethods, "#any_times" do
-    it_should_behave_like "RR::Adapters::RRMethods"
-    
-    it "returns an AnyTimesMatcher" do
-      any_times.should == TimesCalledMatchers::AnyTimesMatcher.new
-    end
+describe RR::Adapters::RRMethods, "#any_times" do
+  it_should_behave_like "RR::Adapters::RRMethods"
 
-    it "rr_any_times returns an AnyTimesMatcher" do
-      rr_any_times.should == TimesCalledMatchers::AnyTimesMatcher.new
-    end
+  it "returns an AnyTimesMatcher" do
+    any_times.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
+  end
+
+  it "rr_any_times returns an AnyTimesMatcher" do
+    rr_any_times.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
   end
-end
 end

data/spec/rr/double_definitions/double_definition_creator_proxy_spec.rb

@@ -94,37 +94,6 @@ module RR
             end
           end
 
-          context "when the block has an arity of -1" do
-            attr_reader :self_value, :passed_in_arguments
-            before do
-              self_value = nil
-              passed_in_arguments = nil
-              block = lambda do |*args|
-                self_value = self
-                passed_in_arguments = args
-                args[0].foobar(1, 2) {:one_two}
-                args[0].foobar(1) {:one}
-                args[0].foobar.with_any_args {:default}
-                args[0].baz() {:baz_result}
-              end
-              block.arity.should == -1
-
-              @the_proxy = DoubleDefinitionCreatorProxy.new(creator, &block)
-              @self_value = self_value
-              @passed_in_arguments = passed_in_arguments
-            end
-
-            send("calls the block to define the Doubles")
-
-            it "passes the self into the block" do
-              passed_in_arguments.map {|a| a.__creator__}.should == [creator]
-            end
-
-            it "evaluates the block with the context of self" do
-              self_value.__creator__.should == creator
-            end
-          end
-
           context "when the block has an arity of 0" do
             attr_reader :self_value
             before do

data/spec/rr/double_definitions/double_definition_creator_spec.rb

@@ -39,7 +39,7 @@ module RR
             context "when passed a subject and a method_name argument" do
               it "creates a mock Double for method" do
                 double_definition = creator.mock(subject, :foobar).returns {:baz}
-                double_definition.times_matcher.should == TimesCalledMatchers::IntegerMatcher.new(1)
+                double_definition.times_matcher.should == RR::TimesCalledMatchers::IntegerMatcher.new(1)
                 double_definition.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
                 double_definition.argument_expectation.expected_arguments.should == []
                 subject.foobar.should == :baz
@@ -72,7 +72,7 @@ module RR
             context "when passed subject and a method_name argument" do
               it "creates a stub Double for method when passed a method_name argument" do
                 double_definition = creator.stub(subject, :foobar).returns {:baz}
-                double_definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+                double_definition.times_matcher.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
                 double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
                 subject.foobar.should == :baz
               end
@@ -105,18 +105,18 @@ module RR
               creator.proxy
               lambda do
                 creator.dont_allow
-              end.should raise_error(Errors::DoubleDefinitionError, "Doubles cannot be proxied when using dont_allow strategy")
+              end.should raise_error(RR::Errors::DoubleDefinitionError, "Doubles cannot be proxied when using dont_allow strategy")
             end
 
             context "when passed a subject and a method_name argument_expectation" do
               it "creates a mock Double for method" do
                 double_definition = creator.dont_allow(subject, :foobar)
-                double_definition.times_matcher.should == TimesCalledMatchers::NeverMatcher.new
+                double_definition.times_matcher.should == RR::TimesCalledMatchers::NeverMatcher.new
                 double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
 
                 lambda do
                   subject.foobar
-                end.should raise_error(Errors::TimesCalledError)
+                end.should raise_error(RR::Errors::TimesCalledError)
                 RR.reset
               end
             end
@@ -198,14 +198,14 @@ module RR
               creator.dont_allow
               lambda do
                 creator.proxy
-              end.should raise_error(Errors::DoubleDefinitionError, "Doubles cannot be proxied when using dont_allow strategy")
+              end.should raise_error(RR::Errors::DoubleDefinitionError, "Doubles cannot be proxied when using dont_allow strategy")
             end
           end
 
           context "when passed a method_name argument" do
             it "creates a proxy Double for method" do
               double_definition = creator.stub.proxy(subject, :foobar).after_call {:baz}
-              double_definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
               double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
               subject.foobar.should == :baz
             end
@@ -225,7 +225,7 @@ module RR
             it "creates a proxy Double for method" do
               klass = Class.new
               double_definition = creator.stub.instance_of(klass, :foobar).returns {:baz}
-              double_definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
               double_definition.argument_expectation.class.should == RR::Expectations::AnyArgumentExpectation
               klass.new.foobar.should == :baz
             end
@@ -247,7 +247,7 @@ module RR
             it "creates a instance_of Double for method" do
               double_definition = instance_of.mock(@klass, :foobar)
               double_definition.with(1, 2) {:baz}
-              double_definition.times_matcher.should == TimesCalledMatchers::IntegerMatcher.new(1)
+              double_definition.times_matcher.should == RR::TimesCalledMatchers::IntegerMatcher.new(1)
               double_definition.argument_expectation.class.should == RR::Expectations::ArgumentEqualityExpectation
               double_definition.argument_expectation.expected_arguments.should == [1, 2]
 
@@ -263,7 +263,7 @@ module RR
             it "raises a DoubleDefinitionError" do
               lambda do
                 creator.create(:foobar, 1, 2)
-              end.should raise_error(Errors::DoubleDefinitionError, "This Double has no strategy")
+              end.should raise_error(RR::Errors::DoubleDefinitionError, "This Double has no strategy")
             end
           end
 
@@ -276,7 +276,7 @@ module RR
               it "sets expectation on the #subject that it will be sent the method_name once with the passed-in arguments" do
                 creator.create(:foobar, 1, 2)
                 subject.foobar(1, 2)
-                lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+                lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
               end
 
               describe "#subject.method_name being called" do
@@ -299,7 +299,7 @@ module RR
                 end
                 creator.create(:foobar, 1, 2)
                 subject.foobar(1, 2)
-                lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+                lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
               end
 
               describe "#subject.method_name being called" do
@@ -330,7 +330,7 @@ module RR
                   before do
                     @real_value = real_value = Object.new
                     (class << subject; self; end).class_eval do
-                      define_method(:foobar) {real_value}
+                      define_method(:foobar) {|arg1, arg2| real_value}
                     end
                   end
 
@@ -400,7 +400,7 @@ module RR
                     creator.create(:foobar, 1, 2) {:baz}
                     lambda do
                       subject.foobar
-                    end.should raise_error(Errors::DoubleNotFoundError)
+                    end.should raise_error(RR::Errors::DoubleNotFoundError)
                   end
                 end
               end
@@ -457,7 +457,7 @@ module RR
                     creator.create(:foobar, 1, 2) {:baz}
                     lambda do
                       subject.foobar
-                    end.should raise_error(Errors::DoubleNotFoundError)
+                    end.should raise_error(RR::Errors::DoubleNotFoundError)
                   end
                 end
               end
@@ -473,8 +473,8 @@ module RR
               describe "#subject.method_name being called with any arguments" do
                 it "raises a TimesCalledError" do
                   creator.create(:foobar)
-                  lambda {subject.foobar}.should raise_error(Errors::TimesCalledError)
-                  lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+                  lambda {subject.foobar}.should raise_error(RR::Errors::TimesCalledError)
+                  lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
                 end
               end
             end
@@ -483,14 +483,14 @@ module RR
               describe "#subject.method_name being called with the passed-in arguments" do
                 it "raises a TimesCalledError" do
                   creator.create(:foobar, 1, 2)
-                  lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+                  lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
                 end
               end
 
               describe "#subject.method_name being called with different arguments" do
                 it "raises a DoubleNotFoundError" do
                   creator.create(:foobar, 1, 2)
-                  lambda {subject.foobar()}.should raise_error(Errors::DoubleNotFoundError)
+                  lambda {subject.foobar()}.should raise_error(RR::Errors::DoubleNotFoundError)
                 end
               end
             end

data/spec/rr/double_definitions/double_definition_spec.rb

@@ -167,7 +167,7 @@ module RR
             end
 
             it "sets an ArgumentEqualityExpectation with no arguments" do
-              definition.argument_expectation.should == Expectations::ArgumentEqualityExpectation.new()
+              definition.argument_expectation.should == RR::Expectations::ArgumentEqualityExpectation.new()
             end
           end
 
@@ -230,13 +230,13 @@ module RR
           it "sets up a Times Called Expectation with 0" do
             definition.with_any_args
             definition.never
-            lambda {subject.foobar}.should raise_error(Errors::TimesCalledError)
+            lambda {subject.foobar}.should raise_error(RR::Errors::TimesCalledError)
           end
 
           describe "#subject.method_name being called" do
             it "raises a TimesCalledError" do
               definition.with_any_args.never
-              lambda {subject.foobar}.should raise_error(Errors::TimesCalledError)
+              lambda {subject.foobar}.should raise_error(RR::Errors::TimesCalledError)
             end
           end
         end
@@ -248,7 +248,7 @@ module RR
             end
 
             it "sets up a Times Called Expectation with 1" do
-              lambda {subject.foobar}.should raise_error(Errors::TimesCalledError)
+              lambda {subject.foobar}.should raise_error(RR::Errors::TimesCalledError)
             end
           end
 
@@ -306,7 +306,7 @@ module RR
 
             it "sets up a Times Called Expectation with 2" do
               definition.twice.with_any_args
-              lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+              lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
             end
           end
 
@@ -365,7 +365,7 @@ module RR
             end
 
             it "sets up a Times Called Expectation with 1" do
-              definition.times_matcher.should == TimesCalledMatchers::AtLeastMatcher.new(2)
+              definition.times_matcher.should == RR::TimesCalledMatchers::AtLeastMatcher.new(2)
             end
           end
 
@@ -425,7 +425,7 @@ module RR
             it "sets up a Times Called Expectation with 1" do
               lambda do
                 subject.foobar
-              end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected at most 2 times.")
+              end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected at most 2 times.")
             end
           end
 
@@ -484,7 +484,7 @@ module RR
             end
 
             it "sets up a Times Called Expectation with passed in times" do
-              lambda {subject.foobar(1, 2)}.should raise_error(Errors::TimesCalledError)
+              lambda {subject.foobar(1, 2)}.should raise_error(RR::Errors::TimesCalledError)
             end
           end
 
@@ -545,7 +545,7 @@ module RR
             end
 
             it "sets up a Times Called Expectation with AnyTimes matcher" do
-              definition.times_matcher.should == TimesCalledMatchers::AnyTimesMatcher.new
+              definition.times_matcher.should == RR::TimesCalledMatchers::AnyTimesMatcher.new
             end
           end
 
@@ -600,12 +600,12 @@ module RR
           macro "#ordered" do
             it "adds itself to the ordered doubles list" do
               definition.ordered
-              Space.instance.ordered_doubles.should include(double)
+              RR::Space.instance.ordered_doubles.should include(double)
             end
 
             it "does not double_injection add itself" do
               definition.ordered
-              Space.instance.ordered_doubles.should == [double]
+              RR::Space.instance.ordered_doubles.should == [double]
             end
 
             it "sets ordered? to true" do
@@ -618,7 +618,7 @@ module RR
                 lambda do
                   definition.ordered
                 end.should raise_error(
-                  Errors::DoubleDefinitionError,
+                  RR::Errors::DoubleDefinitionError,
                   "Double Definitions must have a dedicated Double to be ordered. " <<
                   "For example, using instance_of does not allow ordered to be used. " <<
                   "proxy the class's #new method instead."
@@ -725,10 +725,10 @@ module RR
                   @return_value.should == :new_return_value
                 end
 
-                it "passes an array of the args with the block appended as a ProcFromBlock around the original block" do
+                it "passes an array of the args with the block appended as a RR::ProcFromBlock around the original block" do
                   @args.length.should == 3
                   @args[0..1].should == [1, 2]
-                  @args[2].should be_instance_of(ProcFromBlock)
+                  @args[2].should be_instance_of(RR::ProcFromBlock)
                   @block.should == Proc.new(&@block)
                   @args[2].should == @block
                 end
@@ -1024,7 +1024,7 @@ module RR
           it "raises a DoubleDefinitionError" do
             lambda do
               definition.proxy!(:baz)
-            end.should raise_error(Errors::DoubleDefinitionError)
+            end.should raise_error(RR::Errors::DoubleDefinitionError)
           end
         end
 
@@ -1046,7 +1046,7 @@ module RR
           it "raises a DoubleDefinitionError" do
             lambda do
               definition.strong!(:baz)
-            end.should raise_error(Errors::DoubleDefinitionError)
+            end.should raise_error(RR::Errors::DoubleDefinitionError)
           end
         end
       end
@@ -1064,7 +1064,7 @@ module RR
               definition.argument_expectation = nil
               lambda do
                 definition.exact_match?
-              end.should raise_error(Errors::DoubleDefinitionError)
+              end.should raise_error(RR::Errors::DoubleDefinitionError)
             end
           end
 
@@ -1092,7 +1092,7 @@ module RR
               definition.argument_expectation = nil
               lambda do
                 definition.wildcard_match?
-              end.should raise_error(Errors::DoubleDefinitionError)
+              end.should raise_error(RR::Errors::DoubleDefinitionError)
             end
           end
 
@@ -1142,7 +1142,7 @@ module RR
               definition.times_matcher = nil
               lambda do
                 definition.terminal?
-              end.should raise_error(Errors::DoubleDefinitionError)
+              end.should raise_error(RR::Errors::DoubleDefinitionError)
             end
           end
         end

data/spec/rr/double_injection/double_injection_spec.rb

@@ -28,7 +28,7 @@ module RR
             end
 
             subject.should respond_to(:foobar)
-            subject.methods.should include('foobar')
+            (!!subject.methods.detect {|method| method.to_sym == :foobar}).should be_true
             stub(subject).foobar {:new_foobar}
           end
 
@@ -116,7 +116,7 @@ module RR
                 end
 
                 subject.should respond_to(:foobar)
-                subject.methods.should include('foobar')
+                (!!subject.methods.detect {|method| method.to_sym == :foobar}).should be_true
                 stub.proxy(subject).foobar {:new_foobar}
               end
 
@@ -131,7 +131,7 @@ module RR
               describe "being called" do
                 it "calls the original method first and sends it into the block" do
                   original_return_value = nil
-                  stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                  stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                   subject.foobar.should == :new_foobar
                   original_return_value.should == :original_foobar
                 end
@@ -187,13 +187,13 @@ module RR
 
                   describe "being called" do
                     it "defines __rr__original_{method_name} to be the lazily created method" do
-                      subject.methods.should include("__rr__original_foobar")
+                      (!!subject.methods.detect {|method| method.to_sym == :__rr__original_foobar}).should be_true
                       subject.__rr__original_foobar.should == :original_foobar
                     end
 
                     it "calls the original method first and sends it into the block" do
                       original_return_value = nil
-                      stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                      stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                       subject.foobar.should == :new_foobar
                       original_return_value.should == :original_foobar
                     end
@@ -234,13 +234,13 @@ module RR
                     describe "being called" do
                       it "defines __rr__original_{method_name} to be the lazily created method" do
                         subject.foobar
-                        subject.methods.should include("__rr__original_foobar")
+                        (!!subject.methods.detect {|method| method.to_sym == :__rr__original_foobar}).should be_true
                         subject.__rr__original_foobar.should == :original_foobar
                       end
 
                       it "calls the lazily created method and returns the injected method return value" do
                         original_return_value = nil
-                        stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                        stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                         subject.foobar.should == :new_foobar
                         original_return_value.should == :original_foobar
                       end
@@ -283,7 +283,7 @@ module RR
 
                       it "calls the lazily created method and returns the injected method return value" do
                         original_return_value = nil
-                        stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                        stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                         subject.foobar.should == :new_foobar
                         original_return_value.should == :original_foobar
                       end
@@ -339,13 +339,13 @@ module RR
 
                   describe "being called" do
                     it "defines __rr__original_{method_name} to be the lazily created method" do
-                      subject.methods.should include("__rr__original_foobar")
+                      (!!subject.methods.detect {|method| method.to_sym == :__rr__original_foobar}).should be_true
                       subject.__rr__original_foobar.should == :original_foobar
                     end
 
                     it "calls the original method first and sends it into the block" do
                       original_return_value = nil
-                      stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                      stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                       subject.foobar.should == :new_foobar
                       original_return_value.should == :original_foobar
                     end
@@ -386,13 +386,13 @@ module RR
                     describe "being called" do
                       it "defines __rr__original_{method_name} to be the lazily created method" do
                         subject.foobar
-                        subject.methods.should include("__rr__original_foobar")
+                        (!!subject.methods.detect {|method| method.to_sym == :__rr__original_foobar}).should be_true
                         subject.__rr__original_foobar.should == :original_foobar
                       end
 
                       it "calls the lazily created method and returns the injected method return value" do
                         original_return_value = nil
-                        stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                        stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                         subject.foobar.should == :new_foobar
                         original_return_value.should == :original_foobar
                       end
@@ -435,7 +435,7 @@ module RR
 
                       it "calls the lazily created method and returns the injected method return value" do
                         original_return_value = nil
-                        stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                        stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                         subject.foobar.should == :new_foobar
                         original_return_value.should == :original_foobar
                       end
@@ -481,13 +481,13 @@ module RR
 
               it "adds the method to the subject" do
                 subject.should respond_to(:foobar)
-                subject.methods.should include('foobar')
+                (!!subject.methods.detect {|method| method.to_sym == :foobar}).should be_true
               end
 
               describe "being called" do
                 it "calls the original method first and sends it into the block" do
                   original_return_value = nil
-                  stub.proxy(subject).foobar {|original_return_value| :new_foobar}
+                  stub.proxy(subject).foobar {|arg| original_return_value = arg; :new_foobar}
                   subject.foobar.should == :new_foobar
                   original_return_value.should == :original_foobar
                 end
@@ -516,7 +516,7 @@ module RR
 
               it "adds the method to the subject" do
                 subject.should respond_to(:foobar)
-                subject.methods.should include('foobar')
+                (!!subject.methods.detect {|method| method.to_sym == :foobar}).should be_true
               end
 
               describe "being called" do

data/spec/rr/double_injection/double_injection_verify_spec.rb

@@ -13,14 +13,14 @@ module RR
       end
 
       it "verifies each double was met" do
-        double = Double.new(
+        double = RR::Double.new(
           double_injection,
-          DoubleDefinitions::DoubleDefinition.new(DoubleDefinitions::DoubleDefinitionCreator.new, subject)
+          RR::DoubleDefinitions::DoubleDefinition.new(RR::DoubleDefinitions::DoubleDefinitionCreator.new, subject)
         )
         double_injection.register_double double
 
         double.definition.with(1).once.returns {nil}
-        lambda {double_injection.verify}.should raise_error(Errors::TimesCalledError)
+        lambda {double_injection.verify}.should raise_error(RR::Errors::TimesCalledError)
         subject.foobar(1)
         lambda {double_injection.verify}.should_not raise_error
       end

data/spec/rr/double_spec.rb

@@ -35,14 +35,20 @@ module RR
 
     describe "#call" do
       describe "when verbose" do
+        attr_reader :original_stdout
+        before do
+          @original_stdout = $stdout
+        end
+
+        after do
+          $stdout = original_stdout
+        end
+
         it "prints the message call" do
           double.definition.verbose
-          output = nil
-          (class << double; self; end).__send__(:define_method, :puts) do |output|
-            output = output
-          end
+          $stdout = StringIO.new(output = "")
           subject.foobar(1, 2)
-          output.should == Double.formatted_name(:foobar, [1, 2])
+          output.strip.should == Double.formatted_name(:foobar, [1, 2])
         end
       end
 

data/spec/rr/expectations/hash_including_argument_equality_expectation_spec.rb

@@ -15,11 +15,11 @@ module Expectations
       end
       
       it "returns true when passed in a HashIncluding matcher with the same hash" do
-        expectation.should be_exact_match(WildcardMatchers::HashIncluding.new(expected_hash))
+        expectation.should be_exact_match(RR::WildcardMatchers::HashIncluding.new(expected_hash))
       end
       
       it "returns false when passed in a HashIncluding matcher with a different argument list" do
-        expectation.should_not be_exact_match(WildcardMatchers::HashIncluding.new(:foo => 1))
+        expectation.should_not be_exact_match(RR::WildcardMatchers::HashIncluding.new(:foo => 1))
       end
 
       it "returns false otherwise" do

data/spec/rr/expectations/satisfy_argument_equality_expectation_spec.rb

@@ -17,11 +17,11 @@ module Expectations
       end
       
       it "returns true when passed a Satisfy matcher with the same proc" do
-        expectation.should be_exact_match(WildcardMatchers::Satisfy.new(expectation_proc))
+        expectation.should be_exact_match(RR::WildcardMatchers::Satisfy.new(expectation_proc))
       end
       
       it "returns false when passed a Satisfy matcher with another proc" do
-        expectation.should_not be_exact_match(WildcardMatchers::Satisfy.new(lambda {}))
+        expectation.should_not be_exact_match(RR::WildcardMatchers::Satisfy.new(lambda {}))
       end
 
       it "returns false otherwise" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_at_most_spec.rb

@@ -39,7 +39,7 @@ module RR
 
           it "raises error before attempted more than expected times" do
             3.times {expectation.attempt}
-            lambda {expectation.attempt}.should raise_error( Errors::TimesCalledError )
+            lambda {expectation.attempt}.should raise_error( RR::Errors::TimesCalledError )
           end
         end
 
@@ -48,7 +48,7 @@ module RR
             3.times {expectation.attempt}
             lambda do
               expectation.attempt
-            end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 4 times.\nExpected at most 3 times.")
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 4 times.\nExpected at most 3 times.")
           end
 
           it "passes when times called == times" do

data/spec/rr/expectations/times_called_expectation/times_called_expectation_helper.rb

@@ -7,8 +7,8 @@ module RR
         @subject = Object.new
         @method_name = :foobar
         @double_injection = space.double_injection(subject, method_name)
-        @double_definition = DoubleDefinitions::DoubleDefinition.new(
-          DoubleDefinitions::DoubleDefinitionCreator.new,
+        @double_definition = RR::DoubleDefinitions::DoubleDefinition.new(
+          RR::DoubleDefinitions::DoubleDefinitionCreator.new,
           subject
         )
         @double = new_double(double_injection)
@@ -16,7 +16,7 @@ module RR
       end
 
       def raises_expectation_error(&block)
-        lambda {block.call}.should raise_error(Errors::TimesCalledError)
+        lambda {block.call}.should raise_error(RR::Errors::TimesCalledError)
       end
     end
   end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_integer_spec.rb

@@ -33,7 +33,7 @@ module RR
           it "fails after attempt! called 1 time" do
             expectation.attempt
             lambda {expectation.verify!}.should raise_error(
-            Errors::TimesCalledError,
+            RR::Errors::TimesCalledError,
             "foobar()\nCalled 1 time.\nExpected 2 times."
             )
           end
@@ -43,14 +43,14 @@ module RR
             expectation.attempt
             lambda do
               expectation.attempt
-            end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 2 times.")
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 2 times.")
           end
 
           it "has a backtrace to where the TimesCalledExpectation was instantiated on failure" do
             error = nil
             begin
               expectation.verify!
-            rescue Errors::TimesCalledError => e
+            rescue RR::Errors::TimesCalledError => e
               error = e
             end
             e.backtrace.first.should include(__FILE__)
@@ -60,7 +60,7 @@ module RR
           it "has an error message that includes the number of times called and expected number of times" do
             lambda do
               expectation.verify!
-            end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 0 times.\nExpected 2 times.")
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 0 times.\nExpected 2 times.")
           end
         end
 
@@ -78,7 +78,7 @@ module RR
           it "raises error before attempted more than expected times" do
             2.times {expectation.attempt}
             lambda {expectation.attempt}.should raise_error(
-            Errors::TimesCalledError
+            RR::Errors::TimesCalledError
             )
           end
         end
@@ -89,7 +89,7 @@ module RR
             expectation.attempt
             lambda do
               expectation.attempt
-            end.should raise_error(Errors::TimesCalledError)
+            end.should raise_error(RR::Errors::TimesCalledError)
           end
         end
 

data/spec/rr/expectations/times_called_expectation/times_called_expectation_proc_spec.rb

@@ -34,14 +34,14 @@ module RR
 
           it "fails after attempt! called 1 time" do
             expectation.attempt
-            lambda {expectation.verify!}.should raise_error(Errors::TimesCalledError)
+            lambda {expectation.verify!}.should raise_error(RR::Errors::TimesCalledError)
           end
 
           it "fails after attempt! called 3 times" do
             expectation.attempt
             expectation.attempt
             expectation.attempt
-            lambda {expectation.verify!}.should raise_error(Errors::TimesCalledError)
+            lambda {expectation.verify!}.should raise_error(RR::Errors::TimesCalledError)
           end
         end
 

data/spec/rr/expectations/times_called_expectation/times_called_expectation_range_spec.rb

@@ -40,7 +40,7 @@ module RR
             expectation.attempt
             lambda do
               expectation.attempt
-            end.should raise_error(Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 1..2 times.")
+            end.should raise_error(RR::Errors::TimesCalledError, "foobar()\nCalled 3 times.\nExpected 1..2 times.")
           end
         end
 
@@ -59,7 +59,7 @@ module RR
           it "raises error before attempted more than expected times" do
             2.times {expectation.attempt}
             lambda {expectation.attempt}.should raise_error(
-            Errors::TimesCalledError
+            RR::Errors::TimesCalledError
             )
           end
         end

data/spec/rr/expectations/times_called_expectation/times_called_expectation_spec.rb

@@ -17,7 +17,7 @@ module RR
         describe "#attempt!" do
           it "raises error that includes the double" do
             lambda {expectation.attempt}.should raise_error(
-              Errors::TimesCalledError,
+              RR::Errors::TimesCalledError,
               "#{double.formatted_name}\n#{matcher.error_message(1)}"
             )
           end
@@ -27,7 +27,7 @@ module RR
           it "raises error with passed in message prepended" do
             expectation.instance_variable_set(:@times_called, 1)
             lambda {expectation.verify!}.should raise_error(
-              Errors::TimesCalledError,
+              RR::Errors::TimesCalledError,
               "#{double.formatted_name}\n#{matcher.error_message(1)}"
             )
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.10.9
+  version: 0.10.10
 platform: ruby
 authors: 
 - Brian Takita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 -08:00
+date: 2010-02-25 00:00:00 -08:00
 default_executable: 
 dependencies: []