eac_rest 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d61c6dce47e5da585855c8ca4c3e6900a7890ac9c4943031dc852b4d6338ec7
-  data.tar.gz: a775b53cec23e33c7d54816fdb10066f27988e3c4c44ee3a11b34de5274b89bc
+  metadata.gz: f713ae65fe3703fbdb4ab49b6244e1bf874d7329d2d1712354cdc8908938617b
+  data.tar.gz: 4209a19b37acc8cd8a57375e27f746fe41f2ae6a989f8f1f5c16151659b0bd19
 SHA512:
-  metadata.gz: 4202d66186cefa25da7be74981c64caae9a906a843b32e0ee840e46f7c904d269247445080d351279118c91bfa7406d3cd32b5231df30033a9e4a48b613aadc4
-  data.tar.gz: 2e924d32a06b09eb7867b3ea5736c92848907d3aba416a85eb2ca0d60c6a134aee328319af740b0ed6b68248d601ec138b38510b3565fce6d1f8818dba0e0511
+  metadata.gz: 3c375d852ae036155fb9b04371d8e4125613ac5fd1bd1dee6499cf84fb408c24ab83bffbe51f7f020e4b48cd01923dcdbcafdcb463382cdaa8466e842a44950c
+  data.tar.gz: 522c1d8e8b5f602758784d44b2705fed4436256969221d4e4140ee625dee94d793a631cfa98cbd4cfce23a4c008e49b8097b534de1efbe29a9d924a094731b89

data/lib/eac_rest/error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module EacRest
+  class Error < ::RuntimeError
+  end
+end

data/lib/eac_rest/request/body_field.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'eac_rest/request/body_field_value'
+require 'eac_ruby_utils/core_ext'
+require 'faraday/multipart/file_part'
+
+module EacRest
+  class Request
+    class BodyField
+      class << self
+        # @return [Array<EacRest::Request::BodyField>]
+        def list_from_enumerable(enum)
+          hash = {}
+          enum.each do |v|
+            hash[v[0]] ||= []
+            hash[v[0]] << v[1]
+          end
+          list_from_hash(hash)
+        end
+
+        # @return [Array<EacRest::Request::BodyField>]
+        def list_from_hash(hash)
+          hash.map { |k, v| new(k, v) }
+        end
+      end
+
+      common_constructor :key, :values do
+        self.key = key.to_s
+        self.values = (values.is_a?(::Array) ? values.to_a : [values])
+                        .map { |v| ::EacRest::Request::BodyFieldValue.new(v) }
+      end
+
+      # @return [String]
+      def hash_key
+        key
+      end
+
+      # @return [Array]
+      def hash_value
+        values.map(&:to_faraday)
+      end
+
+      # @return [Boolean]
+      def with_file?
+        values.any?(&:file?)
+      end
+    end
+  end
+end

data/lib/eac_rest/request/body_field_value.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'eac_fs/file_info'
+require 'eac_ruby_utils/core_ext'
+require 'faraday'
+require 'faraday/multipart'
+
+module EacRest
+  class Request
+    class BodyFieldValue
+      common_constructor :value
+
+      def to_faraday
+        return value unless file?
+
+        ::Faraday::Multipart::FilePart.new(value, file_mime_type)
+      end
+
+      # @return [Boolean]
+      def file?
+        value.is_a?(::File)
+      end
+
+      # @return [String]
+      def file_mime_type
+        ::EacFs::FileInfo.new(value.path).mime_type
+      end
+    end
+  end
+end

data/lib/eac_rest/request/body_fields.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_rest/request/body_field'
+
+module EacRest
+  class Request
+    class BodyFields
+      common_constructor :source_body
+
+      # @return [Hash, nil]
+      def to_h
+        fields.if_present do |v|
+          v.each_with_object({}) { |e, a| a[e.hash_key] = e.hash_value }
+        end
+      end
+
+      # @return [Array<EacRest::Request::BodyField>, nil]
+      def fields
+        source_body.if_present do |v|
+          next nil unless v.is_a?(::Enumerable)
+
+          if v.is_a?(::Hash)
+            ::EacRest::Request::BodyField.list_from_hash(v)
+          else
+            ::EacRest::Request::BodyField.list_from_enumerable(v)
+          end
+        end
+      end
+
+      # @return [Boolean]
+      def with_file?
+        fields.if_present(false) { |v| v.any?(&:with_file?) }
+      end
+    end
+  end
+end

data/lib/eac_rest/request.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'curb'
 require 'eac_rest/response'
 require 'eac_ruby_utils/core_ext'
-require 'ostruct'
+require 'faraday'
+require 'faraday/multipart'
 
 module EacRest
   class Request
-    BOOLEAN_MODIFIERS = %w[ssl_verify ssl_verify_peer ssl_verify_host].freeze
+    BOOLEAN_MODIFIERS = %w[ssl_verify].freeze
     COMMON_MODIFIERS = %w[auth body_data verb].freeze
     HASH_MODIFIERS = %w[header].freeze
     MODIFIERS = COMMON_MODIFIERS + BOOLEAN_MODIFIERS + HASH_MODIFIERS.map(&:pluralize)
@@ -23,73 +23,62 @@ module EacRest
     common_constructor :url, :body_data_proc, default: [nil]
 
     def autenticate(username, password)
-      auth(::OpenStruct.new(username: username, password: password))
+      auth(::Struct.new(:username, :password).new(username, password))
     end
 
