uc3-dmp-external-api 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc43472126bd2936720f2b37ecb45bf7bf239d58be5d409019c5e987ecc6fb97
-  data.tar.gz: '038effb8560029ccf52d2f0cff14d1f66e2d5f5b71803dac1acda924bde76920'
+  metadata.gz: e178888492267ac893548e8da18b84cedd8176aeb53cdba538d062a70c20ad86
+  data.tar.gz: 4ad54d6b09e2b4387166b0cf8cfd4e4ea30f494f06c8359441bde9eca1bff8c8
 SHA512:
-  metadata.gz: e948db4ac6313ecaa44956321cafee5fc81e4bb41283a6574c8f29ae24dbf0e514bd101f790179c1918a171dedff0fb4f319a3f770a9550f6bb66ca360c7f73f
-  data.tar.gz: ff3b42fa26cd7c91b6a214ccfa19d7beb11c70fbdf6a6383d1b7da58762a42c8a4747c85beb3c0b2f8f470179a702be43bf4ff129e317f7e1bca72077f0b465a
+  metadata.gz: eb09f23c248470c64789cef799aec2825f0c710421321710daaa61d864b7868749eb1781bdba2d28cd2377cbb535e6dfcbae561844c3f830647aaee94afe38a5
+  data.tar.gz: 9e9ec1d090510c09b9dbb2086a0875a3ad294b1c9b297d00ec73a19e1f05a9be808add4e79206ac69c3a49154d64accc02197b3370badecf1fc25de75f3baeb4

data/lib/uc3-dmp-external-api/client.rb

@@ -18,11 +18,11 @@ module Uc3DmpExternalApi
     class << self
       # Call the specified URL using the specified HTTP method, body and headers
       # rubocop:disable Metrics/AbcSize
-      def call(url:, method: :get, body: '', additional_headers: {}, debug: false)
+      def call(url:, method: :get, body: '', additional_headers: {}, logger: nil)
         uri = URI(url)
         # Skip the body if we are doing a get
         body = nil if method.to_sym == :get
-        opts = _options(body: body, additional_headers: additional_headers, debug: debug)
+        opts = _options(body: body, additional_headers: additional_headers, logger: logger)
         resp = HTTParty.send(method.to_sym, uri, opts)
 
         if resp.code != 200
@@ -44,10 +44,7 @@ module Uc3DmpExternalApi
       # # Handle the response body based on the Content-Type
       def _process_response(resp:)
         return nil if resp.body.nil? || resp.body.empty?
-
-        mime = resp.headers['content-type']
-        mime = 'application/json' if mime.nil? && (rep.body.start_with?('[') || resp.body.start_with?('{'))
-        return resp.body.to_s unless mime == 'application/json'
+        return resp.body.to_s unless resp.headers.fetch('content-type', '').include?('application/json')
 
         JSON.parse(resp.body)
       end
@@ -65,7 +62,7 @@ module Uc3DmpExternalApi
       end
 
       # Prepare the HTTParty gem options
-      def _options(body:, additional_headers: {}, debug: false)
+      def _options(body:, additional_headers: {}, logger: nil)
         hdrs = _headers(additional_headers: additional_headers)
         opts = {
           headers: hdrs,
@@ -75,7 +72,7 @@ module Uc3DmpExternalApi
         # If the body is not already JSON and we intend to send JSON, convert it
         opts[:body] = body.is_a?(Hash) && hdrs['Content-Type'] == 'application/json' ? body.to_json : body
         # If debug is enabled then tap into the HTTParty gem's debug option
-        opts[:debug_output] = $stdout if debug
+        opts[:debug_output] = $stdout if logger&.level == 'debug'
         opts
       end
     end

data/lib/uc3-dmp-external-api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpExternalApi
-  VERSION = '0.0.7'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-external-api
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Brian Riley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-04 00:00:00.000000000 Z
+date: 2023-07-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: active_record_simple_execute
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
   requirement: !ruby/object:Gem::Requirement