stubborn 0.1.5 → 0.2.0

data/README.rdoc

@@ -51,9 +51,17 @@ Which produces this output:
   GreatClass.singleton.stub!(:slow_method).with(123, AClass, "hi").and_return(another_class_instance)
   GreatClass.singleton.stub!(:slow_method).and_return(another_class_instance)
 
-So all unstubbed class methods of the Api class and its instances will raise this special exception while running the tests. If you prefer you can use it on a single instance like this:
+So all unstubbed class methods of the Api class and its instances will raise this special exception while running the tests.
+If you prefer you can use it on a single instance like this:
 
-  Stubborn.should_be_stubbed(Api.new)
+  api = Stubborn.should_be_stubbed(Api.new)
+
+=== Filters
+
+You can control which methods to check with the options :except and :only. Both accept either strings or arrays:
+
+  Stubborn.should_be_stubbed(Api.new, :except => :safe_method)
+  Stubborn.should_be_stubbed(Api.new, :only => [:slow_method, :external_service])
 
 == Installation
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/stubborn.rb

@@ -16,41 +16,29 @@ module Stubborn
     end
 
     def initialize(proxy_target, options = {})
+      @proxy_target = proxy_target
+
+      options[:except] = [options[:except]].flatten.compact.map{|m| m.to_s}
+      options[:only] = [options[:only]].flatten.compact.map{|m| m.to_s}
       options = {:class => proxy_target.class}.merge(options)
       @label = options[:label]
-      @proxy_target = proxy_target
-      @klass = options[:class]
-      @methods_to_skip = ["respond_to?", "is_a?", "kind_of?", "equal?", "eql?", "==", "==="]
+      @class = options[:class]
+      @methods_to_skip = ["respond_to?", "is_a?", "kind_of?", "equal?", "eql?", "==", "==="] + options[:except]
+      @only_methods = options[:only]
     end
 
     def class
-      @klass
+      @class
     end
 
     def method_missing(method_name, *args, &block)
-      comes_from_another = comes_from_another_method_missing?
-      begin
-        set_comes_from_another
-        result = @proxy_target.send(method_name, *args, &block)
-        return result if @methods_to_skip.include?(method_name.to_s) || comes_from_another
-        raise MissedStubException.new(@label || @proxy_target, method_name, args, result, Suggesters::RSpecSuggester)
-      ensure
-        clear_comes_from_another unless comes_from_another
-      end
-    end
-
-    private
-    def comes_from_another_method_missing?
-      Thread.current["stubborn_objects_ids"] = {} if Thread.current["stubborn_objects_ids"].nil?
-      Thread.current["stubborn_objects_ids"][self.__id__]
-    end
-
-    def set_comes_from_another
-      Thread.current["stubborn_objects_ids"][self.__id__] = true
-    end
-
-    def clear_comes_from_another
-      Thread.current["stubborn_objects_ids"].delete(self.__id__)
+      were_we_already_processing_a_missed_stub = Thread.current["inside_missed_stub"]
+      Thread.current["inside_missed_stub"] = true
+      result = @proxy_target.send(method_name, *args, &block)
+      return result if !@only_methods.include?(method_name.to_s) && !@only_methods.empty? || @methods_to_skip.include?(method_name.to_s) || were_we_already_processing_a_missed_stub
+      raise MissedStubException.new(@label || @proxy_target, method_name, args, result, Suggesters::RSpecSuggester)
+    ensure
+      Thread.current["inside_missed_stub"] = false unless were_we_already_processing_a_missed_stub
     end
   end
 

data/stubborn.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stubborn}
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Cadenas"]
-  s.date = %q{2009-10-02}
+  s.date = %q{2009-10-05}
   s.email = %q{dcadenas@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/test/stubborn_method_filtering_test.rb

@@ -1,8 +1,10 @@
 require 'test_helper'
 
-def reset_test_api_class
-  name = "TestApi"
-  Object.__send__(:remove_const, name) if Object.const_defined?(name)
+module FilteringTest; end
+
+def reset_FilteringTest_api_class
+  name = "Api"
+  FilteringTest.send(:remove_const, name) if FilteringTest.const_defined?(name)
   klass =  Class.new do
     def instance_method_1
       "instance_method_1 called"
@@ -20,34 +22,56 @@ def reset_test_api_class
       "class_method_2 called"
     end
   end
-  Object.const_set(name, klass)
+  FilteringTest.const_set(name, klass)
 end
 
-__END__
-PENDING
-
 Expectations do
   expect "instance_method_1 called" do
-    api = TestApi.new   
-    Stubborn.should_be_stubbed(api, :except => :instance_method_1)
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :except => [:instance_method_1, :instance_method_2])
     api.instance_method_1
   end
 
+  expect "instance_method_2 called" do
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :except => [:instance_method_1, :instance_method_2])
+    api.instance_method_2
+  end
+
   expect Stubborn::MissedStubException do
-    api = TestApi.new   
-    Stubborn.should_be_stubbed(api, :except => :instance_method_1)
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :except => :instance_method_1)
     api.instance_method_2
   end
 
   expect "instance_method_2 called" do
-    api = TestApi.new   
-    Stubborn.should_be_stubbed(api, :only => :instance_method_1)
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :only => :instance_method_1)
     api.instance_method_2
   end
 
   expect Stubborn::MissedStubException do
-    api = TestApi.new   
-    Stubborn.should_be_stubbed(api, :only => :instance_method_1)
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :only => :instance_method_1)
+    api.instance_method_1
+  end
+
+  expect Stubborn::MissedStubException do
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :only => [:instance_method_1, :instance_method_2])
     api.instance_method_1
   end
+
+  expect Stubborn::MissedStubException do
+    reset_FilteringTest_api_class
+    api = FilteringTest::Api.new   
+    api = Stubborn.should_be_stubbed(api, :only => [:instance_method_1, :instance_method_2])
+    api.instance_method_2
+  end
 end

data/test/stubborn_test.rb

@@ -4,7 +4,7 @@ module Test; end
 
 def reset_test_api_class
   name = "Api"
-  Test.__send__(:remove_const, name) if Test.const_defined?(name)
+  Test.send(:remove_const, name) if Test.const_defined?(name)
   klass =  Class.new do
     def plus_one(number)
       number + 1
@@ -84,11 +84,10 @@ Expectations do
     reset_test_api_class
     api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
-    message = ""
     begin
       api.plus_one(0)
     rescue => e 
-      message = e.message
+      e.message
     end
   end
 
@@ -96,11 +95,10 @@ Expectations do
     reset_test_api_class
     api = Test::Api.new
     api = Stubborn.should_be_stubbed(api, :label => "Api.singleton")
-    message = ""
     begin
       api.plus_one(0)
     rescue => e 
-      message = e.message
+      e.message
     end
   end
 
@@ -141,35 +139,32 @@ Expectations do
   expect "You've missed adding a stub. Consider this suggestions:\ntest_api_instance.stub!(:plus_one).with(0).and_return(1)\ntest_api_instance.stub!(:plus_one).and_return(1)" do
     reset_test_api_class
     Stubborn.should_be_stubbed(Test::Api)
-    message = ""
     api = Test::Api.new
     begin
       api.plus_one(0)
     rescue => e 
-      message = e.message
+      e.message
     end
   end
 
   expect "You've missed adding a stub. Consider this suggestions:\ntest_api_instance.stub!(:plus_three).with(1).and_return(4)\ntest_api_instance.stub!(:plus_three).and_return(4)" do
     reset_test_api_class
     Stubborn.should_be_stubbed(Test::Api)
-    message = ""
     api = Test::Api.new
     begin
       api.plus_three(1)
     rescue => e 
-      message = e.message
+      e.message
     end
   end
 
   expect "You've missed adding a stub. Consider this suggestions:\nTest::Api.stub!(:plus_four).with(1).and_return(5)\nTest::Api.stub!(:plus_four).and_return(5)" do
     reset_test_api_class
     Stubborn.should_be_stubbed(Test::Api)
-    message = ""
     begin
       Test::Api.plus_four(1)
     rescue => e 
-      message = e.message
+      e.message
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stubborn
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Daniel Cadenas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -03:00
+date: 2009-10-05 00:00:00 -02:00
 default_executable: 
 dependencies: []