-    def immutable_constructor_args
-      [url, body_data_proc]
-    end
-
-    def response
-      ::EacRest::Response.new(build_curl, body_data_proc)
+    # @return [Faraday::Connection]
+    def faraday_connection
+      ::Faraday.default_connection_options[:headers] = {}
+      ::Faraday::Connection.new(faraday_connection_options) do |conn|
+        conn.request(body_with_file? ? :multipart : :url_encoded)
+        auth.if_present { |v| conn.request :authorization, :basic, v.username, v.password }
+      end
     end
 
-    private
-
-    def build_curl
-      r = ::Curl::Easy.new(url)
-      MODIFIERS.each { |suffix| send("build_curl_#{suffix}", r) }
-      r
+    # @return [Hash]
+    def faraday_connection_options
+      {
+        request: { params_encoder: Faraday::FlatParamsEncoder }, ssl: { verify: ssl_verify? }
+      }
     end
 
-    def build_curl_auth(curl)
-      auth.if_present do |a|
-        curl.http_auth_types = :basic
-        curl.username = a.username
-        curl.password = a.password
+    # @return [Faraday::Response]
+    def faraday_response
+      conn = faraday_connection
+      conn.send(sanitized_verb, url) do |req|
+        req.headers = conn.headers.merge(headers)
+        sanitized_body_data.if_present { |v| req.body = v }
       end
     end
 
-    def build_curl_body_data(curl)
-      www_form_body_data_encoded.if_present { |v| curl.post_body = v }
+    def immutable_constructor_args
+      [url, body_data_proc]
     end
 
-    def build_curl_headers(curl)
-      curl.headers.merge!(headers)
+    def response
+      ::EacRest::Response.new(self)
     end
 
-    def build_curl_ssl_verify(curl)
-      return if ssl_verify?.nil?
-
-      curl.ssl_verify_host = ssl_verify?
-      curl.ssl_verify_peer = ssl_verify?
+    # @return [Symbol]
+    def sanitized_verb
+      verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }
     end
 
-    def build_curl_ssl_verify_peer(curl)
-      return if ssl_verify_peer?.nil?
+    private
 
-      curl.ssl_verify_peer = ssl_verify_peer?
+    def body_fields
+      @body_fields ||= ::EacRest::Request::BodyFields.new(body_data)
     end
 
-    def build_curl_ssl_verify_host(curl)
-      return if ssl_verify_host?.nil?
-
-      curl.ssl_verify_peer = ssl_verify_host?
+    # @return [Boolean]
+    def body_with_file?
+      body_fields.with_file?
     end
 
-    def build_curl_verb(curl)
-      curl.set(
-        :customrequest,
-        verb.if_present(VERB_GET) { |v| self.class.lists.verb.value_validate!(v) }.to_s.upcase
-      )
+    def sanitized_body_data
+      body_fields.to_h || body_data
     end
 
-    def www_form_body_data_encoded
-      body_data.if_present do |v|
-        v = v.map { |k, vv| [k, vv] } if v.is_a?(::Hash)
-        v = URI.encode_www_form(v) if v.is_a?(::Array)
-        v.to_s
-      end
-    end
+    require_sub __FILE__
   end
 end

data/lib/eac_rest/response.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/hash/conversions'
+require 'eac_rest'
 require 'eac_ruby_utils/core_ext'
 require 'json'
 
@@ -18,10 +19,11 @@ module EacRest
       [m[2], m[1]]
     end
 
-    common_constructor :curl, :body_data_proc
+    common_constructor :request
+    delegate :body_data_proc, to: :request
 
     def body_data
-      r = performed_curl.headers['Accept'].if_present(body_str) do |v|
+      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
@@ -35,7 +37,10 @@ module EacRest
       body_data
     end
 
-    delegate :body_str, to: :performed_curl
+    # @return [String]
+    def body_str
+      performed.body
+    end
 
     def body_str_or_raise
       raise_unless_200
@@ -48,7 +53,7 @@ module EacRest
     end
 
     def headers
-      performed_curl.header_str.each_line.map(&:strip)[1..-1].reject(&:blank?)
+      performed.header_str.each_line.map(&:strip)[1..-1].reject(&:blank?)
         .map { |header_line| HEADER_LINE_PARSER.parse!(header_line) }
         .to_h
     end
@@ -70,7 +75,7 @@ module EacRest
     end
 
     def status
-      performed_curl.status.to_i
+      performed.status.to_i
     end
 
     delegate :url, to: :curl
@@ -97,16 +102,10 @@ module EacRest
       nil
     end
 
-    def perform
-      @perform ||= begin
-        curl.perform || raise("CURL perform failed for #{url}")
-        true
-      end
-    end
-
-    def performed_curl
-      perform
-      curl
+    def performed
+      @performed_curl ||= request.faraday_response
+    rescue ::Faraday::Error
+      raise ::EacRest::Error
     end
   end
 end

data/lib/eac_rest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacRest
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,29 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: eac_rest
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-04 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: eac_fs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '0.112'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.112'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.70'
+        version: '2.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.4
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: aranha-parsers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+- !ruby/object:Gem::Dependency
+  name: eac_docker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: eac_ruby_gem_support
   requirement: !ruby/object:Gem::Requirement
@@ -47,7 +129,11 @@ files:
 - lib/eac_rest.rb
 - lib/eac_rest/api.rb
 - lib/eac_rest/entity.rb
+- lib/eac_rest/error.rb
 - lib/eac_rest/request.rb
+- lib/eac_rest/request/body_field.rb
+- lib/eac_rest/request/body_field_value.rb
+- lib/eac_rest/request/body_fields.rb
 - lib/eac_rest/response.rb
 - lib/eac_rest/version.rb
 homepage: