terminal-shop 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 751da463435546aa646463c23f281021151b8416d6d96abd3fcb607cb4f1d2dd
-  data.tar.gz: 9b4b300351f7f8752b18fe11098c91b6c77fd805859f9d91aa90d85e04e4a5fe
+  metadata.gz: 974257e90aeb93cf152e34de6ea7351f727f6e6ee95e04415b290b90f648a251
+  data.tar.gz: 7de2c3d22ad41f81fe735d5fb3018b99a9a15350c4faa35b4f316f4ab0ae822a
 SHA512:
-  metadata.gz: 200d08ede71db6dc925f78727b3e15474e825400e8ef73da2affa1ad6991b4f2832cdfe363c3b3348d308ccd5a6127288d9beea6263f819c232cbbbb82c28a6a
-  data.tar.gz: 433ff5cef723e81a8fef27c0d48a8e6a7cf30a3f051b1ad454cc2fc9d1e7b05e0bf70f7a995254ec265c0f2c48a980ab0a809122b885cba976de93bcf0066d7f
+  metadata.gz: 8f6a23136217de3ea26e0bed3db6f7ca39ced5bd099b681fd3f61cc50fdc8b4eb8d3c48591049a7d19e21c107cf7abc576a1bc714bf012ec35a4fa7eda2a46cb
+  data.tar.gz: e8145d5a065574cf2f972f33978247fc21a1a9f9c935ced9d30aaae9d346aed51bc52f6e71b1555cbc089628dfb97c5d740aa2b2a8c2a43752c21253cd2afdd7

data/lib/terminal-shop/base_client.rb

@@ -457,8 +457,10 @@ module TerminalShop
     # @return [String]
     #
     def inspect
+      # rubocop:disable Layout/LineLength
       base_url = TerminalShop::Util.unparse_uri(@base_url)
       "#<#{self.class.name}:0x#{object_id.to_s(16)} base_url=#{base_url} max_retries=#{@max_retries} timeout=#{@timeout}>"
+      # rubocop:enable Layout/LineLength
     end
   end
 end

data/lib/terminal-shop/base_model.rb

@@ -55,11 +55,11 @@ module TerminalShop
           type_info(spec.slice(:const, :enum, :union).first&.last)
         in Proc
           spec
-        in TerminalShop::Converter | Class
+        in TerminalShop::Converter | Class | Symbol
           -> { spec }
         in true | false
           -> { TerminalShop::BooleanModel }
-        in NilClass | true | false | Symbol | Integer | Float
+        in NilClass | Integer | Float
           -> { spec.class }
         end
       end
@@ -82,6 +82,13 @@ module TerminalShop
         case target
         in TerminalShop::Converter
           target.coerce(value)
+        in Symbol
+          case value
+          in Symbol | String if (val = value.to_sym) == target
+            val
+          else
+            value
+          end
         in Class
           case target
           in -> { _1 <= NilClass }
@@ -140,6 +147,13 @@ module TerminalShop
         case target
         in TerminalShop::Converter
           target.try_strict_coerce(value)
+        in Symbol
+          case value
+          in Symbol | String if (val = value.to_sym) == target
+            [true, val, 1]
+          else
+            [false, false, 0]
+          end
         in Class
           case [target, value]
           in [-> { _1 <= NilClass }, _]
@@ -338,7 +352,14 @@ module TerminalShop
       #
       # @return [Symbol, Object]
       #
-      def coerce(value) = (value.is_a?(String) ? value.to_sym : value)
+      def coerce(value)
+        case value
+        in Symbol | String if values.include?(val = value.to_sym)
+          val
+        else
+          value
+        end
+      end
 
       # @!parse
       #   # @private
@@ -359,7 +380,7 @@ module TerminalShop
         return [true, value, 1] if values.include?(value)
 
         case value
-        in String if values.include?(val = value.to_sym)
+        in Symbol | String if values.include?(val = value.to_sym)
           [true, val, 1]
         else
           case [value, values.first]

data/lib/terminal-shop/base_page.rb

@@ -5,6 +5,26 @@ module TerminalShop
   #
   # @abstract
   #
+  # @example
+  # ```ruby
+  # if page.has_next?
+  #   page = page.next_page
+  # end
+  # ```
+  #
+  # @example
+  # ```ruby
+  # page.auto_paging_each do |product|
+  #   puts(product)
+  # end
+  # ```
+  #
+  # @example
+  # ```ruby
+  # products = page.to_enum.take(2)
+  #
+  # products => Array
+  # ```
   module BasePage
     # @return [Boolean]
     #

data/lib/terminal-shop/pooled_net_requester.rb

@@ -48,9 +48,11 @@ module TerminalShop
       #
       #   @option request [Hash{String=>String}] :headers
       #
+      # @param blk [Proc]
+      #
       # @return [Net::HTTPGenericRequest]
       #
-      def build_request(request)
+      def build_request(request, &)
         method, url, headers, body = request.fetch_values(:method, :url, :headers, :body)
         req = Net::HTTPGenericRequest.new(
           method.to_s.upcase,
@@ -64,12 +66,14 @@ module TerminalShop
         case body
         in nil
         in String
-          req.body = body
+          req["content-length"] ||= body.bytesize.to_s unless req["transfer-encoding"]
+          req.body_stream = TerminalShop::Util::ReadIOAdapter.new(body, &)
         in StringIO
-          req.body = body.string
-        in IO
-          body.rewind
-          req.body_stream = body
+          req["content-length"] ||= body.size.to_s unless req["transfer-encoding"]
+          req.body_stream = TerminalShop::Util::ReadIOAdapter.new(body, &)
+        in IO | Enumerator
+          req["transfer-encoding"] ||= "chunked" unless req["content-length"]
+          req.body_stream = TerminalShop::Util::ReadIOAdapter.new(body, &)
         end
 
         req
@@ -97,7 +101,7 @@ module TerminalShop
 
       pool =
         @mutex.synchronize do
-          @pools[origin] ||= ConnectionPool.new(size: Etc.nprocessors) do
+          @pools[origin] ||= ConnectionPool.new(size: @size) do
             self.class.connect(url)
           end
         end
@@ -128,7 +132,6 @@ module TerminalShop
     #
     def execute(request)
       url, deadline = request.fetch_values(:url, :deadline)
-      req = self.class.build_request(request)
 
       eof = false
       finished = false
@@ -136,6 +139,10 @@ module TerminalShop
         with_pool(url) do |conn|
           next if finished
 
+          req = self.class.build_request(request) do
+            self.class.calibrate_socket_timeout(conn, deadline)
+          end
+
           self.class.calibrate_socket_timeout(conn, deadline)
           conn.start unless conn.started?
 
@@ -156,19 +163,25 @@ module TerminalShop
       end
 
       conn, response = enum.next
-      body = TerminalShop::Util.fused_enum(enum) do
+      body = TerminalShop::Util.fused_enum(enum, external: true) do
         finished = true
         tap do
           enum.next
         rescue StopIteration
+          nil
         end
         conn.finish if !eof && conn&.started?
       end
       [response, (response.body = body)]
     end
 
-    def initialize
+    # @private
+    #
+    # @param size [Integer]
+    #
+    def initialize(size: Etc.nprocessors)
       @mutex = Mutex.new
+      @size = size
       @pools = {}
     end
   end

data/lib/terminal-shop/util.rb

@@ -399,41 +399,152 @@ module TerminalShop
       end
     end
 
+    # @private
+    #
+    # An adapter that satisfies the IO interface required by `::IO.copy_stream`
+    class ReadIOAdapter
+      # @private
+      #
+      # @param max_len [Integer, nil]
+      #
+      # @return [String]
+      #
+      private def read_enum(max_len)
+        case max_len
+        in nil
+          @stream.to_a.join
+        in Integer
+          @buf << @stream.next while @buf.length < max_len
+          @buf.slice!(..max_len)
+        end
+      rescue StopIteration
+        @stream = nil
+        @buf.slice!(0..)
+      end
+
+      # @private
+      #
+      # @param max_len [Integer, nil]
+      # @param out_string [String, nil]
+      #
+      # @return [String, nil]
+      #
+      def read(max_len = nil, out_string = nil)
+        case @stream
+        in nil
+          nil
+        in IO | StringIO
+          @stream.read(max_len, out_string)
+        in Enumerator
+          read = read_enum(max_len)
+          case out_string
+          in String
+            out_string.replace(read)
+          in nil
+            read
+          end
+        end
+          .tap(&@blk)
+      end
+
+      # @private
+      #
+      # @param stream [String, IO, StringIO, Enumerable]
+      # @param blk [Proc]
+      #
+      def initialize(stream, &blk)
+        @stream = stream.is_a?(String) ? StringIO.new(stream) : stream
+        @buf = String.new.b
+        @blk = blk
+      end
+    end
+
+    class << self
+      # @param blk [Proc]
+      #
+      # @return [Enumerable]
+      #
+      def string_io(&blk)
+        Enumerator.new do |y|
+          y.define_singleton_method(:write) do
+            self << _1.clone
+            _1.bytesize
+          end
+
+          blk.call(y)
+        end
+      end
+    end
+
     class << self
       # @private
       #
-      # @param io [StringIO]
+      # @param y [Enumerator::Yielder]
       # @param boundary [String]
       # @param key [Symbol, String]
       # @param val [Object]
       #
-      private def encode_multipart_formdata(io, boundary:, key:, val:)
-        io << "--#{boundary}\r\n"
-        io << "Content-Disposition: form-data"
+      private def encode_multipart_formdata(y, boundary:, key:, val:)
+        y << "--#{boundary}\r\n"
+        y << "Content-Disposition: form-data"
         unless key.nil?
           name = ERB::Util.url_encode(key.to_s)
-          io << "; name=\"#{name}\""
+          y << "; name=\"#{name}\""
         end
         if val.is_a?(IO)
           filename = ERB::Util.url_encode(File.basename(val.to_path))
-          io << "; filename=\"#{filename}\""
+          y << "; filename=\"#{filename}\""
         end
-        io << "\r\n"
+        y << "\r\n"
         case val
-        in IO | StringIO
-          io << "Content-Type: application/octet-stream\r\n\r\n"
-          IO.copy_stream(val, io)
+        in IO
+          y << "Content-Type: application/octet-stream\r\n\r\n"
+          IO.copy_stream(val, y)
+        in StringIO
+          y << "Content-Type: application/octet-stream\r\n\r\n"
+          y << val.string
         in String
-          io << "Content-Type: application/octet-stream\r\n\r\n"
-          io << val.to_s
+          y << "Content-Type: application/octet-stream\r\n\r\n"
+          y << val.to_s
         in true | false | Integer | Float | Symbol
-          io << "Content-Type: text/plain\r\n\r\n"
-          io << val.to_s
+          y << "Content-Type: text/plain\r\n\r\n"
+          y << val.to_s
         else
-          io << "Content-Type: application/json\r\n\r\n"
-          io << JSON.fast_generate(val)
+          y << "Content-Type: application/json\r\n\r\n"
+          y << JSON.fast_generate(val)
+        end
+        y << "\r\n"
+      end
+
+      # @private
+      #
+      # @param body [Object]
+      #
+      # @return [Array(String, Enumerable)]
+      #
+      private def encode_multipart_streaming(body)
+        boundary = SecureRandom.urlsafe_base64(60)
+
+        strio = string_io do |y|
+          case body
+          in Hash
+            body.each do |key, val|
+              case val
+              in Array if val.all? { primitive?(_1) }
+                val.each do |v|
+                  encode_multipart_formdata(y, boundary: boundary, key: key, val: v)
+                end
+              else
+                encode_multipart_formdata(y, boundary: boundary, key: key, val: val)
+              end
+            end
+          else
+            encode_multipart_formdata(y, boundary: boundary, key: nil, val: body)
+          end
+          y << "--#{boundary}--\r\n"
         end
-        io << "\r\n"
+
+        [boundary, strio]
       end
 
       # @private
@@ -449,37 +560,11 @@ module TerminalShop
         in ["application/json", Hash | Array]
           [headers, JSON.fast_generate(body)]
         in [%r{^multipart/form-data}, Hash | IO | StringIO]
-          boundary = SecureRandom.urlsafe_base64(60)
-          strio = StringIO.new.tap do |io|
-            case body
-            in Hash
-              body.each do |key, val|
-                case val
-                in Array if val.all? { primitive?(_1) }
-                  val.each do |v|
-                    encode_multipart_formdata(io, boundary: boundary, key: key, val: v)
-                  end
-                else
-                  encode_multipart_formdata(io, boundary: boundary, key: key, val: val)
-                end
-              end
-            else
-              encode_multipart_formdata(io, boundary: boundary, key: nil, val: body)
-            end
-            io << "--#{boundary}--\r\n"
-            io.rewind
-          end
-          headers = {
-            **headers,
-            "content-type" => "#{content_type}; boundary=#{boundary}",
-            "transfer-encoding" => "chunked"
-          }
+          boundary, strio = encode_multipart_streaming(body)
+          headers = {**headers, "content-type" => "#{content_type}; boundary=#{boundary}"}
           [headers, strio]
         in [_, StringIO]
           [headers, body.string]
-        in [_, IO]
-          headers = {**headers, "transfer-encoding" => "chunked"}
-          [headers, body]
         else
           [headers, body]
         end
@@ -524,17 +609,22 @@ module TerminalShop
       # https://doc.rust-lang.org/std/iter/trait.FusedIterator.html
       #
       # @param enum [Enumerable]
+      # @param external [Boolean]
       # @param close [Proc]
       #
       # @return [Enumerable]
       #
-      def fused_enum(enum, &close)
+      def fused_enum(enum, external: false, &close)
         fused = false
         iter = Enumerator.new do |y|
           next if fused
 
           fused = true
-          loop { y << enum.next }
+          if external
+            loop { y << enum.next }
+          else
+            enum.each(&y)
+          end
         ensure
           close&.call
           close = nil
@@ -584,8 +674,9 @@ module TerminalShop
 
         chain_fused(enum) do |y|
           enum.each do |row|
+            offset = buffer.bytesize
             buffer << row
-            while (match = re.match(buffer, cr_seen.to_i))
+            while (match = re.match(buffer, cr_seen&.to_i || offset))
               case [match.captures.first, cr_seen]
               in ["\r", nil]
                 cr_seen = match.end(1)
@@ -595,6 +686,7 @@ module TerminalShop
               else
                 y << buffer.slice!(..(match.end(1).pred))
               end
+              offset = 0
               cr_seen = nil
             end
           end
@@ -613,6 +705,7 @@ module TerminalShop
       # @return [Hash{Symbol=>Object}]
       #
       def decode_sse(lines)
+        # rubocop:disable Metrics/BlockLength
         chain_fused(lines) do |y|
           blank = {event: nil, data: nil, id: nil, retry: nil}
           current = {}
@@ -631,7 +724,7 @@ module TerminalShop
               in "event"
                 current.merge!(event: value)
               in "data"
-                (current[:data] ||= String.new.b) << value << "\n"
+                (current[:data] ||= String.new.b) << (value << "\n")
               in "id" unless value.include?("\0")
                 current.merge!(id: value)
               in "retry" if /^\d+$/ =~ value
@@ -641,6 +734,7 @@ module TerminalShop
             else
             end
           end
+          # rubocop:enable Metrics/BlockLength
 
           y << {**blank, **current} unless current.empty?
         end

data/lib/terminal-shop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TerminalShop
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

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

@@ -15,8 +15,11 @@ module TerminalShop
       def calibrate_socket_timeout(conn, deadline)
       end
 
-      sig { params(request: TerminalShop::PooledNetRequester::RequestShape).returns(Net::HTTPGenericRequest) }
-      def build_request(request)
+      sig do
+        params(request: TerminalShop::PooledNetRequester::RequestShape, blk: T.proc.params(arg0: String).void)
+          .returns(Net::HTTPGenericRequest)
+      end
+      def build_request(request, &blk)
       end
     end
 
@@ -31,8 +34,8 @@ module TerminalShop
     def execute(request)
     end
 
-    sig { returns(T.attached_class) }
-    def self.new
+    sig { params(size: Integer).returns(T.attached_class) }
+    def self.new(size: Etc.nprocessors)
     end
   end
 end

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

@@ -131,9 +131,41 @@ module TerminalShop
       end
     end
 
+    class ReadIOAdapter
+      sig { params(max_len: T.nilable(Integer)).returns(String) }
+      private def read_enum(max_len)
+      end
+
+      sig { params(max_len: T.nilable(Integer), out_string: T.nilable(String)).returns(T.nilable(String)) }
+      def read(max_len = nil, out_string = nil)
+      end
+
+      sig do
+        params(
+          stream: T.any(String, IO, StringIO, T::Enumerable[String]),
+          blk: T.proc.params(arg0: String).void
+        )
+          .returns(T.attached_class)
+      end
+      def self.new(stream, &blk)
+      end
+    end
+
     class << self
-      sig { params(io: StringIO, boundary: String, key: T.any(Symbol, String), val: T.anything).void }
-      private def encode_multipart_formdata(io, boundary:, key:, val:)
+      sig { params(blk: T.proc.params(y: Enumerator::Yielder).void).returns(T::Enumerable[String]) }
+      def string_io(&blk)
+      end
+    end
+
+    class << self
+      sig do
+        params(y: Enumerator::Yielder, boundary: String, key: T.any(Symbol, String), val: T.anything).void
+      end
+      private def encode_multipart_formdata(y, boundary:, key:, val:)
+      end
+
+      sig { params(body: T.anything).returns([String, T::Enumerable[String]]) }
+      private def encode_multipart_streaming(body)
       end
 
       sig { params(headers: T::Hash[String, String], body: T.anything).returns(T.anything) }
@@ -153,8 +185,11 @@ module TerminalShop
     end
 
     class << self
-      sig { params(enum: T::Enumerable[T.anything], close: T.proc.void).returns(T::Enumerable[T.anything]) }
-      def fused_enum(enum, &close)
+      sig do
+        params(enum: T::Enumerable[T.anything], external: T::Boolean, close: T.proc.void)
+          .returns(T::Enumerable[T.anything])
+      end
+      def fused_enum(enum, external: false, &close)
       end
 
       sig { params(enum: T.nilable(T::Enumerable[T.anything])).void }

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

@@ -1,5 +1,5 @@
 # typed: strong
 
 module TerminalShop
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/sig/terminal-shop/pooled_net_requester.rbs

@@ -15,7 +15,9 @@ module TerminalShop
 
     def self.build_request: (
       TerminalShop::PooledNetRequester::request request
-    ) -> top
+    ) {
+      (String arg0) -> void
+    } -> top
 
     private def with_pool: (URI::Generic url) { (top arg0) -> void } -> void
 
@@ -23,6 +25,6 @@ module TerminalShop
       TerminalShop::PooledNetRequester::request request
     ) -> [top, Enumerable[String]]
 
-    def initialize: -> void
+    def initialize: (size: Integer) -> void
   end
 end

data/sig/terminal-shop/util.rbs

@@ -74,13 +74,33 @@ module TerminalShop
       | ::Array[(String | Integer)?])?] headers
     ) -> ::Hash[String, String]
 
+    class ReadIOAdapter
+      private def read_enum: (Integer? max_len) -> String
+
+      def read: (?Integer? max_len, ?String? out_string) -> String?
+
+      def initialize: (
+        String | IO | StringIO | Enumerable[String] stream
+      ) {
+        (String arg0) -> void
+      } -> void
+    end
+
+    def self?.string_io: {
+      (Enumerator::Yielder y) -> void
+    } -> Enumerable[String]
+
     def self?.encode_multipart_formdata: (
-      StringIO io,
+      Enumerator::Yielder y,
       boundary: String,
       key: Symbol | String,
       val: top
     ) -> void
 
+    def self?.encode_multipart_streaming: (
+      top body
+    ) -> [String, Enumerable[String]]
+
     def self?.encode_content: (::Hash[String, String] headers, top body) -> top
 
     def self?.decode_content: (
@@ -89,7 +109,12 @@ module TerminalShop
       suppress_error: bool
     ) -> top
 
-    def self?.fused_enum: (Enumerable[top] enum) { -> void } -> Enumerable[top]
+    def self?.fused_enum: (
+      Enumerable[top] enum,
+      external: bool
+    ) {
+      -> void
+    } -> Enumerable[top]
 
     def self?.close_fused!: (Enumerable[top]? enum) -> void
 

data/sig/terminal-shop/version.rbs

@@ -1,3 +1,3 @@
 module TerminalShop
-  VERSION: "1.0.0"
+  VERSION: "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminal-shop
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Terminal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool