infoboxer 0.2.7 → 0.2.8

data/lib/infoboxer/navigation/sections.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Navigation
     # `Sections` module provides logical view on document strcture.
@@ -24,7 +25,7 @@ module Infoboxer
     #  lookup_parents(:Section) # => []
     # ```
     module Sections
-      # This module is included in {Tree::Document Document}, allowing 
+      # This module is included in {Tree::Document Document}, allowing
       # you to navigate through document's logical sections (and also
       # included in each {Sections::Section} instance, allowing to navigate
       # recursively).
@@ -35,9 +36,9 @@ module Infoboxer
         #
         # @return {Tree::Nodes}
         def intro
-          children.
-            take_while{|n| !n.is_a?(Tree::Heading)}.
-            select{|n| n.is_a?(Tree::BaseParagraph)}
+          children
+            .take_while { |n| !n.is_a?(Tree::Heading) }
+            .select { |n| n.is_a?(Tree::BaseParagraph) }
         end
 
         # List of sections inside current container.
@@ -48,12 +49,12 @@ module Infoboxer
         # document.sections                 # all top-level sections
         # document.sections('Culture')      # only "Culture" section
         # document.sections(/^List of/)     # all sections with heading matching pattern
-        #   
-        # document.   
+        #
+        # document.
         #   sections('Culture').            # long way of recieve nested section
         #     sections('Music')             # (Culture / Music)
-        # 
-        # document. 
+        #
+        # document.
         #   sections('Culture', 'Music')    # the same as above
         #
         # document.
@@ -69,14 +70,14 @@ module Infoboxer
             h.count == 1 or fail(ArgumentError, "Undefined behavior with #{h}")
             names.unshift(h.keys.first, h.values.first)
           end
-          
+
           case names.count
           when 0
             @sections
           when 1
-            @sections.select{|s| names.first === s.heading.text_}
+            @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..-1])
           end
         end
 
@@ -87,10 +88,10 @@ module Infoboxer
           return res if headings.empty?
           level = headings.first.level
 
-          children.
-            chunk{|n| n.matches?(Tree::Heading, level: level)}.
-            drop_while{|is_heading, nodes| !is_heading}.
-            each do |is_heading, nodes|
+          children
+            .chunk { |n| n.matches?(Tree::Heading, level: level) }
+            .drop_while { |is_heading, _nodes| !is_heading }
+            .each do |is_heading, nodes|
               if is_heading
                 nodes.each do |node|
                   res << Section.new(node)
@@ -115,18 +116,19 @@ module Infoboxer
         # @return {Tree::Nodes<Section>}
         def in_sections
           main_node = parent.is_a?(Tree::Document) ? self : lookup_parents[-2]
-          
-          heading = if main_node.is_a?(Tree::Heading)
-            main_node.lookup_prev_siblings(Tree::Heading, level: main_node.level - 1).last
-          else
-            main_node.lookup_prev_siblings(Tree::Heading).last
-          end
+
+          heading =
+            if main_node.is_a?(Tree::Heading)
+              main_node.lookup_prev_siblings(Tree::Heading, level: main_node.level - 1).last
+            else
+              main_node.lookup_prev_siblings(Tree::Heading).last
+            end
           return Tree::Nodes[] unless heading
-          
-          section = Section.new(heading,
-            heading.next_siblings.
-              take_while{|n| !n.is_a?(Tree::Heading) || n.level < heading.level}
-          )
+
+          body = heading.next_siblings
+                        .take_while { |n| !n.is_a?(Tree::Heading) || n.level < heading.level }
+
+          section = Section.new(heading, body)
           Tree::Nodes[section, *heading.in_sections]
         end
       end
@@ -137,11 +139,11 @@ module Infoboxer
       module Nodes
         # @!method sections(*names)
         # @!method in_sections
-        
-        [:sections, :in_sections].each do |sym|
-          define_method(sym){|*args|
-            make_nodes map{|n| n.send(sym, *args)}
-          }
+
+        %i[sections in_sections].each do |sym|
+          define_method(sym) do |*args|
+            make_nodes(map { |n| n.send(sym, *args) })
+          end
         end
       end
 
@@ -174,12 +176,6 @@ module Infoboxer
         end
 
         include Container
-
-        private
-
-        #def show_params
-          #super(level: heading.level, heading: heading.text)
-        #end
       end
     end
   end

data/lib/infoboxer/navigation/selector.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Navigation
     module Lookup
@@ -7,11 +8,11 @@ module Infoboxer
       # See {Lookup::Node Lookup::Node} for detailed explanation of available selectors.
       class Selector
         include ProcMe
-        
+
         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.reject! { |_k, v| v.nil? } if a.is_a?(Hash)
           end
         end
 
@@ -26,7 +27,7 @@ module Infoboxer
         end
 
         def matches?(node)
-          @arg.all?{|a| arg_matches?(a, node)}
+          @arg.all? { |a| arg_matches?(a, node) }
         end
 
         private
@@ -44,9 +45,7 @@ module Infoboxer
           when Proc
             check.call(node)
           when Hash
-            check.all?{|attr, value|
-              node.respond_to?(attr) && value === node.send(attr)
-            }
+            check.all? { |attr, value| node.respond_to?(attr) && value === node.send(attr) }
           when Symbol
             node.respond_to?(check) && node.send(check)
           else

data/lib/infoboxer/navigation/shortcuts.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   module Navigation
     # See {Shortcuts::Node Shortcuts::Node} for everything!
@@ -83,19 +84,19 @@ module Infoboxer
 
         # Returns true, if current node is **inside** bold.
         def bold?
-          has_parent?(Tree::Bold)
+          parent?(Tree::Bold)
         end
 
         # Returns true, if current node is **inside** italic.
         def italic?
-          has_parent?(Tree::Italic)
+          parent?(Tree::Italic)
         end
 
         # Returns true, if current node is **inside** heading.
         #
         # @param level optional concrete level to check
         def heading?(level = nil)
-          has_parent?(Tree::Heading, level: level)
+          parent?(Tree::Heading, level: level)
         end
 
         # Returns all infoboxes inside current node.
@@ -129,12 +130,12 @@ module Infoboxer
         private
 
         def ensure_traits
-          ensure_page.traits or fail("No site traits found")
+          ensure_page.traits or fail('No site traits found')
         end
 
         def ensure_page
           (is_a?(MediaWiki::Page) ? self : lookup_parents(MediaWiki::Page).first) or
-            fail("Node is not inside Page, maybe parsed from text?")
+            fail('Node is not inside Page, maybe parsed from text?')
         end
       end
 
@@ -154,12 +155,12 @@ module Infoboxer
         # @!method infoboxes(*selectors, &block)
         # @!method categories
 
-        [:wikilinks, :headings, :paragraphs, :external_links, :images,
-         :templates, :tables, :lists, :infoboxes, :infobox, :categories].
-          each do |m|
-            define_method(m){|*args|
-              make_nodes map{|n| n.send(m, *args)}
-            }
+        %i[wikilinks headings paragraphs external_links images
+           templates tables lists infoboxes infobox categories]
+          .each do |m|
+            define_method(m) do |*args|
+              make_nodes(map { |n| n.send(m, *args) })
+            end
           end
       end
     end

data/lib/infoboxer/navigation.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   # Navigation is one of the things Infoboxer is proud about. It tries
   # to be logical, unobtrusive and compact.
@@ -64,7 +65,7 @@ module Infoboxer
     %w[lookup shortcuts sections].each do |nav|
       require_relative "navigation/#{nav}"
     end
-    
+
     class Tree::Node
       include Navigation::Lookup::Node
       include Navigation::Shortcuts::Node

data/lib/infoboxer/parser/context.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require 'strscan'
 
 module Infoboxer
@@ -8,9 +9,9 @@ module Infoboxer
       attr_reader :traits
 
       def initialize(text, traits = nil)
-        @lines = text.
-          gsub(/<!--.+?-->/m, ''). # FIXME: will also kill comments inside <nowiki> tag
-          split(/[\r\n]/)
+        @lines = text
+                 .gsub(/<!--.+?-->/m, '') # FIXME: will also kill comments inside <nowiki> tag
+                 .split(/[\r\n]/)
         @lineno = -1
         @traits = traits || MediaWiki::Traits.default
         @scanner = StringScanner.new('')
@@ -82,7 +83,7 @@ module Infoboxer
 
       def scan_until(re, leave_pattern = false)
         guard_eof!
-        
+
         res = _scan_until(re)
         res[matched] = '' if res && !leave_pattern
         res
@@ -102,14 +103,14 @@ module Infoboxer
         # not using StringScanner#check, as it will change #matched value
         eol? ||
           (
-            (current =~ %r[^(</ref>|}})] || @inline_eol_sign && current =~ @inline_eol_sign) && 
-            (!exclude || $1 !~ exclude)
+            (current =~ %r[^(</ref>|}})] || @inline_eol_sign && current =~ @inline_eol_sign) &&
+            (!exclude || Regexp.last_match(1) !~ exclude)
           ) # FIXME: ugly, but no idea of prettier solution
       end
 
       def scan_continued_until(re, leave_pattern = false)
         res = ''
-        
+
         loop do
           chunk = _scan_until(re)
           case matched
@@ -122,7 +123,7 @@ module Infoboxer
             eof? && fail!("Unfinished scan: #{re} not found")
           end
         end
-        
+
         res[/#{re}\Z/] = '' unless leave_pattern
         res
       end
@@ -156,23 +157,21 @@ module Infoboxer
       end
 
       def guard_eof!
-        #eof? and fail!("End of input reached")
-        @scanner or fail!("End of input reached")
+        @scanner or fail!('End of input reached')
       end
 
       def shift(amount)
         @lineno += amount
         current = @lines[lineno]
-        @next_lines = @lines[(lineno+1)..-1]
+        @next_lines = @lines[(lineno + 1)..-1]
         if current
           @scanner.string = current
           @rest = current
-          @matched = nil
         else
           @scanner = nil
           @rest = nil
-          @matched = nil
         end
+        @matched = nil
       end
     end
   end

data/lib/infoboxer/parser/html.rb

@@ -1,18 +1,19 @@
 # encoding: utf-8
+
 module Infoboxer
   class Parser
     module HTML
       include Tree
-      
+
       def html
         case
-        when @context.check(/\/[a-z]+>/)
+        when @context.check(%r{/[a-z]+>})
           html_closing_tag
         when @context.check(/br\s*>/)
           html_br
         when @context.check(%r{[a-z]+[^/>]*/>})
           html_auto_closing_tag
-        when @context.check(/[a-z]+[^>\/]*>/)
+        when @context.check(%r{[a-z]+[^>/]*>})
           html_opening_tag
         else
           # not an HTML tag at all!
@@ -21,7 +22,7 @@ module Infoboxer
       end
 
       def html_closing_tag
-        @context.skip(/\//)
+        @context.skip(%r{/})
         tag = @context.scan(/[a-z]+/)
         @context.skip(/>/)
         HTMLClosingTag.new(tag)
@@ -43,8 +44,8 @@ module Infoboxer
         tag = @context.scan(/[a-z]+/)
         attrs = @context.scan(/[^>]+/)
         @context.skip(/>/)
-        contents = short_inline(/<\/#{tag}>/)
-        if @context.matched =~ /<\/#{tag}>/
+        contents = short_inline(%r{</#{tag}>})
+        if @context.matched =~ %r{</#{tag}>}
           HTMLTag.new(tag, parse_params(attrs), contents)
         else
           [

data/lib/infoboxer/parser/image.rb

@@ -1,19 +1,16 @@
 # encoding: utf-8
+
 module Infoboxer
   class Parser
     module Image
       include Tree
-      
+
       def image
         @context.skip(re.file_namespace) or
           @context.fail!("Something went wrong: it's not image?")
 
         path = @context.scan_until(/\||\]\]/)
-        attrs = if @context.matched == '|'
-          image_attrs
-        else
-          {}
-        end
+        attrs = @context.matched == '|' ? image_attrs : {}
         Tree::Image.new(path, attrs)
       end
 
@@ -25,32 +22,31 @@ module Infoboxer
           break if @context.matched == ']]'
         end
 
-        nodes.map(&method(:image_attr)).
-          inject(&:merge).
-          reject{|k, v| v.nil? || v.empty?}
+        nodes.map(&method(:image_attr))
+             .inject(&:merge)
+             .reject { |_k, v| v.nil? || v.empty? }
       end
 
       def image_attr(nodes)
-        if nodes.count == 1 && nodes.first.is_a?(Text)
-          case (str = nodes.first.text)
-          when /^(thumb)(?:nail)?$/, /^(frame)(?:d)?$/
-            {type: $1}
-          when 'frameless'
-            {type: str}
-          when 'border'
-            {border: str}
-          when /^(baseline|middle|sub|super|text-top|text-bottom|top|bottom)$/
-            {alignment: str}
-          when /^(\d*)(?:x(\d+))?px$/
-            {width: $1, height: $2}
-          when /^link=(.*)$/i
-            {link: $1}
-          when /^alt=(.*)$/i
-            {alt: $1}
-          else # text-only caption
-            {caption: ImageCaption.new(nodes)}
-          end
-        else # it's caption, and can have inline markup!
+        # it's caption, and can have inline markup!
+        return {caption: ImageCaption.new(nodes)} unless nodes.count == 1 && nodes.first.is_a?(Text)
+
+        case (str = nodes.first.text)
+        when /^(thumb)(?:nail)?$/, /^(frame)(?:d)?$/
+          {type: Regexp.last_match(1)}
+        when 'frameless'
+          {type: str}
+        when 'border'
+          {border: str}
+        when /^(baseline|middle|sub|super|text-top|text-bottom|top|bottom)$/
+          {alignment: str}
+        when /^(\d*)(?:x(\d+))?px$/
+          {width: Regexp.last_match(1), height: Regexp.last_match(2)}
+        when /^link=(.*)$/i
+          {link: Regexp.last_match(1)}
+        when /^alt=(.*)$/i
+          {alt: Regexp.last_match(1)}
+        else # text-only caption
           {caption: ImageCaption.new(nodes)}
         end
       end

data/lib/infoboxer/parser/inline.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Infoboxer
   class Parser
     module Inline
@@ -33,13 +34,14 @@ module Infoboxer
         nodes = Nodes[]
         guarded_loop do
           # FIXME: quick and UGLY IS HELL JUST TRYING TO MAKE THE SHIT WORK
-          if @context.inline_eol_sign == /^\]/
-            chunk = @context.scan_until(re.short_inline_until_cache_brackets[until_pattern])
-          elsif @context.inline_eol_sign == /^\]\]/
-            chunk = @context.scan_until(re.short_inline_until_cache_brackets2[until_pattern])
-          else
-            chunk = @context.scan_until(re.short_inline_until_cache[until_pattern])
-          end
+          chunk =
+            if @context.inline_eol_sign == /^\]/
+              @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])
+            else
+              @context.scan_until(re.short_inline_until_cache[until_pattern])
+            end
           nodes << chunk
 
           break if @context.matched_inline?(until_pattern)
@@ -80,89 +82,90 @@ module Infoboxer
       end
 
       private
-        def inline_formatting(match)
-          case match
-          when "'''''"
-            BoldItalic.new(short_inline(/'''''/))
-          when "'''"
-            Bold.new(short_inline(/'''/))
-          when "''"
-            Italic.new(short_inline(/''/))
-          when '[['
-            if @context.check(re.file_namespace)
-              image
-            else
-              wikilink
-            end
-          when /\[(.+)/
-            external_link($1)
-          when '{{'
-            template
-          when /<nowiki([^>]*)>/
-            nowiki($1)
-          when /<ref([^>]*)\/>/
-            reference($1, true)
-          when /<ref([^>]*)>/
-            reference($1)
-          when /<math>/
-            math
-          when '<'
-            html || Text.new(match) # it was not HTML, just accidental <
+
+      def inline_formatting(match)
+        case match
+        when "'''''"
+          BoldItalic.new(short_inline(/'''''/))
+        when "'''"
+          Bold.new(short_inline(/'''/))
+        when "''"
+          Italic.new(short_inline(/''/))
+        when '[['
+          if @context.check(re.file_namespace)
+            image
           else
-            match # FIXME: TEMP
+            wikilink
           end
+        when /\[(.+)/
+          external_link(Regexp.last_match(1))
+        when '{{'
+          template
+        when /<nowiki([^>]*)>/
+          nowiki(Regexp.last_match(1))
+        when %r{<ref([^>]*)/>}
+          reference(Regexp.last_match(1), true)
+        when /<ref([^>]*)>/
+          reference(Regexp.last_match(1))
+        when /<math>/
+          math
+        when '<'
+          html || Text.new(match) # it was not HTML, just accidental <
+        else
+          match # FIXME: TEMP
         end
+      end
 
-        # http://en.wikipedia.org/wiki/Help:Link#Wikilinks
-        # [[abc]]
-        # [[a|b]]
-        def wikilink
-          link = @context.scan_continued_until(/\||\]\]/)
-          if @context.matched == '|'
-            @context.push_eol_sign(/^\]\]/)
-            caption = inline(/\]\]/)
-            @context.pop_eol_sign
-          end
-
-          Wikilink.new(link, caption)
+      # http://en.wikipedia.org/wiki/Help:Link#Wikilinks
+      # [[abc]]
+      # [[a|b]]
+      def wikilink
+        link = @context.scan_continued_until(/\||\]\]/)
+        if @context.matched == '|'
+          @context.push_eol_sign(/^\]\]/)
+          caption = inline(/\]\]/)
+          @context.pop_eol_sign
         end
 
-        # http://en.wikipedia.org/wiki/Help:Link#External_links
-        # [http://www.example.org]
-        # [http://www.example.org link name]
-        def external_link(protocol)
-          link = @context.scan_continued_until(/\s+|\]/)
-          if @context.matched =~ /\s+/
-            @context.push_eol_sign(/^\]/)
-            caption = short_inline(/\]/)
-            @context.pop_eol_sign
-          end
-          ExternalLink.new(protocol + link, caption)
-        end
+        Wikilink.new(link, caption)
+      end
 
-        def reference(param_str, closed = false)
-          children = closed ? Nodes[] : long_inline(/<\/ref>/)
-          Ref.new(children, parse_params(param_str))
+      # http://en.wikipedia.org/wiki/Help:Link#External_links
+      # [http://www.example.org]
+      # [http://www.example.org link name]
+      def external_link(protocol)
+        link = @context.scan_continued_until(/\s+|\]/)
+        if @context.matched =~ /\s+/
+          @context.push_eol_sign(/^\]/)
+          caption = short_inline(/\]/)
+          @context.pop_eol_sign
         end
+        ExternalLink.new(protocol + link, caption)
+      end
 
-        def math
-          Math.new(@context.scan_continued_until(/<\/math>/))
-        end
+      def reference(param_str, closed = false)
+        children = closed ? Nodes[] : long_inline(%r{</ref>})
+        Ref.new(children, parse_params(param_str))
+      end
 
-        def nowiki(tag_rest)
-          if tag_rest.end_with?('/')
-            Text.new('')
-          else
-            Text.new(@context.scan_continued_until(/<\/nowiki>/))
-          end
-        end
+      def math
+        Math.new(@context.scan_continued_until(%r{</math>}))
       end
 
-      require_relative 'image'
-      require_relative 'html'
-      require_relative 'template'
-      include Infoboxer::Parser::Image
-      include Infoboxer::Parser::HTML
-      include Infoboxer::Parser::Template
+      def nowiki(tag_rest)
+        if tag_rest.end_with?('/')
+          Text.new('')
+        else
+          Text.new(@context.scan_continued_until(%r{</nowiki>}))
+        end
+      end
+    end
+
+    require_relative 'image'
+    require_relative 'html'
+    require_relative 'template'
+    include Infoboxer::Parser::Image
+    include Infoboxer::Parser::HTML
+    include Infoboxer::Parser::Template
   end
 end