rack-idempotent 0.0.1 → 0.0.2

data/lib/rack-idempotent/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Idempotent
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/rack-idempotent.rb

@@ -3,7 +3,8 @@ require "rack-idempotent/version"
 module Rack
   class Idempotent
     RETRY_LIMIT = 5
-    IDEMPOTENT_HTTP_CODES = [502, 503, 504, 408]
+    RETRY_HTTP_CODES = [502, 503, 504]
+    IDEMPOTENT_HTTP_CODES = [*RETRY_HTTP_CODES, 408]
     IDEMPOTENT_ERROR_CLASSES = [Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::EHOSTUNREACH]
 
     class RetryLimitExceeded < Exception
@@ -24,6 +25,9 @@ module Rack
       end
     end
 
+    class Retryable < StandardError
+    end
+
     def initialize(app)
       @app= app
     end
@@ -38,15 +42,26 @@ module Rack
         raise HTTPException.new(status, headers, body) if IDEMPOTENT_HTTP_CODES.include?(status)
         env.merge!(dup_env)
         [status, headers, body]
-      rescue *IDEMPOTENT_ERROR_CLASSES, HTTPException => ie
+      rescue *IDEMPOTENT_ERROR_CLASSES, HTTPException, Retryable => ie
         idempotent_exceptions << ie
         if env['client.retries'] > RETRY_LIMIT - 1
           raise(RetryLimitExceeded.new(idempotent_exceptions))
         else
-          env['client.retries'] += 1
-          retry
+          if retry?(status, env["REQUEST_METHOD"])
+            env['client.retries'] += 1
+            retry
+          else
+            raise
+          end
         end
       end
     end
+
+  private
+
+  def retry?(response_status, request_method)
+    RETRY_HTTP_CODES.include?(response_status) || request_method == "GET"
+  end
+
   end
 end

data/spec/rack-idempotent_spec.rb

@@ -37,6 +37,14 @@ describe Rack::Idempotent do
     env['client.retries'].should == 2
   end
 
+  it "should retry Rack::Idempotent::Retryable" do
+    RaiseUp.errors = [Rack::Idempotent::Retryable, Rack::Idempotent::Retryable]
+    client.get("/alsodoesntmatter")
+
+    env = CaptureEnv.env
+    env['client.retries'].should == 2
+  end
+
   it "should raise Rack::Idempotent::RetryLimitExceeded when retry limit is reached" do
     RaiseUp.errors = (Rack::Idempotent::RETRY_LIMIT + 1).times.map{|i| Errno::ETIMEDOUT}
 
@@ -47,7 +55,7 @@ describe Rack::Idempotent do
   end
 
   [502, 503, 504, 408].each do |code|
-    it "retries #{code}" do
+    it "retries GET #{code}" do
       RaiseUp.errors = [code]
       client.get("/something")
       env = CaptureEnv.env
@@ -55,6 +63,24 @@ describe Rack::Idempotent do
     end
   end
 
+  [502, 503, 504].each do |code|
+    it "retries POST #{code}" do
+      RaiseUp.errors = [code]
+      client.post("/something")
+      env = CaptureEnv.env
+      env['client.retries'].should == 1
+    end
+  end
+
+  it "doesn't retry POST when return code is 408" do
+    RaiseUp.errors = [408]
+    lambda do
+      client.post("/something")
+    end.should raise_error(Rack::Idempotent::HTTPException)
+    env = CaptureEnv.env
+    env['client.retries'].should == 0
+  end
+
   it "should store exceptions raised" do
     RaiseUp.errors = [502, Errno::ECONNREFUSED, 408, 504, Errno::EHOSTUNREACH, Errno::ETIMEDOUT]
     errors = RaiseUp.errors.dup

metadata

@@ -1,23 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rack-idempotent
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Ines Sombra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-17 00:00:00.000000000 Z
+
+date: 2012-02-07 00:00:00 Z
 dependencies: []
+
 description: Retry logic for rack-client
-email:
+email: 
 - isombra@engineyard.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -29,30 +39,39 @@ files:
 - rack-idempotent.gemspec
 - spec/rack-idempotent_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Retry logic for rack-client
-test_files:
+test_files: 
 - spec/rack-idempotent_spec.rb
 - spec/spec_helper.rb