stubborn 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/missed_stub_exception.rb

@@ -15,12 +15,12 @@ module Stubborn
   private
     def friendly_name(object)
       return "\"#{object}\"" if object.respond_to?(:to_str)
-      return object.inspect if object.respond_to?(:to_int) || object.is_a?(Hash)
+      return object.inspect if object.respond_to?(:to_int) || object.is_a?(Hash) || object.nil? || object == true || object == false
 
       if object.is_a?(Class)
         object.name
       else
-        "#{object.class.name.downcase}_instance"
+        "#{object.class.name.downcase.gsub(/\W+/, '_')}_instance"
       end
     end
   end

data/lib/stubborn.rb

@@ -28,16 +28,36 @@ module Stubborn
     end
 
     def method_missing(method_name, *args, &block)
-      result = @proxy_target.send(method_name, *args, &block)
-      return result if @methods_to_skip.include?(method_name.to_s)
-      raise MissedStubException.new(@label || @proxy_target, method_name, args, result, Suggesters::RSpecSuggester)
+      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__)
     end
   end
 
   class ProxyForClass < ProxyForInstance
     def initialize(proxy_target, options = {})
       super
-      redefine_const(proxy_target.name, self) unless proxy_target.name.strip.empty?
+      redefine_const(proxy_target, self) unless proxy_target.name.strip.empty?
     end
 
     def name
@@ -50,9 +70,13 @@ module Stubborn
     end
 
   private
-    def redefine_const(name, value)
-      Object.__send__(:remove_const, name) if Object.const_defined?(name)
-      Object.const_set(name, value)
+    def redefine_const(const, value)
+      const_parts = const.name.split('::')
+      const_name = const_parts.pop
+      parent_const = const_parts.inject(Object){|a, c| a.const_get(c) }
+
+      parent_const.__send__(:remove_const, const_name) if parent_const.const_defined?(const_name)
+      parent_const.const_set(const_name, value)
     end
   end
 end

data/lib/suggesters/rspec_suggester.rb

@@ -3,7 +3,7 @@ module Stubborn
     module RSpecSuggester
       def self.suggestions(object_label, method_name, args, result)
         with = args.strip.empty? ? nil : ".with(#{args})"
-        and_return = result.nil? ? nil : ".and_return(#{result})"
+        and_return = result == "nil" ? nil : ".and_return(#{result})"
         suggestions = []
         suggestions << "#{object_label}.stub!(:#{method_name})#{with}#{and_return}"
         suggestions << "#{object_label}.stub!(:#{method_name})#{and_return}"

data/stubborn.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stubborn}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Cadenas"]

data/test/stubborn_test.rb

@@ -1,29 +1,42 @@
 require 'test_helper'
 
+module Test; end
+
 def reset_test_api_class
-  name = "TestApi"
-  Object.__send__(:remove_const, name) if Object.const_defined?(name)
+  name = "Api"
+  Test.__send__(:remove_const, name) if Test.const_defined?(name)
   klass =  Class.new do
     def plus_one(number)
       number + 1
     end
 
+    def plus_three(number)
+      number = plus_one(number)
+      number = plus_one(number)
+      plus_one(number)
+    end
+
     def self.plus_two(number)
       number + 2
     end
+
+    def self.plus_four(number)
+      number = Test::Api.plus_two(number)
+      Test::Api.plus_two(number)
+    end
   end
-  Object.const_set(name, klass)
+  Test.const_set(name, klass)
 end
 
 Expectations do
   expect 2 do
     reset_test_api_class
-    TestApi.new.plus_one(1)
+    Test::Api.new.plus_one(1)
   end
 
-  expect "TestApi" do
+  expect "Test::Api" do
     reset_test_api_class
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
     api.class.name
   end
@@ -31,16 +44,16 @@ Expectations do
   %w[is_a? kind_of?].each do |method|
     expect true do
       reset_test_api_class
-      api = TestApi.new
+      api = Test::Api.new
       api = Stubborn.should_be_stubbed(api)
-      api.send(method, TestApi)
+      api.send(method, Test::Api)
     end
   end
 
   %w[equal? eql? == ===].each do |method|
     expect true do
       reset_test_api_class
-      api = TestApi.new
+      api = Test::Api.new
       proxied_api = Stubborn.should_be_stubbed(api)
       proxied_api.send(method, api)
     end
@@ -48,28 +61,28 @@ Expectations do
 
   expect true do
     reset_test_api_class
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
     api.respond_to?(:plus_one)
   end
 
   expect Stubborn::MissedStubException do
     reset_test_api_class
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
     api.plus_one(1) 
   end
 
   expect 3 do
     reset_test_api_class
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
     api.class.plus_two(1) 
   end
 
-  expect "You've missed adding a stub. Consider this suggestions:\ntestapi_instance.stub!(:plus_one).with(0).and_return(1)\ntestapi_instance.stub!(:plus_one).and_return(1)" 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
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api)
     message = ""
     begin
@@ -81,7 +94,7 @@ Expectations do
 
   expect "You've missed adding a stub. Consider this suggestions:\nApi.singleton.stub!(:plus_one).with(0).and_return(1)\nApi.singleton.stub!(:plus_one).and_return(1)" do
     reset_test_api_class
-    api = TestApi.new
+    api = Test::Api.new
     api = Stubborn.should_be_stubbed(api, :label => "Api.singleton")
     message = ""
     begin
@@ -91,45 +104,74 @@ Expectations do
     end
   end
 
-  expect "TestApi" do
+  expect "Test::Api" do
     reset_test_api_class
-    Stubborn.should_be_stubbed(TestApi)
-    api = TestApi.new
+    Stubborn.should_be_stubbed(Test::Api)
+    api = Test::Api.new
     api.class.name
   end
 
   expect true do
     reset_test_api_class
-    Stubborn.should_be_stubbed(TestApi)
-    api = TestApi.new
+    Stubborn.should_be_stubbed(Test::Api)
+    api = Test::Api.new
     api.respond_to?(:plus_one)
   end
 
   expect Stubborn::MissedStubException do
     reset_test_api_class
-    Stubborn.should_be_stubbed(TestApi)
-    api = TestApi.new
+    Stubborn.should_be_stubbed(Test::Api)
+    api = Test::Api.new
     api.plus_one(1) 
   end
 
   expect Stubborn::MissedStubException do
     reset_test_api_class
-    Stubborn.should_be_stubbed(TestApi)
-    api = TestApi.new
+    Stubborn.should_be_stubbed(Test::Api)
+    api = Test::Api.new
     api.class.plus_two(1) 
   end
 
-  expect "You've missed adding a stub. Consider this suggestions:\ntestapi_instance.stub!(:plus_one).with(0).and_return(1)\ntestapi_instance.stub!(:plus_one).and_return(1)" do
+  expect Stubborn::MissedStubException do
     reset_test_api_class
-    Stubborn.should_be_stubbed(TestApi)
+    Stubborn.should_be_stubbed(Test::Api)
+    Test::Api.plus_two(1) 
+  end
+
+  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 = TestApi.new
+    api = Test::Api.new
     begin
       api.plus_one(0)
     rescue => 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
+    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
+    end
+  end
 end
 
 

data/test/suggesters/rspec_suggester_test.rb

@@ -6,8 +6,8 @@ class Api; end
 include Stubborn
 
 Expectations do
-  expect "You've missed adding a stub. Consider this suggestions:\napi_instance.stub!(:method).with(123, AClass, \"hi\", {1=>2}).and_return(aclass_instance)\napi_instance.stub!(:method).and_return(aclass_instance)" do
-    MissedStubException.new(Api.new, :method, [123, AClass,"hi", {1 => 2}], AClass.new, Suggesters::RSpecSuggester).message
+  expect "You've missed adding a stub. Consider this suggestions:\napi_instance.stub!(:method).with(true, false, 123, AClass, \"hi\", {1=>2}).and_return(aclass_instance)\napi_instance.stub!(:method).and_return(aclass_instance)" do
+    MissedStubException.new(Api.new, :method, [true, false, 123, AClass,"hi", {1 => 2}], AClass.new, Suggesters::RSpecSuggester).message
   end
 
   expect "You've missed adding a stub. Consider this suggestion:\napi_instance.stub!(:method).and_return(aclass_instance)" do
@@ -17,5 +17,9 @@ Expectations do
   expect "You've missed adding a stub. Consider this suggestion:\nApi.singleton.stub!(:method).and_return(aclass_instance)" do
     MissedStubException.new("Api.singleton", :method, [], AClass.new, Suggesters::RSpecSuggester).message
   end
+
+  expect "You've missed adding a stub. Consider this suggestion:\nApi.singleton.stub!(:method)" do
+    MissedStubException.new("Api.singleton", :method, [], nil, Suggesters::RSpecSuggester).message
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stubborn
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Daniel Cadenas