quiz_api_client 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2a00510f91eb1597a6677ddd7db7342293cbead
-  data.tar.gz: c1328d1480d86fa91731d575eadd820038ac51d5
+  metadata.gz: 019fb5be46485bfe51fa89b86e237dd860dde74f
+  data.tar.gz: cb8c846ad17c8c6d54e21e316d0f9bab8ffe17f4
 SHA512:
-  metadata.gz: 1a3445f192bd75c78fdd3f42f46c2d254ab191bbb9e7c805b77da90244072b8d1467d0001af3591187f8257558bb1adb00e4d5e85c4018cbe180b77e33fc3d5e
-  data.tar.gz: 7eb2997e14243ce80868d28995892c7aeb73f85807c16e3e6f98a1017f7dc33365c29199892c3d4fbd95a9669ff434d387cb99e0fd92ef6dfb0a2e501a143a71
+  metadata.gz: c7f0d24d1b650dadf17a88bffc65439b741bc855d4c3d85cf8381d84d3ecb4e6a3832cac96324c7e5b348d1777c596e9fb1afcb496d1d4c1b7bfde8d19a6e473
+  data.tar.gz: 6de74ac09879a9d567de198d6c316ae96548df3f6b15f538bc7cec3ca173ad82f036577dc704d44eb1f76951229f930165180f33a45bc02cd68d8616fcb690c1

data/docker-compose.dev.override.yml

@@ -8,7 +8,7 @@ services:
 
   contracts-testrunner:
     volumes:
-      - .:/app
+      - .:/usr/src/app
       - bundler-config:/home/docker/.rvm/gems/ruby-2.4.0
 
 volumes:

data/lib/quiz_api_client/http_client.rb

@@ -81,14 +81,14 @@ module QuizApiClient
       raise RequestFailed, e.message
     end
 
-    def make_paginated_request(method, url, request_options)
+    def make_paginated_request(method, url, options)
       entities = []
-      request_url = url
+      request_url, request_options = url, options
 
       until request_url.nil? do
         resp = make_request(method, request_url, request_options)
         entities.concat(resp.parsed_response)
-        request_url = next_page(resp)
+        request_url, request_options = next_page(resp, url, options)
       end
       entities
     end
@@ -109,11 +109,27 @@ module QuizApiClient
       initial_hash
     end
 
-    def next_page(response)
-      links = LinkHeader.parse(response.headers['link']).links
+    def next_page(response, url, options)
+      next_page_link(response, options) || next_page_dynamo(response, url, options)
+    end
 
+    def next_page_link(response, options)
+      return unless response.headers['link'].present?
+      links = LinkHeader.parse(response.headers['link']).links
       next_link = links.find { |link| link['rel'] == 'next' }
-      next_link.href if next_link
+      [next_link.href, options] if next_link
+    end
+
+    def next_page_dynamo(response, url, options)
+      hash_key = response.headers['x-last-evaluated-hash-key']
+      range_key = response.headers['x-last-evaluated-range-key']
+      return unless hash_key.present? && range_key.present?
+
+      query = (options[:query] || {}).merge(
+        last_evaluated_hash_key: hash_key,
+        last_evaluated_range_key: range_key
+      )
+      [ url, options.merge(query: query) ]
     end
   end
 end

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '2.4.1'.freeze
+  VERSION = '2.4.2'.freeze
 end

data/quiz_api_client.gemspec

@@ -48,8 +48,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'pact', '~> 1.16.0'
-  spec.add_development_dependency 'pact_broker-client', '~> 1.6.0'
+  spec.add_development_dependency 'pact', '~> 1.19.2'
+  spec.add_development_dependency 'pact_broker-client', '~> 1.13.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Chris Wang
@@ -19,7 +19,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -111,28 +111,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.19.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.19.2
 - !ruby/object:Gem::Dependency
   name: pact_broker-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.13.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.13.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby client for quiz_api