julewire-rack 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0505d309f127982b88645a56045d2f472d36acb14efe781f6f08290559f8763e
-  data.tar.gz: 00b881c32d5761ab740773b80098c9c47950ceb574e65d38f1d4c1e14d36adbe
+  metadata.gz: eb74d11c52a34a94a086bce1adcb38f347f12665a3c48b31e09cb2e851a66346
+  data.tar.gz: e44437009a72f9bb50eb48908efaa3b4825c75129dc406d20fc58f998645a434
 SHA512:
-  metadata.gz: '078de25613aef97e313246e95e5207771a61439ed22f4b5ca97c1276593bd00863285504486275505d187fab88ab63dedbe69913b617e0e9e4c29acdc7abde7a'
-  data.tar.gz: c35d17e54f37c11328f0582497a44084faf7f3ac28f9d5418b637d905d8327441efe71b4af276c4a88c9bc60c3e47daa27893044d8353db3a260c1b2fb34556b
+  metadata.gz: 7e9f9858ef76ee7f26a8b9aa59fb4c2196082285f3e9416444a33d6c6f54332e2db9938fad1a00b3a2ea5d020e7d81e322d87abe4475f7e7035bb68a256bcf57
+  data.tar.gz: 4ef90c074f7a6adbb0942b646fa57efd8213581cf9c5710a4d879815ae8c3ea955adfa9d7f57ce21a79baeab82562658045788564f3ad2e8d14f9e412285399e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Unreleased
 
+## 1.1.0 - 2026-07-20
+
+- Cap request body capture by observed bytes, even when `Content-Length` claims
+  a smaller body.
+- Require julewire-core 1.1.0.
+
+## 1.0.1 - 2026-06-25
+
+- Require julewire-core 1.0.1.
+
 ## 1.0.0 - 2026-06-21
 
 - Initial release: Rack-family request lifecycle support primitives for Julewire

data/julewire-rack.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.executables = []
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "julewire-core", ">= 1.0"
+  spec.add_dependency "julewire-core", ">= 1.1.0"
   spec.add_dependency "rack", ">= 3.2"
   spec.add_dependency "zeitwerk", ">= 2.8.1"
 end

data/lib/julewire/rack/capture/buffered_response_body.rb

@@ -8,7 +8,7 @@ module Julewire
           def call(response, **) = new(response, **).summary_fields
         end
 
-        def initialize(response, content_types:, limit:, mode: Settings::STRING_BODY)
+        def initialize(response, content_types:, limit:, mode: nil)
           @response = response
           @content_types = content_types
           @limit = limit
@@ -30,7 +30,7 @@ module Julewire
           end
 
           capture(body_parts)
-          return {} if @total_bytes.zero? && @captured.empty?
+          return {} if @total_bytes.zero?
 
           JsonBody.fields(:response, @captured, bytes: @total_bytes, truncated: @truncated, mode: @mode)
         end
@@ -38,11 +38,8 @@ module Julewire
         private
 
         def response_body_parts
-          return unless @response.respond_to?(:stream)
-
           stream = @response.stream
           return if stream.respond_to?(:to_path)
-          return unless stream.respond_to?(:to_ary)
 
           stream.to_ary
         rescue StandardError
@@ -59,9 +56,7 @@ module Julewire
         end
 
         def body_string(part)
-          return part.to_str if part.respond_to?(:to_str)
-
-          nil
+          part.to_str
         rescue StandardError
           nil
         end
@@ -70,7 +65,7 @@ module Julewire
           return unless body_parts.length == 1
 
           body = body_string(body_parts.first)
-          return {} unless body && !body.empty?
+          return unless body && !body.empty?
 
           JsonBody.fields(:response, body, bytes: body.bytesize, truncated: false, mode: @mode)
         end
@@ -82,11 +77,6 @@ module Julewire
           return @captured << body if @limit.nil?
 
           remaining = @limit - @captured.bytesize
-          if remaining <= 0
-            @truncated = true if bytesize.positive?
-            return
-          end
-
           @captured << body.byteslice(0, remaining)
           @truncated = true if bytesize > remaining
         end

data/lib/julewire/rack/capture/header_selection.rb

@@ -15,21 +15,21 @@ module Julewire
 
         class << self
           def build(selector)
-            return new(true) if selector == true
             return unless selector
 
-            new(Array(selector).to_h { [normalize_name(it), true] })
+            allowed = Array(selector).to_h { [normalize_name(it), true] } unless selector == true
+            new(allowed)
           end
 
           def normalize_name(name) = name.to_s.tr("_", "-").downcase
         end
 
-        def initialize(selection)
-          @selection = selection
+        def initialize(allowed)
+          @allowed = allowed
         end
 
         def include?(name)
-          @selection == true ? !SENSITIVE_HEADER_SET.key?(name) : @selection.key?(name)
+          @allowed ? @allowed.key?(name) : !SENSITIVE_HEADER_SET.key?(name)
         end
       end
     end

data/lib/julewire/rack/capture/request_body.rb

@@ -27,28 +27,46 @@ module Julewire
         private
 
         def capture_body
-          body = bounded_body
-          bytes = content_length || body.bytesize
+          body, bytes = bounded_body
           captured, truncated = capture(body, total_bytes: bytes)
           [captured, bytes, truncated]
         rescue StandardError
           nil
         end
 
+        def captured_body_bytes(body, trust_actual_bytes:)
+          actual_bytes = body.bytesize
+          return actual_bytes if trust_actual_bytes && actual_bytes <= @limit
+
+          [content_length, actual_bytes].compact.max
+        end
+
         def bounded_body
-          return request_body if @limit.nil?
+          return uncapped_body unless @limit
 
           length = content_length
-          return request_body if length && length <= @limit
+          return trusted_body if length && length <= @limit
+
+          body, position = read_body_stream(limit: @limit + 1)
+          [body, captured_body_bytes(body, trust_actual_bytes: position&.zero?)]
+        end
+
+        def uncapped_body
+          body = request_body
+          [body, body.bytesize]
+        end
 
-          read_body_stream(limit: @limit + 1)
+        def trusted_body
+          body = request_body
+          [body, captured_body_bytes(body, trust_actual_bytes: true)]
         end
 
         def request_body
           # Rack/Rails may already buffer raw_post; the byte cap applies after that read.
           return @request.raw_post if @request.respond_to?(:raw_post)
 
-          read_body_stream(limit: nil)
+          body, = read_body_stream(limit: nil)
+          body
         end
 
         def read_body_stream(limit:)
@@ -61,7 +79,7 @@ module Julewire
           ensure
             restore_body_stream(io, original_position)
           end
-          body.to_str
+          [body.to_str, original_position]
         end
 
         def body_stream_position(io)

data/lib/julewire/rack/capture/settings.rb

@@ -30,7 +30,7 @@ module Julewire
         private
 
         def validate_body(value)
-          return value if CAPTURE_BODY_VALUES.include?(value)
+          return if CAPTURE_BODY_VALUES.include?(value)
 
           raise Error, "body must be false, true, or :json"
         end

data/lib/julewire/rack/version.rb

@@ -2,6 +2,6 @@
 
 module Julewire
   module Rack
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: julewire-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexander Grebennik
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.14
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Rack request lifecycle support for Julewire.
 test_files: []