quiz_api_client 4.13.2 → 4.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3731bc74410110bbb5ebcd49a1810b4609e77a39d0f415a66b2add1c588c83
-  data.tar.gz: c00017a51dd925c73ec1f6a957ba830b2762a1da20ba949ff42090d244188f86
+  metadata.gz: f9c4a3c5a1a9c2363d383f497b8aaccfc1ba1fbde99e6481e911b46f69ff6972
+  data.tar.gz: 4edb45c0ced2efcb9f32c3d7ec1b0376f891dc8d5b9ec336ef61b5a992e30cc5
 SHA512:
-  metadata.gz: 7c0b3d1876135ab671d33a9156d6c56ad7f51103691de92f6a093d91e5f1a1d01c160f5017585572afd88b2bd245df34e043ff8f1e3516b75e87a3e96344bdca
-  data.tar.gz: d41fde3e160e5b9d57b242810ae29657183516e88586f1afb4a0c86f7171ee447603282b43058f3feb7aff8897c06c74cdf2adec23b0dfcdbb54c423a09e12e4
+  metadata.gz: 637eb311b402f08c22e4109be5e092366b08ae0fb9d5db049b8e186ad92bb965bb0ef0bff73e97b88096976e2d28148eb94d107d9c8ca9e5cdf1aed17f9bb3c5
+  data.tar.gz: 4bc454f39df1137b2f289bfd7e99217c0c2eff58c43981b26be2bf3802f2d3a1e03ebd0da015ba48a4b8f6858e3a52f450c3b28d8ef255df1686c5965fc0fbae

data/lib/quiz_api_client/http_client.rb

@@ -31,7 +31,7 @@ module QuizApiClient
     def get(path, all: false, query: {})
       return make_request :get, url_for(path), query: query unless all
 
-      make_paginated_request :get, url_for(path), query: query
+      make_paginated_request :get, url_for(path), query: sanitized_query(query, all)
     end
 
     def post(path, body = {})
@@ -52,6 +52,14 @@ module QuizApiClient
 
     private
 
+    def sanitized_query(query, all)
+      query.delete(:page) if query.key?(:page) && query[:page].nil? || all
+
+      query.delete(:per_page) if query.key?(:per_page) && query[:per_page].nil?
+
+      query
+    end
+
     def initialize_logger(log_level)
       HTTParty::Logger.add_formatter('quiz_api_client_json_formatter', QuizApiClient::JSONFormatter)
       @logger = ::Logger.new(

data/lib/quiz_api_client/services/quiz_session_service.rb

@@ -7,7 +7,10 @@ module QuizApiClient::Services
     def show(params:, token: nil)
       raise 'Quiz Session Id Required' unless params && params[:id]
 
-      get_from_quiz_api(params: params, token: token)
+      access_code_params = {
+        disable_ac_invalidation: params.delete(:disable_ac_invalidation)
+      }.compact
+      get_from_quiz_api(params: params, token: token, access_code_params: access_code_params)
     end
 
     private
@@ -19,9 +22,10 @@ module QuizApiClient::Services
       )
     end
 
-    def get_from_quiz_api(params:, token:)
+    def get_from_quiz_api(params:, token:, access_code_params:)
       client(token: token).get(
-        "/api/quiz_sessions/#{params[:id]}"
+        "/api/quiz_sessions/#{params[:id]}",
+        query: access_code_params
       )
     end
   end

data/lib/quiz_api_client/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '4.13.2'.freeze
+  VERSION = '4.13.4'.freeze
 end

data/spec/http_client_spec.rb

@@ -81,7 +81,17 @@ describe QuizApiClient::HttpClient do
           path = '/api/quizzes'
           stub_quiz_api path, headers: { link: link_header(path, 1, 2) }
           stub_quiz_api path, item: 2, query: { page: 2 }, headers: { link: link_header(path, 2, 2) }
-          expect(client.get('/api/quizzes', all: true)).to eq [1, 2]
+          expect(client.get('/api/quizzes', query: { page: 2 }, all: true)).to eq [1, 2]
+        end
+
+        it 'sanitizies the query param if page is nil' do
+          stub_quiz_api '/api/quizzes'
+          expect(client.get('/api/quizzes', query: { page: nil }, all: true)).to eq [1]
+        end
+
+        it 'sanitizies the query param if per_page is nil' do
+          stub_quiz_api '/api/quizzes'
+          expect(client.get('/api/quizzes', query: { per_page: nil }, all: true)).to eq [1]
         end
       end
 
@@ -102,6 +112,20 @@ describe QuizApiClient::HttpClient do
           stub_quiz_api path, item: 2, query: { my_id: 12, **dynamo_params }
           expect(client.get('/api/quizzes', query: { my_id: 12 }, all: true)).to eq [1, 2]
         end
+
+        it 'retrieves subsequent pages when all is true and sanitizes query if page is nil' do
+          path = '/api/quizzes'
+          stub_quiz_api path, query: { my_id: 12 }, headers: dynamo_headers
+          stub_quiz_api path, item: 2, query: { my_id: 12, **dynamo_params }
+          expect(client.get('/api/quizzes', query: { my_id: 12, page: nil }, all: true)).to eq [1, 2]
+        end
+
+        it 'retrieves subsequent pages when all is true and sanitizes query if per_page is nil' do
+          path = '/api/quizzes'
+          stub_quiz_api path, query: { my_id: 12 }, headers: dynamo_headers
+          stub_quiz_api path, item: 2, query: { my_id: 12, **dynamo_params }
+          expect(client.get('/api/quizzes', query: { my_id: 12, per_page: nil }, all: true)).to eq [1, 2]
+        end
       end
     end
   end

data/spec/services/quiz_session_service_spec.rb

@@ -45,5 +45,26 @@ describe QuizApiClient::Services::QuizSessionService do
       response = subject.show(params: params, token: 'token')
       expect(response.parsed_response).to eql(stubbed_response)
     end
+
+    context 'when the query param "disable_ac_invalidation" is given' do
+      let(:params) { { id: 1, disable_ac_invalidation: true } }
+      let(:stubbed_response) { { 'id' => 1, 'time_limit_seconds' => 10 } }
+      let(:expected_url) { "https://#{host}/api/quiz_sessions/#{params[:id]}?disable_ac_invalidation=true" }
+      let(:status_code) { 200 }
+
+      before do
+        stub_request(:get, expected_url)
+          .to_return(
+            status: status_code,
+            body: stubbed_response.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'gets from quiz_api/api/quiz_sessions and returns the response' do
+        response = subject.show(params: params, token: 'token')
+        expect(response.parsed_response).to eql(stubbed_response)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quiz_api_client
 version: !ruby/object:Gem::Version
-  version: 4.13.2
+  version: 4.13.4
 platform: ruby
 authors:
 - Alex Slaughter
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty