twingly-http 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c96f42ded2e94d947bd2a15cc7de75669e3f2dc06a17ff7d648eb3c0cf862c5e
-  data.tar.gz: 5203e3833efe611708b1b185708735b2c6a027d20d8edd0e79c80dcca696d73a
+  metadata.gz: 21eb122f9e909d09327bb318f00259ed67b5f3a95f7bb7a9963992376730bd4d
+  data.tar.gz: 742b3386edb9e6cb72d84a9d01f1e52ed597446eb67cbd050e800a0842158bf8
 SHA512:
-  metadata.gz: 6869f39208327e4b834f999e96a1a0d7253768022aca54f259c1f0cf57bf60331e4aabc966919ad0a7bef08e3091ff7090c9e576986f7d4f5336894ac47b250b
-  data.tar.gz: 4cf992e7c60229b8fcbfd3ab62b0584e8531b229fd8a863d8ab1a47b248c5c2697eb225beecb6ec26377bce50009bf6ba295e1fee45622951be2809ffb5b4640
+  metadata.gz: 4bf39f3fd4f2939a2648d8dd7c117647b41f561c97ecc879c1735da5f02c1870d702f924a8ed96020e8178a3f4382fb650359873c392a08a994067ae81e7de2d
+  data.tar.gz: 7f31cd2df3b531607987d6915f40d6074f4f4c65cfd0ad6b0fb92897deae3310cb3dd1dc3fb759b1dd667ab14a6d59839c28e5600bea2937b2d5e739677daed8

data/README.md

@@ -1,7 +1,45 @@
 # Twingly::HTTP
 
-Robust HTTP client
+[![Build Status](https://travis-ci.com/twingly/twingly-http.svg?branch=master)](https://travis-ci.com/twingly/twingly-http)
 
+Robust HTTP client, tailored by Twingly.
+
+## Getting Started
+
+Install the gem:
+
+    gem install twingly-http
+
+Example "one-liner" usage:
+
+```
+ruby -rlogger -rtwingly/http -e '\
+    logger = Logger.new(STDOUT); logger.level = :INFO; \
+    puts Twingly::HTTP::Client.new(logger: logger, \
+    base_user_agent: "").get("http://example.org").status'
+```
+
+Example `irb` usage:
+
+```
+irb -rlogger -rtwingly/http
+```
+```ruby
+logger = Logger.new(STDOUT); logger.level = :INFO
+client = Twingly::HTTP::Client.new(logger: logger, base_user_agent: "")
+client.get("http://example.org").status
+```
+
+## Tests
+
+The tests require [Toxiproxy](https://github.com/Shopify/toxiproxy#1-installing-toxiproxy) to be installed and running. On macOS you can install it with Homebrew:
+
+    brew tap shopify/shopify
+    brew install toxiproxy
+
+Run tests with
+
+    bundle exec rake
 
 ## Release workflow
 
@@ -18,6 +56,3 @@ Robust HTTP client
         github_changelog_generator
 
 [twingly-rubygems]: https://rubygems.org/profiles/twingly
-[ruby-prof]: http://ruby-prof.rubyforge.org/
-[memory_profiler]: https://github.com/SamSaffron/memory_profiler
-[examples]: examples/url.rb

data/lib/twingly/http.rb

@@ -2,6 +2,7 @@
 
 require "net/http"
 require "faraday"
+require "faraday_middleware/response/follow_redirects"
 
 require_relative "../faraday/logfmt_logger"
 require_relative "../faraday/url_size_limit"
@@ -12,6 +13,7 @@ module Twingly
   module HTTP
     class ConnectionError < StandardError; end
     class UrlSizeLimitExceededError < StandardError; end
+    class RedirectLimitReachedError < StandardError; end
     class Client # rubocop:disable Metrics/ClassLength
       DEFAULT_RETRYABLE_EXCEPTIONS = [
         Faraday::ConnectionFailed,
@@ -28,6 +30,7 @@ module Twingly
       DEFAULT_NUMBER_OF_RETRIES = 0
       DEFAULT_RETRY_INTERVAL = 1
       DEFAULT_MAX_URL_SIZE_BYTES = Float::INFINITY
+      DEFAULT_FOLLOW_REDIRECTS_LIMIT = 3
 
       attr_writer :http_timeout
       attr_writer :http_open_timeout
@@ -36,27 +39,20 @@ module Twingly
       attr_writer :on_retry_callback
       attr_writer :max_url_size_bytes
       attr_writer :request_id
+      attr_writer :follow_redirects
 
+      attr_accessor :follow_redirects_limit
       attr_accessor :retryable_exceptions
 
       def initialize(logger:, base_user_agent:)
         @logger          = logger
         @base_user_agent = base_user_agent
-        @request_id      = nil
 
-        @http_timeout      = DEFAULT_HTTP_TIMEOUT
-        @http_open_timeout = DEFAULT_HTTP_OPEN_TIMEOUT
-
-        @retryable_exceptions = DEFAULT_RETRYABLE_EXCEPTIONS
-        @number_of_retries    = DEFAULT_NUMBER_OF_RETRIES
-        @retry_interval       = DEFAULT_RETRY_INTERVAL
-        @on_retry_callback    = nil
-
-        @max_url_size_bytes = DEFAULT_MAX_URL_SIZE_BYTES
+        initialize_defaults
       end
 
-      def get(url, params: {})
-        http_response_for(:get, url: url, params: params)
+      def get(url, params: {}, headers: {})
+        http_response_for(:get, url: url, params: params, headers: headers)
       end
 
       def post(url, body:, headers: {})
@@ -65,6 +61,19 @@ module Twingly
 
       private
 
+      def initialize_defaults
+        @request_id             = nil
+        @http_timeout           = DEFAULT_HTTP_TIMEOUT
+        @http_open_timeout      = DEFAULT_HTTP_OPEN_TIMEOUT
+        @retryable_exceptions   = DEFAULT_RETRYABLE_EXCEPTIONS
+        @number_of_retries      = DEFAULT_NUMBER_OF_RETRIES
+        @retry_interval         = DEFAULT_RETRY_INTERVAL
+        @on_retry_callback      = nil
+        @follow_redirects       = false
+        @follow_redirects_limit = DEFAULT_FOLLOW_REDIRECTS_LIMIT
+        @max_url_size_bytes     = DEFAULT_MAX_URL_SIZE_BYTES
+      end
+
       # rubocop:disable Metrics/MethodLength
       def http_response_for(method, *args)
         response = case method
@@ -81,14 +90,16 @@ module Twingly
         raise ConnectionError
       rescue Faraday::UrlSizeLimit::LimitExceededError => error
         raise UrlSizeLimitExceededError, error.message
+      rescue FaradayMiddleware::RedirectLimitReached => error
+        raise RedirectLimitReachedError, error.message
       end
       # rubocop:enable all
 
-      def http_get_response(url:, params: {})
+      def http_get_response(url:, params:, headers:)
         binary_url = url.dup.force_encoding(Encoding::BINARY)
         http_client = create_http_client
 
-        headers = default_headers
+        headers = default_headers.merge(headers)
 
         http_client.get do |request|
           request.url(binary_url)
@@ -128,6 +139,10 @@ module Twingly
                            headers: true,
                            bodies: true,
                            request_id: @request_id
+          if @follow_redirects
+            faraday.use FaradayMiddleware::FollowRedirects,
+                        limit: @follow_redirects_limit
+          end
           faraday.adapter Faraday.default_adapter
           faraday.headers[:user_agent] = user_agent
         end

data/lib/twingly/version.rb

@@ -2,6 +2,6 @@
 
 module Twingly
   module HTTP
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twingly-http
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Twingly AB
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement