esa 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd1ffc2820c7403537f4bb3a6297e1d10e35001
-  data.tar.gz: 2ed3370fa2fa196c62a902c54e2dbfc2b75795ce
+  metadata.gz: e539e9e9dd98be681d769ee35e195c2521953f88
+  data.tar.gz: 00565e222da28955c9a003da10cd3c1eb32ef437
 SHA512:
-  metadata.gz: 2d06a51e5e1d2b19e074d4eb49ab466ca87b960343e654392c465b137bcb05075c53578796179845b220fa86774072ae58158926a3d44ff257ba3f3bb2b658be
-  data.tar.gz: f6784daa050a78c64cb46190b2e1db9a60a960d9ee2a1c80baf4b7ddddd106e464a6067bc5d1c2fbe10d86e45a139e2130435938852106f50cd6e788edc02324
+  metadata.gz: a591ef1455f940ef94d2bfa2cb67bffe4fc9b746d12542b325cfd62fad072689e798a49f7449f4b0e0d081d9c8438b6ca12ca0a2c2cf14c5f067e3bcde9f6243
+  data.tar.gz: f1dd8a14cd8313c0c8e1bb89a6633cbcb35f7a7caddf4b98e34f3a6957d85a2f02ce0c7003408248de44e0203aaa94ed33030b8dc0bf60949ab8e255ca1ae088

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.13.0 (2017-11-01)
+- **changed**: [Retry on rate limit exceeded by default](https://github.com/esaio/esa-ruby/pull/31)
+  - Use `Esa::Client.new(retry_on_rate_limit_exceeded: false, ...)` for previous behavior.
+- doc: [Fixed README typo](https://github.com/esaio/esa-ruby/pull/30)
+
 ## 1.12.0 (2017-10-03)
 - add: [Support /api/v1/comments API by ppworks · Pull Request #29 · esaio/esa-ruby](https://github.com/esaio/esa-ruby/pull/29)
 

data/README.md

@@ -132,7 +132,7 @@ client.batch_move_category(from: '/esa/', to: '/tori/piyo/')
 client.tags
 #=> GET /v1/teams/foobar/tags
 
-# Infitation API
+# Invitation API
 client.invitation
 #=> GET /v1/teams/foobar/invitation
 

data/lib/esa/client.rb

@@ -4,14 +4,18 @@ require "esa/response"
 
 module Esa
   class Client
+    class TooManyRequestError < StandardError; end
+
     include ApiMethods
 
-    def initialize(access_token: nil, api_endpoint: nil, current_team: nil)
+    def initialize(access_token: nil, api_endpoint: nil, current_team: nil, retry_on_rate_limit_exceeded: true)
       @access_token = access_token
       @api_endpoint = api_endpoint
       @current_team = current_team
+
+      @retry_on_rate_limit_exceeded = retry_on_rate_limit_exceeded
     end
-    attr_accessor :current_team
+    attr_accessor :current_team, :retry_on_rate_limit_exceeded
 
     def current_team!
       raise TeamNotSpecifiedError, "current_team is not specified" unless @current_team
@@ -39,7 +43,14 @@ module Esa
     end
 
     def send_request(method, path, params = nil, headers = nil)
-      Esa::Response.new(esa_connection.send(method, path, params, headers))
+      response = esa_connection.send(method, path, params, headers)
+      raise TooManyRequestError if retry_on_rate_limit_exceeded && response.status == 429 # too_many_requests
+      Esa::Response.new(response)
+    rescue TooManyRequestError
+      wait_sec = response.headers['retry-after'].to_i
+      puts "Rate limit exceeded: will retry after #{wait_sec} seconds."
+      wait_for(wait_sec)
+      retry
     end
 
     def send_s3_request(method, path, params = nil, headers = nil)
@@ -101,5 +112,15 @@ module Esa
     def faraday_url
       @api_endpoint || ENV["ESA_API_ENDPOINT"] || "https://api.esa.io"
     end
+
+    def wait_for(wait_sec)
+      return if wait_sec <= 0
+
+      (wait_sec / 10).times do
+        print '.'
+        sleep 10
+      end
+      puts
+    end
   end
 end

data/lib/esa/version.rb

@@ -1,3 +1,3 @@
 module Esa
-  VERSION = '1.12.0'
+  VERSION = '1.13.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esa
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-03 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday