infoboxer 0.2.7 → 0.2.8

data/lib/infoboxer/tree/list.rb

@@ -1,13 +1,14 @@
 # encoding: utf-8
+
 module Infoboxer
   module Tree
-    # Represents item of ordered or unordered list. 
+    # Represents item of ordered or unordered list.
     class ListItem < BaseParagraph
       # @private
       # Internal, used by {Parser}
       def can_merge?(other)
         other.class == self.class &&
-          other.children.first.kind_of?(List)
+          other.children.first.is_a?(List)
       end
 
       # @private
@@ -21,11 +22,12 @@ module Infoboxer
       end
 
       def text
-        make_marker + if children.last.is_a?(List)
-          children[0..-2].map(&:text).join + "\n" + children.last.text
-        else
-          children.map(&:text).join + "\n"
-        end
+        make_marker +
+          if children.last.is_a?(List)
+            children[0..-2].map(&:text).join + "\n" + children.last.text
+          else
+            children.map(&:text).join + "\n"
+          end
       end
 
       private
@@ -71,7 +73,7 @@ module Infoboxer
 
     # Represents unordered list (list with markers).
     class UnorderedList < List
-      def make_marker(item)
+      def make_marker(_item)
         list_text_indent + '* '
       end
     end
@@ -87,7 +89,7 @@ module Infoboxer
     # consists of {DTerm}s and {DDefinition}s.
     #
     # NB: In fact, at least in English Wikipedia, orphan "definition terms"
-    # are used as a low-level headers, especially in lists of links/references. 
+    # are used as a low-level headers, especially in lists of links/references.
     class DefinitionList < List
       def make_marker(item)
         case item
@@ -118,7 +120,7 @@ module Infoboxer
       def merge!(other)
         ochildren = other.children.dup
         if children.last && ochildren.first &&
-          children.last.can_merge?(ochildren.first)
+           children.last.can_merge?(ochildren.first)
 
           children.last.merge!(ochildren.shift)
         end
@@ -133,7 +135,7 @@ module Infoboxer
         klass = LISTS[m] or
           fail("Something went wrong: undefined list marker type #{m}")
         item_klass = ITEMS[m]
-        
+
         if marker.empty?
           klass.new(item_klass.new(nodes))
         else
@@ -141,15 +143,13 @@ module Infoboxer
         end
       end
 
-      private
-
       # @private
       LISTS = {
         ';' => DefinitionList,
         ':' => DefinitionList,
         '*' => UnorderedList,
         '#' => OrderedList
-      }
+      }.freeze
 
       # @private
       ITEMS = {
@@ -157,8 +157,7 @@ module Infoboxer
         ':' => DDefinition,
         '*' => ListItem,
         '#' => ListItem
-      }
-      
+      }.freeze
     end
   end
 end

data/lib/infoboxer/tree/node.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'htmlentities'
 
 module Infoboxer
@@ -11,7 +12,7 @@ module Infoboxer
     #
     class Node
       include ProcMe
-      
+
       def initialize(params = {})
         @params = params
       end
@@ -48,12 +49,12 @@ module Infoboxer
 
       # List of siblings before this one
       def prev_siblings
-        siblings.select{|n| n.index < index}
+        siblings.select { |n| n.index < index }
       end
 
       # List of siblings after this one
       def next_siblings
-        siblings.select{|n| n.index > index}
+        siblings.select { |n| n.index > index }
       end
 
       # Node children list
@@ -63,7 +64,7 @@ module Infoboxer
 
       # @private
       # Used only during tree construction in {Parser}.
-      def can_merge?(other)
+      def can_merge?(_other)
         false
       end
 
@@ -87,7 +88,7 @@ module Infoboxer
       # #     pretty <Italic>
       # #     complicated <Text>
       # ```
-      # 
+      #
       # Useful for understanding page structure, and Infoboxer's representation
       # of this structure
       def to_tree(level = 0)
@@ -144,33 +145,33 @@ module Infoboxer
 
       def descr
         if !params || params.empty?
-          "#{clean_class}"
+          clean_class.to_s
         else
           "#{clean_class}(#{show_params})"
         end
       end
 
       def show_params(prms = nil)
-        (prms || params).map{|k, v| "#{k}: #{v.inspect}"}.join(', ')
+        (prms || params).map { |k, v| "#{k}: #{v.inspect}" }.join(', ')
       end
 
       def indent(level)
         '  ' * level
       end
 
-      def _eq(other)
+      def _eq(_other)
         fail(NotImplementedError, "#_eq should be defined in subclasses (called for #{self.class})")
       end
 
       def decode(str)
         Node.coder.decode(str)
       end
-      
+
       class << self
         # Internal: descendandts DSL
         def def_readers(*keys)
           keys.each do |k|
-            define_method(k){ params[k] }
+            define_method(k) { params[k] }
           end
         end
 

data/lib/infoboxer/tree/nodes.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Tree
     # List of nodes, which tries to be useful both as array, and as proxy
@@ -10,7 +11,7 @@ module Infoboxer
     # like those:
     #
     # ```ruby
-    # document.sections.                  # => Nodes returned, 
+    # document.sections.                  # => Nodes returned,
     #   select{|section|                  #    you can treat them as array, but also...
     #     section.text.length > 1000      #
     #   }.                                #
@@ -22,7 +23,6 @@ module Infoboxer
     # ```
     #
     class Nodes < Array
-
       # @!method select(&block)
       #    Just like Array#select, but returns Nodes
 
@@ -41,10 +41,10 @@ module Infoboxer
       # @!method -(other)
       #    Just like Array#-, but returns Nodes
 
-      [:select, :reject, :sort_by, :flatten, :compact, :-].each do |sym|
-        define_method(sym){|*args, &block|
+      %i[select reject sort_by flatten compact -].each do |sym|
+        define_method(sym) do |*args, &block|
           Nodes[*super(*args, &block)]
-        }
+        end
       end
 
       # Just like Array#first, but returns Nodes, if provided with `n` of elements.
@@ -68,7 +68,7 @@ module Infoboxer
       # Just like Array#map, but returns Nodes, **if** all map results are Node
       def map
         res = super
-        if res.all?{|n| n.is_a?(Node) || n.is_a?(Nodes)}
+        if res.all? { |n| n.is_a?(Node) || n.is_a?(Nodes) }
           Nodes[*res]
         else
           res
@@ -77,7 +77,7 @@ module Infoboxer
 
       # @!method prev_siblings
       #   Previous siblings (flat list) of all nodes inside.
-      
+
       # @!method next_siblings
       #   Next siblings (flat list) of all nodes inside.
 
@@ -88,14 +88,14 @@ module Infoboxer
       #   Fetches by name(s) variables for all templates inside.
       #
       #   See {Tree::Template#fetch} for explanation.
