quiz_api_client 4.13.4 → 4.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9c4a3c5a1a9c2363d383f497b8aaccfc1ba1fbde99e6481e911b46f69ff6972
-  data.tar.gz: 4edb45c0ced2efcb9f32c3d7ec1b0376f891dc8d5b9ec336ef61b5a992e30cc5
+  metadata.gz: c7df5e01555ce19ad84445f0287c640e0c2eb9873af3c88a6ad1432162ce228a
+  data.tar.gz: 04d758bf5007880147d0e4316b6d151821b904b0a84db0401b7b53b426d6791f
 SHA512:
-  metadata.gz: 637eb311b402f08c22e4109be5e092366b08ae0fb9d5db049b8e186ad92bb965bb0ef0bff73e97b88096976e2d28148eb94d107d9c8ca9e5cdf1aed17f9bb3c5
-  data.tar.gz: 4bc454f39df1137b2f289bfd7e99217c0c2eff58c43981b26be2bf3802f2d3a1e03ebd0da015ba48a4b8f6858e3a52f450c3b28d8ef255df1686c5965fc0fbae
+  metadata.gz: f4e95a71d9e8853ae5a3ef251b6df743ee36ce1838be1bcdf7ab6675c6e85a800a5cb4a48a7f394b6094d6b9747ea90c5a1ff2942059991bd6a5f69306185043
+  data.tar.gz: 72c177b35fc78f784c0b26fa49d90c92bfc305539528b357e104864cf339cd870202c97710df4ca672e8d9505b96217be73039b313a4bec7bd244bffbd6c3c15

data/lib/quiz_api_client/http_client.rb

@@ -101,7 +101,7 @@ module QuizApiClient
     rescue HTTParty::Error, Errno::ECONNREFUSED, Net::ReadTimeout => e
       raise_error(method, url, current_error: e)
     ensure
-      record_metrics(method, url, resp, start_time, Time.now)
+      record_metrics(method, resp, start_time, Time.now)
     end
 
     def make_paginated_request(method, url, options)
@@ -138,7 +138,8 @@ module QuizApiClient
     end
 
     def next_page_link(response, options)
-      return if response.headers['link'].blank?
+      return if response.headers['link'].nil?
+      return if response.headers['link'].empty?
 
       links = LinkHeader.parse(response.headers['link']).links
       next_link = links.find { |link| link['rel'] == 'next' }
@@ -148,7 +149,9 @@ module QuizApiClient
     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?
+
+      return if hash_key.nil? || hash_key.empty?
+      return if range_key.nil? || range_key.empty?
 
       query = (options[:query] || {}).merge(
         last_evaluated_hash_key: hash_key,
@@ -163,9 +166,9 @@ module QuizApiClient
       failure.raise_error(method, url, response: response, current_error: current_error)
     end
 
-    def record_metrics(method, url, resp, start_time, end_time)
+    def record_metrics(method, resp, start_time, end_time)
       code = resp&.code || 0
-      metrics = QuizApiClient::HttpRequest::Metrics.new(config, method, url, code)
+      metrics = QuizApiClient::HttpRequest::Metrics.new(config, method, code)
 
       metrics.increment
       metrics.duration(start_time, end_time)

data/lib/quiz_api_client/http_request/metrics.rb

@@ -3,13 +3,12 @@ module QuizApiClient
     class Metrics
       extend Forwardable
 
-      attr_reader :config, :method, :url, :code
+      attr_reader :config, :method, :code
       def_delegators :config, :metrics_handler, :metrics_namespace
 
-      def initialize(config, method, url, code)
+      def initialize(config, method, code)
         @config = config
         @method = method
-        @url = url
         @code = code
       end
 
@@ -58,8 +57,7 @@ module QuizApiClient
       def tags
         {
           method: method,
-          status: code,
-          url: url
+          status: code
         }
       end
     end

data/lib/quiz_api_client/services/quiz_clone_jobs_service.rb

@@ -4,6 +4,10 @@ module QuizApiClient::Services
       post_to_quiz_api(body: body, params: params, token: token)
     end
 
+    def update(body: {}, params:, token: nil)
+      put_to_quiz_api(body: body, params: params, token: token)
+    end
+
     def create_batch(body:, token: nil)
       batch_post_to_quiz_api(body: body, token: token)
     end
@@ -17,6 +21,13 @@ module QuizApiClient::Services
       )
     end
 
+    def put_to_quiz_api(body:, params:, token:)
+      client(token: token).put(
+        "/api/quiz_clone_jobs/#{params.fetch(:id)}",
+        body
+      )
+    end
+
     def batch_post_to_quiz_api(body:, token:)
       client(token: token).post(
         '/api/quiz_clone_jobs/create_batch',

data/lib/quiz_api_client/version.rb

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

data/spec/http_client_spec.rb

@@ -41,9 +41,9 @@ describe QuizApiClient::HttpClient do
     mock
   end
 
-  def expect_metrics_calls(config, method, url, code)
+  def expect_metrics_calls(config, method, code)
     expect(QuizApiClient::HttpRequest::Metrics).to receive(:new)
-      .with(config, method, url, code)
+      .with(config, method, code)
       .and_return(mock_metrics(mock_time(10)))
   end
 
@@ -65,7 +65,7 @@ describe QuizApiClient::HttpClient do
     it 'makes a get request' do
       path = '/api/quizzes'
       stub_quiz_api path, query: { sort: 'alpha' }
-      expect_metrics_calls(client.config, :get, url_for_path(path), 200)
+      expect_metrics_calls(client.config, :get, 200)
       response = client.get(path, all: false, query: { sort: 'alpha' })
       expect(response.parsed_response).to eq [1]
     end
@@ -138,7 +138,7 @@ describe QuizApiClient::HttpClient do
         body: { title: 'ohai' }.to_json,
         **default_request_data
       ).and_return(instance_double('HTTParty::Response', success?: true, code: 200))
-      expect_metrics_calls(client.config, :post, url, 200)
+      expect_metrics_calls(client.config, :post, 200)
       client.post('/api/quizzes', title: 'ohai')
     end
   end
@@ -151,7 +151,7 @@ describe QuizApiClient::HttpClient do
         body: { title: 'new title' }.to_json,
         **default_request_data
       ).and_return(instance_double('HTTParty::Response', success?: true, code: 200))
-      expect_metrics_calls(client.config, :patch, url, 200)
+      expect_metrics_calls(client.config, :patch, 200)
       client.patch('/api/quizzes/1', title: 'new title')
     end
   end
@@ -164,7 +164,7 @@ describe QuizApiClient::HttpClient do
         body: { title: 'new title' }.to_json,
         **default_request_data
       ).and_return(instance_double('HTTParty::Response', success?: true, code: 200))
-      expect_metrics_calls(client.config, :put, url, 200)
+      expect_metrics_calls(client.config, :put, 200)
       client.put('/api/quizzes/1', title: 'new title')
     end
   end
@@ -176,7 +176,7 @@ describe QuizApiClient::HttpClient do
         url,
         **default_request_data
       ).and_return(instance_double('HTTParty::Response', success?: true, code: 200))
-      expect_metrics_calls(client.config, :delete, url, 200)
+      expect_metrics_calls(client.config, :delete, 200)
       client.delete('/api/quizzes/1')
     end
   end
@@ -277,7 +277,7 @@ describe QuizApiClient::HttpClient do
           it 'raises error' do
             expect(client).to receive(:successful_response?).with(mock_response).and_return(false)
             expect(client.class).to receive(:get).and_return(mock_response)
-            expect_metrics_calls(client.config, method, url_for_path(path), code)
+            expect_metrics_calls(client.config, method, code)
             expect_raise_error_call(client.config, method, url_for_path(path), mock_response, nil)
             expect { client.get(path, all: false, query: { sort: 'alpha' }) }
               .to raise_error(QuizApiClient::HttpClient::RequestFailed)
@@ -290,7 +290,7 @@ describe QuizApiClient::HttpClient do
           it 'raises error' do
             expect(client).to receive(:successful_response?).with(mock_response).and_return(false)
             expect(client.class).to receive(:post).and_return(mock_response)
-            expect_metrics_calls(client.config, method, url_for_path(path), code)
+            expect_metrics_calls(client.config, method, code)
             expect_raise_error_call(client.config, method, url_for_path(path), mock_response, nil)
             expect { client.post(path) }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
           end
@@ -302,7 +302,7 @@ describe QuizApiClient::HttpClient do
           it 'raises error' do
             expect(client).to receive(:successful_response?).with(mock_response).and_return(false)
             expect(client.class).to receive(:put).and_return(mock_response)
-            expect_metrics_calls(client.config, method, url_for_path(path), code)
+            expect_metrics_calls(client.config, method, code)
             expect_raise_error_call(client.config, method, url_for_path(path), mock_response, nil)
             expect { client.put(path) }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
           end
@@ -314,7 +314,7 @@ describe QuizApiClient::HttpClient do
           it 'raises error' do
             expect(client).to receive(:successful_response?).with(mock_response).and_return(false)
             expect(client.class).to receive(:patch).and_return(mock_response)
-            expect_metrics_calls(client.config, method, url_for_path(path), code)
+            expect_metrics_calls(client.config, method, code)
             expect_raise_error_call(client.config, method, url_for_path(path), mock_response, nil)
             expect { client.patch(path) }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
           end
@@ -326,7 +326,7 @@ describe QuizApiClient::HttpClient do
           it 'raises error' do
             expect(client).to receive(:successful_response?).with(mock_response).and_return(false)
             expect(client.class).to receive(:delete).and_return(mock_response)
-            expect_metrics_calls(client.config, method, url_for_path(path), code)
+            expect_metrics_calls(client.config, method, code)
             expect_raise_error_call(client.config, method, url_for_path(path), mock_response, nil)
             expect { client.delete(path) }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
           end
@@ -348,21 +348,21 @@ describe QuizApiClient::HttpClient do
 
       it 'handles an HTTParty::Error error' do
         stub_request(:get, url).to_raise(HTTParty::Error)
-        expect_metrics_calls(client.config, :get, url_for_path(path), 0)
+        expect_metrics_calls(client.config, :get, 0)
         expect_raise_error_call(client.config, :get, url_for_path(path), nil, kind_of(HTTParty::Error))
         expect { client.get('/') }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
       end
 
       it 'handles an Errno::ECONNREFUSED error' do
         stub_request(:get, url).to_raise(Errno::ECONNREFUSED)
-        expect_metrics_calls(client.config, :get, url_for_path(path), 0)
+        expect_metrics_calls(client.config, :get, 0)
         expect_raise_error_call(client.config, :get, url_for_path(path), nil, kind_of(Errno::ECONNREFUSED))
         expect { client.get('/') }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
       end
 
       it 'handles an Net::ReadTimeout error' do
         stub_request(:get, url).to_raise(Net::ReadTimeout)
-        expect_metrics_calls(client.config, :get, url_for_path(path), 0)
+        expect_metrics_calls(client.config, :get, 0)
         expect_raise_error_call(client.config, :get, url_for_path(path), nil, kind_of(Net::ReadTimeout))
         expect { client.get('/') }.to raise_error(QuizApiClient::HttpClient::RequestFailed)
       end

data/spec/quiz_api_client/http_request/metrics_spec.rb

@@ -3,10 +3,9 @@ require 'inst_statsd'
 describe QuizApiClient::HttpRequest::Metrics do
   let(:config) { QuizApiClient::Config.new }
   let(:method) { 'GET' }
-  let(:url) { 'https://something.com' }
   let(:code) { 200 }
 
-  subject { described_class.new(config, method, url, code) }
+  subject { described_class.new(config, method, code) }
 
   describe '#increment' do
     it 'does nothing when the metrics handler is nil' do
@@ -29,8 +28,7 @@ describe QuizApiClient::HttpRequest::Metrics do
         'fake-namespace.quiz_api_client.request.count',
         tags: {
           method: method,
-          status: code,
-          url: url
+          status: code
         }
       )
 
@@ -64,8 +62,7 @@ describe QuizApiClient::HttpRequest::Metrics do
         duration_in_secs * 1_000,
         tags: {
           method: method,
-          status: code,
-          url: url
+          status: code
         }
       )
 

data/spec/services/quiz_clone_jobs_service_spec.rb

@@ -40,6 +40,43 @@ describe QuizApiClient::Services::QuizCloneJobsService do
     end
   end
 
+  describe '#update' do
+    let(:body) { { resource_map_url: 'http://foo.bar/123' } }
+    let(:params) { { id: 1 } }
+    let(:expected_url) { "https://#{host}/api/quiz_clone_jobs/#{params.fetch(:id)}" }
+    let(:stubbed_response) { { 'id' => '1' } }
+
+    context 'on success' do
+      before do
+        stub_request(:put, expected_url)
+          .to_return(
+            status: 200,
+            body: stubbed_response.to_json,
+            headers: { 'Content-Type' => 'application/json' }
+          )
+      end
+
+      it 'puts to /api/quiz_clone_jobs/:id' do
+        result = subject.update(body: body, params: params, token: 'token')
+        expect(result.parsed_response).to eql(stubbed_response)
+      end
+    end
+
+    context 'on failure' do
+      let(:status_code) { 401 }
+
+      before do
+        stub_request(:put, expected_url)
+          .to_return(status: status_code)
+      end
+
+      it 'returns a response with the correct code' do
+        response = subject.update(body: body, params: params, token: 'token')
+        expect(response.code).to eq(status_code)
+      end
+    end
+  end
+
   describe '#create_batch' do
     let(:expected_url) { "https://#{host}/api/quiz_clone_jobs/create_batch" }
     let(:body) { { quiz_ids: [1, 2] } }

metadata

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