rr 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.4.2
+- Renamed DoubleInsertion to DoubleInjection to be consistent with Mocha terminology
+
 * 0.4.1
 - Fixed backward compatability issues with rspec
 - Renamed Space#verify_double_insertions to #verify_doubles

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.4.1"
+PKG_VERSION = "0.4.2"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/lib/rr.rb

@@ -7,7 +7,7 @@ require "#{dir}/rr/errors/argument_equality_error"
 require "#{dir}/rr/errors/times_called_error"
 
 require "#{dir}/rr/space"
-require "#{dir}/rr/double_insertion"
+require "#{dir}/rr/double_injection"
 require "#{dir}/rr/hash_with_object_id_key"
 
 require "#{dir}/rr/double_method_proxy"

data/lib/rr/adapters/rr_methods.rb

@@ -1,7 +1,7 @@
 module RR
   module Adapters
     module RRMethods
-      # Verifies all the DoubleInsertion objects have met their
+      # Verifies all the DoubleInjection objects have met their
       # TimesCalledExpectations.
       def verify
         RR::Space.instance.verify_doubles

data/lib/rr/{double_insertion.rb → double_injection.rb}

@@ -1,8 +1,8 @@
 module RR
-  # RR::DoubleInsertion is the binding of an object and a method.
+  # RR::DoubleInjection is the binding of an object and a method.
   # A double_insertion has 0 to many Double objects. Each Double
   # has Argument Expectations and Times called Expectations.
-  class DoubleInsertion
+  class DoubleInjection
     MethodArguments = Struct.new(:arguments, :block)
     attr_reader :space, :object, :method_name, :scenarios
 
@@ -16,13 +16,13 @@ module RR
       @scenarios = []
     end
 
-    # RR::DoubleInsertion#register_scenario adds the passed in Double
-    # into this DoubleInsertion's list of Double objects.
+    # RR::DoubleInjection#register_scenario adds the passed in Double
+    # into this DoubleInjection's list of Double objects.
     def register_scenario(scenario)
       @scenarios << scenario
     end
 
-    # RR::DoubleInsertion#bind injects a method that acts as a dispatcher
+    # RR::DoubleInjection#bind injects a method that acts as a dispatcher
     # that dispatches to the matching Double when the method
     # is called.
     def bind
@@ -36,7 +36,7 @@ module RR
       meta.class_eval(returns_method, __FILE__, __LINE__ - 5)
     end
 
-    # RR::DoubleInsertion#verify verifies each Double
+    # RR::DoubleInjection#verify verifies each Double
     # TimesCalledExpectation are met.
     def verify
       @scenarios.each do |scenario|
@@ -44,7 +44,7 @@ module RR
       end
     end
 
-    # RR::DoubleInsertion#reset removes the injected dispatcher method.
+    # RR::DoubleInjection#reset removes the injected dispatcher method.
     # It binds the original method implementation on the object
     # if one exists.
     def reset

data/lib/rr/space.rb

@@ -49,15 +49,15 @@ module RR
       DoubleDefinition.new(self)
     end
 
-    # Reuses or creates, if none exists, a DoubleInsertion for the passed
+    # Reuses or creates, if none exists, a DoubleInjection for the passed
     # in object and method_name.
-    # When a DoubleInsertion is created, it binds the dispatcher to the
+    # When a DoubleInjection is created, it binds the dispatcher to the
     # object.
     def double_insertion(object, method_name)
       double_insertion = @double_insertions[object][method_name.to_sym]
       return double_insertion if double_insertion
 
-      double_insertion = DoubleInsertion.new(self, object, method_name.to_sym)
+      double_insertion = DoubleInjection.new(self, object, method_name.to_sym)
       @double_insertions[object][method_name.to_sym] = double_insertion
       double_insertion.bind
       double_insertion
@@ -85,7 +85,7 @@ module RR
       scenario
     end
 
-    # Verifies all the DoubleInsertion objects have met their
+    # Verifies all the DoubleInjection objects have met their
     # TimesCalledExpectations.
     def verify_doubles
       @double_insertions.each do |object, method_double_map|
@@ -101,14 +101,14 @@ module RR
       reset_double_insertions
     end
 
-    # Verifies the DoubleInsertion for the passed in object and method_name.
+    # Verifies the DoubleInjection for the passed in object and method_name.
     def verify_double(object, method_name)
       @double_insertions[object][method_name].verify
     ensure
       reset_double object, method_name
     end
 
-    # Resets the DoubleInsertion for the passed in object and method_name.
+    # Resets the DoubleInjection for the passed in object and method_name.
     def reset_double(object, method_name)
       double_insertion = @double_insertions[object].delete(method_name)
       @double_insertions.delete(object) if @double_insertions[object].empty?

data/spec/rr/double/{double_insertion_bind_spec.rb → double_injection_bind_spec.rb}

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, "#bind with an existing method" do
+  describe DoubleInjection, "#bind with an existing method" do
     before do
       @space = Space.new
       @object = Object.new
