Refactor code and tests for consistency and conciseness

Author: sferik

lib/http/form_data/composite_io.rb

@@ -98,17 +98,9 @@ def readpartial(max_length)
 
           return chunk if chunk && !chunk.empty?
 
-          advance_io
+          @index += 1
         end
       end
-
-      # Advances cursor to the next IO object
-      #
-      # @api private
-      # @return [void]
-      def advance_io
-        @index += 1
-      end
     end
   end
 end

lib/http/form_data/file.rb

@@ -86,12 +86,10 @@ def close
       # @param [String, Pathname, IO] path_or_io
       # @return [IO]
       def make_io(path_or_io)
-        if path_or_io.is_a?(String)
-          ::File.new(path_or_io, binmode: true)
-        elsif path_or_io.is_a?(Pathname)
-          path_or_io.open(binmode: true)
-        else
-          path_or_io
+        case path_or_io
+        when String   then ::File.new(path_or_io, binmode: true)
+        when Pathname then path_or_io.open(binmode: true)
+        else path_or_io
         end
       end
 
@@ -102,7 +100,7 @@ def make_io(path_or_io)
       # @return [String]
       def filename_for(io)
         if io.respond_to?(:path)
-          io.path.split(::File::SEPARATOR).last
+          ::File.basename(io.path)
         else
           "stream-#{io.object_id}"
         end

lib/http/form_data/multipart.rb

@@ -97,15 +97,9 @@ def tail
       # @api private
       # @return [Array<Param>]
       def parts(data)
-        params = [] #: Array[Param]
-
-        FormData.ensure_data(data).each do |name, values|
-          Array(values).each do |value|
-            params << Param.new(name, value)
-          end
+        FormData.ensure_data(data).flat_map do |name, values|
+          Array(values).map { |value| Param.new(name, value) }
         end
-
-        params
       end
     end
   end

lib/http/form_data/multipart/param.rb

@@ -31,15 +31,8 @@ class Param
         # @return [Param]
         def initialize(name, value)
           @name = name.to_s
-
-          @part =
-            if value.is_a?(Part)
-              value
-            else
-              Part.new(value)
-            end
-
-          @io = CompositeIO.new [header, @part, footer]
+          @part = value.is_a?(Part) ? value : Part.new(value)
+          @io   = CompositeIO.new [header, @part, footer]
         end
 
         private
@@ -61,9 +54,9 @@ def header
         # @return [String]
         def parameters
           fname = filename
-          parameters = { name: @name }
-          parameters[:filename] = fname if fname
-          parameters.map { |k, v| "#{k}=#{v.inspect}" }.join("; ")
+          params = { name: @name }
+          params[:filename] = fname if fname
+          params.map { |k, v| "#{k}=#{v.inspect}" }.join("; ")
         end
 
         # Returns the content type of the wrapped part
@@ -87,7 +80,7 @@ def filename
         # @api private
         # @return [String]
         def footer
-          "\r\n"
+          CRLF
         end
       end
     end

test/http/form_data/composite_io_test.rb

@@ -17,13 +17,23 @@ def test_accepts_ios_and_strings
     assert_equal "Hello world!", io.read
   end
 
-  def test_fails_if_io_is_neither_string_nor_io
+  def test_rejects_invalid_io_types
     error = assert_raises(ArgumentError) { HTTP::FormData::CompositeIO.new(%i[hello world]) }
 
     assert_includes error.message, ":hello"
     assert_includes error.message, "is neither a String nor an IO object"
   end
 
+  def test_error_message_contains_inspect
+    obj = Object.new
+    def obj.inspect = "INVALID_IO_INSPECT"
+    def obj.to_s = "INVALID_IO_TO_S"
+
+    error = assert_raises(ArgumentError) { HTTP::FormData::CompositeIO.new([obj]) }
+
+    assert_includes error.message, "INVALID_IO_INSPECT"
+  end
+
   def test_reads_all_data
     assert_equal "Hello world!", @composite_io.read
   end
@@ -35,13 +45,13 @@ def test_reads_partial_data
     assert_equal "world!", @composite_io.read(6)
   end
 
-  def test_returns_empty_string_when_no_data_retrieved
+  def test_returns_empty_string_when_exhausted_without_length
     @composite_io.read
 
     assert_equal "", @composite_io.read
   end
 
