nationbuilder-rb 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5c62829ecbd0990f8fd4860b910df7553ea5c15
-  data.tar.gz: 026d923800c4985952d4a37c389d5bbdfaf96f3a
+  metadata.gz: a2a9e95e72f4cd31b317649c6542b23341ced9d4
+  data.tar.gz: 9151348b994b64949318fe8dd7de00d695c872ff
 SHA512:
-  metadata.gz: d86bd8926ae26c03477dc0259ac064eef739546b4bdc3700470a2e66af61b52b5eb659f95d0bb43b7ff22fb442ee1cd3de2ed52384a5a7e09eedd663773c4fee
-  data.tar.gz: b07d522bf665d40727fa7661d79a7085821a7d225aeeffb90a81a0eb572929341bb79cf2fe04fd19e1c572209516798c184077088babf5e699bc42448d168bb0
+  metadata.gz: 5f36cae292f6a27e6ba670f6afcc04fab0baa13e8e17fa63182338ebce404430c8c192a45ce58cf5db9b048fd5389ac7b2e62b3164c19a4b48a7b4b0ff1fc0f2
+  data.tar.gz: 19b7ba8cb1264bce42ddc1c51898aa93d43c94c9549b3c6fbd06e98deede47316e760c8d1f9fd51fa5494ec746861a3e580e37a68bf7de7cabef28f33885ad93

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.3.2
+- When retrying requests, the request is actually resent instead
+  of just reparsing the response
+- [#12] Raise an error if the last API request retry is rate limited
+
 # 1.3
 - [#10] Support fire_webhooks parameter in client
 

data/README.md

@@ -1,6 +1,6 @@
 # nationbuilder-rb
 
-[![Build Status](https://travis-ci.org/3dna/nationbuilder-rb.svg?branch=master)](https://travis-ci.org/3dna/nationbuilder-rb)
+[![Build Status](https://travis-ci.org/nationbuilder/nationbuilder-rb.svg?branch=master)](https://travis-ci.org/nationbuilder/nationbuilder-rb)
 
 A Ruby client for the NationBuilder API.
 
@@ -15,7 +15,7 @@ $ gem install nationbuilder-rb
 Or, add this to your gemfile:
 
 ```ruby
-gem 'nationbuilder-rb', :require => 'nationbuilder'
+gem 'nationbuilder-rb', require: 'nationbuilder'
 ```
 
 ## Creating a client

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/nationbuilder/client.rb

@@ -75,21 +75,30 @@ class NationBuilder::Client
   end
 
   def perform_request_with_retries(method, url, request_args)
-    raw_response = HTTPClient.send(method, url, request_args)
+    raw_response = nil
     parsed_response = nil
+    exception_to_reraise = nil
 
     (@retries + 1).times do |i|
       begin
+        raw_response = HTTPClient.send(method, url, request_args)
         parsed_response = parse_response_body(raw_response)
-      rescue NationBuilder::RateLimitedError
+      rescue NationBuilder::RateLimitedError => e
+        exception_to_reraise = e
         Kernel.sleep(RETRY_DELAY * 2**i)
       rescue => e
         raise e
       else
+        exception_to_reraise = nil
         break
       end
     end
 
+    # If the retry cycle ended with an error, reraise it
+    if exception_to_reraise
+      raise exception_to_reraise
+    end
+
     set_response(raw_response)
     parsed_response
   end

data/nationbuilder-rb.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: nationbuilder-rb 1.3.1 ruby lib
+# stub: nationbuilder-rb 1.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "nationbuilder-rb"
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["David Huie"]
-  s.date = "2015-04-06"
+  s.date = "2015-04-09"
   s.description = "A Ruby client to the NationBuilder API"
   s.email = "david@nationbuilder.com"
   s.executables = ["nbdoc"]
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/nationbuilder/nationbuilder-rb"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "A Ruby client to the NationBuilder API"
 
   if s.respond_to? :specification_version then

data/spec/nationbuilder_client_spec.rb

@@ -139,11 +139,8 @@ describe NationBuilder::Client do
   end
 
   describe '#perform_request_with_retries' do
-    before do
-      expect(HTTPClient).to receive(:send)
-    end
-
     it 'should raise non-rate limiting execeptions' do
+      expect(HTTPClient).to receive(:send)
       expect(client).to receive(:parse_response_body) { raise StandardError.new('boom') }
       expect do
         client.perform_request_with_retries(nil, nil, nil)
@@ -151,16 +148,37 @@ describe NationBuilder::Client do
     end
 
     it 'should return a response if the rate limit is eventually dropped' do
-      expect(Kernel).to receive(:sleep).twice
+      expect(HTTPClient).to receive(:send).twice
+      expect(Kernel).to receive(:sleep)
+
       allow(client).to receive(:parse_response_body) do
-        @count ||= 0
-        if @count != 2
+        unless @count
+          @count ||= 0
+        else
+          @count += 1
+        end
+
+        if @count < 1
           raise NationBuilder::RateLimitedError.new
         end
       end
+
       expect do
         client.perform_request_with_retries(nil, nil, nil)
       end.to_not raise_error
     end
+
+    it 'on the last retry, it should reraise the rate limiting exception ' do
+      expect(HTTPClient).to receive(:send).twice
+      expect(Kernel).to receive(:sleep).twice
+
+      allow(client).to receive(:parse_response_body) do
+        raise NationBuilder::RateLimitedError.new
+      end
+
+      expect do
+        client.perform_request_with_retries(nil, nil, nil)
+      end.to raise_error(NationBuilder::RateLimitedError)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nationbuilder-rb
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - David Huie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Ruby client to the NationBuilder API