eac_envs-http 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 815cab06daf5fa4e2baca67a1bb6fb9282228b081e963e34db3c19499b792904
-  data.tar.gz: 0d35c7cbf823781ae5b11e293b6f8b189bf316a3fa3038374cd183120c39ff0f
+  metadata.gz: 91ef89fd4cd3ad1bb09137c2c314dbeb1014b473a31d6b3a619afd5a25f49011
+  data.tar.gz: 3d1cef722ed45d04b87ad33c7ed3b4ad14e908a311fbb5d1ce83a363491e8bc0
 SHA512:
-  metadata.gz: 1eacb4a2df11f838367dea25261ceb5f3e7a682a2c9cbabe1d3728c18bed33e831817869400fd9b8f21e419fdac9120f5c618b91b8e7c1df2cf6a933b1f80537
-  data.tar.gz: be9a22cce0b1e9ed7f71009d3d1025bedf1249d0a0d87a5148e445fba06a3b93c28660967c3ba3f5ec8fb39a01e72f3e6d449e65c70b575fac01fe6c889867fd
+  metadata.gz: 52fc388acde1ab6a9f8b45f4939dc79cfc39c6de87de58cc4f94e6219f1ef70f111db18ed951c86a6f41a8f71008d062f16162d21bc8756a03867ea021111d1b
+  data.tar.gz: 7f38854cabb1bc75efdfe04ed201a4f1a4ef360707e99e822b32c00959c33717103f823c6ea99f5d7871d54776d4eda9346a94238ceb41bb71fcf98f33b8bdcf

data/lib/eac_envs/http/response/body.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'json'
+
+module EacEnvs
+  module Http
+    class Response < ::StandardError
+      module Body
+        delegate :response_body_data_proc, to: :request
+
+        def body_data
+          r = body_data_method_name.if_present(body_str) do |v|
+            respond_to?(v, true) ? send(v) : body_str
+          end
+          r = response_body_data_proc.call(r) if response_body_data_proc.present?
+          r
+        end
+
+        def body_data_or_raise
+          raise_unless_200
+
+          body_data
+        end
+
+        # @return [String]
+        def body_str
+          performed.body
+        end
+
+        def body_str_or_raise
+          raise_unless_200
+
+          body_str
+        end
+
+        private
+
+        def body_data_from_application_json
+          ::JSON.parse(body_str)
+        end
+
+        def body_data_from_application_xml
+          Hash.from_xml(body_str)
+        end
+
+        # @return [String]
+        def body_data_method_name
+          content_type.if_present do |v|
+            'body_data_from_' +
+              v.split(';').first.force_encoding(::Encoding::UTF_8).variableize
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/response/headers.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacEnvs
+  module Http
+    class Response < ::StandardError
+      module Headers
+        COMMON_HEADERS = %w[Content-Type].freeze
+        HEADER_LINE_PARSER = /\A([^:]+):(.*)\z/.to_parser do |m|
+          [m[1].strip, m[2].strip]
+        end
+
+        def header(name)
+          hash_search(headers, name)
+        end
+
+        # @return [Hash<String, String>]
+        def headers
+          performed.headers.to_hash
+        end
+
+        COMMON_HEADERS.each do |header_key|
+          define_method header_key.underscore do
+            header(header_key)
+          end
+        end
+
+        private
+
+        def hash_search(hash, key)
+          key = key.to_s.downcase
+          hash.each do |k, v|
+            return v if k.to_s.downcase == key
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/response/links.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+module EacEnvs
+  module Http
+    class Response < ::StandardError
+      module Links
+        # https://www.w3.org/wiki/LinkHeader
+        LINKS_HEADER_NAME = 'Link'
+
+        # https://www.w3.org/wiki/LinkHeader
+        LINK_PARSER = /\A\<(.+)\>\s*;\s*rel\s*=\s*\"(.*)\"\z/.to_parser do |m|
+          [m[2], m[1]]
+        end
+
+        def link(rel)
+          hash_search(links, rel)
+        end
+
+        def links
+          header(LINKS_HEADER_NAME).if_present({}) do |v|
+            v.split(',').map { |w| LINK_PARSER.parse!(w.strip) }.to_h
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/response/statuses.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module EacEnvs
+  module Http
+    class Response < ::StandardError
+      module Statuses
+        def raise_unless_200
+          return nil if status == 200
+
+          raise self
+        end
+
+        def status
+          performed.status.to_i
+        end
+      end
+    end
+  end
+end

data/lib/eac_envs/http/response.rb

@@ -9,112 +9,22 @@ 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
-
-      # https://www.w3.org/wiki/LinkHeader
-      LINKS_HEADER_NAME = 'Link'
-
-      # https://www.w3.org/wiki/LinkHeader
-      LINK_PARSER = /\A\<(.+)\>\s*;\s*rel\s*=\s*\"(.*)\"\z/.to_parser do |m|
-        [m[2], m[1]]
-      end
-
       common_constructor :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 = response_body_data_proc.call(r) if response_body_data_proc.present?
-        r
-      end
-
-      def body_data_or_raise
-        raise_unless_200
-
-        body_data
-      end
-
-      # @return [String]
-      def body_str
-        performed.body
-      end
-
-      def body_str_or_raise
-        raise_unless_200
-
-        body_str
-      end
-
-      def header(name)
-        hash_search(headers, name)
-      end
-
-      # @return [Hash<String, String>]
-      def headers
-        performed.headers.to_hash
-      end
-
-      def link(rel)
-        hash_search(links, rel)
-      end
-
-      def links
-        header(LINKS_HEADER_NAME).if_present({}) do |v|
-          v.split(',').map { |w| LINK_PARSER.parse!(w.strip) }.to_h
-        end
-      end
-
-      def raise_unless_200
-        return nil if status == 200
-
-        raise self
-      end
-
-      def status
-        performed.status.to_i
-      end
-
       delegate :url, to: :request
 
       def to_s
         "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
-        ::JSON.parse(body_str)
-      end
-
-      def body_data_from_application_xml
-        Hash.from_xml(body_str)
-      end
-
-      def hash_search(hash, key)
-        key = key.to_s.downcase
-        hash.each do |k, v|
-          return v if k.to_s.downcase == key
-        end
-        nil
-      end
-
       def performed
         @performed ||= request.faraday_response
       rescue ::Faraday::Error
         raise ::EacEnvs::Http::Error
       end
+
+      require_sub __FILE__, include_modules: true
     end
   end
 end

data/lib/eac_envs/http/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_envs-http
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-30 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eac_fs
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.116'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.116'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,10 @@ files:
 - 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/response/body.rb
+- lib/eac_envs/http/response/headers.rb
+- lib/eac_envs/http/response/links.rb
+- lib/eac_envs/http/response/statuses.rb
 - lib/eac_envs/http/rspec.rb
 - lib/eac_envs/http/rspec/echo_server.rb
 - lib/eac_envs/http/rspec/echo_server/request_processor.rb