rescue_me 0.1.2 → 0.1.3

data/Rakefile

@@ -2,5 +2,5 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) { |t| t.rspec_opts = "--colour" }
 task :default => :spec

data/lib/rescue_me/version.rb

@@ -1,3 +1,3 @@
 module RescueMe
-  VERSION = '0.1.2' unless defined? RescueMe::VERSION
+  VERSION = '0.1.3' unless defined? RescueMe::VERSION
 end

data/spec/rescue_me_spec.rb

@@ -1,85 +1,60 @@
 require_relative 'spec_helper'
 
-# TODO AS: Replace this class with a mock
-class ExceptionCounter
-
-  require 'net/smtp'
-  attr_reader :method_called_count
-
-  def initialize
-    @method_called_count = 0
-  end
-
-  def exception_free
-    @method_called_count += 1
-    "This method does not raise exceptions"
-  end
-
-  def raise_zero_division_error
-    @method_called_count += 1
-    12/0
-  end
-
-  # Will raise SMTPServerBusy the first x times this method is called,
-  # after which this method does nothing.
-  def raise_smtp_exception_until_call(times)
-    @method_called_count += 1
-    @smtp_exception_count = (@smtp_exception_count ||= 0) + 1
-    raise Net::SMTPServerBusy if times > @smtp_exception_count
-  end
-
-end # ExceptionCounter
+class TestLogger # required because RSpec mocks have their own #warn
+  def warn(msg); STDERR.puts msg; end
+end
 
 describe 'rescue_me' do
 
-  before(:each) do
-    @exception_counter = ExceptionCounter.new
-  end
+  let(:logger) { TestLogger.new }
+  let(:test_class) { double "TestClass" }
 
   it "runs an exception-free block of code once" do
-    rescue_and_retry {
-      @exception_counter.exception_free
-    }
-    @exception_counter.method_called_count.should == 1
+    test_class.should_receive(:sendmail).once
+    rescue_and_retry { test_class.sendmail }
   end
 
   it "attempts to run a block that raises an unexpected exception only once" do
-    expect do
-      rescue_and_retry(5, IOError) {
-        @exception_counter.raise_zero_division_error
-      }
-    end.to raise_error ZeroDivisionError
-    @exception_counter.method_called_count.should == 1
+    test_class.stub(:sendmail).and_raise(NameError)
+    test_class.should_receive(:sendmail).once
+    expect {
+      rescue_and_retry(4, IOError) { test_class.sendmail }
+    }.to raise_error
   end
 
   it "re-runs the block of code for exactly max_attempt number of times" do
-    begin
-      rescue_and_retry(3, ZeroDivisionError) {
-        @exception_counter.raise_zero_division_error
-      }
-    rescue
-    end
-    @exception_counter.method_called_count.should == 3
+    test_class.stub(:sendmail).and_raise(IOError)
+    test_class.should_receive(:sendmail).exactly(2).times
+    expect {
+      rescue_and_retry(2, IOError) { test_class.sendmail }
+    }.to raise_error
   end
 
   it "re-runs the block of code for exactly a single time when specified" do
-    @exception_counter = ExceptionCounter.new
-    begin
-      rescue_and_retry(1, ZeroDivisionError) {
-        @exception_counter.raise_zero_division_error
-      }
-    rescue
-    end
-    @exception_counter.method_called_count.should == 1
+    test_class.stub(:sendmail).and_raise(IOError)
+    test_class.should_receive(:sendmail).once
+    expect {
+      rescue_and_retry(1, IOError) { test_class.sendmail }
+    }.to raise_error
   end
 
   it "does not re-run the block of code after it has run successfully" do
-    expect do
-      rescue_and_retry(5, Net::SMTPServerBusy) {
-        @exception_counter.raise_smtp_exception_until_call(3)
-      }
-    end.to_not raise_error
-    @exception_counter.method_called_count.should == 3
+    test_class.stub(:sendmail) {
+      @x ||= 0; @x += 1; raise IOError if @x < 3
+    }
+    test_class.should_receive(:sendmail).exactly(3).times
+    expect {
+      rescue_and_retry(5, IOError) { test_class.sendmail }
+    }.to_not raise_error
+  end
+
+  it "names the enclosing method from which an exception arises" do
+    test_class.stub(:sendmail).and_raise(IOError)
+    test_class.stub(:logger).and_return(logger)
+    logger.should_receive(:warn).with(/rescue_me_spec/)
+    expect {
+      rescue_and_retry(1, IOError) { test_class.sendmail }
+    }.to raise_error
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rescue_me
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -101,7 +101,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
 - .gitignore
 - .ruby-version
 - Gemfile

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE