eac_envs-http 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f17385384c0f2915178b63b4a4e655c826cb6593da72b2c77ba5e93ecb67911e
-  data.tar.gz: 8088ab907a1f99ae71a0b528fc110639505885e5dcf063060c09442766cda90a
+  metadata.gz: 815cab06daf5fa4e2baca67a1bb6fb9282228b081e963e34db3c19499b792904
+  data.tar.gz: 0d35c7cbf823781ae5b11e293b6f8b189bf316a3fa3038374cd183120c39ff0f
 SHA512:
-  metadata.gz: 55fc48bfb2a0daafec4ccf30d422ca8f69ce850f17bb2a0834b04190bb941c20bdd0f7468996b69b3c7dd6623fd92831705f7b21978ebc4f064a1d8d850b4000
-  data.tar.gz: cc7ff67747a6001d997407a6c9d511e8a9449010bfe1190de4e97904cd09f500e27c1d5f20bcced5f36fd1d5c3dcfc529f3f43774732b0189a6c1f7de1e4e46a
+  metadata.gz: 1eacb4a2df11f838367dea25261ceb5f3e7a682a2c9cbabe1d3728c18bed33e831817869400fd9b8f21e419fdac9120f5c618b91b8e7c1df2cf6a933b1f80537
+  data.tar.gz: be9a22cce0b1e9ed7f71009d3d1025bedf1249d0a0d87a5148e445fba06a3b93c28660967c3ba3f5ec8fb39a01e72f3e6d449e65c70b575fac01fe6c889867fd

data/lib/eac_envs/http/request/faraday_connection.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'faraday'
+require 'faraday/follow_redirects'
+require 'faraday/gzip'
+require 'faraday/multipart'
+require 'faraday/retry'
+
+module EacEnvs
+  module Http
+    class Request
+      class FaradayConnection
+        enable_method_class
+        common_constructor :request
+
+        SETUPS = %i[multipart authorization follow_redirect gzip retry].freeze
+
+        # @return [Faraday::Connection]
+        def result
+          ::Faraday.default_connection_options[:headers] = {}
+          ::Faraday::Connection.new(connection_options) do |conn|
+            SETUPS.each { |setup| send("setup_#{setup}", conn) }
+          end
+        end
+
+        private
+
+        # @return [Boolean]
+        def body_with_file?
+          request.body_fields.with_file?
+        end
+
+        # @return [Hash]
+        def connection_options
+          {
+            request: { params_encoder: Faraday::FlatParamsEncoder },
+            ssl: { verify: request.ssl_verify? }
+          }
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_authorization(conn)
+          request.auth.if_present do |v|
+            conn.request :authorization, :basic, v.username, v.password
+          end
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_follow_redirect(conn)
+          conn.response :follow_redirects if request.follow_redirect?
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_gzip(conn)
+          conn.request :gzip
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_multipart(conn)
+          if body_with_file?
+            conn.request :multipart, flat_encode: true
+          else
+            conn.request :url_encoded
+          end
+        end
+
+        # @param conn [Faraday::Connection]
+        def setup_retry(conn)
+          conn.request :retry if request.retry?
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/request.rb

@@ -2,13 +2,11 @@
 
 require 'eac_envs/http/response'
 require 'eac_ruby_utils/core_ext'
-require 'faraday'
-require 'faraday/multipart'
 
 module EacEnvs
   module Http
     class Request
-      BOOLEAN_MODIFIERS = %w[ssl_verify].freeze
+      BOOLEAN_MODIFIERS = %w[follow_redirect retry ssl_verify].freeze
       COMMON_MODIFIERS = %w[auth body_data response_body_data_proc url verb].freeze
       HASH_MODIFIERS = %w[header].freeze
       MODIFIERS = COMMON_MODIFIERS + BOOLEAN_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
@@ -25,24 +23,9 @@ module EacEnvs
         auth(::Struct.new(:username, :password).new(username, password))
       end
 
