avmtrf1-tools 0.39.5 → 0.39.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac0a64d3ed7f56d7527f21bd3d827e504623e49dfc7beb4d0584faa538a33e26
-  data.tar.gz: d743696b387e4bef1c0799786e84d1034eb89eb539b9bc0b4c858970eb7851db
+  metadata.gz: f3f26b0210df64425354daf7e5d9ac10dcb0aecbb51b00f9079ac5dc1ff5e8e2
+  data.tar.gz: 7a1ee3b449c30d1ad515d28359aaf8b8a15442bb995a6797a12bce30eba61a25
 SHA512:
-  metadata.gz: 79f00f9a091a4a6392d296daaf0f3929d4e72b75d61f156a9d85fbaed0aa20a3768e178df4d9dcfdec01e29eb467e21feb0ee9b53f40bba7f8c58b54e080a654
-  data.tar.gz: 39ba20d1d841d414b791354ff364d638ed231806db5dfd32b4d6b5faf9f37048d7594d94637f0ab333a0c92895335303f95f50776efdd833cd42c62681c5e14b
+  metadata.gz: 11a4f7ec4a34de508424eceb46f9d3358d3b9e11e1b5f0fcf9375169dc6df8a50193fdbe9891069b0b5e0adb7fa88181a0f04246774afa88e47dd19b5d96645c
+  data.tar.gz: 3607982ce6d014d551c92a323b308143b6b02e473fbb03dddf8c8a8768aeafade90a5a6dbae49cecef16c5037e6555651383c2b9c3a8893e1d505d7a6e3d57af

data/Gemfile

@@ -8,7 +8,5 @@ group :oracle do
   gem 'ruby-oci8'
 end
 
-gem 'httpclient', git: 'https://github.com/livelink/httpclient.git'
-
 local_gemfile = ::File.join(::File.dirname(__FILE__), 'Gemfile.local')
 eval_gemfile local_gemfile if ::File.exist?(local_gemfile)

data/lib/avmtrf1/red/helper.rb

@@ -1,36 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_support/concern'
-require 'active_support/core_ext/string'
-require 'eac_ruby_utils/patches/module/speaker'
+require 'eac_envs/http/request'
+require 'eac_ruby_utils/core_ext'
 require 'erb'
-require 'httpclient'
 require 'nokogiri'
 
 module Avmtrf1
   module Red
     module Helper
-      extend ::ActiveSupport::Concern
-
-      included do
+      common_concern do
         enable_speaker
       end
 
-      def http_client
-        @http_client ||= ::HTTPClient.new
-      end
-
-      def check_request_result(url, result)
-        return if result.status == 200
-
-        raise "#{url} returned #{result.status}\n#{result.body}"
-      end
-
       def post(url, *post_args)
         infom "Requesting \"#{url}\""
-        res = http_client.post(url, *post_args)
-        check_request_result(url, res)
-        res.body
+        ::EacEnvs::Http::Request.new.url(url.to_s).verb(:post).body_data(post_args.first).response
+          .body_str_or_raise
       end
 
       def post_xml(url_suffix, xml_body)

data/lib/avmtrf1/red/profile.rb

@@ -2,13 +2,13 @@
 
 require 'avmtrf1/red/client'
 require 'avmtrf1/red/helper'
-require 'eac_ruby_utils/simple_cache'
+require 'eac_ruby_utils/core_ext'
 
 module Avmtrf1
   module Red
     class Profile
       include ::Avmtrf1::Red::Helper
-      include ::EacRubyUtils::SimpleCache
+      enable_simple_cache
 
       class << self
         def by_ini_profile(ini_profile)
@@ -19,14 +19,10 @@ module Avmtrf1
         end
       end
 
-      attr_reader :client, :metadados
-
+      # @!method initialize(client, metadados)
       # @param client [Avmtrf1::Red::Client]
       # @param metadados [Hash]
-      def initialize(client, metadados)
-        @client = client
-        @metadados = metadados.dup.freeze
-      end
+      common_constructor :client, :metadados
 
       def put_file(file_path)
         auth_url = client.authorization_url
@@ -39,16 +35,7 @@ module Avmtrf1
       private
 
       def put_file_request(auth_url, file_path)
-        post(auth_url, put_file_args(file_path))
-      end
-
-      def put_file_args(file_path)
-        {
-          body: put_file_body(file_path),
-          header: {
-            'Content-Type' => 'multipart/form-data'
-          }
-        }
+        post(auth_url, put_file_body(file_path))
       end
 
       def metadados_file_path_uncached

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.39.5'
+    VERSION = '0.39.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.39.5
+  version: 0.39.6
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-selenium