quiz_api_client 4.13.2 → 4.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3731bc74410110bbb5ebcd49a1810b4609e77a39d0f415a66b2add1c588c83
-  data.tar.gz: c00017a51dd925c73ec1f6a957ba830b2762a1da20ba949ff42090d244188f86
+  metadata.gz: ba3c7ef7577c2eb514a0ba86c804c2b3f98ffcbad90bae29e6a0e505ab987bb4
+  data.tar.gz: 96a6091a6c5b5811bd7776871b9b0af664f3a330306a614f6b0d17662a54c6f9
 SHA512:
-  metadata.gz: 7c0b3d1876135ab671d33a9156d6c56ad7f51103691de92f6a093d91e5f1a1d01c160f5017585572afd88b2bd245df34e043ff8f1e3516b75e87a3e96344bdca
-  data.tar.gz: d41fde3e160e5b9d57b242810ae29657183516e88586f1afb4a0c86f7171ee447603282b43058f3feb7aff8897c06c74cdf2adec23b0dfcdbb54c423a09e12e4
+  metadata.gz: 679f371890c6fa8bbcde89b60f7eaa8bee1e379c666a7fd7e53b6869f69f9e337b45b715a2d469f2fd9f8b2e31aac6b6d7575fddee1e419c1a0b37c87bbb3922
+  data.tar.gz: ebb6c033080207b63e7d3da0d0668057e9b845c95cf43b1ffd70ec8c3da2639c2ae237ef6a1cc36db0a08244d1b92e5c1e69097aecd1c53805e4b7ed7b40009e

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/version.rb

@@ -1,3 +1,3 @@
 module QuizApiClient
-  VERSION = '4.13.2'.freeze
+  VERSION = '4.13.3'.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

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.3
 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-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty