rest 1.2.1 → 1.2.2

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    rest (1.2.0)
-      net-http-persistent
+    rest (1.2.1)
       rest-client (>= 0.3.0)
 
 GEM
@@ -25,6 +24,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  net-http-persistent
   quicky
   rake
   rest!

data/lib/rest/client.rb

@@ -60,18 +60,20 @@ module Rest
     def choose_best_gem
       begin
         raise LoadError
-        require 'typhoeus'
-        @gem = :client
+        #require 'typhoeus'
+        #@gem = :client
       rescue LoadError => ex
         begin
           # try net-http-persistent
-          require 'net/http/persistent'
-          @gem = :net_http_persistent
+          #require 'net/http/persistent'
+          #@gem = :net_http_persistent
         rescue LoadError => ex
-         require 'rest_client'
-          @gem = :rest_client
         end
       end
+      if @gem.nil?
+        require 'rest_client'
+        @gem = :rest_client
+      end
     end
 
     def get(url, req_hash={})
@@ -82,6 +84,8 @@ module Rest
       return res
     end
 
+    # This will attempt to perform the operation with an exponential backoff on 503 errors.
+    # Amazon services throw 503
     def perform_op(&blk)
       max_retries = @options[:max_retries] || 5
       current_retry = 0
@@ -97,9 +101,9 @@ module Rest
           s = Random.rand * pow
                                              #puts 's=' + s.to_s
           sleep_secs = 1.0 * s / 1000.0
-                                             #puts 'sleep for ' + sleep_secs.to_s
+          puts 'sleep for ' + sleep_secs.to_s
           current_retry += 1
-          @logger.debug "503 Error. Retrying #{current_retry} out of #{max_retries} max."
+          @logger.debug "503 Received. Retrying #{current_retry} out of #{max_retries} max in #{sleep_secs} seconds."
           sleep sleep_secs
         else
           break

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/rest.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |gem|
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
   gem.add_runtime_dependency "rest-client", ">= 0.3.0"
-  gem.add_runtime_dependency "net-http-persistent"
 
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "uber_config"
   gem.add_development_dependency "typhoeus"
   gem.add_development_dependency "quicky"
+  gem.add_development_dependency "net-http-persistent"
 
 end
 

data/test/test_base.rb

@@ -13,8 +13,8 @@ class TestBase < Test::Unit::TestCase
  def setup
     puts 'setup'
     #@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "rest", "test", "config.yml")))
-    @rest = Rest::Client.new
-    #@client.logger.level = Logger::DEBUG
+    @rest = Rest::Client.new(:gem=>:rest_client)
+    @rest.logger.level = Logger::DEBUG
 
   end
 end

data/test/test_rest.rb

@@ -19,7 +19,12 @@ class TestTests < TestBase
     assert response.code == 200
     #p response.body
     assert response.body.include?("Social Coding")
+  end
 
+  def test_backoff
+    response = @rest.get("http://rest-test.iron.io/code/503?switch_after=3&switch_to=200")
+    p response
+    p response.code
   end
 
   def test_gets

data/test/tmp.rb

@@ -0,0 +1,14 @@
+require 'yaml'
+begin
+  require File.join(File.dirname(__FILE__), '../lib/rest')
+rescue Exception => ex
+  puts "Could NOT load gem: " + ex.message
+  raise ex
+end
+
+@rest = Rest::Client.new # (:gem=>:rest_client)
+@rest.logger.level = Logger::DEBUG
+
+response = @rest.get("http://smooth-sword-1395.herokuapp.com/code/503?switch_after=3&switch_to=200")
+p response
+p response.code

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-07 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,14 +28,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: uber_config
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uber_config
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: quicky
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: quicky
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -147,6 +147,7 @@ files:
 - test/test_base.rb
 - test/test_performance.rb
 - test/test_rest.rb
+- test/tmp.rb
 homepage: https://github.com/iron-io/rest
 licenses: []
 post_install_message: 
@@ -175,3 +176,4 @@ test_files:
 - test/test_base.rb
 - test/test_performance.rb
 - test/test_rest.rb
+- test/tmp.rb