rspec-fire 0.4.0 → 0.5.0

data/HISTORY

@@ -20,3 +20,7 @@
   * Allow `mock.stub(:foo => 17)` syntax.
   * Don't count block params when determining max arity.
   * Restore original const value when a const is stubbed more than once.
+
+0.5.0 - 4 July 2012
+  * Performance improvements, overhead is now roughly 10% down from 100%
+  * Allow both instance and class doubles for unloaded classes.

data/README.md

@@ -101,7 +101,18 @@ Create a new file `unit_helper.rb` that _does not_ require `spec_helper.rb`.
 Require this file where needed for isolated tests. To run an isolated spec in
 the context of your app:
 
-    rspec -rspec/spec_helper.rb spec/unit/my_spec.rb
+    rspec -r./spec/spec_helper.rb spec/unit/my_spec.rb
+
+### Using with ActiveRecord
+
+ActiveRecord methods defined implicitly from database columns are not detected.
+A workaround is to explicitly define the methods you are mocking:
+
+    class User < ActiveRecord::Base
+      # Explicit column definitions for rspec-fire
+      def name; super; end
+      def email; super; end
+    end
 
 ### Doubling constants
 

data/lib/rspec/fire.rb

@@ -135,41 +135,53 @@ module RSpec
       end
 
       def with_doubled_class
-        if original_stubbed_const_value = ConstantStubber.original_value_for(@__doubled_class_name)
-          yield original_stubbed_const_value
-        elsif recursive_const_defined?(@__doubled_class_name)
+        ConstantStubber.find_original_value_for(@__doubled_class_name) do |value|
+          yield value if value
+          return
+        end
+
+        if recursive_const_defined?(@__doubled_class_name)
           yield recursive_const_get(@__doubled_class_name)
         end
       end
 
       protected
 
-      def ensure_implemented(*method_names)
-        with_doubled_class do |klass|
-          klass.should implement(method_names, @__checked_methods)
-        end
-      end
+      # This cache gives a decent speed up when a class is doubled a lot.
+      def implemented_methods(doubled_class, checked_methods)
+        @@_implemented_methods_cache ||= {}
 
-      define :implement do |expected_methods, checked_methods|
-        unimplemented_methods = lambda {|doubled_class|
-          implemented_methods = doubled_class.send(checked_methods)
-          # to_sym for non-1.9 compat
-          expected_methods - implemented_methods.map(&:to_sym)
-        }
+        # to_sym for non-1.9 compat
+        @@_implemented_methods_cache[[doubled_class, checked_methods]] ||=
+          doubled_class.send(checked_methods).map(&:to_sym)
+      end
 
-        match do |doubled_class|
-          unimplemented_methods[ doubled_class ].empty?
-        end
+      def unimplemented_methods(doubled_class, expected_methods, checked_methods)
+        expected_methods -
+          implemented_methods(doubled_class, checked_methods)
+      end
 
-        failure_message_for_should do |doubled_class|
-          implemented_methods =
-            Object.public_methods - doubled_class.send(checked_methods)
-          "%s does not implement:\n%s" % [
+      def ensure_implemented(*method_names)
+        with_doubled_class do |doubled_class|
+          methods = unimplemented_methods(
             doubled_class,
-            unimplemented_methods[ doubled_class ].sort.map {|x|
-            "  #{x}"
-          }.join("\n")
-          ]
+            method_names,
+            @__checked_methods
+          )
+
+          if methods.any?
+            implemented_methods =
+              Object.public_methods -
+                implemented_methods(doubled_class, @__checked_methods)
+
+            msg = "%s does not implement:\n%s" % [
+              doubled_class,
+              methods.sort.map {|x|
+                "  #{x}"
+              }.join("\n")
+            ]
+            raise RSpec::Expectations::ExpectationNotMetError, msg
+          end
         end
       end
     end
@@ -390,9 +402,10 @@ module RSpec
         @stubbers ||= []
       end
 
-      def self.original_value_for(constant_name)
+      def self.find_original_value_for(constant_name)
         stubber = stubbers.find { |s| s.full_constant_name == constant_name }
-        stubber.original_value if stubber
+        yield stubber.original_value if stubber
+        self
       end
     end
 

data/rspec-fire.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = 'rspec-fire'
-  s.version  = '0.4.0'
+  s.version  = '0.5.0'
   s.summary  = 'More resilient test doubles for RSpec.'
   s.platform = Gem::Platform::RUBY
   s.authors  = ["Xavier Shay"]

data/spec/fire_double_spec.rb

@@ -270,6 +270,28 @@ describe '#fire_replaced_class_double (for a non-existant class)' do
     double.should_receive(:foo).with("a").and_return(:bar)
     A::B::C.foo("a").should eq(:bar)
   end
+
+  def use_doubles(class_double, instance_double)
+    instance_double.should_receive(:undefined_method).and_return(3)
+    class_double.should_receive(:undefined_method).and_return(4)
+
+    instance_double.undefined_method.should eq(3)
+    class_double.undefined_method.should eq(4)
+  end
+
+  it 'can be used after a declared fire_double for the same class' do
+    instance_double = fire_double("A::B::C")
+    class_double = fire_replaced_class_double("A::B::C")
+
+    use_doubles class_double, instance_double
+  end
+
+  it 'can be used before a declared fire_double for the same class' do
+    class_double = fire_replaced_class_double("A::B::C")
+    instance_double = fire_double("A::B::C")
+
+    use_doubles class_double, instance_double
+  end
 end
 
 shared_examples_for "loaded constant stubbing" do |const_name|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-fire
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160595040 !ruby/object:Gem::Requirement
+  requirement: &2159223000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160595040
+  version_requirements: *2159223000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160594520 !ruby/object:Gem::Requirement
+  requirement: &2159222320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2160594520
+  version_requirements: *2159222320
 description: 
 email:
 - hello@xaviershay.com
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: More resilient test doubles for RSpec.