contentful-management 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1844d46d629774fbe7c768093c7231e16398315a
-  data.tar.gz: a0d6f81a64b1476ded7a6b7b84733da67587f6f0
+  metadata.gz: 0b787e1a5b3f2fe80bbc12f9038fd772c01e8df6
+  data.tar.gz: 235ebb4b563abeafe6509dc2fbffb72ccd6e0005
 SHA512:
-  metadata.gz: 476e62803a1c5c19e19eec87a980cd7e31ea195b432a4e8c2c36bb403cb978632bb8d20fc4e231888456570b76677ab46af1c35792b668cc74040c49208cdb8a
-  data.tar.gz: 4c5c1d5f4f053284c28c250da4fe08dd3ee6d03665380007df353d90c64c641ea0e2afc4b19478952fa38153b41ecff81059360efa04333b3029864c862d7ed5
+  metadata.gz: 980359feab17c1e33be85f684a3a17191dacc9038da4e6186c848ef9c398ba9123895bb5015d784900b3ae2c0f76d92f06406e85120cc9e9a27435e0dd920646
+  data.tar.gz: 8199a7f8698c2ff4201a9e7c82f1becd9e032f6087321a214ec1f158fd29d29282eed49afbd37fd782dd8189946788a66819461b4e1a7a008219414ba1982aad

data/.rubocop_todo.yml

@@ -1,24 +1,24 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-02-01 08:50:00 -0300 using RuboCop version 0.34.2.
+# on 2016-08-25 10:16:28 -0300 using RuboCop version 0.35.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 16
+# Offense count: 12
 Metrics/AbcSize:
-  Max: 50
+  Max: 41
 
 # Offense count: 4
 Metrics/CyclomaticComplexity:
   Max: 10
 
-# Offense count: 21
+# Offense count: 18
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 48
+  Max: 24
 
 # Offense count: 2
 Metrics/PerceivedComplexity:
-  Max: 8
+  Max: 9

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## 1.3.0
+### Added
+* Added Rate Limit automatic handling
+
 ## 1.2.0
 ### Added
 * Add support for `::Contentful::Entry` and `::Contentful::Asset` serialization when using the CDA SDK along side this client [#105](https://github.com/contentful/contentful-management.rb/pull/105)

data/README.md

@@ -734,6 +734,22 @@ client = Contributing::Management::Client.new(
 )
 ```
 
+# Rate Limit Management
+
+With the following configuration options you can handle how rate limits are handled within your applications.
+
+## :max_rate_limit_retries
+
+To increase or decrease the retry attempts after a 429 Rate Limit error. Default value is 1. Using 0 will disable retry behaviour.
+Each retry will be attempted after the value (in seconds) of the `X-Contentful-RateLimit-Reset` header, which contains the amount of seconds until the next
+non rate limited request is available, has passed. This is blocking per execution thread.
+
+## :max_rate_limit_wait
+
+Maximum time to wait for next available request (in seconds). Default value is 60 seconds. Keep in mind that if you hit the houly rate limit maximum, you
+can have up to 60 minutes of blocked requests. It is set to a default of 60 seconds in order to avoid blocking processes for too long, as rate limit retry behaviour
+is blocking per execution thread.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/contentful-management/fork )

data/lib/contentful/management/client.rb

@@ -44,8 +44,12 @@ module Contentful
         proxy_host: nil,
         proxy_port: nil,
         proxy_username: nil,
-        proxy_password: nil
+        proxy_password: nil,
+        max_rate_limit_retries: 1,
+        max_rate_limit_wait: 60
       }
+      # Rate Limit Reset Header Key
+      RATE_LIMIT_RESET_HEADER_KEY = 'x-contentful-ratelimit-reset'
 
       # @param [String] access_token
       # @param [Hash] configuration
@@ -208,17 +212,40 @@ module Contentful
 
       # @private
       def execute_request(request)
+        retries_left = configuration[:max_rate_limit_retries]
         request_url = request.url
         url = request.absolute? ? request_url : base_url + request_url
-        logger.info(request: { url: url, query: request.query, header: request_headers }) if logger
-        raw_response = yield(url)
-        logger.debug(response: raw_response) if logger
-        clear_headers
-        result = Response.new(raw_response, request)
-        fail result.object if result.object.is_a?(Error) && configuration[:raise_errors]
+
+        begin
+          logger.info(request: { url: url, query: request.query, header: request_headers }) if logger
+          raw_response = yield(url)
+          logger.debug(response: raw_response) if logger
+          clear_headers
+          result = Response.new(raw_response, request)
+          fail result.object if result.object.is_a?(Error) && configuration[:raise_errors]
+        rescue Contentful::Management::RateLimitExceeded => rate_limit_error
+          reset_time = rate_limit_error.response.raw[RATE_LIMIT_RESET_HEADER_KEY].to_i
+          if should_retry(retries_left, reset_time, configuration[:max_rate_limit_wait])
+            retries_left -= 1
+            retry_message = 'Contentful Management API Rate Limit Hit! '
+            retry_message += "Retrying - Retries left: #{retries_left}"
+            retry_message += "- Time until reset (seconds): #{reset_time}"
+            logger.info(retry_message) if logger
+            sleep(reset_time * Random.new.rand(1.0..1.2))
+            retry
+          end
+
+          raise
+        end
+
         result
       end
 
+      # @private
+      def should_retry(retries_left, reset_time, max_wait)
+        retries_left > 0 && max_wait > reset_time
+      end
+
       # @private
       def clear_headers
         self.content_type_id = nil

data/lib/contentful/management/version.rb

@@ -3,6 +3,6 @@ module Contentful
   # Management Namespace
   module Management
     # Gem Version
-    VERSION = '1.2.0'
+    VERSION = '1.3.0'
   end
 end

data/spec/fixtures/vcr_cassettes/entry/too_many_requests_retry.yml

@@ -0,0 +1,840 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/286arvy86ry9
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Accept-Ranges:
+      - bytes
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cache-Control:
+      - max-age=0
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:23 GMT
+      Etag:
+      - '"91d2291b87bce2aa62bc5aeadb61793a"'
+      Server:
+      - nginx
+      Status:
+      - 200 OK
+      X-Contentful-Request-Id:
+      - f1c-653450314
+      Content-Length:
+      - '453'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys":{
+            "type":"Space",
+            "id":"286arvy86ry9",
+            "version":1,
+            "createdBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "createdAt":"2014-12-15T08:12:42Z",
+            "updatedBy":{
+              "sys":{
+                "type":"Link",
+                "linkType":"User",
+                "id":"1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "updatedAt":"2014-12-15T08:12:42Z"
+          },
+          "name":"TestingRspec"}
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:23 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/286arvy86ry9/content_types
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - 286arvy86ry9
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:23 GMT
+      Etag:
+      - '"0042a1083a298261f6f010e5e28a8f1f"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '4644'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Array"
+          },
+          "total": 3,
+          "skip": 0,
+          "limit": 100,
+          "items": [
+            {
+              "fields": [
+                {
+                  "name": "text",
+                  "id": "text",
+                  "type": "Text"
+                },
+                {
+                  "name": "number2",
+                  "id": "number2",
+                  "type": "Integer"
+                },
+                {
+                  "name": "entry2",
+                  "id": "entry2",
+                  "type": "Link",
+                  "linkType": "Entry"
+                }
+              ],
+              "name": "Test2",
+              "sys": {
+                "id": "4dsDWisVl6WAAYuk60E4QC",
+                "type": "ContentType",
+                "createdAt": "2014-12-15T08:13:47.342Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "286arvy86ry9"
+                  }
+                },
+                "firstPublishedAt": "2014-12-15T08:14:20.807Z",
+                "publishedCounter": 1,
+                "publishedAt": "2014-12-15T08:14:20.807Z",
+                "publishedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "publishedVersion": 39,
+                "version": 40,
+                "updatedAt": "2014-12-15T08:14:20.852Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              },
+              "description": "test",
+              "displayField": "text"
+            },
+            {
+              "fields": [
+                {
+                  "name": "name",
+                  "id": "name",
+                  "type": "Text"
+                },
+                {
+                  "name": "number",
+                  "id": "number",
+                  "type": "Integer"
+                },
+                {
+                  "name": "entry",
+                  "id": "entry",
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "validations": [
+                    {
+                      "linkContentType": [
+                        "4dsDWisVl6WAAYuk60E4QC"
+                      ]
+                    }
+                  ]
+                }
+              ],
+              "name": "Test1",
+              "sys": {
+                "id": "5lIEiXrCIoKoIKaSW2C8aa",
+                "type": "ContentType",
+                "createdAt": "2014-12-15T08:13:15.767Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "286arvy86ry9"
+                  }
+                },
+                "firstPublishedAt": "2014-12-15T08:13:43.070Z",
+                "publishedCounter": 2,
+                "publishedAt": "2014-12-18T12:02:02.366Z",
+                "publishedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "publishedVersion": 30,
+                "version": 31,
+                "updatedAt": "2014-12-18T12:02:02.409Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              },
+              "description": "test1",
+              "displayField": "name"
+            },
+            {
+              "fields": [
+                {
+                  "name": "name",
+                  "id": "name",
+                  "type": "Text",
+                  "validations": [
+                    {
+                      "size": {
+                        "min": 1,
+                        "max": 2
+                      }
+                    }
+                  ]
+                }
+              ],
+              "name": "Test3",
+              "sys": {
+                "id": "2PqKsSmwKASkM6sWiqMuqi",
+                "type": "ContentType",
+                "createdAt": "2014-12-18T12:01:49.830Z",
+                "createdBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "space": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "Space",
+                    "id": "286arvy86ry9"
+                  }
+                },
+                "firstPublishedAt": "2014-12-18T12:01:59.077Z",
+                "publishedCounter": 2,
+                "publishedAt": "2014-12-18T12:16:31.529Z",
+                "publishedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                },
+                "publishedVersion": 14,
+                "version": 15,
+                "updatedAt": "2014-12-18T12:16:31.576Z",
+                "updatedBy": {
+                  "sys": {
+                    "type": "Link",
+                    "linkType": "User",
+                    "id": "1E7acJL8I5XUXAMHQt9Grs"
+                  }
+                }
+              },
+              "displayField": "name"
+            }
+          ]
+        }
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:23 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/286arvy86ry9/entries/1YNepnMpXGiMWikaKC4GG0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - 286arvy86ry9
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:24 GMT
+      Etag:
+      - '"9458b849a96cdf2ff9d50bffce2300ee"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1105'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "id": "1YNepnMpXGiMWikaKC4GG0",
+            "type": "Entry",
+            "createdAt": "2014-12-18T12:02:39.207Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "286arvy86ry9"
+              }
+            },
+            "contentType": {
+              "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "2PqKsSmwKASkM6sWiqMuqi"
+              }
+            },
+            "firstPublishedAt": "2014-12-18T12:02:49.757Z",
+            "publishedCounter": 1,
+            "publishedAt": "2014-12-18T12:02:49.757Z",
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "publishedVersion": 18,
+            "version": 19,
+            "updatedAt": "2014-12-18T12:02:49.806Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          },
+          "fields": {
+            "name": {
+              "en-US": "Entry Test 3"
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:24 GMT
+- request:
+    method: get
+    uri: https://api.contentful.com/spaces/286arvy86ry9/content_types/5lIEiXrCIoKoIKaSW2C8aa
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - 286arvy86ry9
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:24 GMT
+      Etag:
+      - '"bf0d1213c4389c275fe7d30e0e84631a"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '1378'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "fields": [
+            {
+              "name": "name",
+              "id": "name",
+              "type": "Text"
+            },
+            {
+              "name": "number",
+              "id": "number",
+              "type": "Integer"
+            },
+            {
+              "name": "entry",
+              "id": "entry",
+              "type": "Link",
+              "linkType": "Entry",
+              "validations": [
+                {
+                  "linkContentType": [
+                    "4dsDWisVl6WAAYuk60E4QC"
+                  ]
+                }
+              ]
+            }
+          ],
+          "name": "Test1",
+          "sys": {
+            "id": "5lIEiXrCIoKoIKaSW2C8aa",
+            "type": "ContentType",
+            "createdAt": "2014-12-15T08:13:15.767Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "286arvy86ry9"
+              }
+            },
+            "firstPublishedAt": "2014-12-15T08:13:43.070Z",
+            "publishedCounter": 2,
+            "publishedAt": "2014-12-18T12:02:02.366Z",
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "publishedVersion": 30,
+            "version": 31,
+            "updatedAt": "2014-12-18T12:02:02.409Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          },
+          "description": "test1",
+          "displayField": "name"
+        }
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:25 GMT
+- request:
+    method: post
+    uri: https://api.contentful.com/spaces/286arvy86ry9/entries
+    body:
+      encoding: UTF-8
+      string: '{"fields":{"name":{"en-US":"Create test"},"entry":{"en-US":{"sys":{"type":"Link","linkType":"Entry","id":"1YNepnMpXGiMWikaKC4GG0"}}}}}'
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Content-Type:
+      - 5lIEiXrCIoKoIKaSW2C8aa
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 201
+      message: Created
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Cf-Space-Id:
+      - 286arvy86ry9
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:26 GMT
+      Etag:
+      - '"50fcfbbef32b283c8528932f23a158ec"'
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '979'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "fields": {
+            "name": {
+              "en-US": "Create test"
+            },
+            "entry": {
+              "en-US": {
+                "sys": {
+                  "type": "Link",
+                  "linkType": "Entry",
+                  "id": "1YNepnMpXGiMWikaKC4GG0"
+                }
+              }
+            }
+          },
+          "sys": {
+            "id": "7cMVEy1toAWaMKUYsSAmC4",
+            "type": "Entry",
+            "version": 1,
+            "createdAt": "2014-12-18T12:21:26.306Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "286arvy86ry9"
+              }
+            },
+            "contentType": {
+              "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "5lIEiXrCIoKoIKaSW2C8aa"
+              }
+            },
+            "updatedAt": "2014-12-18T12:21:26.306Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:26 GMT
+- request:
+    method: put
+    uri: https://api.contentful.com/spaces/286arvy86ry9/entries/7cMVEy1toAWaMKUYsSAmC4/published
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContentfulManagementGem/0.5.0
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Version:
+      - '1'
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 429
+      message: Rate Limit Exceeded
+    headers:
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization,X-Contentful-Skip-Transformation
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Expose-Headers:
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Date:
+      - Thu, 18 Dec 2014 12:21:27 GMT
+      Server:
+      - nginx
+      X-Powered-By:
+      - Express
+      Content-Length:
+      - '609'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "type": "Error",
+            "id": "RateLimitExceeded"
+          },
+          "message": "You have exceeded the rate limit of the Organization this Space belongs to by making too many API requests within a short timespan. Please wait a moment before trying the request again.",
+          "details": {
+            "errors": [
+              {
+                "details": "You have exceeded the rate limit of the Organization this Space belongs to by making too many API requests within a short timespan. Please wait a moment before trying the request again."
+              }
+            ]
+          }
+        }
+    http_version: 
+  recorded_at: Thu, 18 Dec 2014 12:21:27 GMT
+- request:
+    method: put
+    uri: https://api.contentful.com/spaces/286arvy86ry9/entries/7cMVEy1toAWaMKUYsSAmC4/published
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - RubyContenfulManagementGem/0.0.1
+      Authorization:
+      - Bearer <ACCESS_TOKEN>
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      X-Contentful-Version:
+      - '30'
+      Content-Length:
+      - '0'
+      Host:
+      - api.contentful.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Wed, 30 Jul 2014 12:49:32 GMT
+      Content-Type:
+      - application/vnd.contentful.management.v1+json
+      Content-Length:
+      - '1449'
+      Connection:
+      - keep-alive
+      X-Powered-By:
+      - Express
+      Cf-Space-Id:
+      - yr5m0jky5hsh
+      Etag:
+      - '"6cbe0348b4d246662423a4d2a905ede2"'
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Headers:
+      - Accept,Accept-Language,Authorization,Cache-Control,Content-Length,Content-Range,Content-Type,DNT,Destination,Expires,If-Match,If-Modified-Since,If-None-Match,Keep-Alive,Last-Modified,Origin,Pragma,Range,User-Agent,X-Http-Method-Override,X-Mx-ReqToken,X-Requested-With,X-Contentful-Version,X-Contentful-Content-Type,X-Contentful-Organization
+      Access-Control-Allow-Methods:
+      - DELETE,GET,HEAD,POST,PUT,OPTIONS
+      "^access-Control-Expose-Headers":
+      - Etag
+      Access-Control-Max-Age:
+      - '1728000'
+    body:
+      encoding: UTF-8
+      string: |
+        {
+          "sys": {
+            "id": "1YNepnMpXGiMWikaKC4GG0",
+            "type": "Entry",
+            "createdAt": "2014-12-18T12:02:39.207Z",
+            "createdBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "space": {
+              "sys": {
+                "type": "Link",
+                "linkType": "Space",
+                "id": "286arvy86ry9"
+              }
+            },
+            "contentType": {
+              "sys": {
+                "type": "Link",
+                "linkType": "ContentType",
+                "id": "2PqKsSmwKASkM6sWiqMuqi"
+              }
+            },
+            "firstPublishedAt": "2014-12-18T12:02:49.757Z",
+            "publishedCounter": 1,
+            "publishedAt": "2014-12-18T12:02:49.757Z",
+            "publishedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            },
+            "publishedVersion": 18,
+            "version": 19,
+            "updatedAt": "2014-12-18T12:02:49.806Z",
+            "updatedBy": {
+              "sys": {
+                "type": "Link",
+                "linkType": "User",
+                "id": "1E7acJL8I5XUXAMHQt9Grs"
+              }
+            }
+          },
+          "fields": {
+            "name": {
+              "en-US": "Entry Test 3"
+            }
+          }
+        }
+    http_version: 
+  recorded_at: Wed, 30 Jul 2014 12:49:32 GMT
+recorded_with: VCR 2.9.2

data/spec/lib/contentful/management/entry_spec.rb

@@ -2,6 +2,19 @@ require 'spec_helper'
 require 'contentful/management/space'
 require 'contentful/management/client'
 
+class RetryLoggerMock < Logger
+  attr_reader :retry_attempts
+
+  def initialize(*)
+    super
+    @retry_attempts = 0
+  end
+
+  def info(message)
+    @retry_attempts += 1 if message.include?('Contentful Management API Rate Limit Hit! Retrying')
+  end
+end
+
 module Contentful
   module Management
     describe Entry do
@@ -253,9 +266,9 @@ module Contentful
         it 'create with all attributes' do
           vcr('entry/create') do
             content_type = client.content_types.find('ene4qtp2sh7u', '5BHZB1vi4ooq4wKcmA8e2c')
-            location = Location.new.tap do |location|
-              location.lat = 22.44
-              location.lon = 33.33
+            location = Location.new.tap do |loc|
+              loc.lat = 22.44
+              loc.lon = 33.33
             end
             file = client.assets.find('ene4qtp2sh7u', '2oNoT3vSAs82SOIQmKe0KG')
             entry_att = subject.find('ene4qtp2sh7u', '60zYC7nY9GcKGiCYwAs4wm')
@@ -411,6 +424,19 @@ module Contentful
           end
         end
 
+        it 'too many requests auto-retry' do
+          vcr('entry/too_many_requests_retry') do
+            logger = RetryLoggerMock.new(STDOUT)
+            space = Client.new(token, raise_errors: true, logger: logger).spaces.find('286arvy86ry9')
+            invalid_entry = space.entries.find('1YNepnMpXGiMWikaKC4GG0')
+            ct = space.content_types.find('5lIEiXrCIoKoIKaSW2C8aa')
+            entry = ct.entries.create(name: 'Create test', entry: invalid_entry)
+            entry.publish
+
+            expect(logger.retry_attempts).to eq 1
+          end
+        end
+
         it 'with just an id' do
           vcr('entry/create_with_just_id') do
             space = client.spaces.find('bbukbffokvih')
@@ -735,9 +761,9 @@ module Contentful
 
         it 'parses all kind of fields' do
 
-          location = Location.new.tap do |location|
-            location.lat = 22.44
-            location.lon = 33.33
+          location = Location.new.tap do |loc|
+            loc.lat = 22.44
+            loc.lon = 33.33
           end
 
           attributes = {

data/spec/spec_helper.rb

@@ -7,3 +7,8 @@ require 'pry'
 require 'rspec/its'
 
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful-management
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Piotr Protas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
@@ -444,6 +444,7 @@ files:
 - spec/fixtures/vcr_cassettes/entry/search_filter/reverse_order_sys_updatedAt.yml
 - spec/fixtures/vcr_cassettes/entry/service_unavailable.yml
 - spec/fixtures/vcr_cassettes/entry/too_many_requests.yml
+- spec/fixtures/vcr_cassettes/entry/too_many_requests_retry.yml
 - spec/fixtures/vcr_cassettes/entry/unarchive.yml
 - spec/fixtures/vcr_cassettes/entry/unarchive_already_unarchived.yml
 - spec/fixtures/vcr_cassettes/entry/unpublish.yml
@@ -562,7 +563,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: contentful management api
@@ -736,6 +737,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/entry/search_filter/reverse_order_sys_updatedAt.yml
 - spec/fixtures/vcr_cassettes/entry/service_unavailable.yml
 - spec/fixtures/vcr_cassettes/entry/too_many_requests.yml
+- spec/fixtures/vcr_cassettes/entry/too_many_requests_retry.yml
 - spec/fixtures/vcr_cassettes/entry/unarchive.yml
 - spec/fixtures/vcr_cassettes/entry/unarchive_already_unarchived.yml
 - spec/fixtures/vcr_cassettes/entry/unpublish.yml