infoboxer 0.3.0.pre → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67b07bcee67c15aeb316e2eccf75e85a26cb43ae
-  data.tar.gz: 91f3253151ff816a83b4ffb8f7937c878a5a3ed8
+  metadata.gz: be65bc91a5370bc24553e500754f413196caed76
+  data.tar.gz: d24dca5a13a64d563ddc473197a732a9f95884fd
 SHA512:
-  metadata.gz: f7dd9aa6545853dbf827c1b0b7857b2b5654caf33dcbfcaf4c2194709379f7e73d0978776675fd6265cbf83d88a814332626945db1b45c9562e54a01fa486a55
-  data.tar.gz: fa70f671da0d9acd7a0a131d8119a775c1ff762d7d2b640096f448678b7547477fd0fe93df74c438cd846fa550e33e530999c811bb4b0d4afe347bf058c3321b
+  metadata.gz: 661c06d6703db103035f61f55ebee5f0bc8a5f9ad182fcaf2a22be9f91063a9abd80bac1793fabae436b28bed274fcb7908219ba07453f46271a25d1cba0367a
+  data.tar.gz: 25029633e6516c30a7de21433db1903ab923af2c74082b3a3c9322b50b170cdb104652b95d261b3033a070629ee478a8b5510a7298fbef830d1445dfe56157d0

data/.rubocop_todo.yml

@@ -1 +1,16 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-06-23 13:52:16 +0300 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Metrics/AbcSize:
+  Max: 29
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 10
 

data/CHANGELOG.md

@@ -1,16 +1,5 @@
 # Infoboxer's change log
 
-## 0.3.1.pre (2017-09-16)
-
-* Introduce interwiki links following (and proper handling of interwikis, in general);
-* Add `<gallery>` tag support;
-* Introduce `Navigation::Selector#===`;
-* Much more `Enumerable`'s methods supported by `Nodes`;
-* Lot of small simplifications, cleanups and bugfixes.
-
-TBH, it should be 0.4.0 or more, but it would be a shame to change versions so fast :) So, at least
-until it is `-pre`, let it be 0.3.1.
-
 ## 0.3.0 (2017-07-23)
 
 * Change logic of navigation through templates; now templates contents aren't hidden from global

data/lib/infoboxer.rb

@@ -72,8 +72,8 @@ module Infoboxer
   end
 
   # Includeable version of {Infoboxer.wiki}
-  def wiki(api_url, **options)
-    wikis[api_url] ||= MediaWiki.new(api_url, options)
+  def wiki(api_url, options = {})
+    wikis[api_url] ||= MediaWiki.new(api_url, options || {})
   end
 
   class << self
@@ -168,7 +168,7 @@ module Infoboxer
   end
 
   WIKIMEDIA_PROJECTS.each do |name, domain|
-    define_method name do |lang = 'en', **options|
+    define_method name do |lang = 'en', options = {}|
       lang, options = 'en', lang if lang.is_a?(Hash)
 
       wiki("https://#{lang}.#{domain}/w/api.php", options)
@@ -178,7 +178,7 @@ module Infoboxer
   alias_method :wp, :wikipedia
 
   WIKIMEDIA_COMMONS.each do |name, domain|
-    define_method name do |**options|
+    define_method name do |options = {}|
       wiki("https://#{domain}/w/api.php", options)
     end
   end

data/lib/infoboxer/media_wiki.rb

@@ -47,14 +47,15 @@ module Infoboxer
     # for it, as well as shortcuts for some well-known wikis, like
     # {Infoboxer.wikipedia}.
     #
-    # @param api_base_url [String] URL of `api.php` file in your MediaWiki
+    # @param api_base_url URL of `api.php` file in your MediaWiki
     #   installation. Typically, its `<domain>/w/api.php`, but can vary
     #   in different wikis.
-    # @param user_agent [String] (also aliased as `:ua`) Custom User-Agent header.
-    def initialize(api_base_url, ua: nil, user_agent: ua)
+    # @param options Only one option is currently supported:
+    #   * `: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::Wikipedia::Api.new(api_base_url, user_agent: user_agent(user_agent))
-      @traits = Traits.get(@api_base_url.host, siteinfo)
+      @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
@@ -122,9 +123,7 @@ module Infoboxer
     #     and obtain meaningful results instead of `NoMethodError` or
     #     `SomethingNotFound`.
     #
