aranha-parsers 0.15.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e2646a8b42684dd23fd8575393c03a4ad3edb7fd2e5f53a61cd2436801b2f43
-  data.tar.gz: 733b5d09e5a42e1e140070ed353e8acdf6f8e1c7d1de19d54d9ed2c395850c94
+  metadata.gz: c023094e51e5188e1979f5ab406b595a93b58006c656ccf7bb55609d1b828472
+  data.tar.gz: 1dab0c5d8cb5b000949c3484db3f30494cd893e1f82f194627ae622ece43a457
 SHA512:
-  metadata.gz: f5eeda2f1d9e0232e2dca70aed3c4c86c8b1037dd9ed3b415c9a472ff11143f2afce9bd14d093137c6561048c7cacb7e93aa03dcc6fb76c8c34df401d5138b49
-  data.tar.gz: bd993877f55018c0745fcb81eee0a52b452b64ade0463263c7c59f51be95916b80d191e18863d9e9bcef35c90c43995e3e182c17d19af3d65225175c7272380d
+  metadata.gz: 9a3da7fef40ee10d63806ae268939285b3eb7778ff2d4fe5570ce305ddb7b2ee9d07abc5cd9f31c7e79b484fa807bb57aa2dd04bd5a46f76251cf5f677576ba9
+  data.tar.gz: f96f07f064028911ae1723f97e1cb8543fe44f2e2813e35b70048894788a3a47130e464cef662fa60d75ba07d030eade04fba54b48a04fb6df6c20553622ef32

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

@@ -9,6 +9,34 @@ module Aranha
       module Node
         class Default < ::Aranha::Parsers::Html::Node::Base
           module NumericSupport
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
+            def decimal_comma_value(node, xpath)
+              parse_decimal_comma(node, xpath, true)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
+            def decimal_comma_optional_value(node, xpath)
+              parse_decimal_comma(node, xpath, false)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
+            def decimal_dot_value(node, xpath)
+              parse_decimal_dot(node, xpath, true)
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
+            def decimal_dot_optional_value(node, xpath)
+              parse_decimal_dot(node, xpath, false)
+            end
+
             def integer_value(node, xpath)
               r = string_value(node, xpath)
               return nil if r.blank?
@@ -33,12 +61,20 @@ module Aranha
               parse_float(node, xpath, false)
             end
 
+            # @deprecated Use {#decimal_dot_value} instead.
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float]
             def us_decimal_value(node, xpath)
-              parse_us_decimal(node, xpath, true)
+              decimal_dot_value(node, xpath)
             end
 
+            # @deprecated Use {#decimal_dot_optional_value} instead.
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @return [Float, nil]
             def us_decimal_optional_value(node, xpath)
-              parse_us_decimal(node, xpath, false)
+              decimal_dot_optional_value(node, xpath)
             end
 
             private
@@ -53,15 +89,38 @@ module Aranha
               end
             end
 
-            def parse_us_decimal(node, xpath, required)
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @param separator [String]
+            # @param delimiter [String]
+            # @return [Float, nil]
+            def parse_decimal(node, xpath, required, separator, delimiter)
               s = string_value(node, xpath)
-              m = /\d+(?:[\.\,](\d+))?/.match(s)
+              m = /\d+(?:[#{::Regexp.quote(separator + delimiter)}](\d+))?/.match(s)
               if m
-                m[0].delete(',').to_f
+                m[0].delete(delimiter).to_f
               elsif required
-                raise "US decimal value not found in \"#{s}\""
+                raise "decimal [Separator=\"#{separator}, Delimiter=\"#{delimiter}\"] value not " \
+                  "found in \"#{s}\""
               end
             end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @return [Float, nil]
+            def parse_decimal_dot(node, xpath, required)
+              parse_decimal(node, xpath, required, '.', ',')
+            end
+
+            # @param node [Nokogiri::XML::Element]
+            # @param xpath [String]
+            # @param required [Boolean]
+            # @return [Float, nil]
+            def parse_decimal_comma(node, xpath, required)
+              parse_decimal(node, xpath, required, ',', '.')
+            end
           end
         end
       end

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

@@ -4,6 +4,12 @@ module Aranha
   module Parsers
     class SourceAddress
       class FetchContentError < ::RuntimeError
+        attr_reader :request
+
+        def initialize(msg, request)
+          super(msg)
+          @request = request
+        end
       end
     end
   end

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

@@ -67,8 +67,9 @@ module Aranha
           req = faraday_request
           return req.body if req.status == 200
 
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError,
-                "Get #{url} returned #{req.status.to_i}"
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
+            "Get #{url} returned #{req.status.to_i}", req
+          )
         end
 
         def param(key, default_value)

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

@@ -3,6 +3,7 @@
 require 'addressable'
 require 'aranha/parsers/source_address/fetch_content_error'
 require 'faraday'
+require 'faraday/retry'
 
 module Aranha
   module Parsers
@@ -45,8 +46,9 @@ module Aranha
           c = conn.get(url)
           return c.body if c.status == 200
 
-          raise ::Aranha::Parsers::SourceAddress::FetchContentError,
-                "Get #{url} returned #{c.status.to_i}"
+          raise ::Aranha::Parsers::SourceAddress::FetchContentError.new(
+            "Get #{url} returned #{c.status.to_i}", c
+          )
         end
 
         def serialize

data/lib/aranha/parsers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-parsers
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.17.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,6 +106,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: faraday-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -120,6 +137,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.14.2
 - !ruby/object:Gem::Dependency
   name: ofx-parser
   requirement: !ruby/object:Gem::Requirement