fail_retry 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9ec875649f8634f074dd84df2ef76a0e876fef
-  data.tar.gz: f67a65b0ca3a10500acfd9040138b94574335124
+  metadata.gz: 2760f74347d4d9702e99899cddd837e9a42c7942
+  data.tar.gz: 5e273349f25589aa96b231c63d8d5d33a62ca6f4
 SHA512:
-  metadata.gz: aa379287c86b1d9573ef17f1dd5d37d3c76d03e9fae130781a6e2fd2c9aad44310afa6599fbcb7c64d7b65f143a7211244ddb20a6911e313756d0adb27ebb9ee
-  data.tar.gz: 9fc8e81742601f1e61cb1536037d0e2f2f5e944edbfcf18db270f90fc60dabb27884dc60f771d479126bdfc8637d9901327289c9e1b7e6c6d6c2c70c74cebb7c
+  metadata.gz: 699c4f950ee5bbafb54d6f2b5528dafa04fa144296d769d4b4b852c5fc3988ed0c1c6f19c9d0492151981f261805b6b18d8042d91db72102196cc0124433c15f
+  data.tar.gz: 539c2e330209276a7153ef4bb095ed769045833120fdc4371f1c7a31614c34010769acfdc52916614f58721ea8bf62a828bf692b404be1badd146d9bc847ba4b

data/fail_retry.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = "~> 2.1"
+
   spec.add_development_dependency "bundler", "~>1.7"
   spec.add_development_dependency "rake", "~>10.0"
   spec.add_development_dependency "rspec", "2.14.1"

data/lib/fail_retry.rb

@@ -8,16 +8,24 @@ module FailRetry
   end
 
   module ClassMethods
-    def fail_retry(method_name, exception: Fail, max_tries: 1, on_retry: nil)
+    def fail_retry(method_name, on: Fail, max: 1, if: nil)
       define_method("#{method_name}_with_retry") do |*args, &block|
         trial = 0
         begin
           send("#{method_name}_without_retry", *args, &block)
         rescue => e
-          raise if !e.kind_of?(exception) || trial >= max_tries
-          on_retry.call(self) if on_retry
-          trial += 1
-          retry
+          exception = on
+          if_proc = binding.local_variable_get(:if)
+          retriable = e.kind_of?(exception)
+          retriable &&= trial < max
+          retriable &&= if_proc ? if_proc.call(self) : true
+
+          if retriable
+            trial = trial.succ
+            retry
+          else
+            raise
+          end
         end
       end
 

data/lib/fail_retry/version.rb

@@ -1,3 +1,3 @@
 module FailRetry
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fail_retry_spec.rb

@@ -33,7 +33,7 @@ describe FailRetry do
 
   context "when a method call succeeds" do
     before do
-      klass.fail_retry :call, exception: ZeroDivisionError, on_retry: -> (instance) { instance.value += 1 }
+      klass.fail_retry :call, on: ZeroDivisionError, if: -> (instance) { instance.value += 1 }
     end
 
     it "retries and return number" do
@@ -43,6 +43,7 @@ describe FailRetry do
 
   context "when an unexpected exception happened" do
     before do
+      klass.fail_retry :call, on: ArgumentError
       klass.send(:undef_method, :perform_action)
     end
 
@@ -51,9 +52,9 @@ describe FailRetry do
     end
   end
 
-  context "when a method call fails and max_retries is 0" do
+  context "when a method call fails and max is 0" do
     before do
-      klass.fail_retry :call, exception: ZeroDivisionError, max_tries: 0
+      klass.fail_retry :call, on: ZeroDivisionError, max: 0
     end
 
     it "retries without retry" do
@@ -64,7 +65,7 @@ describe FailRetry do
 
   context "when a method call fails until trial reaches max_tries" do
     before do
-      klass.fail_retry :call, exception: ZeroDivisionError, max_tries: 3
+      klass.fail_retry :call, on: ZeroDivisionError, max: 3
     end
 
     it "retries and raise error" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fail_retry
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tomoya Hirano
@@ -80,9 +80,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="