digger 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e89f179fa868ecd2879180d1fbfbf03ba0ebee3731b9c8b4741d22663ff4aa
-  data.tar.gz: 1b27e4a1446e9835203bf5497aeebc3bc4ab58998a0fc443eeaaf7e7ec86c2c7
+  metadata.gz: 2f506fd615df8b9d732d6b67bedc72644df26dc3f5725cfe5dba10c1098bae0b
+  data.tar.gz: 0e9afcb19ba0be5ce4a90787d54c3b43d58100bac3ec45bf5ef93781a60b6eb1
 SHA512:
-  metadata.gz: 5671e5d2484ca744e5c75f97beeb473e1970291fc094c0274714af27cc847ef47bcf3b1b81534e6f299f35648fdf3aabec9d90777e4b2fbe49dc2629c048f610
-  data.tar.gz: 496534bb394d17792dc7173759b83c0dd62b8569a241b2a6a57e60a14ea99ddafd7e030fe16480c5782ec319f6dc1d3563919f7202026fb008522dd26cae6c01
+  metadata.gz: 8608a2ee8e06ddd846772d40dc3e417560229729b7b736eda8a7f50977a7d2c6fc523f86fe64480b5172c5295137eae7c85f945f7ca310502c54c8b90dd75e8d
+  data.tar.gz: 59fef1a13adc8f983c16428ee4d08d6ccdecea09b7583452b6ca07689727c3d6a386f5a5b767a20d117c8c4bc9775a2a6b32fd4caff1c1a5e85ee2af82e39d1b

data/lib/digger/index.rb

@@ -8,33 +8,34 @@ module Digger
 
     def urls
       @urls ||= begin
-        args = self.args.map{|a| (a.respond_to? :each) ? a.to_a : [a]}
-        args.shift.product(*args).map{|arg| pattern_applied_url(arg)}
+        args = self.args.map { |a| a.respond_to?(:each) ? a.to_a : [a] }
+        args.shift.product(*args).map { |arg| pattern_applied_url(arg) }
       end
     end
 
     def pattern_applied_url(arg)
-      pattern.gsub('*').each_with_index{|_, i| arg[i]}
+      pattern.gsub('*').each_with_index { |_, i| arg[i] }
     end
 
     def self.batch(entities, cocurrence = 1, &block)
-      raise NoBlockError, "No block given" unless block
+      raise NoBlockError, 'No block given' unless block
 
       if cocurrence > 1
-        results = {}
-        entities.each_slice(cocurrence) do |group|
+        results = Array.new(entities.size)
+        entities.each_slice(cocurrence).with_index do |group, idx1|
           threads = []
-          group.each do |entity|
+          group.each_with_index do |entity, idx2|
+            index = idx1 * cocurrence + idx2
             threads << Thread.new(entity) do |ent|
-              results[ent] = block.call(ent)
+              results[index] = block.call(ent)
             end
           end
-          threads.each{|thread| thread.join}
+          threads.each(&:join)
         end
-        entities.map{|ent| results[ent]}
+        results
       else
-        entities.map{|ent| block.call(ent) }
+        entities.map { |ent| block.call(ent) }
       end
     end
   end
-end
+end

data/lib/digger/model.rb

@@ -1,16 +1,19 @@
 
 module Digger
   class Model
-    @@digger_config = {'pattern'=>{}, 'index'=>{}}
+    @@digger_config = {
+      'pattern' => {},
+      'index' => {}
+    }
 
     class << self
       # patterns
       def pattern_config
-        @@digger_config['pattern'][self.name] ||= {}
+        @@digger_config['pattern'][name] ||= {}
       end
 
       Pattern::TYPES.each do |method|
-        define_method method, ->(pairs, &block){
+        define_method method, -> (pairs, &block) {
           pairs.each_pair do |key, value|
             pattern_config[key] = Pattern.new(type: method, value: value, block: block)
           end
@@ -18,21 +21,22 @@ module Digger
       end
 
       def validate_presence(*keys)
-        keys_all = pattern_config.keys
-        raise "Pattern keys #{(keys - keys_all).join(', ')} should be present" unless keys.all?{|k| keys_all.include?(k) }
+        is_all = pattern_config.keys.all? { |k| keys.include?(k) }
+        raise "Pattern keys #{(keys - keys_all).join(', ')} should be present" unless is_all
       end
 
       def validate_includeness(*keys)
-        raise "Pattern keys #{(pattern_config.keys - keys).join(', ')} should not be included" unless pattern_config.keys.all?{|k| keys.include?(k)}
+        is_all = pattern_config.keys.all? { |k| keys.include?(k) }
+        raise "Pattern keys #{(pattern_config.keys - keys).join(', ')} should not be included" if is_all
       end
 
       # index page
       def index_config
-        @@digger_config['index'][self.name]
+        @@digger_config['index'][name]
       end
 
       def index_page(pattern, *args)
-         @@digger_config['index'][self.name] = Index.new(pattern, args)
+        @@digger_config['index'][name] = Index.new(pattern, args)
       end
 
       def index_page?
@@ -55,13 +59,15 @@ module Digger
     end
 
     def dig_urls(urls, cocurrence = 1, opts = {})
-      Index.batch(urls, cocurrence){|url| dig_url(url, opts) }
+      Index.batch(urls, cocurrence) { |url| dig_url(url, opts) }
     end
 
     def dig(cocurrence = 1)
       if self.class.index_page?
-        self.class.index_config.process(cocurrence){|url| dig_url(url) }
+        self.class.index_config.process(cocurrence) do |url|
+          dig_url(url)
+        end
       end
     end
   end
-end
+end

data/lib/digger/page.rb

@@ -28,16 +28,12 @@ module Digger
     # OpenStruct it holds users defined data
     attr_accessor :user_data
 
-    attr_accessor :aliases
-
-    attr_accessor :domain_aliases
+    attr_accessor :aliases, :domain_aliases, :fetched_at
 
     # Whether the current page should be stored
     # Default: true
     attr_accessor :storable
 
-    attr_accessor :fetched_at
-
     #
     # Create a new page
     #
@@ -61,7 +57,7 @@ module Digger
     end
 
     def title
-      doc.title if doc
+      doc&.title
     end
 
     #
@@ -75,6 +71,7 @@ module Digger
         doc.search('//a[@href]').each do |a|
           u = a['href']
           next if u.nil? || u.empty?
+
           abs = to_absolute(u) rescue next
           @links << abs if abs && in_domain?(abs)
         end
@@ -101,7 +98,7 @@ module Digger
     end
 
     def jsonp
-      @jsonp ||= JSON.parse body.match(/^[^\(]+?\((.+)\)[^\)]*$/)[1]
+      @jsonp ||= JSON.parse body.match(/^[^(]+?\((.+)\)[^)]*$/)[1]
     end
 
     #
@@ -163,7 +160,7 @@ module Digger
     # returns +false+ otherwise.
     #
     def not_found?
-      404 == @code
+      @code == 404
     end
 
     #
@@ -177,6 +174,7 @@ module Digger
               end unless @base
 
       return nil if @base && @base.to_s.empty?
+
       @base
     end
 
@@ -245,6 +243,7 @@ module Digger
 
     def expired?(ttl)
       return false if fetched_at.nil?
+
       (Time.now.to_i - ttl) > fetched_at
     end
 

data/lib/digger/pattern.rb

@@ -1,111 +1,113 @@
 require 'nokogiri'
 
 module Digger
+  # Extractor patterns definition
   class Pattern
     attr_accessor :type, :value, :block
 
     def initialize(hash = {})
-      hash.each_pair{|key, value| send("#{key}=", value) if %w{type value block}.include?(key.to_s)}
+      hash.each_pair { |key, value| send("#{key}=", value) if %w[type value block].include?(key.to_s)}
     end
 
-    def safe_block
-      block && begin
-        if block.respond_to?(:call)
-          block
-        elsif block.strip == '' # 
-          nil
-        else
-          proc{ $SAFE = 2; eval block }.call
-        end
-      rescue StandardError
-        nil
+    def safe_block(&default_block)
+      if block.nil? || (block.is_a?(String) && block.strip.empty?)
+        default_block
+      elsif block.respond_to?(:call)
+        block
+      else
+        proc {
+          $SAFE = 2
+          eval block
+        }.call
       end
     end
 
     def self.wrap(hash)
-      Hash[hash.map{|key, value| [key, value.is_a?(Pattern) ? value : Pattern.new(value)]}]
+      hash.transform_values { |value| value.is_a?(Pattern) ? value : Pattern.new(value) }
     end
 
     MATCH_MAX = 3
 
-    TYPES_REGEXP = 0.upto(MATCH_MAX).map{|i| "match_#{i}"} + %w{match_many}
-    TYPES_CSS = %w{css_one css_many}
-    TYPES_JSON = %w{json jsonp}
-    
+    TYPES_REGEXP = 0.upto(MATCH_MAX).map { |i| "match_#{i}" } + %w[match_many]
+    TYPES_CSS = %w[css_one css_many].freeze
+    TYPES_JSON = %w[json jsonp].freeze
+
     TYPES = TYPES_REGEXP + TYPES_CSS + TYPES_JSON
 
-    def match_page(page, &callback)
-      blk = callback || safe_block
+    def match_page(page)
+      return unless page.success?
       if TYPES_REGEXP.include?(type) # regular expression
-        blk ||= ->(text){ text.strip }
-        # content is String
-        if type == 'match_many'
-          match = page.body.gsub(value).to_a
-        else
-          index = TYPES_REGEXP.index(type)
-          matches = page.body.match(value)
-          match = matches.nil? ? nil : matches[index]
-        end
+        regexp_match(page.body)
       elsif TYPES_CSS.include?(type) # css expression
-        blk ||= ->(node){ node.content.strip }
-        # content is Nokogiri::HTML::Document
-        if type == 'css_one'
-          match = page.doc.css(value).first
-        else
-          match = page.doc.css(value)
-        end
+        css_match(page.doc)
       elsif TYPES_JSON.include?(type)
-        json = page.send(type)
-        match = json_fetch(json, value)
+        json_match(page)
+      end
+    end
+
+    def json_match(page)
+      block = safe_block { |j| j }
+      json = page.send(type)
+      keys = json_index_keys(value)
+      match = json_fetch(json, keys)
+      block.call(match)
+    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
+      else
+        block.call(contents.first)
       end
-      if match.nil?
-        nil
-      elsif %w{css_many match_many}.include? type
-        match.map{|node| blk.call(node) }.uniq
+    end
+
+    def regexp_match(body)
+      block = safe_block(&:strip)
+      # content is String
+      if type == 'match_many'
+        body.gsub(value).to_a.map { |node| block.call(node) }.uniq
       else
-        blk.call(match)
+        index = TYPES_REGEXP.index(type)
+        matches = body.match(value)
+        block.call(matches[index]) unless matches.nil?
       end
-    rescue
-      nil
     end
 
     def json_fetch(json, keys)
-      if keys.is_a? String
-        # parse json keys like '$.k1.k2[0]'
-        parts = keys.match(/^\$[\S]*$/)[0].scan(/(\.([\w]+)|\[([\d]+)\])/).map do |p|
-          p[1].nil? ? { index: p[2].to_i  } : { key: p[1] }
-        end
-        json_fetch(json, parts)
-      elsif keys.is_a? Array
-        if keys.length == 0
-          json
-        else
-          pt = keys.shift
-          json_fetch(json[pt[:index] || pt[:key]], keys)
-        end
+      if keys.empty?
+        json
+      else
+        pt = keys.shift
+        json_fetch(json[pt[:index] || pt[:key]], keys)
       end
     end
 
+    def json_index_keys(keys)
+      keys.to_s.match(/^\$\S*$/)[0].scan(/(\.(\w+)|\[(\d+)\])/).map do |p|
+        p[1].nil? ? { index: p[2].to_i } : { key: p[1] }
+      end
+    end
+
+    private :json_index_keys, :json_fetch
+
+    # Nokogiri node methods
     class Nokogiri::XML::Node
-      %w{one many}.each do |name|
-        define_method "inner_#{name}" do |css, &block| 
-          callback = ->(node) do
-            if node
-              (block || ->(n){n.text.strip}).call(node)
-            else
-              nil
-            end
-          end
+      %w[one many].each do |name|
+        define_method "inner_#{name}" do |css, &block|
+          callback = ->(node) { (block || ->(n) { n.text.strip }).call(node) if node }
           if name == 'one' # inner_one
             callback.call(self.css(css).first)
           else # inner_many
-            self.css(css).map{|node| callback.call(node)}
+            self.css(css).map { |node| callback.call(node) }
           end
         end
       end
       def source
         to_xml
       end
-    end # nokogiri
+    end
   end
-end
+end

data/lib/digger/version.rb

@@ -1,3 +1,3 @@
 module Digger
-  VERSION = "0.1.6"
+  VERSION = '0.1.7'.freeze
 end

data/spec/index_spec.rb

@@ -0,0 +1,12 @@
+require 'digger'
+
+describe Digger::Index do
+  it 'batch digger' do
+    list = [1, 2, 3, 4, 5, 6, 7, 8]
+    pt = Digger::Index.batch(list, 3) do |num|
+      sleep(rand(1..3))
+      "##{num}"
+    end
+    expect(pt.join).to eq(list.map { |num| "##{num}" }.join)
+  end
+end

data/spec/pattern_spec.rb

@@ -3,12 +3,12 @@ require 'json'
 
 describe Digger::Pattern do
   it 'json fetch' do
-    json = JSON.parse('{"a":1,"b":[1,2,3]}')
+    json = JSON.parse('[{"a":1,"b":[1,2,3]}]')
     pt = Digger::Pattern.new
-    expect(pt.json_fetch(json, '$')['a']).to eq(1)
-    expect(pt.json_fetch(json, '$.a')).to eq(1)
-    expect(pt.json_fetch(json, '$.b').length).to eq(3)
-    expect(pt.json_fetch(json, '$.b[2]')).to eq(3)
+    expect(pt.json_fetch(json, '$[0]')['a']).to eq(1)
+    expect(pt.json_fetch(json, '$[0].a')).to eq(1)
+    expect(pt.json_fetch(json, '$[0].b').length).to eq(3)
+    expect(pt.json_fetch(json, '$[0].b[2]')).to eq(3)
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: digger
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - binz
@@ -87,6 +87,7 @@ files:
 - lib/digger/pattern.rb
 - lib/digger/version.rb
 - spec/digger_spec.rb
+- spec/index_spec.rb
 - spec/page_spec.rb
 - spec/pattern_spec.rb
 - spec/validate_spec.rb
@@ -115,6 +116,7 @@ specification_version: 4
 summary: Dig need stractual infomation from web page.
 test_files:
 - spec/digger_spec.rb
+- spec/index_spec.rb
 - spec/page_spec.rb
 - spec/pattern_spec.rb
 - spec/validate_spec.rb