infoboxer 0.3.3 → 0.4.0

data/lib/infoboxer/navigation/sections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Navigation
     # `Sections` module provides logical view on document strcture.
@@ -75,7 +77,7 @@ module Infoboxer
           when 1
             @sections.select { |s| names.first === s.heading.text_ }
           else
-            @sections.select { |s| names.first === s.heading.text_ }.sections(*names[1..-1])
+            @sections.select { |s| names.first === s.heading.text_ }.sections(*names[1..])
           end
         end
 
@@ -83,6 +85,7 @@ module Infoboxer
           sections = names.map { |name|
             heading = lookup_children(:Heading, text_: name).first
             next unless heading
+
             body = heading.next_siblings
                           .take_while { |n| !n.is_a?(Tree::Heading) || n.level > heading.level }
 
@@ -104,6 +107,7 @@ module Infoboxer
         def make_sections
           res = Tree::Nodes[]
           return res if headings.empty?
+
           level = headings.first.level
 
           children

data/lib/infoboxer/navigation/selector.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Navigation
     module Lookup
@@ -8,7 +10,7 @@ module Infoboxer
         def initialize(*arg, &block)
           @arg = [arg, block].flatten.compact.map(&method(:sym_to_class))
           @arg.each do |a|
-            a.reject! { |_k, v| v.nil? } if a.is_a?(Hash)
+            a.compact! if a.is_a?(Hash)
           end
         end
 

data/lib/infoboxer/navigation/shortcuts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Navigation
     # See {Shortcuts::Node Shortcuts::Node} for everything!

data/lib/infoboxer/navigation/wikipath.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../wiki_path'
 
 module Infoboxer

data/lib/infoboxer/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ostruct'
 require 'logger'
 
@@ -52,7 +54,7 @@ module Infoboxer
     def initialize(context)
       @context = context
       @re = OpenStruct.new(make_regexps)
-      @logger = Logger.new(STDOUT).tap { |l| l.level = Logger::FATAL }
+      @logger = Logger.new($stdout).tap { |l| l.level = Logger::FATAL }
     end
 
     require_relative 'parser/inline'

data/lib/infoboxer/parser/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'strscan'
 
 module Infoboxer
@@ -8,7 +10,7 @@ module Infoboxer
 
       def initialize(text, traits = nil)
         @lines = text
-                 .gsub(/<!--.+?-->/m, '') # FIXME: will also kill comments inside <nowiki> tag
+                 .gsub(/<!--.*?-->/m, '') # FIXME: will also kill comments inside <nowiki> tag
                  .split(/[\r\n]/)
         @lineno = -1
         @traits = traits || MediaWiki::Traits.default
@@ -19,22 +21,23 @@ module Infoboxer
       attr_reader :next_lines
 
       def colno
-        @scanner && @scanner.pos || 0
+        @scanner&.pos || 0
       end
 
       def matched
-        @matched ||= @scanner && @scanner.matched
+        @matched ||= @scanner&.matched
       end
 
       # check which works only once
       def eat_matched?(str)
         return false unless matched == str
+
         @matched = 'DUMMY'
         true
       end
 
       def rest
-        @rest ||= @scanner && @scanner.rest
+        @rest ||= @scanner&.rest
       end
 
       alias_method :current, :rest
@@ -107,7 +110,7 @@ module Infoboxer
       end
 
       def scan_continued_until(re, leave_pattern = false)
-        res = ''
+        res = +''
 
         loop do
           chunk = _scan_until(re)
@@ -152,6 +155,7 @@ module Infoboxer
 
       def unscan_matched!
         return unless @matched
+
         @scanner.pos -= @matched.size
         @rest = nil
       end
@@ -173,7 +177,7 @@ module Infoboxer
       def shift(amount)
         @lineno += amount
         current = @lines[lineno]
-        @next_lines = @lines[(lineno + 1)..-1]
+        @next_lines = @lines[(lineno + 1)..]
         if current
           @scanner.string = current
           @rest = current

data/lib/infoboxer/parser/html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module HTML

data/lib/infoboxer/parser/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module Image
@@ -9,7 +11,7 @@ module Infoboxer
 
         path = @context.scan_until(/\||\]\]/)
         attrs = @context.matched == '|' ? image_attrs : {}
-        Tree::Image.new(path, attrs)
+        Tree::Image.new(path, **attrs)
       end
 
       def image_attrs

data/lib/infoboxer/parser/inline.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module Inline
@@ -16,6 +18,7 @@ module Infoboxer
 
           if @context.eof?
             break unless until_pattern
+
             @context.fail!("#{until_pattern.source} not found, starting from #{start}")
           end
 
@@ -33,7 +36,7 @@ module Infoboxer
         guarded_loop do
           # FIXME: quick and UGLY IS HELL JUST TRYING TO MAKE THE SHIT WORK
           chunk =
-            if @context.inline_eol_sign == /^\]/
+            if @context.inline_eol_sign == /^\]/ # rubocop:disable Style/CaseLikeIf
               @context.scan_until(re.short_inline_until_cache_brackets[until_pattern])
             elsif @context.inline_eol_sign == /^\]\]/
               @context.scan_until(re.short_inline_until_cache_brackets2[until_pattern])
@@ -64,6 +67,7 @@ module Infoboxer
 
           if @context.eof?
             break unless until_pattern
+
             @context.fail!("#{until_pattern.source} not found")
           end
 
@@ -155,7 +159,7 @@ module Infoboxer
 
       def reference(param_str, closed = false)
         children = closed ? Nodes[] : long_inline(%r{</ref>})
-        Ref.new(children, parse_params(param_str))
+        Ref.new(children, **parse_params(param_str))
       end
 
       def math
@@ -179,11 +183,11 @@ module Infoboxer
           attrs = @context.matched == '|' ? gallery_image_attrs : {}
           unless path.empty?
             # FIXME: what if path NOT matches the namespace?
-            images << Tree::Image.new(path.sub(/^#{re.file_namespace.source}/i, ''), attrs)
+            images << Tree::Image.new(path.sub(/^#{re.file_namespace.source}/i, ''), **attrs)
           end
           break if @context.matched == '</gallery>'
         end
-        Gallery.new(images, params)
+        Gallery.new(images, **params)
       end
 
       def gallery_image_attrs

data/lib/infoboxer/parser/paragraphs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module Paragraphs
@@ -23,7 +25,7 @@ module Infoboxer
           heading(Regexp.last_match[:text], Regexp.last_match[:level])
         when /^\s*{\|/
           table
-        when /^[\*\#:;]./
+        when /^[*\#:;]./
           list(until_pattern)
         when /^-{4,}/
           HR.new

data/lib/infoboxer/parser/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     # http://en.wikipedia.org/wiki/Help:Table
@@ -12,7 +14,7 @@ module Infoboxer
 
         prms = table_params
         log "Table params found #{prms}"
-        table = Tree::Table.new(Nodes[], prms)
+        table = Tree::Table.new(Nodes[], **prms)
 
         @context.next!
 
@@ -51,6 +53,9 @@ module Infoboxer
           table_template(table)
         when nil
           return false
+        when /^(?<level>={2,})\s*(?<text>.+?)\s*\k<level>$/ # heading implicitly closes the table
+          @context.prev!
+          return false
         else
           return table_cell_cont(table)
         end
@@ -60,14 +65,14 @@ module Infoboxer
 
       def table_row(table, param_str)
         log 'Table row found'
-        table.push_children(TableRow.new(Nodes[], parse_params(param_str)))
+        table.push_children(TableRow.new(Nodes[], **parse_params(param_str)))
       end
 
       def table_caption(table)
         log 'Table caption found'
         @context.skip(/^\s*\|\+\s*/)
 
-        params = if @context.check(/[^|{|\[]+\|([^\|]|$)/)
+        params = if @context.check(/[^|{\[]+\|([^|]|$)/)
                    parse_params(@context.scan_until(/\|/))
                  else
                    {}
@@ -78,7 +83,7 @@ module Infoboxer
           @context.unscan_matched!
           @context.prev! # compensate next! which will be done in table()
         end
-        table.push_children(TableCaption.new(children.strip, params))
+        table.push_children(TableCaption.new(children.strip, **params))
       end
 
       def table_cells(table, cell_class = TableCell)
@@ -88,13 +93,13 @@ module Infoboxer
 
         @context.skip(/\s*[!|]\s*/)
         guarded_loop do
-          params = if @context.check(/[^|{|\[]+\|([^\|]|$)/)
+          params = if @context.check(/[^|{\[]+\|([^|]|$)/)
                      parse_params(@context.scan_until(/\|/))
                    else
                      {}
                    end
           content = short_inline(/(\|\||!!)/)
-          row.push_children(cell_class.new(content, params))
+          row.push_children(cell_class.new(content, **params))
           break if @context.eol?
         end
       end
@@ -102,15 +107,17 @@ module Infoboxer
       def table_template(table)
         contents = paragraph(/^\s*([|!]|{\|)/).to_templates?
 
-        if (row = table.children.last).is_a?(TableRow)
-          if (cell = row.children.last).is_a?(BaseCell)
-            cell.push_children(*contents)
-          else
-            row.push_children(*contents)
-          end
-        else
-          table.push_children(*contents)
-        end
+        # Note: in fact, without full template parsing, we CAN'T know what level to insert it:
+        # Template can be something like <tr><td>Foo</td></tr>
+        # But for consistency, we insert all templates inside the <td>, forcing this <td>
+        # to exist.
+
+        table.push_children(TableRow.new) unless table.children.last.is_a?(TableRow)
+        row = table.children.last
+        row.push_children(TableCell.new) unless row.children.last.is_a?(BaseCell)
+        cell = row.children.last
+
+        cell.push_children(*contents)
       end
 
       # Good news, everyone! Table can be IMPLICITLY closed when it's
@@ -130,6 +137,7 @@ module Infoboxer
         unless container
           # return "table not continued" unless row is empty
           return true if @context.current.empty?
+
           @context.prev!
           return false
         end

data/lib/infoboxer/parser/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module Template
@@ -44,6 +46,7 @@ module Infoboxer
           log 'Variable value found'
 
           break if @context.eat_matched?('}}')
+
           @context.eof? and @context.fail!("Unexpected break of template variables: #{res}")
         end
         res

data/lib/infoboxer/parser/util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   class Parser
     module Util

data/lib/infoboxer/templates.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   # This module covers advanced MediaWiki templates usage.
   #

data/lib/infoboxer/templates/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Templates
     class Base < Tree::Template

data/lib/infoboxer/templates/set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Templates
     # Base class for defining set of templates, used for some site/domain.

data/lib/infoboxer/tree.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   # Infoboxer provides you with tree structure of the Wikipedia page,
   # which you can introspect and navigate with ease. This tree structure

data/lib/infoboxer/tree/compound.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Tree
     # Base class for all nodes with children.
     class Compound < Node
       def initialize(children = Nodes.new, **params)
-        super(params)
+        super(**params)
         @children = Nodes[*children]
         @children.each { |c| c.parent = self }
       end

data/lib/infoboxer/tree/document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Tree
     # Represents entire document.

data/lib/infoboxer/tree/gallery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Tree
     # Represents gallery of images (contents of `<gallery>` special tag).

data/lib/infoboxer/tree/html.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Tree
     module HTMLTagCommons
@@ -11,7 +13,7 @@ module Infoboxer
     # Represents HTML tag, surrounding some contents.
     class HTMLTag < Compound
       def initialize(tag, attrs, children = Nodes.new)
-        super(children, attrs)
+        super(children, **attrs)
         @tag = tag
       end
 
@@ -43,7 +45,7 @@ module Infoboxer
     #
     class HTMLOpeningTag < Node
       def initialize(tag, attrs)
-        super(attrs)
+        super(**attrs)
         @tag = tag
       end
 

data/lib/infoboxer/tree/image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Infoboxer
   module Tree
     # Represents image (or other media file).
@@ -7,7 +9,7 @@ module Infoboxer
     class Image < Node
       def initialize(path, caption: nil, **params)
         @caption = caption
-        super({path: path}.merge(params))
+        super(path: path, **params)
       end
 
       # Image caption. Can have (sometimes many) other nodes inside.