api_hammer 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 822c3220d1b6c07c850f3b0c66a5f18c6026bfd6415b059ff3c18569af48939b
-  data.tar.gz: 3ef1009398f37e4322809a381ccaa23072e3dbb2a32396012ba4f6754ec81d8d
+  metadata.gz: 431eb2a642aea887bd47826572e0631ebc6e18daa0714c430d6b0c690bb68ea3
+  data.tar.gz: dd74fb4768fb9f51dcb139fe3ba7cf61e9f949b96ec3013cfbde0f41534ced12
 SHA512:
-  metadata.gz: 87b589dc7d2228051c011483ac37738f32b82d2761d6a43b72a86cad0711ce214126657fee707ff3a2ef3d1f872f58e8b664be0786cfa1df4f4791cbb0b5940b
-  data.tar.gz: 61f839239d5997277a7ea88e47b20109b6fd2bb0ee81e54520da2f784088a592f8c3d35d91108455efd1b93a331849ccda861077ce884f9c1e94ea7682b1c73c
+  metadata.gz: 22aa57cf47a015dc1c62053c21bff79e549ebcf7cc7d3c2702224fdcd1dd86f037186419525dbb4143c75f9ae9ce639df91af621bd7ce6b5d12b6435e200bdad
+  data.tar.gz: c136b0b42e7256bcbb9c8b6498a1a52307d116fcf0d8f0f2f8bb41991842912b3b32a95e86f8442ce36ccb42e8563ca2cac17ad969f177d3567c4b627140039e

data/api_hammer.gemspec

@@ -29,10 +29,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack'
-  spec.add_dependency 'faraday', '~> 1.0'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'json'
-  spec.add_dependency 'json_pure'
   spec.add_dependency 'addressable'
   spec.add_dependency 'coderay'
   spec.add_dependency 'i18n'

data/lib/api_hammer/body.rb

@@ -12,17 +12,23 @@ module ApiHammer
     # parses the body to an object
     def object
       instance_variable_defined?(:@object) ? @object : @object = begin
-        if media_type == 'application/json'
+        if body.nil?
+          nil
+        elsif media_type == 'application/json'
           JSON.parse(body) rescue nil
         elsif media_type == 'application/x-www-form-urlencoded'
-          CGI.parse(body).map { |k, vs| {k => vs.last} }.inject({}, &:update)
+          Addressable::URI.form_unencode(body).group_by(&:first).transform_values do |kvs|
+            kvs.map(&:last).inject(nil) { |c, v| c ? v ? "#{c},#{v}" : c : v }
+          end
         end
       end
     end
 
     def filtered(options)
       @filtered ||= Body.new(begin
-        if media_type == 'application/json'
+        if body.nil?
+          nil
+        elsif media_type == 'application/json'
           begin
             ApiHammer::Filtration::Json.new(body, options).filter
           rescue JSON::ParserError

data/lib/api_hammer/filtration/json.rb

@@ -15,7 +15,7 @@ module ApiHammer
 
       def filter
         reset
-        obj = ''
+        obj = +''
         while !eos? && scan_result(obj, IGNORE)
         end
         if eos?
@@ -57,7 +57,7 @@ module ApiHammer
       end
 
       def filter_array
-        result = ''
+        result = +''
         delim = false
         until eos?
           if (value = filter_value) != UNPARSED
@@ -86,7 +86,7 @@ module ApiHammer
       FILTERED_JSON = JSON.generate("[FILTERED]", :quirks_mode => true)
 
       def filter_object
-        result = ''
+        result = +''
         delim = false
         until eos?
           if (string = filter_string) != UNPARSED

data/lib/api_hammer/request_logger.rb

@@ -53,14 +53,18 @@ module ApiHammer
       super(app, logger)
     end
 
+    Headers = ::Rack.const_defined?(:Headers) ? ::Rack::Headers : ::Rack::Utils::HeaderHash
+
     def call(env)
       began_at = Time.now
       began_ns = Process.clock_gettime(Process::CLOCK_MONOTONIC, :nanosecond)
 
       # this is closed after the app is called, so read it before 
-      env["rack.input"].rewind
-      request_body = env["rack.input"].read
-      env["rack.input"].rewind
+      if env["rack.input"]
+        env["rack.input"].rewind
+        request_body = env["rack.input"].read
+        env["rack.input"].rewind
+      end
 
       if @logger && @logger.formatter.respond_to?(:current_tags)
         log_tags = @logger.formatter.current_tags.dup
@@ -76,7 +80,7 @@ module ApiHammer
       )
 
       status, response_headers, response_body = @app.call(env)
-      response_headers = ::Rack::Utils::HeaderHash.new(response_headers)
+      response_headers = Headers.new.merge(response_headers)
       body_proxy = ::Rack::BodyProxy.new(response_body) do
         log(env, request_uri, request_body, status, response_headers, response_body, began_at, began_ns, log_tags)
       end
@@ -135,7 +139,9 @@ module ApiHammer
           parsed_body = ApiHammer::Body.new(body, content_type)
           content_type_attrs = ApiHammer::ContentTypeAttrs.new(content_type)
           if content_type_attrs.text?
-            if (400..599).include?(status.to_i) || body.size < LARGE_BODY_SIZE
+            if body.nil?
+              data[role]['body'] = body
+            elsif (400..599).include?(status.to_i) || body.size < LARGE_BODY_SIZE
               # log bodies if they are not large, or if there was an error (either client or server) 
               data[role]['body'] = parsed_body.filtered(@options.reject { |k,v| ![:filter_keys].include?(k) }).jsonifiable.body
             else

data/lib/api_hammer/trailing_newline.rb

@@ -29,8 +29,10 @@ module ApiHammer
       _, content_type = headers.detect { |(k,_)| k =~ /\Acontent.type\z/i }
       if env['REQUEST_METHOD'].downcase != 'head' && ApiHammer::ContentTypeAttrs.new(content_type).text?
         body = TNLBodyProxy.new(body){}
-        if headers["Content-Length"]
-          headers["Content-Length"] = body.map(&:bytesize).inject(0, &:+).to_s
+        headers.each_key do |k|
+          if "content-length".casecmp?(k)
+            headers[k] = body.map(&:bytesize).inject(0, &:+).to_s
+          end
         end
       end
       [status, headers, body]

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.19.1"
+  VERSION = "0.19.2"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Ethan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -26,20 +25,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +38,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +52,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,7 +160,6 @@ homepage: https://github.com/notEthan/api_hammer
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 4.0.5
 specification_version: 4
 summary: an API tool
 test_files: []