terminal-shop 0.1.0.pre.alpha.7 → 0.1.0.pre.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35020e82a26bf26e9c0f7ca2926f00db9a43f10767c0e21fd61442e68bb07cf
-  data.tar.gz: 56a1434608c6c18d12aaa9d926bc67206b6334e9fc42a4f7e3dbfd072da36d41
+  metadata.gz: e49f5a72c701e7a5a68d1b537d9910a95d385966dcab6788a080c0d7cfefc503
+  data.tar.gz: c94a21a6fc772735aedd857c5f592b5ab0eb7344419814d593f7bec71b96b5e5
 SHA512:
-  metadata.gz: a20785d886ae90219e648ad6cd65fbd0366aea77fc73c702db96e7327e2b039e4772f1eaaef423e3e75c47547d012e335a19f7fa16483aa69376ccf13a371075
-  data.tar.gz: 5a84296c9dcb1868cd6f662bf8a34e067162fce60c9344957cac63bc3ad7473f36abb63d7a3e2db741ddd00967a6eb42d04bc2e7378a6cecbc94d791105770f5
+  metadata.gz: 4b5237266009ebbfb3019971b882c5c92076931ee011fbad8023c8ac806a89bd58eeb1373aa38ee60374d8af66913bacd8f00afd5f809bec5e682cabdb70dced
+  data.tar.gz: 882c016a8b85b9ce829fb952eb63cccf295595f64c500863a8550243946e5164b0308af9699f618cfd768a812831d4d2953af97a1ef12c7e3dc3bc9ab0f5c8b8

data/lib/terminal-shop/models/subscription.rb

@@ -63,11 +63,11 @@ module TerminalShop
       # @!attribute [r] schedule
       #   Schedule of the subscription.
       #
-      #   @return [TerminalShop::Models::SubscriptionAPI::Schedule::Type, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1, nil]
+      #   @return [TerminalShop::Models::SubscriptionAPI::Schedule::Fixed, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly, nil]
       optional :schedule, union: -> { TerminalShop::Models::SubscriptionAPI::Schedule }
 
       # @!parse
-      #   # @return [TerminalShop::Models::SubscriptionAPI::Schedule::Type, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1]
+      #   # @return [TerminalShop::Models::SubscriptionAPI::Schedule::Fixed, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly]
       #   attr_writer :schedule
 
       # @!parse
@@ -80,7 +80,7 @@ module TerminalShop
       #   # @param product_variant_id [String]
       #   # @param quantity [Integer]
       #   # @param next_ [String]
-      #   # @param schedule [TerminalShop::Models::SubscriptionAPI::Schedule::Type, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1]
+      #   # @param schedule [TerminalShop::Models::SubscriptionAPI::Schedule::Fixed, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly]
       #   #
       #   def initialize(id:, address_id:, card_id:, frequency:, product_variant_id:, quantity:, next_: nil, schedule: nil, **) = super
 
@@ -127,24 +127,24 @@ module TerminalShop
       # @example
       # ```ruby
       # case schedule
-      # in TerminalShop::Models::SubscriptionAPI::Schedule::Type
+      # in TerminalShop::Models::SubscriptionAPI::Schedule::Fixed
       #   # ...
-      # in TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+      # in TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
       #   # ...
       # end
       # ```
       class Schedule < TerminalShop::Union
-        variant -> { TerminalShop::Models::SubscriptionAPI::Schedule::Type }
+        variant -> { TerminalShop::Models::SubscriptionAPI::Schedule::Fixed }
 
-        variant -> { TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1 }
+        variant -> { TerminalShop::Models::SubscriptionAPI::Schedule::Weekly }
 
         # @example
         # ```ruby
-        # type => {
+        # fixed => {
         #   type: :fixed
         # }
         # ```
-        class Type < TerminalShop::BaseModel
+        class Fixed < TerminalShop::BaseModel
           # @!attribute type
           #
           #   @return [Symbol, :fixed]
@@ -160,12 +160,12 @@ module TerminalShop
 
         # @example
         # ```ruby
-        # union_member1 => {
+        # weekly => {
         #   interval: Integer,
         #   type: :weekly
         # }
         # ```
-        class UnionMember1 < TerminalShop::BaseModel
+        class Weekly < TerminalShop::BaseModel
           # @!attribute interval
           #
           #   @return [Integer]

data/lib/terminal-shop/pooled_net_requester.rb

@@ -12,29 +12,58 @@ module TerminalShop
     # @private
     #
     # @param url [URL::Generic]
-    # @param timeout [Float]
+    # @param blk [Proc]
     #
     # @return [ConnectionPool]
     #
-    private def get_pool(url)
+    private def with_pool(url, &blk)
       origin = TerminalShop::Util.uri_origin(url)
-      @mutex.synchronize do
-        @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
-          port =
-            case [url.port, url.scheme]
-            in [Integer, _]
-              url.port
-            in [nil, "http" | "ws"]
-              Net::HTTP.http_default_port
-            in [nil, "https" | "wss"]
-              Net::HTTP.https_default_port
-            end
+      key = :"#{self.class.name}-connection_in_use_for_#{origin}"
+
+      return blk.call(make_conn(url)) if Thread.current[key]
+
+      pool =
+        @mutex.synchronize do
+          @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
+            make_conn(url)
+          end
+        end
+
+      pool.with do |conn|
+        Thread.current[key] = true
+
+        blk.call(conn)
+        # rubocop:disable Lint/RescueException
+      rescue Exception => e
+        # rubocop:enable Lint/RescueException
+        # should close connection on all errors to ensure no invalid state persists
+        conn.finish if conn.started?
+        raise e
+      ensure
+        Thread.current[key] = nil
+      end
+    end
 
-          session = Net::HTTP.new(url.host, port)
-          session.use_ssl = %w[https wss].include?(url.scheme)
-          session.max_retries = 0
-          session
+    # @private
+    #
+    # @param url [URI::Generic]
+    #
+    # @return [Net::HTTP]
+    #
+    private def make_conn(url)
+      port =
+        case [url.port, url.scheme]
+        in [Integer, _]
+          url.port
+        in [nil, "http" | "ws"]
+          Net::HTTP.http_default_port
+        in [nil, "https" | "wss"]
+          Net::HTTP.https_default_port
         end
+
+      Net::HTTP.new(url.host, port).tap do
+        _1.use_ssl = %w[https wss].include?(url.scheme)
+        _1.max_retries = 0
       end
     end
 
@@ -44,7 +73,7 @@ module TerminalShop
     #   @option req [Symbol] :method
     #   @option req [URI::Generic] :url
     #   @option req [Hash{String => String}] :headers
-    #   @option req [String, Hash] :body
+    #   @option req [String, Hash, IO, StringIO] :body
     #   @option req [Float] :timeout
     #
     # @return [Net::HTTPResponse]
@@ -55,7 +84,7 @@ module TerminalShop
       request = Net::HTTPGenericRequest.new(
         method.to_s.upcase,
         !body.nil?,
-        ![:head, :options].include?(method),
+        method != :head,
         url.to_s
       )
 
@@ -67,28 +96,30 @@ module TerminalShop
         request.body_stream = body
       end
 
-      # This timeout is for acquiring a connection from the pool
-      # The default 5 seconds seems too short, lets just have a nearly unbounded queue for now
-      #
-      # TODO: revisit this around granular timeout / concurrency control
-      get_pool(url).with(timeout: 600) do |conn|
+      with_pool(url) do |conn|
+        make_request(conn, request, timeout)
+      end
+    end
+
+    # @private
+    #
+    # @param conn [Net::HTTP]
+    # @param request [Net::HTTPGenericRequest]
+    # @param timeout [Float]
+    #
+    # @return [Net::HTTPResponse]
+    #
+    private def make_request(conn, request, timeout)
+      unless conn.started?
         conn.open_timeout = timeout
-        conn.read_timeout = timeout
-        conn.write_timeout = timeout
-        conn.continue_timeout = timeout
+        conn.start
+      end
 
-        conn.start unless conn.started?
+      conn.read_timeout = timeout
+      conn.write_timeout = timeout
+      conn.continue_timeout = timeout
 
-        conn.request(request)
-        # rubocop:disable Lint/RescueException
-      rescue Exception => e
-        # rubocop:enable Lint/RescueException
-        # should close connection on all errors to ensure no invalid state persists
-        conn.finish if conn.started?
-        raise e
-      end
-    rescue ConnectionPool::TimeoutError
-      raise TerminalShop::APITimeoutError.new(url: url)
+      conn.request(request)
     end
   end
 end

data/lib/terminal-shop/resources/subscription.rb

@@ -21,7 +21,7 @@ module TerminalShop
       #
       #   @option params [String] :next_ Next shipment and billing date for the subscription.
       #
-      #   @option params [TerminalShop::Models::SubscriptionAPI::Schedule::Type, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1] :schedule Schedule of the subscription.
+      #   @option params [TerminalShop::Models::SubscriptionAPI::Schedule::Fixed, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly] :schedule Schedule of the subscription.
       #
       #   @option params [TerminalShop::RequestOptions, Hash{Symbol=>Object}, nil] :request_options
       #

data/lib/terminal-shop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerminalShop
-  VERSION = "0.1.0-alpha.7"
+  VERSION = "0.1.0-alpha.10"
 end

data/rbi/lib/terminal-shop/models/subscription.rbi

@@ -63,8 +63,8 @@ module TerminalShop
         returns(
           T.nilable(
             T.any(
-              TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-              TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+              TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+              TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
             )
           )
         )
@@ -75,12 +75,12 @@ module TerminalShop
       sig do
         params(
           _: T.any(
-            TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-            TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+            TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+            TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
           )
         ).returns(T.any(
-                    TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-                    TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+                    TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+                    TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
                   ))
       end
       def schedule=(_)
@@ -96,8 +96,8 @@ module TerminalShop
           quantity: Integer,
           next_: String,
           schedule: T.any(
-            TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-            TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+            TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+            TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
           )
         ).void
       end
@@ -124,8 +124,8 @@ module TerminalShop
             quantity: Integer,
             next_: String,
             schedule: T.any(
-              TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-              TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+              TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+              TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
             )
           }
         )
@@ -150,7 +150,7 @@ module TerminalShop
       class Schedule < TerminalShop::Union
         abstract!
 
-        class Type < TerminalShop::BaseModel
+        class Fixed < TerminalShop::BaseModel
           sig { returns(Symbol) }
           def type
           end
@@ -168,7 +168,7 @@ module TerminalShop
           end
         end
 
-        class UnionMember1 < TerminalShop::BaseModel
+        class Weekly < TerminalShop::BaseModel
           sig { returns(Integer) }
           def interval
           end
@@ -197,8 +197,8 @@ module TerminalShop
         sig do
           override.returns(
             [
-              [NilClass, TerminalShop::Models::SubscriptionAPI::Schedule::Type],
-              [NilClass, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1]
+              [NilClass, TerminalShop::Models::SubscriptionAPI::Schedule::Fixed],
+              [NilClass, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly]
             ]
           )
         end

data/rbi/lib/terminal-shop/resources/subscription.rbi

@@ -13,8 +13,8 @@ module TerminalShop
           quantity: Integer,
           next_: String,
           schedule: T.any(
-            TerminalShop::Models::SubscriptionAPI::Schedule::Type,
-            TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+            TerminalShop::Models::SubscriptionAPI::Schedule::Fixed,
+            TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
           ),
           request_options: T.nilable(T.any(TerminalShop::RequestOptions, T::Hash[Symbol, T.anything]))
         ).returns(TerminalShop::Models::SubscriptionCreateResponse)

data/rbi/lib/terminal-shop/version.rbi

@@ -1,5 +1,5 @@
 # typed: strong
 
 module TerminalShop
-  VERSION = "0.1.0-alpha.7"
+  VERSION = "0.1.0-alpha.10"
 end

data/sig/terminal-shop/models/subscription.rbs

@@ -65,28 +65,28 @@ module TerminalShop
       end
 
       type schedule =
-        TerminalShop::Models::SubscriptionAPI::Schedule::Type
-        | TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1
+        TerminalShop::Models::SubscriptionAPI::Schedule::Fixed
+        | TerminalShop::Models::SubscriptionAPI::Schedule::Weekly
 
       class Schedule < TerminalShop::Union
-        type type_ = { type: :fixed }
+        type fixed = { type: :fixed }
 
-        class Type < TerminalShop::BaseModel
+        class Fixed < TerminalShop::BaseModel
           attr_accessor type: :fixed
 
           def initialize:
             (type: :fixed) -> void
             | (
-              ?TerminalShop::Models::SubscriptionAPI::Schedule::type_
+              ?TerminalShop::Models::SubscriptionAPI::Schedule::fixed
               | TerminalShop::BaseModel data
             ) -> void
 
-          def to_hash: -> TerminalShop::Models::SubscriptionAPI::Schedule::type_
+          def to_hash: -> TerminalShop::Models::SubscriptionAPI::Schedule::fixed
         end
 
-        type union_member1 = { interval: Integer, type: :weekly }
+        type weekly = { interval: Integer, type: :weekly }
 
-        class UnionMember1 < TerminalShop::BaseModel
+        class Weekly < TerminalShop::BaseModel
           attr_accessor interval: Integer
 
           attr_accessor type: :weekly
@@ -94,14 +94,14 @@ module TerminalShop
           def initialize:
             (interval: Integer, type: :weekly) -> void
             | (
-              ?TerminalShop::Models::SubscriptionAPI::Schedule::union_member1
+              ?TerminalShop::Models::SubscriptionAPI::Schedule::weekly
               | TerminalShop::BaseModel data
             ) -> void
 
-          def to_hash: -> TerminalShop::Models::SubscriptionAPI::Schedule::union_member1
+          def to_hash: -> TerminalShop::Models::SubscriptionAPI::Schedule::weekly
         end
 
-        private def self.variants: -> [[nil, TerminalShop::Models::SubscriptionAPI::Schedule::Type], [nil, TerminalShop::Models::SubscriptionAPI::Schedule::UnionMember1]]
+        private def self.variants: -> [[nil, TerminalShop::Models::SubscriptionAPI::Schedule::Fixed], [nil, TerminalShop::Models::SubscriptionAPI::Schedule::Weekly]]
       end
     end
   end

data/sig/terminal-shop/version.rbs

@@ -1,3 +1,3 @@
 module TerminalShop
-  VERSION: "0.1.0-alpha.6"
+  VERSION: "0.1.0-alpha.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-shop
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.7
+  version: 0.1.0.pre.alpha.10
 platform: ruby
 authors:
 - Terminal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-16 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool