aranha-parsers 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b411d37103346c68691d1ac9e76c9fe6677e872bd295a4e7867ea4165b0f588
-  data.tar.gz: 5d75fea05464975630f0dd8777bdfd140011a8a641a2086c18e223c3dabd2985
+  metadata.gz: c023094e51e5188e1979f5ab406b595a93b58006c656ccf7bb55609d1b828472
+  data.tar.gz: 1dab0c5d8cb5b000949c3484db3f30494cd893e1f82f194627ae622ece43a457
 SHA512:
-  metadata.gz: 5656a1c5ba1c00908bb183ad1bf3a6ecc2c1bea254492ea33c0733cb58380cc748a9b23d8d677b61e82aa418889d22995580585198f337dd05ba288ca23cda7b
-  data.tar.gz: d44b6f14e521c2853b660bddcafab29c4f3e64e4f85030840c5414370188ec7fc5bc6254a20de8b532105cf77d9b99b1223b7cc5d37183d76f86bd09f32ba2d5
+  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/version.rb

@@ -2,6 +2,6 @@
 
 module Aranha
   module Parsers
-    VERSION = '0.16.0'
+    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.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport