aranha-parsers 0.17.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f1b799c069d10df8548cab6f80af270b4efe96fd515ed9bb51b52dd41a1fb0
-  data.tar.gz: 4277d1ede3d4d766de0578e043e35a0c34483f7e286d2ffaa130e18865793682
+  metadata.gz: fbd2b941128c7e9295e385c75bf10d9a4074dc41fb70c6814eed11c78f469f6e
+  data.tar.gz: 5ead55e4c16b3afa84edcd72050994fc9b503036a4ffcb500dc69193513abdd7
 SHA512:
-  metadata.gz: b6bf24b5aac72c3ff02b7b619bdfca517e86a54e96c5a9b4a8edf718837a8cbd4ec5ce1fe941df85a50701e9277753f81ea29e9313d6f8bd9f69126bbede5643
-  data.tar.gz: 01feebca673e547d9983eaf6f16f5a13224311db0ca8c77672290d88b19664c6fe7146ce8094fd7fa4a45721980e48c8c3250867921ff07616b543743db00676
+  metadata.gz: 5372a04c8b487c9820815974b5c3ccc679ded34cee791a0038af7b28fe4089a3a76f216a819f101fa573955bf96f6f1da21f5917a4402aeef994011861ce703f
+  data.tar.gz: 9f745e276a8514c9c2acf071555367650d72a1749e51970cb5c76c29c96550a14a9d4780a859935eb2996315168c37824ba9e6bff5a7768fbbafb582f743b1e8

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

@@ -10,14 +10,9 @@ module Aranha
         class Default < ::Aranha::Parsers::Html::Node::Base
           require_sub __FILE__, include_modules: true
 
-          def array_value(node, xpath)
-            r = node.xpath(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 +22,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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aranha-parsers
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-08 00:00:00.000000000 Z
+date: 2023-05-21 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.3
+        version: 2.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.8.4
 - !ruby/object:Gem::Dependency
   name: eac_envs-http
   requirement: !ruby/object:Gem::Requirement
@@ -51,6 +51,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,40 +61,43 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: eac_ruby_utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.117'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.112'
+        version: '0.117'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.15'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.14.2
+        version: 1.15.1
 - !ruby/object:Gem::Dependency
   name: ofx-parser
   requirement: !ruby/object:Gem::Requirement