quiz_api_client 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1e14b9c229985dd69bc7284699715cda82025d
-  data.tar.gz: 30b5c1d20b6f340594c10bd33c1cef01fe9266ea
+  metadata.gz: 70e713b4e5b2500e94c9b5a2c3d37a199cbe217f
+  data.tar.gz: 23d8d25b11174dd9b62073be217bcf3ba446f378
 SHA512:
-  metadata.gz: 06cdb297c1abf092b5f6da8c4f374515e9bf46e9f6006754aefb0451ad4225f3e795cfc8dab91ef627a58712daa3e1a9e516d4539a2799aaa01a21126754b87d
-  data.tar.gz: bc41f42733af1782ee302603f340b370756dc93581e4f3ec2fd1a79236e096d3503a7ac27b2c0ce9830057a9b4804e71c5f757bffabc3673ba9c1b49755d8f62
+  metadata.gz: 1432971a3e6b77b29e10cabb6336076e8d714fcbe030b1722d9f2c04d76f9e5ad4d96048c325a5f28e432db917bd31cee8d6179995222a52784448ab309d5b2d
+  data.tar.gz: 20ab1c0813f2bf9a9be32f3132f333a1ecf9144669461a2e68ebcd873010fdd714925a1ada23036e70e27749fcd696fde0553b8038d5a30863f9ae14e5529154

data/build.sh

@@ -5,7 +5,8 @@ set -ex
 function save_pact_files_to_s3()
 {
   echo "Saving pact files to S3..."
-  aws s3 cp pacts s3://ci-asset-cache/pacts/${JOB_NAME} --recursive --only-show-errors --region us-east-1
+  folder=${1:-latest}
+  aws s3 cp pacts s3://ci-asset-cache/pacts/${JOB_NAME}/${folder} --recursive --only-show-errors --region us-east-1
 }
 
 function cleanup() {
@@ -28,4 +29,6 @@ docker-compose run --name contracts -T contracts-testrunner bundle exec rspec sp
 docker cp contracts:/usr/src/app/pacts .
 docker cp contracts:/usr/src/app/log .
 
-save_pact_files_to_s3
+if [[ "${GERRIT_EVENT_TYPE}" == "change-merged" ]]; then
+  save_pact_files_to_s3
+fi

data/lib/quiz_api_client/http_client.rb

@@ -11,47 +11,67 @@ module QuizApiClient
       @jwt = jwt
     end
 
-    def get(path, query = {})
-      make_request :get, path, options(query: query)
+    def get(path, all: false, query: {})
+      return make_request :get, path, query: query unless all
+      make_paginated_request :get, path, query: query
     end
 
     def post(path, body = {})
-      make_request :post, path, options(body: body.to_json)
+      make_request :post, path, body: body.to_json
     end
 
     def patch(path, body = {})
-      make_request :patch, path, options(body: body.to_json)
+      make_request :patch, path, body: body.to_json
     end
 
     def put(path, body = {})
-      make_request :put, path, options(body: body.to_json)
+      make_request :put, path, body: body.to_json
     end
 
     def delete(path)
-      make_request :delete, path, options
+      make_request :delete, path
     end
 
     private
 
-    def make_request(method, path, options)
+    def make_request(method, path, request_options = {})
       self.class.send(
         method,
         "#{uri}#{path}",
-        options
+        default_request_data.merge(request_options)
       )
     rescue HTTParty::Error, Errno::ECONNREFUSED, Net::ReadTimeout => e
       raise RequestFailed, e.message
     end
 
-    def options(opts = {})
-      { headers: headers }.merge(opts)
+    def make_paginated_request(method, path, request_options)
+      entities = []
+      request_path = path
+
+      until request_path.nil? do
+        resp = make_request(method, request_path, request_options)
+        entities.concat(resp.parsed_response)
+        request_path = next_page(resp)
+      end
+      entities
+    end
+
+    def default_request_data
+      {
+        headers: {
+          'Authorization' => jwt,
+          'AuthType' => 'Signature',
+          'Accept' => 'application/json',
+          'Content-Type' => 'application/json'
+        }
+      }
     end
 
-    def headers
-      { 'Authorization' => jwt,
-        'AuthType' => 'Signature',
-        'Accept' => 'application/json',
-        'Content-Type' => 'application/json' }
+    def next_page(response)
+      links = LinkHeader.parse(response.headers['link']).links
+
+      next_link = links.find { |link| link['rel'] == 'next' }
+      next_link.href if next_link
     end
   end
 end

data/lib/quiz_api_client/services/item_analyses_service.rb

@@ -1,18 +1,17 @@
 module QuizApiClient::Services
   class ItemAnalysesService < BaseApiService
-    def list(params:, token: nil)
+    def list(params:, token: nil, all: false)
       raise 'Quiz Id Required' unless params.key?(:quiz_id)
       client(token: token).get(
         "/api/quizzes/#{params[:quiz_id]}/stats/item_analyses",
-        {}
+        all: all
       )
     end
 
     def get(params:, token: nil)
       raise 'Quiz Id and Item Id are Required' unless params.key?(:id) && params.key?(:quiz_id)
       client(token: token).get(
-        "/api/quizzes/#{params[:quiz_id]}/stats/item_analyses/#{params[:id]}",
-        {}
+        "/api/quizzes/#{params[:quiz_id]}/stats/item_analyses/#{params[:id]}"
       )
     end
   end

data/lib/quiz_api_client/services/qti_imports_service.rb

@@ -10,7 +10,7 @@ module QuizApiClient::Services
     def post_to_quiz_api(params:, token:)
       client(token: token).post(
         "/api/quizzes/#{params[:quiz_id]}/qti_imports",
-        qti_import: params
+        query: { qti_import: params }
       )
     end
   end

data/lib/quiz_api_client/services/quiz_analyses_service.rb

@@ -9,8 +9,7 @@ module QuizApiClient::Services
 
     def get_from_quiz_api(params:, token:)
       client(token: token).get(
-        "/api/quizzes/#{params[:quiz_id]}/stats/quiz_analysis",
-        {}
+        "/api/quizzes/#{params[:quiz_id]}/stats/quiz_analysis"
       )
     end
   end

data/lib/quiz_api_client/services/quiz_entries_service.rb

@@ -1,15 +1,16 @@
 module QuizApiClient::Services
   class QuizEntriesService < BaseApiService
-    def list(params:, token: nil)
+    def list(params:, token: nil, all: false)
       raise 'Quiz Id Required' unless params && params[:id]
-      get_from_quiz_api(params: params, token: token)
+      get_from_quiz_api(params: params, token: token, all: all)
     end
 
     private
 
-    def get_from_quiz_api(params:, token:)
+    def get_from_quiz_api(params:, token:, all:)
       client(token: token).get(
-        "/api/quizzes/#{params[:id]}/quiz_entries"
+        "/api/quizzes/#{params[:id]}/quiz_entries",
+        all: all
       )
     end
   end

data/lib/quiz_api_client/services/quiz_session_events_service.rb

@@ -1,16 +1,16 @@
 module QuizApiClient::Services
   class QuizSessionEventsService < BaseApiService
-    def list(params:, token: nil)
+    def list(params:, token: nil, all: false)
       raise 'Quiz Session Id Required' unless params.key?(:quiz_session_id)
-      get_from_quiz_api(params: params, token: token)
+      get_from_quiz_api(params: params, token: token, all: all)
     end
 
     private
 
-    def get_from_quiz_api(params:, token:)
+    def get_from_quiz_api(params:, token:, all:)
       client(token: token).get(
         "/api/quiz_sessions/#{params[:quiz_session_id]}/quiz_session_events",
-        {}
+        all: all
       )
     end
   end

data/lib/quiz_api_client/services/quizzes_service.rb

@@ -4,8 +4,8 @@ module QuizApiClient::Services
       post_to_quiz_api(params: params, token: token)
     end
 
-    def list(params:, token: nil)
-      get_from_quiz_api(params: params, token: token)
+    def list(params:, token: nil, all: false)
+      get_from_quiz_api(params: params, token: token, all: all)
     end
 
     private
@@ -17,10 +17,11 @@ module QuizApiClient::Services
       )
     end
 
-    def get_from_quiz_api(params:, token:)
+    def get_from_quiz_api(params:, token:, all:)
       client(token: token).get(
         '/api/quizzes',
-        params
+        all: all,
+        query: params
       )
     end
   end

data/lib/quiz_api_client/services/session_item_results_service.rb

@@ -1,16 +1,17 @@
 module QuizApiClient::Services
   class SessionItemResultsService < BaseApiService
-    def list(params:, token: nil)
+    def list(params:, token: nil, all: false)
       raise 'QuizSession Id Required' unless params && params[:quiz_session_id]
       raise 'QuizSessionResult Id Required' unless params && params[:quiz_session_result_id]
-      get_from_quiz_api(params: params, token: token)
+      get_from_quiz_api(params: params, token: token, all: all)
     end
 
     private
 
-    def get_from_quiz_api(params:, token:)
+    def get_from_quiz_api(params:, token:, all:)
       client(token: token).get(
-        "/api/quiz_sessions/#{params[:quiz_session_id]}/results/#{params[:quiz_session_result_id]}/session_item_results"
+        "/api/quiz_sessions/#{params[:quiz_session_id]}/results/#{params[:quiz_session_result_id]}/session_item_results",
+        all: all
       )
     end
   end

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/quiz_api_client.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'httparty', '0.14.0'
   spec.add_dependency 'jwt'
+  spec.add_dependency 'link_header'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'simplecov'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Chris Wang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: link_header
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement