terminal-shop 0.1.0.pre.alpha.13 → 0.1.0.pre.alpha.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d0377b351b29fd528cf8cfac1ca0709534478162601101eff9c1cec288167ac
-  data.tar.gz: 9d0178a0d2193ebf30b3d87b056e9958de8f70921088c6877ac1b40c59537a2c
+  metadata.gz: 4a3091f60527a7010ac8c95c545b0d74fdf801d4275fc573515a720cbe178fe8
+  data.tar.gz: 25cef1faf2a04c0aaf4695e8c9c5ac03b51006cb69e119efa6ffd8c8967080c0
 SHA512:
-  metadata.gz: d47c80cc764a70c4d04ce0ec5f0f82c7a374976334608d0bc2579cf58db62637f0c3def0a701756aef8b81817a840c78e7e6236cc52b48e81921fbd537ddf1c0
-  data.tar.gz: 0daab830e1738889aa702da0b82b02b9bc5750c0b36dc7bf0e7a6c932e4430926b29047e038a335c3a3fc199b0547bd9f045e4d57b4fff7edd4370ad51896b7a
+  metadata.gz: 31a440c12cd9f04c420d2baccb9d31f592d66cec2ad7bba4b240543cfd07ce5bb3a8155499154f835b13b95e737d2a70ac3fabfad3e30b3721ec7fe306124911
+  data.tar.gz: 0c9d51f4b0e74fd05220865b119d4a9e7f23270eafee16348fc2f5ae0369f1dc89131e19607185817f3f1dfa75d34a308728ad97b2ba15d4e3c2db82352a6e19

data/README.md

@@ -3,7 +3,7 @@
 The Terminal Ruby library provides convenient access to the Terminal REST API from any Ruby 3.0.0+
 application.
 
-It is generated with [Stainless](https://www.stainlessapi.com/).
+It is generated with [Stainless](https://www.stainless.com/).
 
 ## Documentation
 

data/lib/terminal-shop/base_client.rb

@@ -90,15 +90,13 @@ module TerminalShop
       def follow_redirect(request, status:, response_headers:)
         method, url, headers = request.fetch_values(:method, :url, :headers)
         location =
-          TerminalShop::Util.suppress(ArgumentError) do
+          Kernel.then do
             URI.join(url, response_headers["location"])
+          rescue ArgumentError
+            message = "Server responded with status #{status} but no valid location header."
+            raise TerminalShop::APIConnectionError.new(url: url, message: message)
           end
 
-        unless location
-          message = "Server responded with status #{status} but no valid location header."
-          raise TerminalShop::APIConnectionError.new(url: url, message: message)
-        end
-
         request = {**request, url: location}
 
         case [url.scheme, location.scheme]
@@ -144,7 +142,7 @@ module TerminalShop
     # @param max_retries [Integer]
     # @param initial_retry_delay [Float]
     # @param max_retry_delay [Float]
-    # @param headers [Hash{String=>String, nil}]
+    # @param headers [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}]
     # @param idempotency_header [String, nil]
     #
     def initialize(
@@ -195,7 +193,7 @@ module TerminalShop
     #
     #   @option req [Hash{String=>Array<String>, String, nil}, nil] :query
     #
-    #   @option req [Hash{String=>String, nil}, nil] :headers
+    #   @option req [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}, nil] :headers
     #
     #   @option req [Object, nil] :body
     #
@@ -286,8 +284,10 @@ module TerminalShop
       retry_header = headers["retry-after"]
       return span if (span = Float(retry_header, exception: false))
 
-      span = retry_header && TerminalShop::Util.suppress(ArgumentError) do
-        Time.httpdate(retry_header) - Time.now
+      span = retry_header&.then do
+        Time.httpdate(_1) - Time.now
+      rescue ArgumentError
+        nil
       end
       return span if span
 
@@ -399,7 +399,7 @@ module TerminalShop
     #
     #   @option req [Hash{String=>Array<String>, String, nil}, nil] :query
     #
-    #   @option req [Hash{String=>String, nil}, nil] :headers
+    #   @option req [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}, nil] :headers
     #
     #   @option req [Object, nil] :body
     #
@@ -442,7 +442,7 @@ module TerminalShop
     #
     #   @option req [Hash{String=>Array<String>, String, nil}, nil] :query
     #
-    #   @option req [Hash{String=>String, nil}, nil] :headers
+    #   @option req [Hash{String=>String, Integer, Array<String, Integer, nil>, nil}, nil] :headers
     #
     #   @option req [Object, nil] :body
     #

data/lib/terminal-shop/base_model.rb

@@ -153,10 +153,11 @@ module TerminalShop
           in [-> { _1 <= String }, Symbol]
             [true, value.to_s, 1]
           in [-> { _1 <= Date || _1 <= Time }, String]
-            TerminalShop::Util.suppress(ArgumentError, Date::Error) do
-              return [true, target.parse(value), 1]
+            Kernel.then do
+              [true, target.parse(value), 1]
+            rescue ArgumentError, Date::Error
+              [false, false, 0]
             end
-            [false, false, 0]
           in [_, ^target]
             [true, value, 1]
           else

data/lib/terminal-shop/client.rb

@@ -22,6 +22,9 @@ module TerminalShop
     # @return [String]
     attr_reader :bearer_token
 
+    # @return [String, nil]
+    attr_reader :app_id
+
     # @return [TerminalShop::Resources::Product]
     attr_reader :product
 
@@ -78,6 +81,8 @@ module TerminalShop
     #
     # @param bearer_token [String, nil] Defaults to `ENV["TERMINAL_BEARER_TOKEN"]`
     #
+    # @param app_id [String, nil]
+    #
     # @param max_retries [Integer] Max number of retries to attempt after a failed retryable request.
     #
     # @param timeout [Float]
@@ -90,6 +95,7 @@ module TerminalShop
       environment: nil,
       base_url: nil,
       bearer_token: ENV["TERMINAL_BEARER_TOKEN"],
+      app_id: nil,
       max_retries: DEFAULT_MAX_RETRIES,
       timeout: DEFAULT_TIMEOUT_IN_SECONDS,
       initial_retry_delay: DEFAULT_INITIAL_RETRY_DELAY,
@@ -110,6 +116,10 @@ module TerminalShop
         raise ArgumentError.new("bearer_token is required")
       end
 
+      headers = {
+        "x-terminal-app-id" => (@app_id = app_id&.to_s)
+      }
+
       @bearer_token = bearer_token.to_s
 
       super(
@@ -117,7 +127,8 @@ module TerminalShop
         timeout: timeout,
         max_retries: max_retries,
         initial_retry_delay: initial_retry_delay,
-        max_retry_delay: max_retry_delay
+        max_retry_delay: max_retry_delay,
+        headers: headers
       )
 
       @product = TerminalShop::Resources::Product.new(client: self)

data/lib/terminal-shop/pooled_net_requester.rb

@@ -35,8 +35,7 @@ module TerminalShop
       #
       def calibrate_socket_timeout(conn, deadline)
         timeout = deadline - TerminalShop::Util.monotonic_secs
-        (conn.open_timeout = timeout) unless conn.started?
-        conn.read_timeout = conn.write_timeout = conn.continue_timeout = timeout
+        conn.open_timeout = conn.read_timeout = conn.write_timeout = conn.continue_timeout = timeout
       end
 
       # @private
@@ -134,9 +133,10 @@ module TerminalShop
       eof = false
       enum = Enumerator.new do |y|
         with_pool(url) do |conn|
-          conn.start unless conn.started?
           self.class.calibrate_socket_timeout(conn, deadline)
+          conn.start unless conn.started?
 
+          self.class.calibrate_socket_timeout(conn, deadline)
           conn.request(req) do |rsp|
             y << [conn, rsp]
             rsp.read_body do |bytes|