rr 0.7.0 → 0.7.1

data/CHANGES

@@ -1,3 +1,5 @@
+- Performance improvements
+
 * 0.7.0
 - Added spies (Patchs by Joe Ferris, Michael Niessner & Mike Mangino)
 - Added strongly typed reimplementation doubles (Patch by Michael Niessner)

data/README.rdoc

@@ -312,10 +312,10 @@ to making it possible. We all are standing on the shoulders of giants.
 * Dan North for syntax ideas
 * Dave Astels for some BDD inspiration
 * David Chelimsky for encouragement to make the RR framework, for developing the Rspec mock framework, and syntax ideas
+* Daniel Sudol for identifing performance issues with RR
 * Felix Morio for pairing with me
 * Gerard Meszaros for his excellent book "xUnit Test Patterns"
 * James Mead for developing Mocha
-* Joe Ferris for patches
 * Jeff Whitmire for documentation suggestions
 * Jim Weirich for developing Flexmock, the first Terse ruby mock framework in Ruby
 * Joe Ferris for patches

data/Rakefile

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

data/lib/rr/double_definitions/double_definition_creator_proxy.rb

@@ -1,54 +1,34 @@
 module RR
   module DoubleDefinitions
     class DoubleDefinitionCreatorProxy
-      def initialize(creator, &block) #:nodoc:
-        @creator = creator
-        class << self
-          def __apply_blank_slate
-            @apply_blank_slate = true
-          end
-
-          def __apply_blank_slate?
-            @apply_blank_slate ||= false
-          end
-
+      class << self
+        def blank_slate_methods
           instance_methods.each do |m|
-            unless m =~ /^_/ || m.to_s == 'object_id' || m.to_s == "instance_eval" || m.to_s == 'respond_to?'
+            unless m =~ /^_/ || m.to_s == 'object_id' || m.to_s == 'respond_to?' || m.to_s == 'method_missing'
               alias_method "__blank_slated_#{m}", m
               undef_method m
             end
           end
-
-          def instance_eval
-            return_value = super
-            class << self
-              alias_method "__blank_slated_instance_eval", "instance_eval"
-              undef_method :instance_eval
-              alias_method "__blank_slated_respond_to?", "respond_to?"
-              undef_method :respond_to?
-            end
-            return_value
-          end
-
-          def method_missing(method_name, *args, &block)
-            if __apply_blank_slate?
-              @creator.create(method_name, *args, &block)
-            else
-              __blank_slated_send("__blank_slated_#{method_name}", *args, &block)
-            end
-          end
         end
+      end
+
+      def initialize(creator, &block) #:nodoc:
+        @creator = creator
+        respond_to?(:class) ? self.class.blank_slate_methods : __blank_slated_class.blank_slate_methods
 
-        __apply_blank_slate
         if block_given?
           if block.arity == 1
             yield(self)
           else
-            instance_eval(&block)
+            respond_to?(:instance_eval) ? instance_eval(&block) : __blank_slated_instance_eval(&block)
           end
         end
       end
 
+      def method_missing(method_name, *args, &block)
+        @creator.create(method_name, *args, &block)
+      end
+
       def __creator__
         @creator
       end

data/lib/rr/errors/rr_error.rb

@@ -1,6 +1,6 @@
 module RR
   module Errors
-    BACKTRACE_IDENTIFIER = /lib\/rr/
+    BACKTRACE_IDENTIFIER = Regexp.new("/lib/rr")
 
     class RRError < RuntimeError
       attr_writer :backtrace

data/lib/rr/expectations/argument_equality_expectation.rb

@@ -8,17 +8,17 @@ module RR
       end
 
       def exact_match?(*arguments)
-        return false unless arguments.length == @expected_arguments.length
+        return false unless arguments.length == expected_arguments.length
         arguments.each_with_index do |arg, index|
-          return false unless equality_match(@expected_arguments[index], arg)
+          return false unless equality_match(expected_arguments[index], arg)
         end
         true
       end
 
       def wildcard_match?(*arguments)
-        return false unless arguments.length == @expected_arguments.length
+        return false unless arguments.length == expected_arguments.length
         arguments.each_with_index do |arg, index|
-          expected_argument = @expected_arguments[index]
+          expected_argument = expected_arguments[index]
           if expected_argument.respond_to?(:wildcard_match?)
             return false unless expected_argument.wildcard_match?(arg)
           else
@@ -29,7 +29,7 @@ module RR
       end
 
       def ==(other)
-        @expected_arguments == other.expected_arguments
+        expected_arguments == other.expected_arguments
       end
 
       protected

data/spec/rr/rspec/rspec_backtrace_tweaking_spec.rb

@@ -19,34 +19,11 @@ module RR
         end
       end
 
-      describe " backtrace tweaking" do
-        attr_reader :original_rspec_options, :error, :output
-        before do
-          @original_rspec_options = Spec::Runner.options
-          @error = StringIO.new("")
-          @output = StringIO.new("")
-          Spec::Runner.use(::Spec::Runner::Options.new(error, output))
-        end
-
-        after do
-          Spec::Runner.use(original_rspec_options)
-        end
-
+      describe "backtrace tweaking" do
         it "hides rr library from the backtrace by default" do
-          subject = @subject
-          example_group = Class.new(::Spec::Example::ExampleGroup) do
-            describe "Example"
-
-            it("hides RR framework in backtrace") do
-              mock(subject).foobar()
-              RR.verify_double(subject, :foobar)
-            end
-          end
-
-          Spec::Runner.options.run_examples
-
-          output.string.should_not be_empty
-          output.string.should_not include("lib/rr")
+          dir = File.dirname(__FILE__)
+          output = `ruby #{dir}/rspec_backtrace_tweaking_spec_fixture.rb`
+          output.should_not include("lib/rr")
         end
       end
     end

data/spec/rr/rspec/rspec_backtrace_tweaking_spec_fixture.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require "spec"
+dir = File.dirname(__FILE__)
+require File.expand_path("#{dir}/../../../lib/rr")
+
+describe "Example" do
+  it("hides RR framework in backtrace") do
+    mock(subject).foobar()
+    RR.verify_double(subject, :foobar)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Brian Takita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -05:00
+date: 2009-01-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -102,6 +102,7 @@ files:
 - spec/rr/space/space_spec.rb
 - spec/rr/rspec/rspec_backtrace_tweaking_spec.rb
 - spec/rr/rspec/invocation_matcher_spec.rb
+- spec/rr/rspec/rspec_backtrace_tweaking_spec_fixture.rb
 - spec/rr/rspec/rspec_usage_spec.rb
 - spec/rr/rspec/rspec_adapter_spec.rb
 - spec/rr/test_unit/test_unit_backtrace_test.rb