-      
-      [
-        :prev_siblings, :next_siblings, :siblings,
-        :fetch
+
+      %i[
+        prev_siblings next_siblings siblings
+        fetch
       ].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
 
       # By list of variable names, fetches hashes of `{name => value}`
@@ -105,7 +105,7 @@ module Infoboxer
       #
       # @return [Array<Hash>]
       def fetch_hashes(*args)
-        map{|t| t.fetch_hash(*args)}
+        map { |t| t.fetch_hash(*args) }
       end
 
       # Just join of all {Node#to_tree Node#to_tree} strings inside.
@@ -114,10 +114,11 @@ module Infoboxer
       end
 
       def inspect
-        '[' + 
+        '[' +
           case
           when count > MAX_CHILDREN
-            self[0...MAX_CHILDREN].map(&:inspect).join(', ') + ", ...#{count - MAX_CHILDREN} more nodes"
+            self[0...MAX_CHILDREN].map(&:inspect).join(', ') +
+            ", ...#{count - MAX_CHILDREN} more nodes"
           else
             map(&:inspect).join(', ')
           end + ']'
@@ -138,19 +139,19 @@ module Infoboxer
       # @return [Nodes<MediaWiki::Page>] It is still `Nodes`, so you
       #   still can process them uniformely.
       def follow
-        links = select{|n| n.respond_to?(:link)}.map(&:link)
+        links = select { |n| n.respond_to?(:link) }.map(&:link)
         return Nodes[] if links.empty?
         page = first.lookup_parents(MediaWiki::Page).first or
-          fail("Not in a page from real source")
-        page.client or fail("MediaWiki client not set")
+          fail('Not in a page from real source')
+        page.client or fail('MediaWiki client not set')
         page.client.get(*links)
       end
 
       # @private
       # Internal, used by {Parser}
       def <<(node)
-        if node.kind_of?(Array)
-          node.each{|n| self << n}
+        if node.is_a?(Array)
+          node.each { |n| self << n }
         elsif last && last.can_merge?(node)
           last.merge!(node)
         else
@@ -172,7 +173,7 @@ module Infoboxer
       # @private
       # Internal, used by {Parser}
       def flow_templates
-        make_nodes map{|n| n.is_a?(Paragraph) ? n.to_templates? : n}
+        make_nodes(map { |n| n.is_a?(Paragraph) ? n.to_templates? : n })
       end
 
       private

data/lib/infoboxer/tree/paragraphs.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Tree
     # Base class for all "paragraph-level" nodes: {Paragraph}, {ListItem},
@@ -46,7 +47,7 @@ module Infoboxer
         end
       end
     end
-    
+
     # @private
     class MergeableParagraph < BaseParagraph
       include Mergeable
@@ -68,7 +69,7 @@ module Infoboxer
       # @private
       # Internal, used by {Parser}
       def templates_only?
-        children.all?{|c| c.is_a?(Template) || c.is_a?(Text) && c.raw_text.strip.empty?}
+        children.all? { |c| c.is_a?(Template) || c.is_a?(Text) && c.raw_text.strip.empty? }
       end
 
       # @private

data/lib/infoboxer/tree/ref.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Tree
     # Represents footnote.
@@ -6,13 +7,15 @@ module Infoboxer
     # Is not rendered in text flow, so, wikitext like
     #
     # ```
-    # ...pushed it back into underdevelopment,<ref>...tons of footnote text...</ref> though it nevertheless...
+    # ...pushed it back into underdevelopment,<ref>...tons of footnote text...</ref> though it
+    # nevertheless...
     # ```
     # when parsed and {Node#text} called, will return text like:
     #
     # ```
     # ...pushed it back into underdevelopment, though it nevertheless...
     # ```
+    #
     # ...which most times is most reasonable thing to do.
     class Ref < Compound
       # @!attribute [r] name
@@ -24,11 +27,11 @@ module Infoboxer
         # even empty tag should not be dropped!
         false
       end
-      
+
       def text
         # because we want "clean" text,
         # without references & footnotes messed up in it
-        '' 
+        ''
       end
     end
   end

data/lib/infoboxer/tree/table.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'terminal-table'
 
 module Infoboxer
@@ -25,31 +26,30 @@ module Infoboxer
       #
       # FIXME: it can easily be several table heading rows
       def heading_row
-        rows.first && rows.first.children.all?(&call(matches?: TableHeading)) ?
-          rows.first : nil
+        rows.first if rows.first && rows.first.children.all?(&call(matches?: TableHeading))
       end
 
       # For now, returns all table rows except {#heading_row}
       def body_rows
-        rows.first && rows.first.children.all?(&call(matches?: TableHeading)) ?
-          rows[1..-1] :
+        if rows.first && rows.first.children.all?(&call(matches?: TableHeading))
+          rows[1..-1]
+        else
           rows
+        end
       end
 
       def text
         table = Terminal::Table.new
-        if caption
-          table.title = caption.text.sub(/\n+\Z/, '')
-        end
-        
+        table.title = caption.text.sub(/\n+\Z/, '') if caption
+
         if heading_row
-          table.headings = heading_row.children.map(&:text).
-            map(&call(sub: [/\n+\Z/, '']))
+          table.headings = heading_row.children.map(&:text)
+                                      .map(&call(sub: [/\n+\Z/, '']))
         end
 
-        table.rows = body_rows.map{|r|
-          r.children.map(&:text).
-            map(&call(sub: [/\n+\Z/, '']))
+        table.rows = body_rows.map { |r|
+          r.children.map(&:text)
+           .map(&call(sub: [/\n+\Z/, '']))
         }
         table.to_s + "\n\n"
       end

data/lib/infoboxer/tree/template.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require_relative 'linkable'
 
 module Infoboxer
@@ -40,7 +41,7 @@ module Infoboxer
     # with Infoboxer, you are working with original templates.
     #
     # It requires some mastering and understanding, yet allows to do
-    # very poweful things. There are many kinds of them, from pure 
+    # very poweful things. There are many kinds of them, from pure
     # formatting-related (which are typically not more than small bells
     # and whistles for page outlook, and should be rendered as a text)
     # to very information-heavy ones, like
@@ -107,14 +108,14 @@ module Infoboxer
 
       def initialize(name, variables = Nodes[])
         super(Nodes[], extract_params(variables))
-        @name  = name 
-        @variables = Nodes[*variables].each{|v| v.parent = self}
+        @name = name
+        @variables = Nodes[*variables].each { |v| v.parent = self }
       end
 
       # See {Node#to_tree}
       def to_tree(level = 0)
         '  ' * level + "<#{descr}>\n" +
-          variables.map{|var| var.to_tree(level+1)}.join
+          variables.map { |var| var.to_tree(level + 1) }.join
       end
 
       # Represents entire template as hash of `String => String`,
@@ -123,7 +124,7 @@ module Infoboxer
       #
       # @return [Hash{String => String}]
       def to_h
-        variables.map{|var| [var.name, var.text]}.to_h
+        variables.map { |var| [var.name, var.text] }.to_h
       end
 
       # Returns list of template variables with numeric names (which
@@ -148,14 +149,14 @@ module Infoboxer
       #
       # @return [Nodes<Var>]
       def fetch(*patterns)
-        Nodes[*patterns.map{|p| variables.find(name: p)}.flatten]
+        Nodes[*patterns.map { |p| variables.find(name: p) }.flatten]
       end
 
       # Fetches hash `{name => variable}`, by same patterns as {#fetch}.
       #
       # @return [Hash<String => Var>]
       def fetch_hash(*patterns)
-        fetch(*patterns).map{|v| [v.name, v]}.to_h
+        fetch(*patterns).map { |v| [v.name, v] }.to_h
       end
 
       # Fetches date by list of variable names containing date components.
@@ -175,11 +176,11 @@ module Infoboxer
       def fetch_date(*patterns)
         components = fetch(*patterns)
         components.pop while components.last.nil? && !components.empty?
-        
+
         if components.empty?
           nil
         else
-          Date.new(*components.map{|v| v.to_s.to_i})
+          Date.new(*components.map { |v| v.to_s.to_i })
         end
       end
 
@@ -231,16 +232,15 @@ module Infoboxer
       def clean_class
         "Template[#{name}]"
       end
-      
+
       def extract_params(vars)
-        # NB: backports' to_h is cleaner but has performance penalty :(
-        Hash[*vars.
-          select{|v| v.children.count == 1 && v.children.first.is_a?(Text)}.
-          map{|v| [v.name, v.children.first.raw_text]}.flatten(1)]
+        vars
+          .select { |v| v.children.count == 1 && v.children.first.is_a?(Text) }
+          .map { |v| [v.name, v.children.first.raw_text] }.to_h
       end
 
       def inspect_variables(depth)
-        variables.to_a[0..1].map{|name, var| "#{name}: #{var.inspect(depth+1)}"}.join(', ') +
+        variables.to_a[0..1].map { |name, var| "#{name}: #{var.inspect(depth + 1)}" }.join(', ') +
           (variables.count > 2 ? ', ...' : '')
       end
     end

data/lib/infoboxer/tree/text.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Tree
     # Represents plain text node.
@@ -13,7 +14,7 @@ module Infoboxer
     class Text < Node
       # Text fragment without decodint of HTML entities.
       attr_accessor :raw_text
-      
+
       def initialize(text, params = {})
         super(params)
         @raw_text = text

data/lib/infoboxer/tree/wikilink.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require_relative 'linkable'
 
 module Infoboxer
@@ -35,7 +36,7 @@ module Infoboxer
       # The same way, `[Pipe (programming)]` has `topic == 'Pipe'` and
       # `refinement == 'programming'`
       attr_reader :topic
-      
+
       # Refinement part of link name.
       #
       # See {#topic} for explanation.
@@ -57,17 +58,17 @@ module Infoboxer
 
       # @see http://en.wikipedia.org/wiki/Help:Pipe_trick
       def parse_topic!
-        @topic, @refinement = case @name
-          when /^(.+\S)\s*\((.+)\)$/,
-               /^(.+?),\s*(.+)$/
-            [$1, $2]
+        @topic, @refinement =
+          case @name
+          when /^(.+\S)\s*\((.+)\)$/, /^(.+?),\s*(.+)$/
+            [Regexp.last_match(1), Regexp.last_match(2)]
           else
             [@name, '']
           end
 
-        if children.count == 1 && children.first.is_a?(Text) && children.first.raw_text.empty?
-          children.first.raw_text = @topic
-        end
+        return unless children.count == 1 &&
+                      children.first.is_a?(Text) && children.first.raw_text.empty?
+        children.first.raw_text = @topic
       end
     end
   end

data/lib/infoboxer/tree.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   # Infoboxer provides you with tree structure of the Wikipedia page,
   # which you can introspect and navigate with ease. This tree structure
@@ -62,8 +63,8 @@ module Infoboxer
     require_relative 'tree/nodes'
 
     %w[text compound inline
-      image html paragraphs list template table ref math
-      document].each do |type|
+       image html paragraphs list template table ref math
+       document].each do |type|
       require_relative "tree/#{type}"
     end
   end

data/lib/infoboxer/version.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
+
 module Infoboxer
   MAJOR = 0
   MINOR = 2
-  PATCH = 7
+  PATCH = 8
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end