rest 2.0.0 → 2.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rest (1.2.2)
+    rest (2.0.0)
       net-http-persistent
       rest-client (>= 0.3.0)
 

data/lib/rest/client.rb

@@ -87,11 +87,13 @@ module Rest
       current_retry = 0
       current_follow = 0
       success = false
+      tries = 0
       res = nil
       while current_retry < max_retries && current_follow < max_follows do
+        tries += 1
         begin
           res = yield blk
-          res.tries = current_retry + 1
+          res.tries = tries
           if res.code >= 300 && res.code < 400
             # try new location
             #p res.headers
@@ -113,6 +115,8 @@ module Rest
           break
         rescue Rest::HttpError => ex
           if ex.code == 503
+            raise ex if current_retry == max_retries - 1
+
             pow = (4 ** (current_retry)) * 100 # milliseconds
                                                #puts 'pow=' + pow.to_s
             s = Random.rand * pow

data/lib/rest/version.rb

@@ -1,3 +1,3 @@
 module Rest
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/rest/wrappers/net_http_persistent_wrapper.rb

@@ -36,6 +36,7 @@ module Rest
       def initialize(client)
         @client = client
         @http = Net::HTTP::Persistent.new 'rest_gem'
+        @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
       def default_headers

data/test/test_performance.rb

@@ -14,7 +14,7 @@ class TestPerformance < TestBase
   def test_get_performance
     puts 'test_get_performance'
 
-    times = 100
+    times = 20
 
     quicky = Quicky::Timer.new
 

data/test/test_rest.rb

@@ -25,9 +25,25 @@ class TestRest < TestBase
     response = @rest.get("http://rest-test.iron.io/code/503?switch_after=3&switch_to=200")
     p response
     p response.code
-    p response.tries == 3
+    assert response.tries == 3
     assert response.code == 200
 
+    # Now let's try to error out
+    begin
+      response = @rest.get("http://rest-test.iron.io/code/503")
+      assert false, "shouldn't get here"
+    rescue Rest::HttpError => ex
+      puts "EX: " + ex.inspect
+      p ex.backtrace
+      assert ex.is_a?(Rest::HttpError)
+      assert ex.response
+      assert ex.response.body
+      assert ex.code == 503
+      #assert ex.response.tries == 5 # the default max
+      assert ex.response.body.include?("503")
+      assert ex.to_s.include?("503")
+    end
+
   end
 
   def test_gets
@@ -98,6 +114,7 @@ class TestRest < TestBase
     end
   end
 
+
   def test_post_with_headers
 
     @token = "abctoken"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-10 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client