@@ -11,7 +11,7 @@ module RR
       end
       @original_method = @object.method(:foobar)
       @object.methods.should include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
 
     it "overrides the original method with the double_insertion's dispatching methods" do
@@ -41,13 +41,13 @@ module RR
     end
   end
 
-  describe DoubleInsertion, "#bind without an existing method" do
+  describe DoubleInjection, "#bind without an existing method" do
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :foobar
       @object.methods.should_not include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
 
     it "overrides the original method with the double_insertion's dispatching methods" do

data/spec/rr/double/{double_insertion_dispatching_spec.rb → double_injection_dispatching_spec.rb}

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion do
+  describe DoubleInjection do
     before do
       @space = Space.new
       @object = Object.new

data/spec/rr/double/{double_insertion_has_original_method_spec.rb → double_injection_has_original_method_spec.rb}

@@ -1,12 +1,12 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, "#object_has_original_method?" do
+  describe DoubleInjection, "#object_has_original_method?" do
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :to_s
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
       class << @double_insertion
         public :original_method_name
       end

data/spec/rr/double/{double_insertion_register_scenario_spec.rb → double_injection_register_scenario_spec.rb}

@@ -1,13 +1,13 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, "#register_scenario" do
+  describe DoubleInjection, "#register_scenario" do
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :foobar
       @object.methods.should_not include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
       def @double_insertion.scenarios
         @scenarios
       end

data/spec/rr/double/{double_insertion_reset_spec.rb → double_injection_reset_spec.rb}

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, "#reset", :shared => true do
+  describe DoubleInjection, "#reset", :shared => true do
     it "cleans up by removing the __rr__method" do
       @double_insertion.bind
       @object.methods.should include("__rr__foobar")
@@ -11,15 +11,15 @@ module RR
     end
   end
 
-  describe DoubleInsertion, "#reset when method does not exist" do
-    it_should_behave_like "RR::DoubleInsertion#reset"
+  describe DoubleInjection, "#reset when method does not exist" do
+    it_should_behave_like "RR::DoubleInjection#reset"
 
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :foobar
       @object.methods.should_not include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
 
     it "removes the method" do
@@ -32,8 +32,8 @@ module RR
     end
   end
 
-  describe DoubleInsertion, "#reset when method exists" do
-    it_should_behave_like "RR::DoubleInsertion#reset"
+  describe DoubleInjection, "#reset when method exists" do
+    it_should_behave_like "RR::DoubleInjection#reset"
 
     before do
       @space = Space.new
@@ -44,7 +44,7 @@ module RR
       end
       @object.methods.should include(@method_name.to_s)
       @original_method = @object.method(@method_name)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
 
       @double_insertion.bind
       @object.methods.should include(@method_name.to_s)
@@ -57,8 +57,8 @@ module RR
     end
   end
 
-  describe DoubleInsertion, "#reset when method with block exists" do
-    it_should_behave_like "RR::DoubleInsertion#reset"
+  describe DoubleInjection, "#reset when method with block exists" do
+    it_should_behave_like "RR::DoubleInjection#reset"
 
     before do
       @space = Space.new
@@ -69,7 +69,7 @@ module RR
       end
       @object.methods.should include(@method_name.to_s)
       @original_method = @object.method(@method_name)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
 
       @double_insertion.bind
       @object.methods.should include(@method_name.to_s)

data/spec/rr/double/{double_insertion_spec.rb → double_injection_spec.rb}

@@ -1,46 +1,46 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, :shared => true do
+  describe DoubleInjection, :shared => true do
     it "sets up object and method_name" do
       @double_insertion.object.should === @object
       @double_insertion.method_name.should == @method_name.to_sym
     end
   end
 
-  describe DoubleInsertion, "#initialize where method_name is a symbol" do
-    it_should_behave_like "RR::DoubleInsertion"
+  describe DoubleInjection, "#initialize where method_name is a symbol" do
+    it_should_behave_like "RR::DoubleInjection"
 
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :foobar
       @object.methods.should_not include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
   end
 
-  describe DoubleInsertion, "#initialize where method_name is a string" do
-    it_should_behave_like "RR::DoubleInsertion"
+  describe DoubleInjection, "#initialize where method_name is a string" do
+    it_should_behave_like "RR::DoubleInjection"
 
     before do
       @space = Space.new
       @object = Object.new
       @method_name = 'foobar'
       @object.methods.should_not include(@method_name)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
   end
 
-  describe DoubleInsertion, "#initialize where method does not exist on object" do
-    it_should_behave_like "RR::DoubleInsertion"
+  describe DoubleInjection, "#initialize where method does not exist on object" do
+    it_should_behave_like "RR::DoubleInjection"
 
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :foobar
       @object.methods.should_not include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
 
     it "object does not have original method" do
@@ -48,15 +48,15 @@ module RR
     end
   end
 
-  describe DoubleInsertion, "#initialize where method exists on object" do
-    it_should_behave_like "RR::DoubleInsertion"
+  describe DoubleInjection, "#initialize where method exists on object" do
+    it_should_behave_like "RR::DoubleInjection"
 
     before do
       @space = Space.new
       @object = Object.new
       @method_name = :to_s
       @object.methods.should include(@method_name.to_s)
-      @double_insertion = DoubleInsertion.new(@space, @object, @method_name)
+      @double_insertion = DoubleInjection.new(@space, @object, @method_name)
     end
 
     it "has a original_method" do

data/spec/rr/double/{double_insertion_verify_spec.rb → double_injection_verify_spec.rb}

@@ -1,7 +1,7 @@
 require "spec/spec_helper"
 
 module RR
-  describe DoubleInsertion, "#verify" do
+  describe DoubleInjection, "#verify" do
     before do
       @space = Space.new
       @object = Object.new

data/spec/rr/double_spec.rb

@@ -622,7 +622,7 @@ module RR
     end
 
     describe "#method_name" do
-      it "returns the DoubleInsertion's method_name" do
+      it "returns the DoubleInjection's method_name" do
         double_insertion.method_name.should == :foobar
         scenario.method_name.should == :foobar
       end

data/spec/rr/rspec/rspec_usage_spec.rb

@@ -6,7 +6,7 @@ describe RR do
       @subject = Object.new
     end
 
-    it "creates a mock DoubleInsertion Double" do
+    it "creates a mock DoubleInjection Double" do
       mock(@subject).foobar(1, 2) {:baz}
       @subject.foobar(1, 2).should == :baz
     end
@@ -17,7 +17,7 @@ describe RR do
       @subject = Object.new
     end
 
-    it "creates a stub DoubleInsertion Double" do
+    it "creates a stub DoubleInjection Double" do
       stub(@subject).foobar {:baz}
       @subject.foobar("any", "thing").should == :baz
     end
@@ -31,7 +31,7 @@ describe RR do
       end
     end
 
-    it "creates a proxy DoubleInsertion Double" do
+    it "creates a proxy DoubleInjection Double" do
       mock.proxy(@subject).foobar
       @subject.foobar.should == :baz
     end
@@ -45,7 +45,7 @@ describe RR do
       end
     end
 
-    it "creates a proxy DoubleInsertion Double" do
+    it "creates a proxy DoubleInjection Double" do
       stub.proxy(@subject).foobar
       @subject.foobar.should == :baz
     end
@@ -59,7 +59,7 @@ describe RR do
       end
     end
 
-    it "creates a proxy DoubleInsertion Double" do
+    it "creates a proxy DoubleInjection Double" do
       stub.proxy(@subject).foobar
       @subject.foobar.should == :baz
     end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 date: 2007-12-31 00:00:00 -08:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
@@ -43,7 +43,6 @@ files:
 - lib/rr/times_called_matchers/terminal.rb
 - lib/rr/times_called_matchers/range_matcher.rb
 - lib/rr/hash_with_object_id_key.rb
-- lib/rr/double_insertion.rb
 - lib/rr/double_creator.rb
 - lib/rr/expectations/argument_equality_expectation.rb
 - lib/rr/expectations/times_called_expectation.rb
@@ -60,6 +59,7 @@ files:
 - lib/rr/adapters/test_unit.rb
 - lib/rr/adapters/rspec.rb
 - lib/rr/double_definition.rb
+- lib/rr/double_injection.rb
 - lib/rr/double_method_proxy.rb
 - lib/rr/space.rb
 - lib/rr/wildcard_matchers/boolean.rb
@@ -118,13 +118,13 @@ files:
 - spec/rr/adapters/rr_methods_creator_spec.rb
 - spec/rr/adapters/rr_methods_argument_matcher_spec.rb
 - spec/rr/double_definition_spec.rb
-- spec/rr/double/double_insertion_bind_spec.rb
-- spec/rr/double/double_insertion_dispatching_spec.rb
-- spec/rr/double/double_insertion_has_original_method_spec.rb
-- spec/rr/double/double_insertion_verify_spec.rb
-- spec/rr/double/double_insertion_spec.rb
-- spec/rr/double/double_insertion_register_scenario_spec.rb
-- spec/rr/double/double_insertion_reset_spec.rb
+- spec/rr/double/double_injection_register_scenario_spec.rb
+- spec/rr/double/double_injection_has_original_method_spec.rb
+- spec/rr/double/double_injection_spec.rb
+- spec/rr/double/double_injection_bind_spec.rb
+- spec/rr/double/double_injection_dispatching_spec.rb
+- spec/rr/double/double_injection_verify_spec.rb
+- spec/rr/double/double_injection_reset_spec.rb
 - spec/rr/double_method_proxy_spec.rb
 - spec/rr/test_unit/test_unit_backtrace_test.rb
 - spec/rr/test_unit/test_helper.rb