twingly-http 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 573e3beb22fd03c1961fe5b6264b3a2b1ef9f0a5a89b95e0094e1693e76dff7f
-  data.tar.gz: 30a0dda321f1a3804492fd91e49907456cd3e45494f79ff571c054b648f7725c
+  metadata.gz: 8fd022cb30b4e6aea665f8e8bc569a7fa7023c78f1a0cc88b18c4f00793b23ac
+  data.tar.gz: 498f19467946922913480c55637baea6871d6895ab2a51ed82d7e6cd6fd4b60c
 SHA512:
-  metadata.gz: 9d209c54bbd796f27d38796d6a5449cf961e7de9a351700098ba92f022502a34950dc7652c4c9d16f80d9ae7474fe65bd6d3a60976cf43db65f767d5fb97277e
-  data.tar.gz: 6e4db092c8893e0539b17af90233d9ac86f2bbb2f51a2ab3b29fbd7c671211861168e30b434b4abdbf209c332861292a71bee37cb47fe4a91f3623b14f67a21f
+  metadata.gz: 8658da71b5b0a3d327f81cf8f4c29014606ca3336b2ed3848b234498511fde9152953e841ca920818b2a1daae9024912ce5987b518b0be7204bdf61071a8b115
+  data.tar.gz: a397277ad9301bae0b25589e0aeea82beaa11e57a8c228a6d3d8bcc276010b181721b184c230d29fbb41a592c74905a411be68d717ee04e5049a8cd4e6534097

data/README.md

@@ -14,7 +14,7 @@ Example "one-liner" usage:
 
 ```
 ruby -rlogger -rtwingly/http -e '\
-    logger = Logger.new(STDOUT); logger.level = :INFO; \
+    logger = Logger.new($stdout); logger.level = :INFO; \
     puts Twingly::HTTP::Client.new(logger: logger, \
     base_user_agent: "").get("http://example.org").status'
 ```
@@ -25,7 +25,7 @@ Example `irb` usage:
 irb -rlogger -rtwingly/http
 ```
 ```ruby
-logger = Logger.new(STDOUT); logger.level = :INFO
+logger = Logger.new($stdout); logger.level = :INFO
 client = Twingly::HTTP::Client.new(logger: logger, base_user_agent: "")
 client.get("http://example.org").status
 ```

data/lib/faraday/logfmt_logger/middleware.rb

@@ -13,7 +13,7 @@ module Faraday
         super(app)
         @logger = logger || begin
           require "logger"
-          ::Logger.new(STDOUT)
+          ::Logger.new($stdout)
         end
 
         @filter = []
@@ -26,10 +26,10 @@ module Faraday
       def call(env)
         info("request") do
           log_entry = {
-            "source": "upstream-request",
-            "method": env.method.upcase,
-            "url": apply_filters(env.url.to_s),
-            "request_id": request_id,
+            source: "upstream-request",
+            method: env.method.upcase,
+            url: apply_filters(env.url.to_s),
+            request_id: request_id,
           }.merge(app_metadata)
 
           Twingly::StringUtilities.logfmt(log_entry)
@@ -41,9 +41,9 @@ module Faraday
       def on_complete(env)
         info("response") do
           log_entry = {
-            "source": "upstream-response",
-            "status": env.status,
-            "request_id": request_id,
+            source: "upstream-response",
+            status: env.status,
+            request_id: request_id,
           }.merge(app_metadata)
 
           Twingly::StringUtilities.logfmt(log_entry)
@@ -68,7 +68,7 @@ module Faraday
 
       def app_metadata
         {
-          "release": Twingly::HTTP::Heroku.release_version,
+          release: Twingly::HTTP::Heroku.release_version,
         }
       end
 

data/lib/faraday/url_size_limit/middleware.rb

@@ -16,7 +16,7 @@ module Faraday
 
         if url_bytesize >= @max_size_bytes
           raise LimitExceededError,
-                "Expected URL below #{@max_size_bytes} bytes, "\
+                "Expected URL below #{@max_size_bytes} bytes, " \
                 "was #{url_bytesize} bytes"
         end
 

data/lib/twingly/heroku.rb

@@ -20,7 +20,7 @@ module Twingly
       end
 
       def self.review_app?
-        parent_name = ENV.fetch("HEROKU_PARENT_APP_NAME") {}
+        parent_name = ENV.fetch("HEROKU_PARENT_APP_NAME") { nil }
 
         return false unless parent_name
 

data/lib/twingly/http.rb

@@ -46,9 +46,10 @@ module Twingly
       attr_accessor :logger
       attr_accessor :retryable_exceptions
 
-      def initialize(base_user_agent:, logger: default_logger)
+      def initialize(base_user_agent:, logger: default_logger, user_agent: nil)
         @base_user_agent = base_user_agent
         @logger          = logger
+        @user_agent      = user_agent
 
         initialize_defaults
       end
@@ -97,7 +98,8 @@ module Twingly
 
         Response.new(headers: response.headers.to_h,
                      status: response.status,
-                     body: response.body)
+                     body: response.body,
+                     final_url: response.env.url.to_s)
       rescue *(@retryable_exceptions + TIMEOUT_EXCEPTIONS)
         raise ConnectionError
       rescue Faraday::UrlSizeLimit::LimitExceededError => error
@@ -231,7 +233,7 @@ module Twingly
       end
 
       def user_agent
-        format(
+        @user_agent || format(
           "%<base>s (Release/%<release>s; Commit/%<commit>s)",
           base: @base_user_agent,
           release: Heroku.release_version,
@@ -241,9 +243,9 @@ module Twingly
 
       def app_metadata
         {
-          "dyno_id": Heroku.dyno_id,
-          "release": Heroku.release_version,
-          "git_head": Heroku.slug_commit,
+          dyno_id: Heroku.dyno_id,
+          release: Heroku.release_version,
+          git_head: Heroku.slug_commit,
         }
       end
 
@@ -258,13 +260,16 @@ module Twingly
       attr_reader :headers
       attr_reader :status
       attr_reader :body
+      attr_reader :final_url
 
       def initialize(headers: nil,
                      status: nil,
-                     body: nil)
+                     body: nil,
+                     final_url: nil)
         @headers       = headers
         @status        = status
         @body          = body
+        @final_url     = final_url
       end
     end
   end

data/lib/twingly/string_utilities.rb

@@ -12,7 +12,7 @@ module Twingly
       return unless string
 
       if string[0] == char
-        string[1..-1]
+        string[1..]
       else
         string
       end

data/lib/twingly/version.rb

@@ -2,6 +2,6 @@
 
 module Twingly
   module HTTP
-    VERSION = "0.4.0"
+    VERSION = "0.6.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-http
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,118 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: climate_control
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.77.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.77.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.36'
-- !ruby/object:Gem::Dependency
-  name: toxiproxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.7'
 description: Robust HTTP client tailored by Twingly
 email:
 - support@twingly.com
@@ -177,7 +65,8 @@ files:
 homepage: http://github.com/twingly/twingly-http
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -193,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Robust HTTP client