infoboxer 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc65cf33309c84191cac67a24377302a220a899
-  data.tar.gz: 64d1a9f50089fa0b676ffa02db045efce5445100
+  metadata.gz: ef407b6160d6d0ff8cfb874338320532d1b18906
+  data.tar.gz: fdc4ccf4b051c50958e6cc9720619ea5110b5ea5
 SHA512:
-  metadata.gz: b7850a54a7aa864dd0d5d4c8e741877b3bde859d3bd19b0dde1303a411f6948c58144e6fd2389df7626d3b3e967063b2784f91a34bd69b7c6375598e6051044f
-  data.tar.gz: 59cd28da34d3e66c6ecb971985d7fbfecb3f649911f45a8d205df156899d4a265a887f30566a9825f67ca3a4457638c92b4966f75e559c36ea310eb94d05e212
+  metadata.gz: d5224104b02115c47f27c69926128023da3765d1d7089241190a6b3f5c8c3de79be91f65276c82536c671424d10000e2f5198413b3aa21e9802ccc9ca41fbdef
+  data.tar.gz: 0f1f8d9ee3a4e94d6529208a9678bcb0915a884525433d2397249afada141d96c88c74e0546ddd0576adffcc2785f96ad1da57d61284b84d96661fb49c0fd46d

data/.rubocop_todo.yml

@@ -0,0 +1 @@
+

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Infoboxer's change log
 
+## 0.2.8 (2017-05-11)
+
+* Switch to MediaWiktory 0.1.0 + some subsequent cleanup of internal logic;
+* Additional `prop:` param for `MediaWiki#get`, `#get_h`, and `#raw`, allowing to fetch arbitrary
+  page properties.
+
 ## 0.2.7 (2016-09-18)
 
 * Fix `Math` node rendering to text (#68);

data/bin/infoboxer

@@ -9,9 +9,9 @@ require 'optparse'
 wiki_url = nil
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: infoboxer [-w wiki_api_url]"
+  opts.banner = 'Usage: infoboxer [-w wiki_api_url]'
 
-  opts.on("-w", "--wiki WIKI_API_URL",
+  opts.on('-w', '--wiki WIKI_API_URL',
               "Make wiki by WIKI_API_URL a default wiki, and use it with just get('Pagename')") do |w|
     wiki_url = w
   end
@@ -20,19 +20,19 @@ end.parse!
 if wiki_url
   if wiki_url =~ /^[a-z]+$/
     wiki_url = case
-    when domain = Infoboxer::WIKIMEDIA_PROJECTS[wiki_url.to_sym]
-      "https://en.#{domain}/w/api.php"
-    when domain = Infoboxer::WIKIMEDIA_PROJECTS[('w' + wiki_url).to_sym]
-      "https://en.#{domain}/w/api.php"
-    else
-      fail("Unidentified wiki: #{wiki_url}")
-    end
+               when domain = Infoboxer::WIKIMEDIA_PROJECTS[wiki_url.to_sym]
+                 "https://en.#{domain}/w/api.php"
+               when domain = Infoboxer::WIKIMEDIA_PROJECTS[('w' + wiki_url).to_sym]
+                 "https://en.#{domain}/w/api.php"
+               else
+                 fail("Unidentified wiki: #{wiki_url}")
+               end
   end
-  
+
   DEFAULT_WIKI = Infoboxer.wiki(wiki_url)
   puts "Default Wiki selected: #{wiki_url}.\nNow you can use `get('Pagename')`, `category('Categoryname')` and so on.\n\n"
   [:raw, :get, :get_h, :category, :search, :prefixsearch].each do |m|
-    define_method(m){|*arg|
+    define_method(m) { |*arg|
       DEFAULT_WIKI.send(m, *arg)
     }
   end
@@ -41,4 +41,3 @@ end
 require 'irb'
 ARGV.shift until ARGV.empty?
 IRB.start
-

data/infoboxer.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   EOF
   s.licenses = ['MIT']
 
+  s.required_ruby_version = '>= 2.1.0'
+
   s.files = `git ls-files`.split($RS).reject do |file|
     file =~ /^(?:
     spec\/.*
@@ -31,8 +33,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'htmlentities'
   s.add_dependency 'procme'
-  s.add_dependency 'mediawiktory', '>= 0.0.2'
+  s.add_dependency 'mediawiktory', '>= 0.1.0'
   s.add_dependency 'addressable'
   s.add_dependency 'terminal-table'
-  s.add_dependency 'backports'
 end

data/lib/infoboxer/core_ext.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 # @private
 class Object
   # Unfortunately, not in backports gem still :(

data/lib/infoboxer/definitions/en.wikipedia.org.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   MediaWiki::Traits.for('en.wikipedia.org') do
     templates do
@@ -38,7 +39,7 @@ module Infoboxer
         'Asterisk' => '*',
         'Colon' => ':',
         'Em dash' => '—',
-        'Gc' => "†",
+        'Gc' => '†',
         'Ibeam' => 'I',
         'Long dash' => ' ——— ',
         'Nbhyph' => '‑',
@@ -64,12 +65,12 @@ module Infoboxer
         'Break' => "\n", # FIXME: in fact, break has optional parameter "how many breaks"
         'Crlf' => "\n",  # FIXME: in fact, alias for break, should have DSL syntax for it!
         'Crlf2' => "\n",
-        
+
       )
       show(
         'Allow wrap',
         'Nowrap',
-          'j', 'nobr', 'nobreak', # aliases for Nowrap
+        'j', 'nobr', 'nobreak', # aliases for Nowrap
         'nowraplinks',
       )
       # inflow_template('Normalwraplink') # TODO: tricky
@@ -168,7 +169,7 @@ module Infoboxer
         'lime', 'green', 'aqua (color)', 'cyan', 'teal', 'blue', 'navy (color)',
         'purple', 'fuchsia', 'magenta'
       )
-      
+
       # Some most popular templates, without categorical splitting
       # https://en.wikipedia.org/wiki/Wikipedia:Database_reports/Templates_transcluded_on_the_most_pages
       # ------------------------------------------------------------------------------------------------
@@ -190,7 +191,7 @@ module Infoboxer
       template 'Coord' do
         def model
           @model ||= begin
-            npos = lookup_children(text: /^N|S$/).first.index rescue nil
+            npos = lookup_children(text: /^N|S$/).first.index rescue nil # rubocop:disable Style/RescueModifier
             case npos
             when 1
               :decimal
@@ -235,12 +236,11 @@ module Infoboxer
         end
 
         ALLOW_BETWEEN = ['-;', '–',
-          'and', '&', 'and(-)', ', and',
-          'or', ', or',
-          'to', 'to(-)', 'to about',
-          '+/-', '±', '+',
-          'by', 'x', '×', 'x',
-        ]
+                         'and', '&', 'and(-)', ', and',
+                         'or', ', or',
+                         'to', 'to(-)', 'to about',
+                         '+/-', '±', '+',
+                         'by', 'x', '×', 'x',].freeze
 
         def between
           ALLOW_BETWEEN.include?(fetch('2').text) ? fetch('2').text : nil
@@ -253,11 +253,11 @@ module Infoboxer
         def measure_from
           between ? fetch('4').text : fetch('2').text
         end
-        
+
         def measure_to
           between ? fetch('5').text : fetch('3').text
         end
-        
+
         def text
           [value1, between, value2, measure_from].compact.join(' ')
         end

data/lib/infoboxer/media_wiki/page.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   class MediaWiki
     # A descendant of {Tree::Document Document}, representing page,
@@ -9,7 +10,7 @@ module Infoboxer
     class Page < Tree::Document
       def initialize(client, children, source)
         @client, @source = client, source
-        super(children, title: source.title, url: source.fullurl)
+        super(children, title: source['title'], url: source['fullurl'])
       end
 
       # Instance of {MediaWiki} which this page was received from
@@ -36,10 +37,10 @@ module Infoboxer
 
       private
 
-      PARAMS_TO_INSPECT = [:url, :title] #, :domain]
+      PARAMS_TO_INSPECT = %i[url title].freeze
 
       def show_params
-        super(params.select{|k, v| PARAMS_TO_INSPECT.include?(k)})
+        super(params.select { |k, _v| PARAMS_TO_INSPECT.include?(k) })
       end
     end
   end

data/lib/infoboxer/media_wiki/traits.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   class MediaWiki
     # DSL for defining "traits" for some site.
@@ -19,7 +20,7 @@ module Infoboxer
           @templates ||= Templates::Set.new
 
           return @templates unless definition
-          
+
           @templates.define(&definition)
         end
 
@@ -59,7 +60,7 @@ module Infoboxer
         # [English Wikipedia traits](https://github.com/molybdenum-99/infoboxer/blob/master/lib/infoboxer/definitions/en.wikipedia.org.rb)
         # for example implementation.
         def for(domain, &block)
-          Traits.domains[domain].tap{|c| c && c.instance_eval(&block)} ||
+          Traits.domains[domain].tap { |c| c && c.instance_eval(&block) } ||
             Class.new(self, &block).domain(domain)
         end
 
@@ -69,10 +70,12 @@ module Infoboxer
 
       def initialize(options = {})
         @options = options
-        @file_namespace = [DEFAULTS[:file_namespace], namespace_aliases(options, 'File')].
-          flatten.compact.uniq
-        @category_namespace = [DEFAULTS[:category_namespace], namespace_aliases(options, 'Category')].
-          flatten.compact.uniq
+        @file_namespace =
+          [DEFAULTS[:file_namespace], namespace_aliases(options, 'File')]
+          .flatten.compact.uniq
+        @category_namespace =
+          [DEFAULTS[:category_namespace], namespace_aliases(options, 'Category')]
+          .flatten.compact.uniq
       end
 
       # @private
@@ -86,16 +89,15 @@ module Infoboxer
       private
 
       def namespace_aliases(options, canonical)
-        namespace = (options[:namespaces] || []).detect{|v| v.canonical == canonical}
+        namespace = (options[:namespaces] || []).detect { |v| v['canonical'] == canonical }
         return nil unless namespace
-        [namespace['*'], *namespace.aliases]
+        [namespace['*'], *namespace['aliases']]
       end
 
       DEFAULTS = {
         file_namespace: 'File',
         category_namespace: 'Category'
-      }
-
+      }.freeze
     end
   end
 end

data/lib/infoboxer/media_wiki.rb

@@ -1,10 +1,8 @@
 # encoding: utf-8
-#require 'rest-client'
-#require 'json'
+
 require 'mediawiktory'
 require 'addressable/uri'
 
-require_relative 'media_wiki/mediawiktory_patch'
 require_relative 'media_wiki/traits'
 require_relative 'media_wiki/page'
 
@@ -14,7 +12,8 @@ module Infoboxer
   # Usage:
   #
   # ```ruby
-  # client = Infoboxer::MediaWiki.new('http://en.wikipedia.org/w/api.php', user_agent: 'My Own Project')
+  # client = Infoboxer::MediaWiki
+  #   .new('http://en.wikipedia.org/w/api.php', user_agent: 'My Own Project')
   # page = client.get('Argentina')
   # ```
   #
@@ -27,7 +26,8 @@ module Infoboxer
     #
     # You can set yours as an option to {Infoboxer.wiki} and its shortcuts,
     # or to {#initialize}
-    UA = "Infoboxer/#{Infoboxer::VERSION} (https://github.com/molybdenum-99/infoboxer; zverok.offline@gmail.com)"
+    UA = "Infoboxer/#{Infoboxer::VERSION} "\
+      '(https://github.com/molybdenum-99/infoboxer; zverok.offline@gmail.com)'.freeze
 
     class << self
       # User agent getter/setter.
@@ -35,9 +35,12 @@ module Infoboxer
       # Default value is {UA}.
       #
       # You can also use per-instance option, see {#initialize}
+      #
+      # @return [String]
       attr_accessor :user_agent
     end
 
+    # @private
     attr_reader :api_base_url, :traits
 
     # Creating new MediaWiki client. {Infoboxer.wiki} provides shortcut
@@ -51,28 +54,44 @@ module Infoboxer
     #   * `:user_agent` (also aliased as `:ua`) -- custom User-Agent header.
     def initialize(api_base_url, options = {})
       @api_base_url = Addressable::URI.parse(api_base_url)
-      @client = MediaWiktory::Client.new(api_base_url, user_agent: user_agent(options))
+      @client = MediaWiktory::Wikipedia::Api.new(api_base_url, user_agent: user_agent(options))
       @traits = Traits.get(@api_base_url.host, namespaces: extract_namespaces)
     end
 
     # Receive "raw" data from Wikipedia (without parsing or wrapping in
     # classes).
     #
-    # @return [Array<Hash>]
-    def raw(*titles)
-      return [] if titles.empty? # could emerge on "automatically" created page lists, should work
-      
-      titles.each_slice(50).map{|part|
-        @client.query.
-          titles(*part).
-          prop(revisions: {prop: :content}, info: {prop: :url}).
-          redirects(true). # FIXME: should be done transparently by MediaWiktory?
-          perform.pages
-      }.inject(:concat). # somehow flatten(1) fails!
-      sort_by{|page|
-        res_title = page.alt_titles.detect{|t| titles.map(&:downcase).include?(t.downcase)} # FIXME?..
-        titles.index(res_title) || 1_000
-      }
+    # @param titles [Array<String>] List of page titles to get.
+    # @param prop [Array<Symbol>] List of additional page properties to get, refer to
+    #   [MediaWiktory::Actions::Query#prop](http://www.rubydoc.info/gems/mediawiktory/MediaWiktory/Wikipedia/Actions/Query#prop-instance_method)
+    #   for the list of available properties.
+    #
+    # @return [Hash{String => Hash}] Hash of `{requested title => raw MediaWiki object}`. Note that
+    #   even missing (does not exist in current Wiki) or invalid (impossible title) still be present
+    #   in response, just will have `"missing"` or `"invalid"` key, just like MediaWiki returns them.
+    def raw(*titles, prop: [])
+      # could emerge on "automatically" created page lists, should work
+      return {} if titles.empty?
+
+      titles.each_slice(50).map do |part|
+        response = @client
+                   .query
+                   .titles(*part)
+                   .prop(:revisions, :info, *prop).prop(:content, :timestamp, :url)
+                   .redirects
+                   .response
+
+        sources = response['pages'].values.map { |page| [page['title'], page] }.to_h
+        redirects =
+          if response['redirects']
+            response['redirects'].map { |r| [r['from'], sources[r['to']]] }.to_h
+          else
+            {}
+          end
+
+        # This way for 'Einstein' query we'll have {'Albert Einstein' => page, 'Einstein' => same page}
+        sources.merge(redirects)
+      end.inject(:merge)
     end
 
     # Receive list of parsed MediaWiki pages for list of titles provided.
@@ -83,7 +102,12 @@ module Infoboxer
     # many queries as necessary to extract them all (it will be like
     # `(titles.count / 50.0).ceil` requests)
     #
-    # @return [Tree::Nodes<Page>] array of parsed pages. Notes:
+    # @param titles [Array<String>] List of page titles to get.
+    # @param prop [Array<Symbol>] List of additional page properties to get, refer to
+    #   [MediaWiktory::Actions::Query#prop](http://www.rubydoc.info/gems/mediawiktory/MediaWiktory/Wikipedia/Actions/Query#prop-instance_method)
+    #   for the list of available properties.
+    #
+    # @return [Page, Tree::Nodes<Page>] array of parsed pages. Notes:
     #   * if you call `get` with only one title, one page will be
     #     returned instead of an array
     #   * if some of pages are not in wiki, they will not be returned,
@@ -96,22 +120,15 @@ module Infoboxer
     #     Infoboxer.wp.get('Argentina', 'Chile', 'Something non-existing').
     #        infobox.fetch('some value')
     #     ```
-    #     and obtain meaningful results instead of NoMethodError or some
-    #     NotFound.
-    #
-    def get(*titles)
-      pages = raw(*titles).
-        tap{|pages| pages.detect(&:invalid?).tap{|i| i && fail(i.raw.invalidreason)}}.
-        select(&:exists?).
-        map{|raw|
-          Page.new(self,
-            Parser.paragraphs(raw.content, traits),
-            raw)
-        }
+    #     and obtain meaningful results instead of `NoMethodError` or
+    #     `SomethingNotFound`.
+    #
+    def get(*titles, prop: [])
+      pages = get_h(*titles, prop: prop).values.compact
       titles.count == 1 ? pages.first : Tree::Nodes[*pages]
     end
 
-    # Same as {#get}, but returns hash of {requested title => page}.
+    # Same as {#get}, but returns hash of `{requested title => page}`.
     #
     # Useful quirks:
     # * when requested page not existing, key will be still present in
@@ -123,13 +140,18 @@ module Infoboxer
     # This allows you to be in full control of what pages of large list
     # you've received.
     #
+    # @param titles [Array<String>] List of page titles to get.
+    # @param prop [Array<Symbol>] List of additional page properties to get, refer to
+    #   [MediaWiktory::Actions::Query#prop](http://www.rubydoc.info/gems/mediawiktory/MediaWiktory/Wikipedia/Actions/Query#prop-instance_method)
+    #   for the list of available properties.
+    #
     # @return [Hash<String, Page>]
     #
-    def get_h(*titles)
-      pages = [*get(*titles)]
-      titles.map{|t|
-        [t, pages.detect{|p| p.source.alt_titles.map(&:downcase).include?(t.downcase)}]
-      }.to_h
+    def get_h(*titles, prop: [])
+      raw_pages = raw(*titles, prop: prop)
+                  .tap { |ps| ps.detect { |_, p| p['invalid'] }.tap { |_, i| i && fail(i['invalidreason']) } }
+                  .reject { |_, p| p.key?('missing') }
+      titles.map { |title| [title, make_page(raw_pages, title)] }.to_h
     end
 
     # Receive list of parsed MediaWiki pages from specified category.
@@ -139,8 +161,8 @@ module Infoboxer
     # fetched in 50-page batches, then parsed. So, for large category
     # it can really take a while to fetch all pages.
     #
-    # @param title Category title. You can use namespaceless title (like
-    #     `"Countries in South America"`), title with namespace (like 
+    # @param title [String] Category title. You can use namespaceless title (like
+    #     `"Countries in South America"`), title with namespace (like
     #     `"Category:Countries in South America"`) or title with local
     #     namespace (like `"Catégorie:Argentine"` for French Wikipedia)
     #
@@ -148,8 +170,8 @@ module Infoboxer
     #
     def category(title)
       title = normalize_category_title(title)
-      
-      list(categorymembers: {title: title, limit: 50})
+
+      list(@client.query.generator(:categorymembers).title(title).limit('max'))
     end
 
     # Receive list of parsed MediaWiki pages for provided search query.
@@ -158,10 +180,10 @@ module Infoboxer
     #
     # **NB**: currently, this API **always** fetches all pages from
     # category, there is no option to "take first 20 pages". Pages are
-    # fetched in 50-page batches, then parsed. So, for large category
+    # fetched in 50-page batches, then parsed. So, for large search query
     # it can really take a while to fetch all pages.
     #
-    # @param query Search query. For old installations, look at
+    # @param query [String] Search query. For old installations, look at
     #     https://www.mediawiki.org/wiki/Help:Searching
     #     for search syntax. For new ones (including Wikipedia), see at
     #     https://www.mediawiki.org/wiki/Help:CirrusSearch.
@@ -169,7 +191,7 @@ module Infoboxer
     # @return [Tree::Nodes<Page>] array of parsed pages.
     #
     def search(query)
-      list(search: {search: query, limit: 50})
+      list(@client.query.generator(:search).search(query).limit('max'))
     end
 
     # Receive list of parsed MediaWiki pages with titles startin from prefix.
@@ -178,38 +200,44 @@ module Infoboxer
     #
     # **NB**: currently, this API **always** fetches all pages from
     # category, there is no option to "take first 20 pages". Pages are
-    # fetched in 50-page batches, then parsed. So, for large category
+    # fetched in 50-page batches, then parsed. So, for large search query
     # it can really take a while to fetch all pages.
     #
-    # @param prefix page title prefix.
+    # @param prefix [String] Page title prefix.
     #
     # @return [Tree::Nodes<Page>] array of parsed pages.
     #
     def prefixsearch(prefix)
-      list(prefixsearch: {search: prefix, limit: 100})
+      list(@client.query.generator(:prefixsearch).search(prefix).limit('max'))
     end
 
+    # @return [String]
     def inspect
       "#<#{self.class}(#{@api_base_url.host})>"
     end
 
     private
 
+    def make_page(raw_pages, title)
+      _, source = raw_pages.detect { |ptitle, _| ptitle.casecmp(title).zero? }
+      source or return nil
+      Page.new(self, Parser.paragraphs(source['revisions'].first['*'], traits), source)
+    end
+
     def list(query)
-      response = @client.query.
-        generator(query).
-        prop(revisions: {prop: :content}, info: {prop: :url}).
-        redirects(true). # FIXME: should be done transparently by MediaWiktory?
-        perform
+      response = query
+                 .prop(:revisions, :info)
+                 .prop(:content, :timestamp, :url)
+                 .redirects
+                 .response
 
-      response.continue! while response.continue?
+      response = response.continue while response.continue?
 
-      pages = response.pages.select(&:exists?).
-        map{|raw|
-          Page.new(self,
-            Parser.paragraphs(raw.content, traits),
-            raw)
-        }
+      return Tree::Nodes[] if response['pages'].nil?
+
+      pages = response['pages']
+              .values.select { |p| p['missing'].nil? }
+              .map { |raw| Page.new(self, Parser.paragraphs(raw['revisions'].first['*'], traits), raw) }
 
       Tree::Nodes[*pages]
     end
@@ -218,7 +246,7 @@ module Infoboxer
       # FIXME: shouldn't it go to MediaWiktory?..
       namespace, titl = title.include?(':') ? title.split(':', 2) : [nil, title]
       namespace, titl = nil, title unless traits.category_namespace.include?(namespace)
-      
+
       namespace ||= traits.category_namespace.first
       [namespace, titl].join(':')
     end
@@ -228,11 +256,12 @@ module Infoboxer
     end
 
     def extract_namespaces
-      siteinfo = @client.query.meta(siteinfo: {prop: [:namespaces, :namespacealiases]}).perform
-      siteinfo.raw.query.namespaces.map{|_, namespace|
-        aliases = siteinfo.raw.query.namespacealiases.select{|a| a.id == namespace.id}.map{|a| a['*']}
-        namespace.merge(aliases: aliases)
-      }
+      siteinfo = @client.query.meta(:siteinfo).prop(:namespaces, :namespacealiases).response
+      siteinfo['namespaces'].map do |_, namespace|
+        aliases =
+          siteinfo['namespacealiases'].select { |a| a['id'] == namespace['id'] }.map { |a| a['*'] }
+        namespace.merge('aliases' => aliases)
+      end
     end
   end
 end

data/lib/infoboxer/navigation/lookup.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require_relative 'selector'
 
 module Infoboxer
@@ -104,8 +105,8 @@ module Infoboxer
 
         # Underscored version of {#lookup}
         def _lookup(selector)
-          Tree::Nodes[_matches?(selector) ? self : nil, *children._lookup(selector)].
-            flatten.compact
+          Tree::Nodes[_matches?(selector) ? self : nil, *children._lookup(selector)]
+            .flatten.compact
         end
 
         # Underscored version of {#lookup_children}
@@ -139,20 +140,23 @@ module Infoboxer
         def _lookup_next_siblings(selector)
           next_siblings._find(selector)
         end
-        
-        [:matches?,
-          :lookup, :lookup_children, :lookup_parents,
-          :lookup_siblings,
-          :lookup_next_siblings, :lookup_prev_siblings
-        ].map{|sym| [sym, :"_#{sym}"]}.each do |sym, underscored|
-
-          define_method(sym){|*args, &block|
+
+        %i[
+          matches?
+          lookup lookup_children lookup_parents
+          lookup_siblings
+          lookup_next_siblings lookup_prev_siblings
+        ]
+          .map { |sym| [sym, :"_#{sym}"] }
+          .each do |sym, underscored|
+
+          define_method(sym) do |*args, &block|
             send(underscored, Selector.new(*args, &block))
-          }
+          end
         end
 
         # Checks if node has any parent matching selectors.
-        def has_parent?(*selectors, &block)
+        def parent?(*selectors, &block)
           !lookup_parents(*selectors, &block).empty?
         end
       end
@@ -181,7 +185,7 @@ module Infoboxer
 
         # Underscored version of {#find}.
         def _find(selector)
-          select{|n| n._matches?(selector)}
+          select { |n| n._matches?(selector) }
         end
 
         # Selects nodes of current list (and only it, no children checks),
@@ -190,25 +194,25 @@ module Infoboxer
           _find(Selector.new(*selectors, &block))
         end
 
-        [
-          :_lookup, :_lookup_children, :_lookup_parents,
-          :_lookup_siblings, :_lookup_prev_siblings, :_lookup_next_siblings
+        %i[
+          _lookup _lookup_children _lookup_parents
+          _lookup_siblings _lookup_prev_siblings _lookup_next_siblings
         ].each do |sym|
-          define_method(sym){|*args|
-            make_nodes map{|n| n.send(sym, *args)}
-          }
+          define_method(sym) do |*args|
+            make_nodes(map { |n| n.send(sym, *args) })
+          end
         end
 
         # not delegate, but redefine: Selector should be constructed only once
-        [
-          :lookup, :lookup_children, :lookup_parents,
-          :lookup_siblings,
-          :lookup_next_siblings, :lookup_prev_siblings
-        ].map{|sym| [sym, :"_#{sym}"]}.each do |sym, underscored|
+        %i[
+          lookup lookup_children lookup_parents
+          lookup_siblings
+          lookup_next_siblings lookup_prev_siblings
+        ].map { |sym| [sym, :"_#{sym}"] }.each do |sym, underscored|
 
-          define_method(sym){|*args, &block|
+          define_method(sym) do |*args, &block|
             send(underscored, Selector.new(*args, &block))
-          }
+          end
         end
       end
     end