twingly-http 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc5e134cf7d77a56bda5f8d4c40ef90f6c80c0230aea262cada8c943b4defa77
-  data.tar.gz: ad54778da0dddff2b0bb14e4205333758a43272cfd9d6458566fbb4fc48c9816
+  metadata.gz: 504e1df993b190cf3039e5b45b9586f2babaab2fe5e1a881a10dfc407fd21663
+  data.tar.gz: 6081a1578382fa683f5ae71f52749988b52346dfef87cbcc9295d3ac33453bb8
 SHA512:
-  metadata.gz: 83b57d12d30e4a3f38c5e4b71d06d1ed894ab7ecca32495d9607bb2cf434e0f5bc1b1ffea0d4855b06e3e7791987c60ffe2d0e0c69be739bf0f5eabcb0ff4ed1
-  data.tar.gz: 138b97d64ed9b979c942eecd48728fd1427b26054b6c614ee19799e3046695dc7f1523c113f4f9efdb289fdfac092315f15e084e6ab3b2ad8fa723d091100ff1
+  metadata.gz: 493b7190c970e227735c7ffa8e7377f243cec8c8e24778662b3f9e9f187f713e16f68404c0c9c6322ad002fd05f75e2088027471747b2d022fb204e5ca719729
+  data.tar.gz: 68baaace97462c88bbbd84a082848264ee5515fde8505cf3e0e3524912d0b4f3387aa9c3057b577a683dbcd6f39ffec9dbaeae65c2b4bd3a35c8e5892f2684b0

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/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

@@ -61,6 +61,18 @@ module Twingly
         http_response_for(:post, url: url, body: body, headers: headers)
       end
 
+      def put(url, body:, headers: {})
+        http_response_for(:put, url: url, body: body, headers: headers)
+      end
+
+      def patch(url, body:, headers: {})
+        http_response_for(:patch, url: url, body: body, headers: headers)
+      end
+
+      def delete(url, params: {}, headers: {})
+        http_response_for(:delete, url: url, params: params, headers: headers)
+      end
+
       private
 
       def default_logger
@@ -80,18 +92,13 @@ module Twingly
         @max_url_size_bytes     = DEFAULT_MAX_URL_SIZE_BYTES
       end
 
-      # rubocop:disable Metrics/MethodLength
       def http_response_for(method, **args)
-        response = case method
-                   when :get
-                     http_get_response(**args)
-                   when :post
-                     http_post_response(**args)
-                   end
+        response = send("http_#{method}_response", **args)
 
         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
@@ -99,7 +106,6 @@ module Twingly
       rescue FaradayMiddleware::RedirectLimitReached => error
         raise RedirectLimitReachedError, error.message
       end
-      # rubocop:enable all
 
       def http_get_response(url:, params:, headers:)
         binary_url = url.dup.force_encoding(Encoding::BINARY)
@@ -131,6 +137,51 @@ module Twingly
         end
       end
 
+      def http_put_response(url:, body:, headers:)
+        binary_url = url.dup.force_encoding(Encoding::BINARY)
+        http_client = create_http_client
+
+        headers = default_headers.merge(headers)
+
+        http_client.put do |request|
+          request.url(binary_url)
+          request.headers.merge!(headers)
+          request.body = body
+          request.options.timeout = @http_timeout
+          request.options.open_timeout = @http_open_timeout
+        end
+      end
+
+      def http_patch_response(url:, body:, headers:)
+        binary_url = url.dup.force_encoding(Encoding::BINARY)
+        http_client = create_http_client
+
+        headers = default_headers.merge(headers)
+
+        http_client.patch do |request|
+          request.url(binary_url)
+          request.headers.merge!(headers)
+          request.body = body
+          request.options.timeout = @http_timeout
+          request.options.open_timeout = @http_open_timeout
+        end
+      end
+
+      def http_delete_response(url:, params:, headers:)
+        binary_url = url.dup.force_encoding(Encoding::BINARY)
+        http_client = create_http_client
+
+        headers = default_headers.merge(headers)
+
+        http_client.delete do |request|
+          request.url(binary_url)
+          request.params.merge!(params)
+          request.headers.merge!(headers)
+          request.options.timeout = @http_timeout
+          request.options.open_timeout = @http_open_timeout
+        end
+      end
+
       def create_http_client # rubocop:disable Metrics/MethodLength
         Faraday.new do |faraday|
           faraday.request :url_size_limit,
@@ -191,9 +242,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
 
@@ -208,13 +259,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.3.2"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-http
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2023-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -92,28 +92,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 1.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.36'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: toxiproxy
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Robust HTTP client