-    def get(*titles, prop: [], interwiki: nil)
-      return interwikis(interwiki).get(*titles, prop: prop) if interwiki
-
+    def get(*titles, prop: [])
       pages = get_h(*titles, prop: prop).values.compact
       titles.count == 1 ? pages.first : Tree::Nodes[*pages]
     end
@@ -252,26 +251,17 @@ module Infoboxer
       [namespace, titl].join(':')
     end
 
-    def user_agent(custom)
-      custom || self.class.user_agent || UA
-    end
-
-    def siteinfo
-      @siteinfo ||= @client.query.meta(:siteinfo).prop(:namespaces, :namespacealiases, :interwikimap).response.to_h
+    def user_agent(options)
+      options[:user_agent] || options[:ua] || self.class.user_agent || UA
     end
 
-    def interwikis(prefix)
-      @interwikis ||= Hash.new { |h, pre|
-        interwiki = siteinfo['interwikimap'].detect { |iw| iw['prefix'] == prefix } or
-          fail ArgumentError, "Undefined interwiki: #{prefix}"
-
-        # FIXME: fragile, but what can we do?..
-        m = interwiki['url'].match(%r{^(.+)/wiki/\$1$}) or
-          fail ArgumentError, "Interwiki #{interwiki} seems not to be a MediaWiki instance"
-        h[pre] = self.class.new("#{m[1]}/w/api.php") # TODO: copy useragent
-      }
-
-      @interwikis[prefix]
+    def extract_namespaces
+      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/media_wiki/traits.rb

@@ -34,8 +34,9 @@ module Infoboxer
         end
 
         # @private
-        def get(domain, site_info = {})
-          (Traits.domains[domain] || Traits).new(site_info)
+        def get(domain, options = {})
+          cls = Traits.domains[domain]
+          cls ? cls.new(options) : Traits.new(options)
         end
 
         # @private
@@ -67,27 +68,18 @@ module Infoboxer
         alias_method :default, :new
       end
 
-      def initialize(site_info = {})
-        @site_info = site_info
-      end
-
-      def namespace?(prefix)
-        known_namespaces.include?(prefix)
-      end
-
-      def interwiki?(prefix)
-        known_interwikis.key?(prefix)
-      end
-
-      # @private
-      def file_namespace
-        @file_namespace ||= ns_aliases('File')
+      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
       end
 
       # @private
-      def category_namespace
-        @category_namespace ||= ns_aliases('Category')
-      end
+      attr_reader :file_namespace, :category_namespace
 
       # @private
       def templates
@@ -96,54 +88,16 @@ module Infoboxer
 
       private
 
-      def known_namespaces
-        @known_namespaces ||=
-          if @site_info.empty?
-            STANDARD_NAMESPACES
-          else
-            (@site_info['namespaces'].values + @site_info['namespacealiases']).map { |n| n['*'] }
-          end
-      end
-
-      def known_interwikis
-        @known_interwikis ||=
-          if @site_info.empty?
-            {}
-          else
-            @site_info['interwikimap'].map { |iw| [iw['prefix'], iw] }.to_h
-          end
-      end
-
-      def ns_aliases(base)
-        return [base] if @site_info.empty?
-        main = @site_info['namespaces'].values.detect { |n| n['canonical'] == base }
-        [base, main['*']] +
-          @site_info['namespacealiases']
-          .select { |a| a['id'] == main['id'] }.flat_map { |n| n['*'] }
-          .compact.uniq
+      def namespace_aliases(options, canonical)
+        namespace = (options[:namespaces] || []).detect { |v| v['canonical'] == canonical }
+        return nil unless namespace
+        [namespace['*'], *namespace['aliases']]
       end
 
-      # See https://www.mediawiki.org/wiki/Help:Namespaces#Standard_namespaces
-      STANDARD_NAMESPACES = [
-        'Media',            # Direct linking to media files.
-        'Special',          # Special (non-editable) pages.
-        '',                 # (Main)
-        'Talk',             # Article discussion.
-        'User',             #
-        'User talk',        #
-        'Project',          # Meta-discussions related to the operation and development of the wiki.
-        'Project talk',     #
-        'File',             # Metadata for images, videos, sound files and other media.
-        'File talk',        #
-        'MediaWiki',        # System messages and other important content.
-        'MediaWiki talk',   #
-        'Template',         # Templates: blocks of text or wikicode that are intended to be transcluded.
-        'Template talk',    #
-        'Help',             # Help files, instructions and "how-to" guides.
-        'Help talk',        #
-        'Category',         # Categories: dynamic lists of other pages.
-        'Category talk',    #
-      ].freeze
+      DEFAULTS = {
+        file_namespace: 'File',
+        category_namespace: 'Category'
+      }.freeze
     end
   end
 end

data/lib/infoboxer/navigation/lookup.rb

@@ -98,13 +98,9 @@ module Infoboxer
         #   Selects matching nodes from current node's siblings, which
         #   are above current node in parents children list.
 
-        # @!method lookup_prev_sibling(*selectors, &block)
-        #   Selects first matching nodes from current node's siblings, which
-        #   are above current node in parents children list.
-
         # Underscored version of {#matches?}
         def _matches?(selector)
-          selector === self
+          selector.matches?(self)
         end
 
         # Underscored version of {#lookup}
@@ -140,11 +136,6 @@ module Infoboxer
           prev_siblings._find(selector)
         end
 
-        # Underscored version of {#lookup_prev_sibling}
-        def _lookup_prev_sibling(selector)
-          prev_siblings.reverse.detect { |n| selector === n }
-        end
-
         # Underscored version of {#lookup_next_siblings}
         def _lookup_next_siblings(selector)
           next_siblings._find(selector)
@@ -155,7 +146,6 @@ module Infoboxer
           lookup lookup_children lookup_parents
           lookup_siblings
           lookup_next_siblings lookup_prev_siblings
-          lookup_prev_sibling
         ]
           .map { |sym| [sym, :"_#{sym}"] }
           .each do |sym, underscored|

data/lib/infoboxer/navigation/sections.rb

@@ -123,25 +123,21 @@ module Infoboxer
         #
         # @return {Tree::Nodes<Section>}
         def in_sections
-          return parent.in_sections unless parent.is_a?(Tree::Document)
-          return @in_sections if @in_sections
+          main_node = parent.is_a?(Tree::Document) ? self : lookup_parents[-2]
 
           heading =
-            if is_a?(Tree::Heading)
-              lookup_prev_sibling(Tree::Heading, level: level - 1)
+            if main_node.is_a?(Tree::Heading)
+              main_node.lookup_prev_siblings(Tree::Heading, level: main_node.level - 1).last
             else
-              lookup_prev_sibling(Tree::Heading)
+              main_node.lookup_prev_siblings(Tree::Heading).last
             end
-          unless heading
-            @in_sections = Tree::Nodes[]
-            return @in_sections
-          end
+          return Tree::Nodes[] unless heading
 
           body = heading.next_siblings
                         .take_while { |n| !n.is_a?(Tree::Heading) || n.level < heading.level }
 
           section = Section.new(heading, body)
-          @in_sections = Tree::Nodes[section, *heading.in_sections]
+          Tree::Nodes[section, *heading.in_sections]
         end
       end
 

data/lib/infoboxer/navigation/selector.rb

@@ -24,8 +24,8 @@ module Infoboxer
           "#<Selector(#{@arg.map(&:to_s).join(', ')})>"
         end
 
-        def ===(other)
-          @arg.all? { |a| arg_matches?(a, other) }
+        def matches?(node)
+          @arg.all? { |a| arg_matches?(a, node) }
         end
 
         private
@@ -44,8 +44,8 @@ module Infoboxer
             check.call(node)
           when Hash
             check.all? { |attr, value|
-              node.respond_to?(attr) && value_matches?(value, node.send(attr)) ||
-                node.params.key?(attr) && value_matches?(value, node.params[attr])
+              node.respond_to?(attr) && value === node.send(attr) ||
+                node.params.key?(attr) && value === node.params[attr]
             }
           when Symbol
             node.respond_to?(check) && node.send(check)
@@ -53,14 +53,6 @@ module Infoboxer
             check === node
           end
         end
-
-        def value_matches?(matcher, value)
-          if matcher.is_a?(String) && value.is_a?(String)
-            matcher.casecmp(value).zero?
-          else
-            matcher === value
-          end
-        end
       end
     end
   end

data/lib/infoboxer/parser/inline.rb

@@ -83,7 +83,7 @@ module Infoboxer
 
       private
 