-      # @return [Faraday::Connection]
-      def faraday_connection
-        ::Faraday.default_connection_options[:headers] = {}
-        ::Faraday::Connection.new(faraday_connection_options) do |conn|
-          if body_with_file?
-            conn.request :multipart, flat_encode: true
-          else
-            conn.request :url_encoded
-          end
-          auth.if_present { |v| conn.request :authorization, :basic, v.username, v.password }
-        end
-      end
-
-      # @return [Hash]
-      def faraday_connection_options
-        {
-          request: { params_encoder: Faraday::FlatParamsEncoder }, ssl: { verify: ssl_verify? }
-        }
+      # @return [EacEnvs::Http::Request::BodyFields]
+      def body_fields
+        @body_fields ||= ::EacEnvs::Http::Request::BodyFields.new(body_data)
       end
 
       # @return [Faraday::Response]
@@ -65,20 +48,11 @@ module EacEnvs
 
       private
 
-      def body_fields
-        @body_fields ||= ::EacEnvs::Http::Request::BodyFields.new(body_data)
-      end
-
-      # @return [Boolean]
-      def body_with_file?
-        body_fields.with_file?
-      end
-
       def sanitized_body_data
         body_fields.to_h || body_data
       end
 
-      require_sub __FILE__
+      require_sub __FILE__, require_dependency: true
     end
   end
 end

data/lib/eac_envs/http/response.rb

@@ -9,6 +9,7 @@ require 'json'
 module EacEnvs
   module Http
     class Response < ::StandardError
+      COMMON_HEADERS = %w[Content-Type].freeze
       HEADER_LINE_PARSER = /\A([^:]+):(.*)\z/.to_parser do |m|
         [m[1].strip, m[2].strip]
       end
@@ -22,14 +23,14 @@ module EacEnvs
       end
 
       common_constructor :request
-      delegate :body_data_proc, to: :request
+      delegate :response_body_data_proc, to: :request
 
       def body_data
         r = performed.headers['Accept'].if_present(body_str) do |v|
           method_name = "body_data_from_#{v.parameterize.underscore}"
           respond_to?(method_name) ? send(method_name) : body_str
         end
-        r = body_data_proc.call(r) if body_data_proc.present?
+        r = response_body_data_proc.call(r) if response_body_data_proc.present?
         r
       end
 
@@ -54,10 +55,9 @@ module EacEnvs
         hash_search(headers, name)
       end
 
+      # @return [Hash<String, String>]
       def headers
-        performed.header_str.each_line.map(&:strip)[1..-1].reject(&:blank?)
-                 .map { |header_line| HEADER_LINE_PARSER.parse!(header_line) }
-                 .to_h
+        performed.headers.to_hash
       end
 
       def link(rel)
@@ -86,6 +86,12 @@ module EacEnvs
         "URL: #{url}\nStatus: #{status}\nBody:\n\n#{body_str}"
       end
 
+      COMMON_HEADERS.each do |header_key|
+        define_method header_key.underscore do
+          header(header_key)
+        end
+      end
+
       private
 
       def body_data_from_application_json

data/lib/eac_envs/http/version.rb

@@ -2,6 +2,6 @@
 
 module EacEnvs
   module Http
-    VERSION = '0.2.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_envs-http
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -58,6 +58,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.4
+- !ruby/object:Gem::Dependency
+  name: faraday-follow_redirects
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: faraday-gzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +106,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +166,7 @@ files:
 - lib/eac_envs/http/request/body_field.rb
 - lib/eac_envs/http/request/body_field_value.rb
 - lib/eac_envs/http/request/body_fields.rb
+- lib/eac_envs/http/request/faraday_connection.rb
 - lib/eac_envs/http/response.rb
 - lib/eac_envs/http/rspec.rb
 - lib/eac_envs/http/rspec/echo_server.rb