squake 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9998b15ce76aa8dbc8be90d10591fcc590a6371f49ff5f18782ce77081ff1420
-  data.tar.gz: 68b42dec21a0f57f64b1fd12b1a206496cd7b0e2c2aefccb75d3890914865f2a
+  metadata.gz: f0a27760d58eb232e2a38bc0fe9fca78576aa9c47531697af30e94ddcf32727d
+  data.tar.gz: 13e3f50d2b597c753ac91a088eb1c36e756ccb18b8acdf4dce936e9851cca9fd
 SHA512:
-  metadata.gz: 20b305cc676a3fce372ca814206a4299b173ae9560115f582dd957abd2387b3d8defd44f254ec5a835a94e1eb6e366fe7c23ecb9bf5c71edc360ee92268ebb05
-  data.tar.gz: ef97791c2cfb0bddde5cc0e15eca9e5d2055d24daceffee4e77473d3595bb4fa5f1ee5eeb6430580b7da2efdc0a610763f5d75bcee65010d727a04774706ade0
+  metadata.gz: 257eb22823b5d8b47109e00dbf47e76e6becbc18ece39a18cbfa74437c6c5e5a08ba77bff90a9cbc6467fc548619632f9b197435cd9918c7feb583fe90141f06
+  data.tar.gz: f70d1d24c37b130f4e93705b88d81fbccd0090d9df2770735ae193be7c1022e9332a92efb69dfc5482b1232917eeea041df8690c8bc14838097fbfc228314a6e

data/lib/squake/client.rb

@@ -68,7 +68,7 @@ module Squake
 
       headers = request_headers(api_key).merge!(headers)
       query = query_params ? Util.encode_parameters(query_params) : nil
-      body = body_params ? ::Oj.dump(body_params) : nil
+      body = body_params ? ::Oj.dump(body_params, Squake::OJ_CONFIG) : nil
       sanitized_path = path[0] == '/' ? path : "/#{path}"
       uri = URI.parse(api_base + sanitized_path)
 
@@ -93,6 +93,7 @@ module Squake
           'http.route': request.path,
           'http.headers': request.to_hash,
         },
+        Squake::OJ_CONFIG,
       )
       canonical_request_line.gsub!(api_key, 'API_KEY_REDACTED')
       @config.logger.info(canonical_request_line)
@@ -118,7 +119,7 @@ module Squake
 
     sig { params(result_body: T.untyped).returns(JsonResponseBody) }
     private def try_parse_json(result_body)
-      ::Oj.load(result_body, symbol_keys: true)
+      ::Oj.load(result_body, Squake::OJ_CONFIG)
     rescue ::Oj::ParseError, TypeError, JSON::ParserError, EncodingError => e
       # in case of an error, Squake's response body is HTML not JSON
       { error: { 'message' => e.message, 'body' => result_body } }

data/lib/squake/response.rb

@@ -1,6 +1,7 @@
 # typed: strict
 # frozen_string_literal: true
 
+require_relative 'client'
 require 'oj'
 
 module Squake
@@ -36,7 +37,7 @@ module Squake
       <<~TXT
         Failed Request
           http_code=#{code}
-          body=#{::Oj.dump(body)}
+          body=#{::Oj.dump(body, Squake::OJ_CONFIG)}
           original_request_http_method=#{original_request.method}
           original_request_http_path=#{original_request.path}
       TXT

data/lib/squake/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Squake
-  VERSION = '0.6.0'
+  VERSION = '0.6.2'
 end

data/lib/squake.rb

@@ -3,16 +3,24 @@
 
 require 'sorbet-runtime'
 require 'oj'
+require 'uri'
 require 'net/http'
 
-Oj.default_options = {
-  mode: :compat, # required to dump hashes with symbol-keys
-  symbol_keys: true,
-}
-
-Dir[File.join(__dir__, './**/*', '*.rb')].each { require(_1) }
+Dir[File.join(__dir__, './**/*', '*.rb')].each { |file_path| require(file_path) }
 
 module Squake
+  # Don't freeze this constant, since we don't know what Oj is doing with the object under the hood
+  # Don't set this as global Oj settings to avoid bleeding into other apps that build on this gem
+  # rubocop:disable Style/MutableConstant
+  OJ_CONFIG = T.let(
+    {
+      mode: :compat, # required to dump hashes with symbol-keys
+      symbol_keys: true,
+    },
+    T::Hash[Symbol, T.untyped],
+  )
+  # rubocop:enable Style/MutableConstant
+
   class << self
     extend T::Sig
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squake
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - SQUAKE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet
+  name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet-runtime
+  name: uri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The industry solution for sustainable travel and logistics.