-      def inline_formatting(match) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
+      def inline_formatting(match)
         case match
         when "'''''"
           BoldItalic.new(short_inline(/'''''/))
@@ -109,8 +109,6 @@ module Infoboxer
           reference(Regexp.last_match(1))
         when /<math>/
           math
-        when /<gallery([^>]*)>/
-          gallery(Regexp.last_match(1))
         when '<'
           html || Text.new(match) # it was not HTML, just accidental <
         else
@@ -128,18 +126,8 @@ module Infoboxer
           caption = inline(/\]\]/)
           @context.pop_eol_sign
         end
-        name, namespace = link.split(':', 2).reverse
-        lnk, params =
-          if @context.traits.namespace?(namespace)
-            [link, {namespace: namespace}]
-          elsif @context.traits.interwiki?(namespace)
-            [name, {interwiki: namespace}]
-          else
-            [link, {}]
-          end
 
-        puts @context.rest if lnk.nil?
-        Wikilink.new(lnk, caption, **params)
+        Wikilink.new(link, caption)
       end
 
       # http://en.wikipedia.org/wiki/Help:Link#External_links
@@ -171,34 +159,6 @@ module Infoboxer
           Text.new(@context.scan_continued_until(%r{</nowiki>}))
         end
       end
-
-      def gallery(tag_rest)
-        params = parse_params(tag_rest)
-        images = []
-        guarded_loop do
-          @context.next! if @context.eol?
-          path = @context.scan_until(%r{</gallery>|\||$})
-          attrs = @context.matched == '|' ? gallery_image_attrs : {}
-          unless path.empty?
-            images << Tree::Image.new(path.sub(/^#{re.file_namespace}/, ''), attrs)
-          end
-          break if @context.matched == '</gallery>'
-        end
-        Gallery.new(images, params)
-      end
-
-      def gallery_image_attrs
-        nodes = []
-
-        guarded_loop do
-          nodes << short_inline(%r{\||</gallery>})
-          break if @context.eol? || @context.matched?(%r{</gallery>})
-        end
-
-        nodes.map(&method(:image_attr))
-             .inject(&:merge)
-             .reject { |_k, v| v.nil? || v.empty? }
-      end
     end
 
     require_relative 'image'

data/lib/infoboxer/parser/paragraphs.rb

@@ -14,7 +14,7 @@ module Infoboxer
 
           @context.next!
         end
-        nodes
+        nodes.flow_templates
       end
 
       private

data/lib/infoboxer/parser/template.rb

@@ -29,8 +29,8 @@ module Infoboxer
 
         guarded_loop do
           @context.next! while @context.eol?
-          if @context.check(/\s*([^=}|<]+)\s*=\s*/)
-            name = @context.scan(/\s*([^=]+)/).strip
+          if @context.check(/\s*([^ =}|<]+)\s*=\s*/)
+            name = @context.scan(/\s*([^ =]+)/).strip
             @context.skip(/\s*=\s*/)
           else
             name = num
@@ -52,7 +52,7 @@ module Infoboxer
       end
 
       def sanitize_value(nodes)
-        nodes.pop if (nodes.last.is_a?(Pre) || nodes.last.is_a?(Text)) && nodes.last.text =~ /^\s*$/ # FIXME: dirty!
+        nodes.pop if nodes.last.is_a?(Pre) && nodes.last.text =~ /^\s*$/ # FIXME: dirty!
         nodes
       end
     end

data/lib/infoboxer/parser/util.rb

@@ -12,7 +12,6 @@ module Infoboxer
         \[[a-z]+://   |     # external link
         <nowiki[^>]*> |     # nowiki
         <ref[^>]*>    |     # reference
-        <gallery[^>]*>|     # gallery
         <math>        |     # math
         <                   # HTML tag
       ))x

data/lib/infoboxer/tree.rb

@@ -63,7 +63,7 @@ module Infoboxer
     require_relative 'tree/nodes'
 
     %w[text compound inline
-       image gallery html paragraphs list template table ref math
+       image html paragraphs list template table ref math
        document].each do |type|
       require_relative "tree/#{type}"
     end

data/lib/infoboxer/tree/compound.rb

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

data/lib/infoboxer/tree/image.rb

@@ -7,8 +7,8 @@ module Infoboxer
     # See [Wikipedia Tutorial](https://en.wikipedia.org/wiki/Wikipedia:Extended_image_syntax)
     # for explanation of attributes.
     class Image < Node
-      def initialize(path, caption: nil, **params)
-        @caption = caption
+      def initialize(path, params = {})
+        @caption = params.delete(:caption)
         super({path: path}.merge(params))
       end
 

data/lib/infoboxer/tree/inline.rb

@@ -17,8 +17,8 @@ module Infoboxer
 
     # Base class for internal/external links,
     class Link < Compound
-      def initialize(link, label = nil, **attr)
-        super(label || Nodes.new([Text.new(link)]), link: link, **attr)
+      def initialize(link, label = nil)
+        super(label || Nodes.new([Text.new(link)]), link: link)
       end
 
       # @!attribute [r] link

data/lib/infoboxer/tree/linkable.rb

@@ -15,7 +15,7 @@ module Infoboxer
       # * {Tree::Nodes#follow} for extracting multiple links at once;
       # * {MediaWiki#get} for basic information on page extraction.
       def follow
-        client.get(link, interwiki: interwiki)
+        client.get(link)
       end
 
       # Human-readable page URL
@@ -28,9 +28,6 @@ module Infoboxer
 
       protected
 
-      # redefined in {Wikilink}
-      def interwiki; end
-
       def page
         lookup_parents(MediaWiki::Page).first or fail('Not in a page from real source')
       end

data/lib/infoboxer/tree/math.rb

@@ -4,6 +4,9 @@ module Infoboxer
     #
     # See also: https://en.wikipedia.org/wiki/Help:Displaying_a_formula
     class Math < Text
+      def text
+        "<math>#{super}</math>"
+      end
     end
   end
 end

data/lib/infoboxer/tree/node.rb

@@ -11,7 +11,7 @@ module Infoboxer
     # you will receive it from tree and use for navigations.
     #
     class Node
-      def initialize(**params)
+      def initialize(params = {})
         @params = params
       end
 
@@ -154,7 +154,7 @@ module Infoboxer
       end
 
       def show_params(prms = nil)
-        (prms || params).reject { |_, v| v.nil? }.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')
+        (prms || params).map { |k, v| "#{k}: #{v.inspect}" }.join(', ')
       end
 
       def indent(level)

data/lib/infoboxer/tree/nodes.rb

@@ -38,19 +38,10 @@ module Infoboxer
       # @!method compact
       #    Just like Array#compact, but returns Nodes
 
-      # @!method grep(pattern)
-      #    Just like Array#grep, but returns Nodes
-
-      # @!method grep_v(pattern)
-      #    Just like Array#grep_v, but returns Nodes
-
       # @!method -(other)
       #    Just like Array#-, but returns Nodes
 
-      # @!method +(other)
-      #    Just like Array#+, but returns Nodes
-
-      %i[select reject sort_by flatten compact grep grep_v - +].each do |sym|
+      %i[select reject sort_by flatten compact -].each do |sym|
         define_method(sym) do |*args, &block|
           Nodes[*super(*args, &block)]
         end
@@ -84,21 +75,6 @@ module Infoboxer
         end
       end
 
-      # Just like Array#flat_map, but returns Nodes, **if** all map results are Node
-      def flat_map
-        res = super
-        if res.all? { |n| n.is_a?(Node) || n.is_a?(Nodes) }
-          Nodes[*res]
-        else
-          res
-        end
-      end
-
-      # Just like Array#group, but returns hash with `{<grouping variable> => Nodes}`
-      def group_by
-        super.map { |title, group| [title, Nodes[*group]] }.to_h
-      end
-
       # @!method prev_siblings
       #   Previous siblings (flat list) of all nodes inside.
 
@@ -163,14 +139,12 @@ module Infoboxer
       # @return [Nodes<MediaWiki::Page>] It is still `Nodes`, so you
       #   still can process them uniformely.
       def follow
-        links = grep(Linkable)
+        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')
-        pages = links.group_by(&:interwiki)
-                     .flat_map { |iw, ls| page.client.get(*ls.map(&:link), interwiki: iw) }
-        pages.count == 1 ? pages.first : Nodes[*pages]
+        page.client.get(*links)
       end
 
       # @private
@@ -199,9 +173,7 @@ module Infoboxer
       # @private
       # Internal, used by {Parser}
       def flow_templates
-        # TODO: will it be better?..
-        # make_nodes(map { |n| n.is_a?(Paragraph) ? n.to_templates? : n })
-        self
+        make_nodes(map { |n| n.is_a?(Paragraph) ? n.to_templates? : n })
       end
 
       private

data/lib/infoboxer/tree/template.rb

@@ -22,10 +22,6 @@ module Infoboxer
         false
       end
 
-      def named?
-        name !~ /^\d+$/
-      end
-
       protected
 
       def descr
@@ -143,7 +139,7 @@ module Infoboxer
       #
       # @return [Nodes<Var>]
       def unnamed_variables
-        variables.reject(&:named?)
+        variables.find(name: /^\d+$/)
       end
 
       # Fetches template variable(s) by name(s) or patterns.
@@ -246,7 +242,7 @@ module Infoboxer
       def extract_params(vars)
         vars
           .select { |v| v.children.count == 1 && v.children.first.is_a?(Text) }
-          .map { |v| [v.name.to_sym, v.children.first.raw_text] }.to_h
+          .map { |v| [v.name, v.children.first.raw_text] }.to_h
       end
 
       def inspect_variables(depth)

data/lib/infoboxer/tree/text.rb

@@ -15,7 +15,7 @@ module Infoboxer
       # Text fragment without decodint of HTML entities.
       attr_accessor :raw_text
 
-      def initialize(text, **params)
+      def initialize(text, params = {})
         super(params)
         @raw_text = text
       end

data/lib/infoboxer/tree/wikilink.rb

@@ -12,23 +12,14 @@ module Infoboxer
     # Note, that Wikilink is {Linkable}, so you can {Linkable#follow #follow}
     # it to obtain linked pages.
     class Wikilink < Link
-      def initialize(link, label = nil, namespace: nil, interwiki: nil)
-        super(link, label, namespace: namespace, interwiki: interwiki)
-        @namespace = namespace || ''
-        @interwiki = interwiki
-        parse_name!
+      def initialize(*)
+        super
+        parse_link!
       end
 
       # "Clean" wikilink name, for ex., `Cities` for `[Category:Cities]`
       attr_reader :name
 
-      # Interwiki identifier. For example, `[[wikt:Argentina]]`
-      # will have `"Argentina"` as its {#name} and `"wikt"` (wiktionary) as an
-      # interwiki. TODO: how to use it.
-      #
-      # See [Wikipedia docs](https://en.wikipedia.org/wiki/Help:Interwiki_linking) for details.
-      attr_reader :interwiki
-
       # Wikilink namespace, `Category` for `[Category:Cities]`, empty
       # string (not `nil`!) for just `[Cities]`
       attr_reader :namespace
@@ -55,8 +46,10 @@ module Infoboxer
 
       private
 
-      def parse_name!
-        @name = namespace.empty? ? link : link.sub(/^#{namespace}:/, '')
+      def parse_link!
+        @name, @namespace = link.split(':', 2).reverse
+        @namespace ||= ''
+
         @name, @anchor = @name.split('#', 2)
         @anchor ||= ''
 

data/lib/infoboxer/version.rb

@@ -4,6 +4,5 @@ module Infoboxer
   MAJOR = 0
   MINOR = 3
   PATCH = 0
-  PRE = 'pre'.freeze # set to `nil` for normal releases
-  VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
+  VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

data/lib/infoboxer/wiki_path.rb

@@ -36,7 +36,7 @@ module Infoboxer
           attrs[attr.to_sym] = process_value(value)
         end
         res = op == '//' ? {op: :lookup} : {}
-        res[:type] = process_type(type) unless type.empty?
+        res[:type] = type.gsub(/(?:^|_)([a-z])/, &:upcase).tr('_', '').to_sym unless type.empty?
         res.merge(attrs) # TODO: raise if empty selector
       end
 
@@ -51,15 +51,6 @@ module Infoboxer
         end
       end
 
-      def process_type(type)
-        type.gsub(/(?:^|_)([a-z])/, &:upcase).tr('_', '').to_sym
-            .tap { |t| valid_type?(t) or fail(ParseError, "Unrecognized node type: #{type}") }
-      end
-
-      def valid_type?(t)
-        t == :Section || Infoboxer::Tree.const_defined?(t)
-      end
-
       def unexpected(scanner, expected)
         place = scanner.eos? ? 'end of pattern' : scanner.rest.inspect
         fail ParseError, "Unexpected #{place}, expecting #{expected}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infoboxer
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre
+  version: 0.3.0
 platform: ruby
 authors:
 - Victor Shepelev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-16 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -117,7 +117,6 @@ files:
 - lib/infoboxer/tree.rb
 - lib/infoboxer/tree/compound.rb
 - lib/infoboxer/tree/document.rb
-- lib/infoboxer/tree/gallery.rb
 - lib/infoboxer/tree/html.rb
 - lib/infoboxer/tree/image.rb
 - lib/infoboxer/tree/inline.rb
@@ -166,9 +165,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.10

data/lib/infoboxer/tree/gallery.rb

@@ -1,12 +0,0 @@
-# encoding: utf-8
-
-module Infoboxer
-  module Tree
-    # Represents gallery of images (contents of `<gallery>` special tag).
-    #
-    # See [Wikipedia Tutorial](https://en.wikipedia.org/wiki/Help:Gallery_tag)
-    # for explanation of attributes.
-    class Gallery < Compound
-    end
-  end
-end