terminal-shop 1.0.0 → 1.2.0

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
@@ -505,10 +590,10 @@ module TerminalShop
             json
           end
         in %r{^text/event-stream}
-          lines = enum_lines(stream)
-          parse_sse(lines)
+          lines = decode_lines(stream)
+          decode_sse(lines)
         in %r{^application/(?:x-)?jsonl}
-          enum_lines(stream)
+          decode_lines(stream)
         in %r{^text/}
           stream.to_a.join
         else
@@ -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.0.0"
+  VERSION = "1.2.0"
 end

data/lib/terminal-shop.rb

@@ -63,6 +63,10 @@ require_relative "terminal-shop/models/cart_convert_params"
 require_relative "terminal-shop/models/cart_convert_response"
 require_relative "terminal-shop/models/cart_get_params"
 require_relative "terminal-shop/models/cart_get_response"
+require_relative "terminal-shop/models/cart_redeem_gift_card_params"
+require_relative "terminal-shop/models/cart_redeem_gift_card_response"
+require_relative "terminal-shop/models/cart_remove_gift_card_params"
+require_relative "terminal-shop/models/cart_remove_gift_card_response"
 require_relative "terminal-shop/models/cart_set_address_params"
 require_relative "terminal-shop/models/cart_set_address_response"
 require_relative "terminal-shop/models/cart_set_card_params"

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

@@ -43,25 +43,27 @@ module TerminalShop
 
     PLATFORM_HEADERS = T::Hash[String, String]
 
-    sig { params(req: TerminalShop::BaseClient::RequestComponentsShape).void }
-    def self.validate!(req)
-    end
-
-    sig do
-      params(status: Integer, headers: T.any(T::Hash[String, String], Net::HTTPHeader)).returns(T::Boolean)
-    end
-    def self.should_retry?(status, headers:)
-    end
-
-    sig do
-      params(
-        request: TerminalShop::BaseClient::RequestInputShape,
-        status: Integer,
-        response_headers: T.any(T::Hash[String, String], Net::HTTPHeader)
-      )
-        .returns(TerminalShop::BaseClient::RequestInputShape)
-    end
-    def self.follow_redirect(request, status:, response_headers:)
+    class << self
+      sig { params(req: TerminalShop::BaseClient::RequestComponentsShape).void }
+      def validate!(req)
+      end
+
+      sig do
+        params(status: Integer, headers: T.any(T::Hash[String, String], Net::HTTPHeader)).returns(T::Boolean)
+      end
+      def should_retry?(status, headers:)
+      end
+
+      sig do
+        params(
+          request: TerminalShop::BaseClient::RequestInputShape,
+          status: Integer,
+          response_headers: T.any(T::Hash[String, String], Net::HTTPHeader)
+        )
+          .returns(TerminalShop::BaseClient::RequestInputShape)
+      end
+      def follow_redirect(request, status:, response_headers:)
+      end
     end
 
     sig { returns(T.anything) }
@@ -83,9 +85,9 @@ module TerminalShop
                          T.nilable(T.any(String, Integer, T::Array[T.nilable(T.any(String, Integer))]))],
         idempotency_header: T.nilable(String)
       )
-        .void
+        .returns(T.attached_class)
     end
-    def initialize(
+    def self.new(
       base_url:,
       timeout: 0.0,
       max_retries: 0,