dato 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95b2f3c8bcf22fedf8b578ae80e935c7992a325587592e32e6d8de0eb42d2723
-  data.tar.gz: f0d31b23cf1a1c78a1d229601f88905e6a3e3d1097954d722d7454a402d2e645
+  metadata.gz: 18f6bab733bb56da0e48f7141e919700ecf428d7dafa5e79812bdd01de16c5bc
+  data.tar.gz: 6b2f8b434254f0830c5c7d3e1a729f8752474ddab549e2b1bcc85771f0d0a136
 SHA512:
-  metadata.gz: 5e08e8c062c574e18fb638ed415ab63752230c41a30472ad9c69b82d1d8d8f5eebf905a8a511e0996531ce97c58d39228b9a574e267ff357d2cb8cf64e3f0c17
-  data.tar.gz: 58b5b1c0dc0c0638b6b83e86238eb4b465db65950e4fb6866959b4c16786513a370edb62aa7f2c9f23f26ae2da897aa9743379d475d6b180adff11cb98f26bd5
+  metadata.gz: b8cc64b4cafeed1887cbc481f7e01c89ace6ba1597082b2ae42adf03c2a4ad284db40e920a060bcb9b91f7516b3466f8d8456c0f816ccf29c7d4ae3dc0bf1e84
+  data.tar.gz: e2d408db575c37e60f33c472ce4c6698d4dc115e7c95757a788414d4822ca2dd129a7007f034e6091f554a5d23caf506f0b59113a41c6fc7fa1659d865edd478

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.15
+
+* Handle `429 Too Many Requests` responses from API
+
 # 0.6.12
 
 * Allow empty responses from server

data/lib/dato/api_client.rb

@@ -72,15 +72,43 @@ module Dato
       puts e.message
       raise e
     rescue Faraday::ClientError => e
-      error = ApiError.new(e)
-      puts '===='
-      puts error.message
-      puts '===='
-      raise error
+      if e.response[:status] == 429
+        to_wait = e.response[:headers]['x-ratelimit-reset'].to_i
+        puts "Rate limit exceeded, waiting #{to_wait} seconds..."
+        sleep(to_wait + 1)
+        request(*args)
+      elsif e.response[:status] == 422 && batch_data_validation?(e.response)
+        puts "Validating items, waiting 1 second and retrying..."
+        sleep(1)
+        request(*args)
+      else
+        error = ApiError.new(e)
+        puts "===="
+        puts error.message
+        puts "===="
+        raise error
+      end
     end
 
     private
 
+    def batch_data_validation?(response)
+      body = begin
+               JSON.parse(response[:body])
+             rescue JSON::ParserError => e
+               nil
+             end
+
+      return false unless body
+      return false unless body["data"]
+
+      body["data"].any? do |e|
+        e["attributes"]["code"] == "BATCH_DATA_VALIDATION_IN_PROGRESS"
+      end
+    rescue
+      false
+    end
+
     def connection
       default_headers = {
         'Accept' => 'application/json',

data/lib/dato/json_api_deserializer.rb

@@ -51,13 +51,7 @@ module Dato
     end
 
     def relationships
-      @relationships ||= JsonSchemaRelationships.new(link_relationships).relationships
-    end
-
-    def link_relationships
-      if link.target_schema
-        link.target_schema.properties['data'].properties['relationships']
-      end
+      @relationships ||= JsonSchemaRelationships.new(link.target_schema).relationships
     end
   end
 end

data/lib/dato/json_api_serializer.rb

@@ -106,7 +106,7 @@ module Dato
     end
 
     def relationships
-      @relationships ||= JsonSchemaRelationships.new(link_relationships).relationships
+      @relationships ||= JsonSchemaRelationships.new(link.schema).relationships
     end
 
     def required_relationships

data/lib/dato/json_schema_relationships.rb

@@ -1,15 +1,19 @@
 module Dato
   class JsonSchemaRelationships
-    attr_reader :link
+    attr_reader :schema
 
-    def initialize(link)
-      @link = link
+    def initialize(schema)
+      @schema = schema
     end
 
     def relationships
-      return {} unless link
+      if !schema || !schema.properties['data'] || !schema.properties['data'].properties['relationships']
+        return {}
+      end
+
+      relationships = schema.properties['data'].properties['relationships'].properties
 
-      link.properties.each_with_object({}) do |(relationship, schema), acc|
+      relationships.each_with_object({}) do |(relationship, schema), acc|
         is_collection = schema.properties['data'].type.first == 'array'
 
         types = if is_collection

data/lib/dato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dato
-  VERSION = '0.6.14'
+  VERSION = '0.6.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.6.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler