aranha-parsers 0.17.0 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c023094e51e5188e1979f5ab406b595a93b58006c656ccf7bb55609d1b828472
-  data.tar.gz: 1dab0c5d8cb5b000949c3484db3f30494cd893e1f82f194627ae622ece43a457
+  metadata.gz: 62f1b799c069d10df8548cab6f80af270b4efe96fd515ed9bb51b52dd41a1fb0
+  data.tar.gz: 4277d1ede3d4d766de0578e043e35a0c34483f7e286d2ffaa130e18865793682
 SHA512:
-  metadata.gz: 9a3da7fef40ee10d63806ae268939285b3eb7778ff2d4fe5570ce305ddb7b2ee9d07abc5cd9f31c7e79b484fa807bb57aa2dd04bd5a46f76251cf5f677576ba9
-  data.tar.gz: f96f07f064028911ae1723f97e1cb8543fe44f2e2813e35b70048894788a3a47130e464cef662fa60d75ba07d030eade04fba54b48a04fb6df6c20553622ef32
+  metadata.gz: b6bf24b5aac72c3ff02b7b619bdfca517e86a54e96c5a9b4a8edf718837a8cbd4ec5ce1fe941df85a50701e9277753f81ea29e9313d6f8bd9f69126bbede5643
+  data.tar.gz: 01feebca673e547d9983eaf6f16f5a13224311db0ca8c77672290d88b19664c6fe7146ce8094fd7fa4a45721980e48c8c3250867921ff07616b543743db00676

data/lib/aranha/parsers/source_address/hash_http_base.rb

@@ -2,10 +2,9 @@
 
 require 'aranha/parsers/source_address/fetch_content_error'
 require 'aranha/parsers/source_address/hash_http_base'
+require 'eac_envs/http/error'
+require 'eac_envs/http/request'
 require 'eac_ruby_utils/core_ext'
-require 'faraday'
-require 'faraday/follow_redirects'
-require 'faraday/gzip'
 require 'yaml'
 
 module Aranha
@@ -55,21 +54,11 @@ module Aranha
           source.to_yaml
         end
 
-        # @return [Faraday]
-        def faraday_connection
-          ::Faraday.new do |f|
-            f.request :gzip
-            f.response :follow_redirects if follow_redirect?
-          end
-        end
-
         def content
-          req = faraday_request
-          return req.body if req.status == 200
-
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
-            "Get #{url} returned #{req.status.to_i}", req
-          )
+          request = http_request
+          request.response.body_str
+        rescue ::EacEnvs::Http::Error => e
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError, e.message, request
         end
 
         def param(key, default_value)
@@ -82,11 +71,13 @@ module Aranha
 
         private
 
-        def faraday_request_uncached
-          faraday_connection.send(self.class.http_method, url) do |req|
-            headers.if_present { |v| req.headers = v }
-            body.if_present { |v| req.body = v }
-          end
+        # @return [EacEnvs::Http::Request]
+        def http_request
+          r = ::EacEnvs::Http::Request.new.verb(self.class.http_method).url(url)
+          r = headers.if_present(r) { |v| r.headers(v) }
+          r = body.if_present(r) { |v| r.body(v) }
+          r = r.follow_redirect(true) if follow_redirect?
+          r
         end
       end
     end

data/lib/aranha/parsers/source_address/http_get.rb

@@ -2,8 +2,8 @@
 
 require 'addressable'
 require 'aranha/parsers/source_address/fetch_content_error'
-require 'faraday'
-require 'faraday/retry'
+require 'eac_envs/http/error'
+require 'eac_envs/http/request'
 
 module Aranha
   module Parsers
@@ -39,16 +39,10 @@ module Aranha
         end
 
         def content
-          conn = ::Faraday.new do |f|
-            f.request :retry # retry transient failures
-            f.response :follow_redirects # follow redirects
-          end
-          c = conn.get(url)
-          return c.body if c.status == 200
-
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
-            "Get #{url} returned #{c.status.to_i}", c
-          )
+          request = ::EacEnvs::Http::Request.new.url(url).retry(true).follow_redirect(true)
+          request.response.body_str
+        rescue ::EacEnvs::Http::Error => e
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError, e.message, request
         end
 
         def serialize

data/lib/aranha/parsers/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.17.0'
+    VERSION = '0.17.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-parsers
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.17.1
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,7 +33,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,43 +43,9 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
-  name: eac_ruby_utils
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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: '2.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.7.4
-- !ruby/object:Gem::Dependency
-  name: faraday-follow_redirects
+  name: eac_envs-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -93,33 +59,19 @@ dependencies:
       - !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-retry
+  name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.112'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.112'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement