digger 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b036f2d202aa8360cf3b07822168fb8e3e3e084d4b2f5ccb5eca026dd4c47981
-  data.tar.gz: 85d13e567add73e38c25738852dc3b30e3ad1900579dca815d5aef4cb16dbca8
+  metadata.gz: 025bfc4f8d6dbf55994363070b67a450fd421457c4f12bf9b714fe965aefaad6
+  data.tar.gz: a8464f07a53c332ddb40457998b830b1dff99661431a7608d9dc075175f5e9f1
 SHA512:
-  metadata.gz: decb9abb96f56dc7f75ba95151b02c7415018a789583da1324ab4786317d7e0bfc272a83b47399b51672bdb30b3d90c502f25358d7438b9ee26a8d39764a58dd
-  data.tar.gz: 73f7dfd179175bcda4a24a120cad95a61093f17166e389e44b37a158ff8ee1ea927844d9b85773914f14d99473776f11752c7aa32fadfec1b8b703e584591c3f
+  metadata.gz: d84a2f8ee2d65c16d79b66795fc618b07fb5ba4517d902eec7e17107b69c240b36f68728de49f451fd143ddeb872743a906b608d413446971e5f38a632cf6fbe
+  data.tar.gz: 4f36e035bab956bd6702024d951eb9963f2f97812f355e00b0840148eaa4fef07949abac0f874f889c88703addd13ea2bc69efa61bac3872b14f371f7fa47ded

data/lib/digger/pattern.rb

@@ -30,8 +30,8 @@ module Digger
 
     MATCH_MAX = 3
 
-    TYPES_REGEXP = 0.upto(MATCH_MAX).map { |i| "match_#{i}" } + %w[match_many]
-    TYPES_CSS = %w[css_one css_many].freeze
+    TYPES_REGEXP = 0.upto(MATCH_MAX).map { |i| "match_#{i}" } + %w[match_many match_all]
+    TYPES_CSS = %w[css_one css_many css_all].freeze
     TYPES_JSON = %w[json jsonp].freeze
     TYPES_OTHER = %w[cookie plain lines header body].freeze
 
@@ -61,7 +61,7 @@ module Digger
     end
 
     def get_plain(page)
-      safe_block.call(page.doc.text)
+      safe_block.call(page.doc&.text)
     end
 
     def get_lines(page)
@@ -82,25 +82,36 @@ module Digger
     end
 
     def css_match(doc)
-      block = safe_block { |node| node&.content&.strip }
       # content is Nokogiri::HTML::Document
       contents = doc.css(value)
       if type == 'css_many'
-        contents.map { |node| block.call(node) }.uniq
+        block = safe_block { |node| node&.content&.strip }
+        contents.map { |node| block.call(node) }
+      elsif type == 'css_all'
+        block = safe_block
+        block.call(contents)
       else
+        block = safe_block { |node| node&.content&.strip }
         block.call(contents.first)
       end
     end
 
     def regexp_match(body)
-      block = safe_block(&:strip)
       # content is String
-      if type == 'match_many'
+      if %w[match_many match_all].include? type
         regexp = value.is_a?(Regexp) ? value : Regexp.new(value.to_s)
-        body.gsub(regexp).to_a.map { |node| block.call(node) }.uniq
+        matches = body.gsub(regexp).to_a
+        if type == 'match_many'
+          block = safe_block(&:strip)
+          matches.map { |node| block.call(node) }
+        else
+          block = safe_block
+          block.call(matches)
+        end
       else
         index = TYPES_REGEXP.index(type)
         matches = body.match(value)
+        block = safe_block(&:strip)
         block.call(matches[index]) unless matches.nil?
       end
     end

data/lib/digger/version.rb

@@ -1,3 +1,3 @@
 module Digger
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/spec/pattern_spec.rb

@@ -24,4 +24,10 @@ describe Digger::Pattern do
     p3 = Digger::Pattern.new({ type: 'plain' })
     expect(p3.match_page(page).length).to be > 100
   end
+
+  it 'match_all & css_all' do
+    p = Digger::Pattern.new({ type: 'match_all', value: '[\d]+' })
+    m = p.regexp_match('123,12,1')
+    expect(m.length).to eq(3)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - binz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake