method_decorators 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed79ca8949f564d8260a8e2f3d6ca6c25a4c6087
-  data.tar.gz: e300b088390c17c198cf7a22ba105dd547fde0ad
+  metadata.gz: 30c841da2ec60e5e17325036618cd80d5a625b72
+  data.tar.gz: cf294d186cba4cbbcf461fa55368bd5408501197
 SHA512:
-  metadata.gz: cc6ef5fd815700115771f75782619fb7ea726dcc9ab60e155c68e1deeb6fa3e2aea6f8f831413541bd39c63a6a9676d9b60a2ea9fee4702594dfaaf4ce483264
-  data.tar.gz: 75c088d37f52ea4c695f5da57b71bd8674912b8e615fab19f3089639716b11fadb6da5dca66a8e162f096f3ecd181ed72a5163ec40ad3f923f2a1d73102c9395
+  metadata.gz: 1a0d710846e84f0e1ff3e661b38325decb508c7d63b6aad5b58b29d57b079e739a57bbab2c7483396345e66050e42d363301edb4e929c0e11f61f0f662d35ef4
+  data.tar.gz: 6c0f700a8a243fdf2002a9c80d10c1bec4fa73bb52db799df58c03bc84296d9a23511bf898c7c3ffbfa4d806c3f6ce41d73eee42ea0a6a234e7d5a523b135c30

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
   - 2.0.0
   - jruby-18mode
   - jruby-19mode
-  - rbx-2.1.1
   - ruby-head
   - jruby-head
-  - ree
+  - ree

data/lib/method_decorators/retry.rb

@@ -5,6 +5,7 @@ module MethodDecorators
     def initialize(max, options = {})
       @max = max
       @options = options
+      @exceptions = options[:exceptions] || [StandardError]
     end
 
     def call(orig, this, *args, &blk)
@@ -12,7 +13,7 @@ module MethodDecorators
       begin
         attempts += 1
         orig.call(*args, &blk)
-      rescue
+      rescue *@exceptions
         if attempts < @max
           sleep(@options[:sleep]) if @options[:sleep]
           retry

data/lib/method_decorators/version.rb

@@ -1,3 +1,3 @@
 module MethodDecorators
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/lib/method_decorators/within.rb

@@ -3,12 +3,13 @@ require 'timeout'
 
 module MethodDecorators
   class Within < Decorator
-    def initialize(timeout)
+    def initialize(timeout, exception_class = nil)
       @seconds = timeout
+      @exception_class = exception_class
     end
 
     def call(orig, this, *args, &blk)
-      Timeout::timeout(@seconds) do
+      Timeout.timeout(@seconds, @exception_class) do
         orig.call(*args, &blk)
       end
     end

data/spec/decorators/precondition_spec.rb

@@ -28,7 +28,7 @@ describe MethodDecorators::Precondition do
 
         +MethodDecorators::Precondition.new{ |a| a + @x < 10 }
         def multiply(a)
-	  a * @x
+          a * @x
         end
 
         +MethodDecorators::Precondition.new{ |a| a + @x == 10 }

data/spec/decorators/retry_spec.rb

@@ -27,24 +27,65 @@ describe MethodDecorators::Retry do
         expect { subject.call(method, nil) }.to raise_error(ArgumentError)
       end
     end
+
+    context 'when :exceptions is given to #initialize' do
+      subject do
+        MethodDecorators::Retry.new(3, :exceptions => [ArgumentError])
+      end
+
+      context 'and the raised exception matches' do
+        before do
+          allow(method).to receive(:call) { raise ArgumentError }
+        end
+
+        it 'retries' do
+          expect(method).to receive(:call).exactly(3).times
+          expect { subject.call(method, nil) }.to raise_error(ArgumentError)
+        end
+      end
+
+      context 'and the raised exception does not match' do
+        before do
+          allow(method).to receive(:call) { raise IndexError }
+        end
+
+        it 'does not retry' do
+          expect(method).to receive(:call).once
+          expect { subject.call(method, nil) }.to raise_error(IndexError)
+        end
+      end
+    end
   end
 
   describe "acceptance" do
-    let(:klass) do
-      Class.new Base do
-        +MethodDecorators::Retry.new(3)
+    def create_class(options = {})
+      Class.new(Base) do
+        attr_reader :times
+
+        +MethodDecorators::Retry.new(3, options)
         def do_it(magic_number)
           @times ||= 0
           @times += 1
-          raise  if @times == magic_number
+          raise if @times == magic_number
           @times
         end
       end
     end
+
+    let(:klass) { create_class }
     subject { klass.new }
 
     it 'retries calls to the method' do
       subject.do_it(1).should == 2
     end
+
+    context 'when :exceptions is given to #initialize' do
+      let(:klass) { create_class(:exceptions => [ArgumentError]) }
+
+      it 'does not retry if the raised exception does not match' do
+        expect { subject.do_it(1) }.to raise_error
+        expect(subject.times).to eq(1)
+      end
+    end
   end
 end

data/spec/decorators/within_spec.rb

@@ -15,6 +15,15 @@ describe MethodDecorators::Within do
       method.stub(:call){ sleep 1 }
       expect{ subject.call(method, nil) }.to_not raise_error
     end
+
+    context 'when an exception class is given in #initialize' do
+      subject { MethodDecorators::Within.new(1, ArgumentError) }
+
+      it 'raises the given exception if timeout seconds have elapsed' do
+        allow(method).to receive(:call) { sleep 2 }
+        expect { subject.call(method, nil) }.to raise_error(ArgumentError)
+      end
+    end
   end
 
   describe "acceptance" do
@@ -32,6 +41,21 @@ describe MethodDecorators::Within do
       it "raises if the timeout period has elapsed" do
         expect{ subject.do_it(3) }.to raise_error(Timeout::Error)
       end
+
+      context 'and given an exception' do
+        let(:klass) do
+          Class.new(Base) do
+            +MethodDecorators::Within.new(1, ArgumentError)
+            def do_it(execution_period)
+              sleep(execution_period)
+            end
+          end
+        end
+
+        it 'raises the given exception' do
+          expect { subject.do_it(2) }.to raise_error(ArgumentError)
+        end
+      end
     end
 
     context "with shorter execution period" do

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: method_decorators
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Michael Fairley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Python's function decorators for Ruby
@@ -45,9 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Contributors.md
 - Gemfile
 - History.md
@@ -87,17 +87,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Python's function decorators for Ruby