-  def test_returns_nil_when_no_partial_data_retrieved
+  def test_returns_nil_when_exhausted_with_length
     @composite_io.read
 
     assert_nil @composite_io.read(3)
@@ -72,15 +82,15 @@ def test_fills_buffer_with_retrieved_content
     assert_equal "world!", outbuf
   end
 
-  def test_returns_nil_when_no_partial_data_retrieved_with_buffer
+  def test_clears_buffer_when_exhausted_with_length
     outbuf = +"content"
     @composite_io.read
 
     assert_nil @composite_io.read(3, outbuf)
     assert_equal "", outbuf
   end
 
-  def test_returns_data_in_binary_encoding
+  def test_returns_binary_encoding
     io = HTTP::FormData::CompositeIO.new(%w[Janko Marohnić])
 
     assert_equal Encoding::BINARY, io.read(5).encoding
@@ -109,90 +119,62 @@ def test_rewinds_all_ios
     assert_equal "Hello world!", @composite_io.read
   end
 
-  def test_returns_sum_of_all_io_sizes
+  def test_size_returns_sum_of_all_ios
     assert_equal 12, @composite_io.size
   end
 
-  def test_returns_zero_when_no_ios
-    empty = HTTP::FormData::CompositeIO.new([])
-
-    assert_equal 0, empty.size
+  def test_size_returns_zero_for_empty
+    assert_equal 0, HTTP::FormData::CompositeIO.new([]).size
   end
 
-  # --- Kill mutations for CompositeIO#initialize ---
-
-  # Kill: replacing io.is_a?(String) with nil/false/self.is_a?(String)/io.instance_of?(String)
-  # Verify that a String subclass is also converted to StringIO
-  def test_initialize_converts_string_subclass_to_io
-    str_subclass = Class.new(String)
-    io = HTTP::FormData::CompositeIO.new([str_subclass.new("hello")])
+  # String subclass is also converted to StringIO
+  def test_accepts_string_subclass
+    io = HTTP::FormData::CompositeIO.new([Class.new(String).new("hello")])
 
     assert_equal "hello", io.read
   end
 
-  # Kill: replacing io.respond_to?(:read) with nil/false
-  # Verify that an object responding to :read is accepted as-is
-  def test_initialize_accepts_custom_io_object
+  # Object responding to :read is accepted as-is
+  def test_accepts_custom_io_object
     custom_io = Class.new do
-      def initialize
-        @done = false
-      end
+      def initialize = @done = false
 
       def read(length = nil, outbuf = nil)
         if @done
           length ? nil : ""
         else
           @done = true
           result = +"custom"
-          if outbuf
-            outbuf.replace(result)
-            outbuf
-          else
-            result
-          end
+          outbuf ? outbuf.replace(result) : result
         end
       end
 
       def size = 6
-
-      def rewind
-        @done = false
-      end
+      def rewind = @done = false
     end.new
 
-    io = HTTP::FormData::CompositeIO.new([custom_io])
-
-    assert_equal "custom", io.read
+    assert_equal "custom", HTTP::FormData::CompositeIO.new([custom_io]).read
   end
 
-  # Kill: @index = 0 replaced with @index = nil or removed
-  def test_initialize_starts_reading_from_beginning
-    io = HTTP::FormData::CompositeIO.new(%w[abc def])
-
-    assert_equal "a", io.read(1)
+  def test_starts_reading_from_beginning
+    assert_equal "a", HTTP::FormData::CompositeIO.new(%w[abc def]).read(1)
   end
 
-  # Kill: @buffer = "".b replaced with something else
-  def test_read_partial_uses_internal_buffer_correctly
+  def test_reads_across_io_boundaries
     io = HTTP::FormData::CompositeIO.new(%w[abc def])
 
     assert_equal "ab", io.read(2)
     assert_equal "cd", io.read(2)
     assert_equal "ef", io.read(2)
   end
 
-  # Kill: replacing current_io with nil or other mutation
-  def test_current_io_returns_nil_after_all_read
+  def test_returns_nil_after_all_read_with_length
     io = HTTP::FormData::CompositeIO.new(["a"])
     io.read
 
     assert_nil io.read(1)
   end
 
-  # --- Kill mutations for CompositeIO#read ---
-
-  # Kill: data unless length && data.empty? — various mutations
-  # When reading all with no length and there IS data
   def test_read_without_length_returns_string
     io = HTTP::FormData::CompositeIO.new(["hello"])
     result = io.read
@@ -201,48 +183,15 @@ def test_read_without_length_returns_string
     assert_equal "hello", result
   end
 
-  # When reading all with no length and NO data left
-  def test_read_without_length_returns_empty_string_when_exhausted
-    io = HTTP::FormData::CompositeIO.new(["hello"])
-    io.read
-    result = io.read
-
-    assert_instance_of String, result
-    assert_equal "", result
-  end
-
-  # When reading with length and NO data left
-  def test_read_with_length_returns_nil_when_exhausted
-    io = HTTP::FormData::CompositeIO.new(["hello"])
-    io.read
-    result = io.read(5)
-
-    assert_nil result
-  end
-
-  # --- Kill mutations for CompositeIO#readpartial ---
-
-  # Kill: chunk && !chunk.empty? mutations
-  # Read across IO boundary with exact length
-  def test_readpartial_advances_through_ios
-    io = HTTP::FormData::CompositeIO.new(%w[ab cd ef])
-
-    assert_equal "abcdef", io.read
+  def test_advances_through_ios
+    assert_equal "abcdef", HTTP::FormData::CompositeIO.new(%w[ab cd ef]).read
   end
 
-  # Kill: chunk = current_io.read(max_length, @buffer) mutations
-  def test_readpartial_with_empty_io_in_middle
-    io = HTTP::FormData::CompositeIO.new(["ab", "", "cd"])
-
-    assert_equal "abcd", io.read
+  def test_skips_empty_io_in_middle
+    assert_equal "abcd", HTTP::FormData::CompositeIO.new(["ab", "", "cd"]).read
   end
 
-  # --- Kill mutations for CompositeIO#read_chunks ---
-
-  # Kill: next if length.nil? replaced with other
-  # Kill: length -= chunk.bytesize mutations
-  # Kill: break if length.zero? mutations
-  def test_read_chunks_respects_length_exactly
+  def test_respects_length_exactly
     io = HTTP::FormData::CompositeIO.new(%w[abcdef ghijkl])
 
     assert_equal "abc", io.read(3)
@@ -252,14 +201,13 @@ def test_read_chunks_respects_length_exactly
     assert_nil io.read(1)
   end
 
-  def test_read_chunks_length_spanning_ios
+  def test_length_spanning_ios
     io = HTTP::FormData::CompositeIO.new(%w[ab cd ef])
 
     assert_equal "abcd", io.read(4)
     assert_equal "ef", io.read(4)
   end
 
-  # Kill: read with outbuf and no length
   def test_read_all_with_outbuf
     outbuf = +""
     io = HTTP::FormData::CompositeIO.new(["hello", " ", "world"])
@@ -270,7 +218,6 @@ def test_read_all_with_outbuf
     assert_same result, outbuf
   end
 
-  # Verify outbuf is cleared before use
   def test_read_with_outbuf_clears_previous_content
     outbuf = +"previous content"
     io = HTTP::FormData::CompositeIO.new(["new"])
@@ -279,25 +226,12 @@ def test_read_with_outbuf_clears_previous_content
     assert_equal "new", outbuf
   end
 
-  # Kill: outbuf.clear.force_encoding(Encoding::BINARY) -> outbuf.clear
-  # Verify that outbuf encoding is forced to binary
-  def test_read_with_utf8_outbuf_returns_binary_encoding
+  def test_outbuf_encoding_forced_to_binary
     outbuf = +"hello"
     outbuf.force_encoding(Encoding::UTF_8)
     io = HTTP::FormData::CompositeIO.new(%w[Marohnić])
     io.read(5, outbuf)
 
     assert_equal Encoding::BINARY, outbuf.encoding
   end
-
-  # Kill: error message mutation — io.inspect vs io vs nil vs self.inspect
-  def test_error_message_contains_inspect_of_invalid_io
-    obj = Object.new
-    def obj.inspect = "INVALID_IO_INSPECT"
-    def obj.to_s = "INVALID_IO_TO_S"
-
-    error = assert_raises(ArgumentError) { HTTP::FormData::CompositeIO.new([obj]) }
-
-    assert_includes error.message, "INVALID_IO_INSPECT"
-  end
 end