rr 1.0.2 → 1.0.3

data/CHANGES

@@ -1,3 +1,9 @@
+1.0.3
+- Eliminate usage of ObjectSpace._id2ref (Patch Evan Phoenix)
+- Added minitest adapter (Patch Caleb Spare)
+- Added instructions on installing the gem (Patch Gavin Miller)
+- delete missing scratch.rb file from gemspec (Patch bonkydog)
+
 1.0.2
 - Fixed Two calls recorded to a mock expecting only one call when called via another mock's yield block (http://github.com/btakita/rr/issues/closed#issue/42). Patch by Eugene Pimenov (http://github.com/libc).
 

data/Gemfile

@@ -1,6 +1,12 @@
+source :rubygems
+
 group :test do
   gem "rspec", "1.3.0"
-  gem "session", "2.4.0"
+  gem "session", "3.1.0"
   gem "diff-lcs", "1.1.2"
-  gem "ruby-debug", "0.10.3"
+  if RUBY_VERSION.include?("1.9")
+    gem "ruby-debug19", "0.11.6"
+  else
+    gem "ruby-debug", "0.10.4"
+  end
 end

data/Gemfile.lock

@@ -0,0 +1,31 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    archive-tar-minitar (0.5.2)
+    columnize (0.3.2)
+    diff-lcs (1.1.2)
+    fattr (2.2.0)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+    rspec (1.3.0)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    session (3.1.0)
+      fattr
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  diff-lcs (= 1.1.2)
+  rspec (= 1.3.0)
+  ruby-debug19 (= 0.11.6)
+  session (= 3.1.0)

data/README.rdoc

@@ -3,6 +3,10 @@
 RR (Double Ruby) is a test double framework that features a rich
 selection of double techniques and a terse syntax.
 
+To get started, install RR from the command prompt:
+  
+    gem install rr
+
 == More Information
 === Mailing Lists
 * double-ruby-users@rubyforge.org
@@ -356,6 +360,7 @@ If you have directly contributed to RR and I missed you in this list, please let
 * Andreas Haller for patches
 * Aslak Hellesoy for Developing Rspec
 * Bryan Helmkamp for patches
+* Caleb Spare for patches
 * Christopher Redinger for patches
 * Dan North for syntax ideas
 * Dave Astels for some BDD inspiration
@@ -364,8 +369,10 @@ If you have directly contributed to RR and I missed you in this list, please let
 * Daniel Sudol for identifing performance issues with RR
 * Dmitry Ratnikov for patches
 * Eugene Pimenov for patches
+* Evan Phoenix for patches
 * Felix Morio for pairing with me
 * Gabriel Horner for patches
+* Gavin Miller for patches
 * Gerard Meszaros for his excellent book "xUnit Test Patterns"
 * James Mead for developing Mocha
 * Jeff Whitmire for documentation suggestions
@@ -382,4 +389,4 @@ If you have directly contributed to RR and I missed you in this list, please let
 * Pivotal Labs for sponsoring RR development
 * Stephen Baker for Developing Rspec
 * Tatsuya Ono for patches
-* Tuomas Kareinen for a bug report
+* Tuomas Kareinen for a bug report

data/lib/rr.rb

@@ -84,6 +84,7 @@ require "#{dir}/rr/spy_verification"
 
 require "#{dir}/rr/adapters/rspec"
 require "#{dir}/rr/adapters/test_unit"
+require "#{dir}/rr/adapters/minitest"
 
 module RR
   class << self

data/lib/rr/adapters/minitest.rb

@@ -0,0 +1,31 @@
+module RR
+  module Adapters
+    module MiniTest
+      include RRMethods
+      def self.included(mod)
+        RR.trim_backtrace = true
+        mod.class_eval do
+          unless instance_methods.any? { |method_name| method_name.to_sym == :setup_with_rr }
+            alias_method :setup_without_rr, :setup
+            def setup_with_rr
+              setup_without_rr
+              RR.reset
+            end
+            alias_method :setup, :setup_with_rr
+
+            alias_method :teardown_without_rr, :teardown
+            def teardown_with_rr
+              RR.verify
+              teardown_without_rr
+            end
+            alias_method :teardown, :teardown_with_rr
+          end
+        end
+      end
+
+      def assert_received(subject, &block)
+        block.call(received(subject)).call
+      end
+    end
+  end
+end

data/lib/rr/double_definitions/double_definition.rb

@@ -26,8 +26,6 @@ module RR
         @verify_method_signature = false
       end
       
-      attr_reader :argument_expectation
-
       def subject
         double_definition_create.subject
       end

data/lib/rr/injections/double_injection.rb

@@ -119,11 +119,15 @@ module RR
         self
       end
 
+      BoundObjects = {}
+
       def bind_method_that_self_destructs_and_delegates_to_method_missing
-        subject_class_object_id = subject_class.object_id
+        id = BoundObjects.size
+        BoundObjects[id] = subject_class
+
         subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def #{method_name}(*args, &block)
-          ObjectSpace._id2ref(#{subject_class_object_id}).class_eval do
+          ::RR::Injections::DoubleInjection::BoundObjects[#{id}].class_eval do
             remove_method(:#{method_name})
           end
           method_missing(:#{method_name}, *args, &block)
@@ -133,11 +137,14 @@ module RR
       end
 
       def bind_method
-        subject_class_object_id = subject_class.object_id
+        id = BoundObjects.size
+        BoundObjects[id] = subject_class
+
         subject_class.class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
         def #{method_name}(*args, &block)
           arguments = MethodArguments.new(args, block)
-          RR::Injections::DoubleInjection.dispatch_method(self, ObjectSpace._id2ref(#{subject_class_object_id}), :#{method_name}, arguments.arguments, arguments.block)
+          obj = ::RR::Injections::DoubleInjection::BoundObjects[#{id}]
+          RR::Injections::DoubleInjection.dispatch_method(self, obj, :#{method_name}, arguments.arguments, arguments.block)
         end
         RUBY
         self

data/lib/rr/injections/method_missing_injection.rb

@@ -51,11 +51,16 @@ module RR
       end
 
       protected
+      BoundObjects = {}
+
       def bind_method
-        subject_class_object_id = subject_class.object_id
+        id = BoundObjects.size
+        BoundObjects[id] = subject_class
+
         subject_class.class_eval((<<-METHOD), __FILE__, __LINE__ + 1)
         def method_missing(method_name, *args, &block)
-          MethodDispatches::MethodMissingDispatch.new(self, ObjectSpace._id2ref(#{subject_class_object_id}), method_name, args, block).call
+          obj = ::RR::Injections::MethodMissingInjection::BoundObjects[#{id}]
+          MethodDispatches::MethodMissingDispatch.new(self, obj, method_name, args, block).call
         end
         METHOD
       end

data/lib/rr/injections/singleton_method_added_injection.rb

@@ -29,9 +29,9 @@ module RR
           unless class_instance_method_defined(subject_class, :singleton_method_added, false)
             @placeholder_method_defined = true
             subject_class.class_eval do
-              def singleton_method_added(method_name)
-                super
-              end
+              #def singleton_method_added(method_name)
+              #  super
+              #end
             end
           end
 

data/lib/rr/space.rb

@@ -63,6 +63,7 @@ module RR
       reset_method_missing_injections
       reset_singleton_method_added_injections
       reset_recorded_calls
+      reset_bound_objects
     end
 
     # Verifies the DoubleInjection for the passed in subject and method_name.
@@ -108,5 +109,9 @@ module RR
     def reset_recorded_calls
       @recorded_calls.clear
     end
+
+    def reset_bound_objects
+      RR::Injections::DoubleInjection::BoundObjects.clear
+    end
   end
 end

data/spec/minitest_spec_suite.rb

@@ -0,0 +1,21 @@
+require "rubygems"
+require "spec"
+
+class MiniTestTestSuite
+  def run
+    require_tests
+
+    puts "Running MiniTest Test Suite"
+  end
+
+  def require_tests
+    dir = File.dirname(__FILE__)
+    Dir["#{dir}/rr/minitest/**/*_test.rb"].each do |file|
+      require File.expand_path(file)
+    end
+  end
+end
+
+if $0 == __FILE__
+  MiniTestTestSuite.new.run
+end

data/spec/rr/double_injection/double_injection_verify_spec.rb

@@ -4,7 +4,7 @@ module RR
   module Injections
     describe DoubleInjection, "#verify" do
       it_should_behave_like "Swapped Space"
-      attr_reader :space, :subject, :method_name, :double_injection
+      attr_reader :subject, :method_name, :double_injection
       before do
         @subject = Object.new
         @method_name = :foobar

data/spec/rr/minitest/minitest_integration_test.rb

@@ -0,0 +1,59 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class MiniTestIntegrationTest < MiniTest::Unit::TestCase
+  include RR::Adapters::MiniTest # Testing against double inclusion issues
+
+  def setup
+    super
+    @subject = Object.new
+  end
+
+  def teardown
+    super
+  end
+
+  def test_using_a_mock
+    mock(@subject).foobar(1, 2) {:baz}
+    assert_equal :baz, @subject.foobar(1, 2)
+  end
+
+  def test_using_a_stub
+    stub(@subject).foobar {:baz}
+    assert_equal :baz, @subject.foobar("any", "thing")
+  end
+
+  def test_using_a_mock_proxy
+    def @subject.foobar
+      :baz
+    end
+
+    mock.proxy(@subject).foobar
+    assert_equal :baz, @subject.foobar
+  end
+
+  def test_using_a_stub_proxy
+    def @subject.foobar
+      :baz
+    end
+
+    stub.proxy(@subject).foobar
+    assert_equal :baz, @subject.foobar
+  end
+
+  def test_times_called_verification
+    mock(@subject).foobar(1, 2) {:baz}
+    assert_raises RR::Errors::TimesCalledError do
+      teardown
+    end
+  end
+
+  def test_using_assert_received
+    stub(@subject).foobar(1, 2)
+    @subject.foobar(1, 2)
+    assert_received(@subject) {|subject| subject.foobar(1, 2)}
+
+    assert_raises RR::Errors::SpyVerificationErrors::InvocationCountError do
+      assert_received(@subject) {|subject| subject.foobar(1, 2, 3)}
+    end
+  end
+end

data/spec/rr/minitest/test_helper.rb

@@ -0,0 +1,7 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../../environment_fixture_setup")
+
+require "minitest/autorun"
+
+class MiniTest::Unit::TestCase
+  include RR::Adapters::MiniTest
+end

data/spec/rr/space/space_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper")
 module RR
   describe Space do
     it_should_behave_like "Swapped Space"
-    attr_reader :space, :subject, :method_name, :double_injection
+    attr_reader :subject, :method_name, :double_injection
 
     before do
       @subject = Object.new
@@ -279,6 +279,13 @@ module RR
         subject_2.respond_to?(:singleton_method_added).should be_false
         Injections::SingletonMethodAddedInjection.exists?(subject_2).should be_false
       end
+
+      it "clears RR::Injections::DoubleInjection::BoundObjects" do
+        stub(subject).foobar
+        RR::Injections::DoubleInjection::BoundObjects.should_not be_empty
+        space.reset
+        RR::Injections::DoubleInjection::BoundObjects.should be_empty
+      end
     end
 
     describe "#reset_double" do

data/spec/spec_suite.rb

@@ -1,4 +1,5 @@
 require "rubygems"
+require "bundler"
 require "session"
 
 class ExampleSuite
@@ -11,6 +12,7 @@ class ExampleSuite
     run_core_examples
     run_rspec_examples
     run_test_unit_examples
+    run_minitest_examples
   end
 
   def run_core_examples
@@ -25,6 +27,10 @@ class ExampleSuite
     run_suite("#{dir}/test_unit_spec_suite.rb") || raise("Test::Unit suite Failed")
   end
 
+  def run_minitest_examples
+    run_suite("#{dir}/minitest_spec_suite.rb") || raise("MiniTest suite Failed")
+  end
+
   def run_suite(path)
     # From http://www.eglug.org/node/946
     bash.execute "exec 3>&1", :out => STDOUT, :err => STDERR
@@ -45,4 +51,4 @@ end
 
 if $0 == __FILE__
   ExampleSuite.new.run
-end
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 
+  version: 1.0.3
 platform: ruby
 authors: 
 - Brian Takita
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-01 00:00:00 -07:00
+date: 2011-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,11 +26,13 @@ extra_rdoc_files:
 files: 
 - CHANGES
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
 - lib/rr.rb
+- lib/rr/adapters/minitest.rb
 - lib/rr/adapters/rr_methods.rb
 - lib/rr/adapters/rspec.rb
 - lib/rr/adapters/test_unit.rb
@@ -109,7 +106,6 @@ files:
 - lib/rr/wildcard_matchers/range.rb
 - lib/rr/wildcard_matchers/regexp.rb
 - lib/rr/wildcard_matchers/satisfy.rb
-- scratch.rb
 - spec/api/any_instance_of/all_instances_of_spec.rb
 - spec/api/any_instance_of/any_instance_of_spec.rb
 - spec/api/any_instance_of/instance_of_spec.rb
@@ -121,6 +117,7 @@ files:
 - spec/api/stub/stub_spec.rb
 - spec/core_spec_suite.rb
 - spec/environment_fixture_setup.rb
+- spec/minitest_spec_suite.rb
 - spec/proc_from_block_spec.rb
 - spec/rr/adapters/rr_methods_argument_matcher_spec.rb
 - spec/rr/adapters/rr_methods_creator_spec.rb
@@ -148,6 +145,8 @@ files:
 - spec/rr/expectations/times_called_expectation/times_called_expectation_integer_spec.rb
 - spec/rr/expectations/times_called_expectation/times_called_expectation_proc_spec.rb
 - spec/rr/expectations/times_called_expectation/times_called_expectation_range_spec.rb
+- spec/rr/minitest/minitest_integration_test.rb
+- spec/rr/minitest/test_helper.rb
 - spec/rr/rspec/invocation_matcher_spec.rb
 - spec/rr/rspec/rspec_adapter_spec.rb
 - spec/rr/rspec/rspec_backtrace_tweaking_spec.rb
@@ -195,27 +194,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: pivotalrb
-rubygems_version: 1.3.7
+rubygems_version: 1.3.9.2
 signing_key: 
 specification_version: 3
 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
 test_files: 
-- spec/spy_verification_spec.rb
 - spec/proc_from_block_spec.rb
 - spec/rr_spec.rb
+- spec/spy_verification_spec.rb

data/scratch.rb

@@ -1,118 +0,0 @@
-o = Object.new
-#p (class << o; self; end).singleton_methods
-#p (class << o; self; end).superclass
-
-klass = Class.new
-p klass
-p klass.superclass
-p (class << klass; self; end).superclass
-p (class << Class; self; end)
-
-p Class.new
-
-##any_instance_of(Person, :id => 111, :to_s => "Joe Smith")
-##
-##any_instance_of(Person) do |person|
-##  person.id {111}
-##  person.to_s {"Joe Smith"}
-##end
-##
-##new_instance_of(Person, :id => 111, :to_s => "Joe Smith")
-##new_instance_of(Person) do |person|
-##  person.id {111}
-##  person.to_s {"Joe Smith"}
-##end
-#
-#class Sut
-#  def existing_method
-#    "existing_method"
-#  end
-#end
-#
-#class Dispatcher
-#  def self.call(subject, method_name, *args, &block)
-#    new(subject, method_name, *args, &block).call
-#  end
-#
-#  attr_reader :method_name
-#  def initialize(subject, method_name, *args, &block)
-#    @subject, @method_name, @args, @block = subject, method_name, args, block
-#  end
-#
-#  def call
-#
-#  end
-#end
-#
-#Sut.class_eval do
-#  alias_method :existing_method_without_rr, :existing_method
-#
-#  def existing_method(*args, &block)
-#    Dispatcher.call(self, :existing_method, *args, &block)
-#  end
-#end
-
-#class SubjectClass
-#  def foo
-#    :foo_original
-#  end
-#
-#  def _dump(arg)
-#    ""
-#  end
-#end
-#subject = SubjectClass.new
-#
-#class << subject
-#  p self.class
-#  class << self
-#    def foobar
-#      :baz
-#    end
-#  end
-#  p foobar
-#end
-#
-#Foo = Module.new do
-#  def foo
-#    :foo_module
-#  end
-#end
-#Bar = Module.new do
-#  def foo
-#    :bar_module
-#  end
-#end
-##module Foo
-##  def foo
-##  end
-##end
-#
-#subject.extend Foo
-#end
-#p subject.foo
-#p Marshal.dump(subject)
-
-
-class Super
-
-end
-class Sub < Super
-
-end
-
-def Super.foo
-  :bar
-end
-
-def Sub.foo
-  super
-end
-
-s = Super.new
-p s.object_id
-p (class << s; self; end).object_id
-p s.class
-#subject.extend Bar
-#def subject.foo
-#  :singleton_foo