aranha-parsers 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c023094e51e5188e1979f5ab406b595a93b58006c656ccf7bb55609d1b828472
-  data.tar.gz: 1dab0c5d8cb5b000949c3484db3f30494cd893e1f82f194627ae622ece43a457
+  metadata.gz: cb5cd7c64c21a8805a583f01c75efd58268003a8c8cc695ef809f938e79dc3ed
+  data.tar.gz: '078397e90586fe403b39dc8821e30f36efcf86fa55d31058bd94d18a42cb8eb8'
 SHA512:
-  metadata.gz: 9a3da7fef40ee10d63806ae268939285b3eb7778ff2d4fe5570ce305ddb7b2ee9d07abc5cd9f31c7e79b484fa807bb57aa2dd04bd5a46f76251cf5f677576ba9
-  data.tar.gz: f96f07f064028911ae1723f97e1cb8543fe44f2e2813e35b70048894788a3a47130e464cef662fa60d75ba07d030eade04fba54b48a04fb6df6c20553622ef32
+  metadata.gz: d017b16cb135ad2968fb35e83c086d3e5bdfbc59a8be5281303f26d8fbdbdff6697d9d1f029d949c69bb6341ae7eb25509d924e82a99c26e0391df7322a6a095
+  data.tar.gz: ada16700b30a9456f1140debf88f17020699d27ecc1dc6bcafbac43a1569d3bfe19415109b6f74688214bb94033dcb14ec2fc251fb3ae8060f5a45e62f8902c0

data/lib/aranha/parsers/base.rb

@@ -9,20 +9,25 @@ module Aranha
   module Parsers
     class Base
       class << self
+        # @deprecated Use {#from_string} instead.
+        # @param content [String]
+        # @return [Aranha::Parsers::Base]
         def from_content(content)
+          from_string(content)
+        end
+
+        # @param string [String]
+        # @return [Aranha::Parsers::Base]
+        def from_string(string)
           ::EacRubyUtils::Fs::Temp.on_file do |path|
             ::File.open(path.to_s, 'w:UTF-8') do |f|
-              f.write content.dup.force_encoding('UTF-8')
+              f.write string.dup.force_encoding('UTF-8')
             end
             r = new(path.to_path)
             r.content
             r
           end
         end
-
-        def parse_content(content)
-          from_content(content).data
-        end
       end
 
       LOG_DIR_ENVVAR = 'ARANHA_PARSERS_LOG_DIR'

data/lib/aranha/parsers/html/base.rb

@@ -19,6 +19,20 @@ module Aranha
             @fields << Field.new(name, type, xpath)
           end
 
+          # @param node [Nokogiri::XML::Node]
+          # @return [Aranha::Parsers::Html::Base]
+          def from_node(node)
+            from_string(node.to_html)
+          end
+
+          # @param haystack [String]
+          # @param needle [String]
+          # @return [String]
+          def xpath_ends_with(haystack, needle)
+            "substring(#{haystack}, string-length(#{haystack}) - string-length(#{needle}) + 1) " \
+              "= #{needle}"
+          end
+
           Field = Struct.new(:name, :type, :xpath)
         end
 

data/lib/aranha/parsers/html/node/default/string_support.rb

@@ -27,16 +27,16 @@ module Aranha
               raise "Pattern \"#{pattern}\" not found in string \"#{s}\""
             end
 
+            # @param node [Nokogiri::XML::Node]
+            # @param xpath [String]
+            # @return [String]
             def string_value(node, xpath)
-              if node.at_xpath(xpath)
-                sanitize_string(node.at_xpath(xpath).text)
-              else
-                ''
-              end
+              found = node_value(node, xpath)
+              found ? sanitize_string(found.text) : ''
             end
 
             def string_recursive_value(node, xpath, required = true)
-              root = node.at_xpath(xpath)
+              root = node_value(node, xpath)
               if root.blank?
                 return nil unless required
 

data/lib/aranha/parsers/html/node/default.rb

@@ -11,13 +11,13 @@ module Aranha
           require_sub __FILE__, include_modules: true
 
           def array_value(node, xpath)
-            r = node.xpath(xpath).map { |n| n.text.strip }
+            r = node_set_value(node, xpath).map { |n| n.text.strip }
             r.join('|')
           end
 
           def join_value(node, xpath)
             m = ''
-            node.xpath(xpath).each do |n|
+            node_set_value(node, xpath).each do |n|
               m << n.text.strip
             end
             m
@@ -27,6 +27,20 @@ module Aranha
             m = /(\d+) m/.match(join_value(node, xpath))
             m ? m[1].to_i : nil
           end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::NodeSet]
+          def node_set_value(node, xpath)
+            node.xpath(xpath)
+          end
+
+          # @param node [Nokogiri::XML::Node]
+          # @param xpath [String]
+          # @return [Nokogiri::XML::Node]
+          def node_value(node, xpath)
+            node.at_xpath(xpath)
+          end
         end
       end
     end

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.18.0'
   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.18.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-05-13 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.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,48 +43,17 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 2.8.4
 - !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
+  name: eac_envs-http
   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'
+        version: '0.3'
     - - ">="
       - !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'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,34 +61,23 @@ 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'
+        version: 0.3.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.116'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.116'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -129,7 +87,7 @@ dependencies:
         version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.14.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -139,7 +97,7 @@ dependencies:
         version: '1.14'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.14.4
 - !ruby/object:Gem::Dependency
   name: ofx-parser
   requirement: !ruby/object:Gem::Requirement