wikiscript 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e86e3e1b50b44067a5815a13155b04aa441e8023
+  data.tar.gz: c38ed306346a9b3d2c7c365fba00c41bee4624b4
+SHA512:
+  metadata.gz: 290c18216f59d7c2e6f2e1b181651413790fd2f7ff709c7f6f9c9cf1708b540480efa8827c57613df6862b1da755cd584c53f71ff93b07fe34a7a2ef4a67420d
+  data.tar.gz: 9e0c5c402b17263d38065eaac1a9e1febee6f3a73dff382aae8d81a8d0436881a2437a784dcee83f69c50d1fb5c6c5f385458a90ebb2cff8a31d31fffbd951a5

data/LICENSE.md

@@ -0,0 +1,116 @@
+CC0 1.0 Universal
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator and
+subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the
+purpose of contributing to a commons of creative, cultural and scientific
+works ("Commons") that the public can reliably and without fear of later
+claims of infringement build upon, modify, incorporate in other works, reuse
+and redistribute as freely as possible in any form whatsoever and for any
+purposes, including without limitation commercial purposes. These owners may
+contribute to the Commons to promote the ideal of a free culture and the
+further production of creative, cultural and scientific works, or to gain
+reputation or greater distribution for their Work in part through the use and
+efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation
+of additional consideration or compensation, the person associating CC0 with a
+Work (the "Affirmer"), to the extent that he or she is an owner of Copyright
+and Related Rights in the Work, voluntarily elects to apply CC0 to the Work
+and publicly distribute the Work under its terms, with knowledge of his or her
+Copyright and Related Rights in the Work and the meaning and intended legal
+effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not limited
+to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display, communicate,
+  and translate a Work;
+
+  ii. moral rights retained by the original author(s) and/or performer(s);
+
+  iii. publicity and privacy rights pertaining to a person's image or likeness
+  depicted in a Work;
+
+  iv. rights protecting against unfair competition in regards to a Work,
+  subject to the limitations in paragraph 4(a), below;
+
+  v. rights protecting the extraction, dissemination, use and reuse of data in
+  a Work;
+
+  vi. database rights (such as those arising under Directive 96/9/EC of the
+  European Parliament and of the Council of 11 March 1996 on the legal
+  protection of databases, and under any national implementation thereof,
+  including any amended or successor version of such directive); and
+
+  vii. other similar, equivalent or corresponding rights throughout the world
+  based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of,
+applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and
+unconditionally waives, abandons, and surrenders all of Affirmer's Copyright
+and Related Rights and associated claims and causes of action, whether now
+known or unknown (including existing as well as future claims and causes of
+action), in the Work (i) in all territories worldwide, (ii) for the maximum
+duration provided by applicable law or treaty (including future time
+extensions), (iii) in any current or future medium and for any number of
+copies, and (iv) for any purpose whatsoever, including without limitation
+commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes
+the Waiver for the benefit of each member of the public at large and to the
+detriment of Affirmer's heirs and successors, fully intending that such Waiver
+shall not be subject to revocation, rescission, cancellation, termination, or
+any other legal or equitable action to disrupt the quiet enjoyment of the Work
+by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be
+judged legally invalid or ineffective under applicable law, then the Waiver
+shall be preserved to the maximum extent permitted taking into account
+Affirmer's express Statement of Purpose. In addition, to the extent the Waiver
+is so judged Affirmer hereby grants to each affected person a royalty-free,
+non transferable, non sublicensable, non exclusive, irrevocable and
+unconditional license to exercise Affirmer's Copyright and Related Rights in
+the Work (i) in all territories worldwide, (ii) for the maximum duration
+provided by applicable law or treaty (including future time extensions), (iii)
+in any current or future medium and for any number of copies, and (iv) for any
+purpose whatsoever, including without limitation commercial, advertising or
+promotional purposes (the "License"). The License shall be deemed effective as
+of the date CC0 was applied by Affirmer to the Work. Should any part of the
+License for any reason be judged legally invalid or ineffective under
+applicable law, such partial invalidity or ineffectiveness shall not
+invalidate the remainder of the License, and in such case Affirmer hereby
+affirms that he or she will not (i) exercise any of his or her remaining
+Copyright and Related Rights in the Work or (ii) assert any associated claims
+and causes of action with respect to the Work, in either case contrary to
+Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+  a. No trademark or patent rights held by Affirmer are waived, abandoned,
+  surrendered, licensed or otherwise affected by this document.
+
+  b. Affirmer offers the Work as-is and makes no representations or warranties
+  of any kind concerning the Work, express, implied, statutory or otherwise,
+  including without limitation warranties of title, merchantability, fitness
+  for a particular purpose, non infringement, or the absence of latent or
+  other defects, accuracy, or the present or absence of errors, whether or not
+  discoverable, all to the greatest extent permissible under applicable law.
+
+  c. Affirmer disclaims responsibility for clearing rights of other persons
+  that may apply to the Work or any use thereof, including without limitation
+  any person's Copyright and Related Rights in the Work. Further, Affirmer
+  disclaims responsibility for obtaining any necessary consents, permissions
+  or other rights required for any use of the Work.
+
+  d. Affirmer understands and acknowledges that Creative Commons is not a
+  party to this document and has no duty or obligation with respect to this
+  CC0 or use of the Work.
+
+For more information, please see
+<http://creativecommons.org/publicdomain/zero/1.0/>

data/Manifest.txt

@@ -1,11 +1,18 @@
-HISTORY.md
-Manifest.txt
-README.md
-Rakefile
-lib/wikiscript.rb
-lib/wikiscript/client.rb
-lib/wikiscript/page.rb
-lib/wikiscript/version.rb
-test/helper.rb
-test/test_page.rb
-test/test_page_de.rb
+CHANGELOG.md
+LICENSE.md
+Manifest.txt
+NOTES.md
+README.md
+Rakefile
+lib/wikiscript.rb
+lib/wikiscript/client.rb
+lib/wikiscript/page.rb
+lib/wikiscript/page_reader.rb
+lib/wikiscript/table_reader.rb
+lib/wikiscript/version.rb
+test/helper.rb
+test/test_link.rb
+test/test_page.rb
+test/test_page_de.rb
+test/test_page_reader.rb
+test/test_table_reader.rb

data/NOTES.md

@@ -0,0 +1,6 @@
+# Notes
+
+
+## Alternatives
+
+TBD

data/README.md

@@ -1,7 +1,7 @@
 # wikiscript - scripts for wikipedia (get wikitext for page etc.)
 
-* home  :: [github.com/wikiscript/wikiscript.ruby](https://github.com/wikiscript/wikiscript.ruby)
-* bugs  :: [github.com/wikiscript/wikiscript.ruby/issues](https://github.com/wikiscript/wikiscript.ruby/issues)
+* home  :: [github.com/wikiscript/wikiscript](https://github.com/wikiscript/wikiscript)
+* bugs  :: [github.com/wikiscript/wikiscript/issues](https://github.com/wikiscript/wikiscript/issues)
 * gem   :: [rubygems.org/gems/wikiscript](https://rubygems.org/gems/wikiscript)
 * rdoc  :: [rubydoc.info/gems/wikiscript](http://rubydoc.info/gems/wikiscript)
 
@@ -12,13 +12,16 @@ Read-only access to wikikpedia pages.
 Example - Get wikitext source (via `en.wikipedia.org/w/index.php?action=raw&title=<title>`):
 
 
-    >> page = Wikiscript::Page.new( '2014_FIFA_World_Cup_squads' )
-    >> page.text
-    
-    The [[2014 FIFA World Cup]] is an international [[association football|football]]
-    tournament which is currently being held in Brazil from 12 June to 13 July 2014.
-    The 32 national teams involved in the tournament were required to register
-    a squad of 23 players, including three goalkeepers...
+```
+>> page = Wikiscript::Page.new( '2014_FIFA_World_Cup_squads' )
+>> page.text
+
+The [[2014 FIFA World Cup]] is an international [[association football|football]]
+tournament which is currently being held in Brazil from 12 June to 13 July 2014.
+The 32 national teams involved in the tournament were required to register
+a squad of 23 players, including three goalkeepers...
+```
+
 
 
 ## Install
@@ -28,11 +31,6 @@ Just install the gem:
     $ gem install wikiscript
 
 
-## Alternatives
-
-TBD
-
-
 ## License
 
 The `wikiscript` scripts are dedicated to the public domain.

data/Rakefile

@@ -8,14 +8,14 @@ Hoe.spec 'wikiscript' do
   self.summary = 'wikiscript - scripts for wikipedia (get wikitext for page etc.)'
   self.description = summary
 
-  self.urls = ['https://github.com/wikiscript/wikiscript.ruby']
+  self.urls = ['https://github.com/wikiscript/wikiscript']
 
   self.author = 'Gerald Bauer'
   self.email = 'opensport@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
-  self.readme_file = 'README.md'
-  self.history_file = 'HISTORY.md'
+  self.readme_file  = 'README.md'
+  self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
     ['logutils' ],
@@ -25,7 +25,6 @@ Hoe.spec 'wikiscript' do
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   :required_ruby_version => '>= 1.9.2'
+    required_ruby_version: '>= 2.2.2'
   }
-
 end

data/lib/wikiscript/page.rb

@@ -6,24 +6,27 @@ module Wikiscript
 
     include LogUtils::Logging
 
-    attr_reader :title, :text
+    attr_reader :title
 
-    def initialize( title )
+    def initialize( title, text: nil )
       ## todo: check title
       ## replace title spaces w/ _ ????
       ##  to allow "pretty" titles - why? why not??
 
       @title = title
-      @text  = nil
+      @text  = text
     end
-    
+
     def text
-      if @text.nil?
-        # cache text (from request)
-        @text = Client.new.text( @title )
-      end
-      @text
+      @text ||= download_text   # cache text (from request)
+    end
+
+    def download_text
+      Client.new.text( @title )
     end
 
+    def parse   ## todo/change: use/find a different name e.g. doc/elements/etc. - why? why not?
+      PageReader.parse( text )
+    end
   end # class Page
 end # Wikiscript

data/lib/wikiscript/page_reader.rb

@@ -0,0 +1,65 @@
+# encoding: utf-8
+
+module Wikiscript
+
+class PageReader
+
+  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+    txt = File.open( path, 'r:utf-8' ).read
+    parse( txt )
+  end
+
+
+  def self.parse( txt )
+    page = []   ## page structure
+
+    inside_table = false
+    table_txt    = nil
+
+    txt.each_line do |line|
+      line = line.strip
+
+      break if line == '__END__'
+
+      ## note:  allow/add comments
+      ##   note: CANNOT allow inline (end-of-line) comments
+      ##     would strip/break css colors eg.  bgcolor=#ffff44
+      next if line.start_with?( '#' )   ## skip comments too
+      next if line.empty?               ## skip empty lines for now
+
+      ## note: like in wikimedia markup (and markdown) all optional trailing ==== too
+      ##  todo/check:  allow ===  Text  =-=-=-=-=-=   too - why? why not?
+      if line =~ /^(={1,})       ## leading ======
+                  ([^=]+?)       ##  text   (note: for now no "inline" = allowed)
+                  =*             ## (optional) trailing ====
+                  $/x
+        heading_marker = $1
+        heading_level  = $1.length   ## count number of = for heading level
+        heading        = $2.strip
+
+        puts "heading #{heading_level} >#{heading}<"
+        page << [:"h#{heading_level}", heading]
+      elsif line.start_with?( '{|' )     ## start table
+        inside_table = true
+        table_txt = String.new   ## collect table source text
+        table_txt << line << "\n"    ## note: do NOT forget to add back newline!!
+      elsif inside_table && line.start_with?( '|}' )  ## end table
+        table_txt << line << "\n"
+        table = TableReader.parse_table( table_txt )
+        page << [:table, table]
+        ## reset table variables
+        inside_table = false
+        table_txt    = nil
+      elsif inside_table
+         table_txt << line << "\n"
+      else
+        puts "** !!! ERROR !!! unknown line type in wiki page:"
+        pp line
+        exit 1
+      end
+    end
+    page
+  end # method parse
+end # class PageReader
+
+end # module Wikiscript

data/lib/wikiscript/table_reader.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+module Wikiscript
+
+class TableReader
+
+  def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+    txt = File.open( path, 'r:utf-8' ).read
+    parse( txt )
+  end
+
+
+  def self.parse_table( txt )   ## only allow single table
+    tables = parse( txt )
+
+    if tables.size == 0
+      puts "** !!! ERROR !!! no table found in text"
+      exit 1
+    elsif tables.size > 1
+      puts "** !!! ERROR !!! too many tables (#{tables.size}) found in text; only one expected/allowed; sorry"
+      exit 1
+    else
+      tables[0]    ## pass-along first table; everything ok
+    end
+  end
+
+  def self.parse( txt )
+    tables = []     ## todo/check: allow multiple tables? why? why not?
+
+    rows   = nil   ## note: assume first row is the headers row!!
+    row    = nil   ## current row  ## note: same as rows[-1]
+
+    inside_table = false
+
+    txt.each_line do |line|
+      line = line.strip
+
+      break if line == '__END__'
+
+      ## note:  allow/add comments
+      ##   note: CANNOT allow inline (end-of-line) comments
+      ##     would strip/break css colors eg.  bgcolor=#ffff44
+      next if line.start_with?( '#' )   ## skip comments too
+      next if line.empty?               ## skip empty lines for now
+
+
+      ## note:  for the table format
+      ##  see https://en.wikipedia.org/wiki/Help:Basic_table_markup
+
+      if line.start_with?( '{|' )     ## start table
+        inside_table = true
+        rows = []
+      elsif inside_table && line.start_with?( '|}' )  ## end table
+        tables << rows
+        rows   = nil
+        row    = nil
+        inside_table = false
+      elsif inside_table && line.start_with?( '|-' )  ## row divider
+         row = []
+         rows << row
+      elsif inside_table && line.start_with?( '!' )    ## header column
+         values = line.sub( '!', '' ).strip.split( '!!' )
+         ## note: |-  row divider is optional before header columns
+         if rows.empty?
+           row = []
+           rows << row
+         end
+         ## add each value one-by-one for now (to keep (same) row reference)
+         ##   note: also strip leading (optional) attributes
+         values.each do |value|
+           row <<  strip_emphases( strip_attributes( value.strip ))
+         end
+      elsif inside_table && line.start_with?( '|' )   ## table data
+         values = line.sub( '|', '' ).strip.split( '||' )
+         ## add each value one-by-one for now (to keep (same) row reference)
+         values.each do |value|
+           row <<  strip_emphases( strip_attributes( value.strip ))
+         end
+      elsif inside_table
+        puts "!! ERROR !! unknown line type inside table:"
+        puts line
+        exit 1
+      else
+        puts "!! ERROR !! unknown line type outside (before or after) table:"
+        puts line
+        exit 1
+      end
+    end
+    tables
+  end # method parse
+
+  ####
+  # helper
+  def self.strip_attributes( value )
+    if value =~ /^[a-z]+=/                      ## if starts with 'attribute='
+      value = value.sub( /[^|]+\|[ ]*/ , '' )   ## strip everything incl. pipe (|) and trailing spaces
+    else
+      value   ## return as-is (pass-through)
+    end
+  end
+
+  def self.strip_emphases( value )   ## strip bold or emphasis; note: emphases plural of emphasis
+    value = value.gsub( /'{2,}/, '' ).strip   ## remove two or more quotes e.g. '' or ''' etc.
+    value
+  end
+
+end # class TableReader
+
+end # module Wikiscript

data/lib/wikiscript/version.rb

@@ -1,5 +1,12 @@
 
 module Wikiscript
-   VERSION = '0.1.1'
-end
+   VERSION = '0.2.0'
+
+   def self.banner
+     "wikiscript/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+   end
 
+   def self.root
+     "#{File.expand_path( File.dirname(File.dirname(File.dirname(__FILE__))) )}"
+   end
+end

data/lib/wikiscript.rb

@@ -18,19 +18,13 @@ require 'fetcher'
 
 require 'wikiscript/version' # let it always go first
 require 'wikiscript/client'
+require 'wikiscript/table_reader'
+require 'wikiscript/page_reader'
 require 'wikiscript/page'
 
 
-module Wikiscript
-
-  def self.banner
-    "wikiscript/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  end
-
-  def self.root
-    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
-  end
 
+module Wikiscript
 
   ## for now make lang a global - change why? why not??
   def self.lang=(value)
@@ -42,8 +36,61 @@ module Wikiscript
     @@lang ||= 'en'
   end
 
+  ##
+  ## todo: fix? - strip spaces from link and title
+  ##   spaces possible? strip in ruby later e.g. use strip - why? why not?
+  ##   todo/change: find a better name - rename LINK_PATTERN to LINK_REGEX - why? why not?
+  LINK_PATTERN = %r{
+      \[\[
+        (?<link>[^|\]]+)     # everything but pipe (|) or bracket (])
+        (?:
+          \|
+          (?<title>[^\]]+)
+        )?                   # optional wiki link title
+      \]\]
+    }x
+
+
+  def self.unlink( value )
+    ## replace ALL wiki links with title (or link)
+    ##  e.g. [[Santiago]] ([[La Florida, Chile|La Florida]])
+    ##   =>    Santiago (La Florida)
+    value = value.gsub( LINK_PATTERN ) do |_|
+      link  = $~[:link]
+      title = $~[:title]
+
+      if title
+        title
+      else
+        link
+      end
+    end
+
+    value.strip
+  end
+
+
+  def self.parse_link( value )     ## todo/change: find a better name - use match_link/etc. - why? why not?
+    ##  find first matching link
+    ##   return [nil,nil] if nothing found
+    if (m = LINK_PATTERN.match( value ))
+      link  = m[:link]
+      title = m[:title]
+
+      link  = link.strip     ## remove leading and trailing spaces
+      title = title.strip   if title
+      [link,title]
+    else
+      [nil,nil]
+    end
+  end
+
 end # module Wikiscript
 
 
 
+## add camelcase alias
+WikiScript = Wikiscript
+
+
 puts Wikiscript.banner

data/test/helper.rb

@@ -1,13 +1,8 @@
 ## $:.unshift(File.dirname(__FILE__))
 
 ## minitest setup
-
-# require 'minitest/unit'
 require 'minitest/autorun'
 
-# include MiniTest::Unit # lets us use TestCase instead of MiniTest::Unit::TestCase
 
 ## our own code
-
 require 'wikiscript'
-

data/test/test_link.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_link.rb
+
+
+require 'helper'
+
+
+class TestLink < MiniTest::Test
+
+  def test_unlink
+    assert_equal 'Santiago (La Florida)',  Wikiscript.unlink( '[[Santiago]] ([[La Florida, Chile|La Florida]])' )
+  end
+
+  def test_parse_link
+    link, title = Wikiscript.parse_link( '[[La Florida, Chile|La Florida]]' )
+    assert_equal 'La Florida, Chile', link
+    assert_equal 'La Florida',        title
+
+    link, title = Wikiscript.parse_link( '[[ La Florida, Chile | La Florida ]]' )
+    assert_equal 'La Florida, Chile', link
+    assert_equal 'La Florida',        title
+
+    link, title = Wikiscript.parse_link( 'La Florida' )
+    assert  link  == nil
+    assert  title == nil
+  end
+
+end # class TestLink

data/test/test_page.rb

@@ -4,7 +4,7 @@
 require 'helper'
 
 
-class TestPage < MiniTest::Unit::TestCase
+class TestPage < MiniTest::Test
 
   def setup
     Wikiscript.lang = :en
@@ -18,10 +18,10 @@ class TestPage < MiniTest::Unit::TestCase
     pp text[0..600]
 
     ## check for some snippets
-    assert( /{{Infobox country/ =~ text ) 
-    assert( /common_name = Austria/ =~ text )
-    assert( /capital = \[\[Vienna\]\]/ =~ text )
-    assert( /The origins of modern-day Austria date back to the time/ =~ text )
+    assert /{{Infobox country/ =~ text
+    assert /common_name = Austria/ =~ text
+    assert /capital = \[\[Vienna\]\]/ =~ text
+    assert /The origins of modern-day Austria date back to the time/ =~ text
   end
 
   def test_sankt_poelten_en
@@ -32,10 +32,9 @@ class TestPage < MiniTest::Unit::TestCase
     pp text[0..600]
 
     ## check for some snippets
-    assert( /{{Infobox Town AT/ =~ text ) 
-    assert( /Name\s+=\s+Sankt Pölten/ =~ text )
-    assert( /'''Sankt Pölten''' \(''St. Pölten''\) is the capital city of/ =~ text )
+    assert /{{Infobox Town AT/ =~ text
+    assert /Name\s+=\s+Sankt Pölten/ =~ text
+    assert /'''Sankt Pölten''' \(''St. Pölten''\) is the capital city of/ =~ text
   end
 
 end # class TestPage
-

data/test/test_page_de.rb

@@ -4,7 +4,7 @@
 require 'helper'
 
 
-class TestPageDe < MiniTest::Unit::TestCase
+class TestPageDe < MiniTest::Test
 
   def setup
     Wikiscript.lang = :de
@@ -18,11 +18,10 @@ class TestPageDe < MiniTest::Unit::TestCase
     pp text[0..600]
 
     ## check for some snippets
-    assert( /{{Infobox Gemeinde in Österreich/ =~ text ) 
-    assert( /Name\s+=\s+St\. Pölten/ =~ text )
-    assert( /'''St\. Pölten''' \(amtlicher Name,/ =~ text )
-    assert( /Die Stadt liegt am Fluss \[\[Traisen \(Fluss\)\|Traisen\]\]/ =~ text )
+    assert /{{Infobox Gemeinde in Österreich/ =~ text
+    assert /Name\s+=\s+St\. Pölten/ =~ text
+    assert /'''St\. Pölten''' \(amtlicher Name,/ =~ text
+    ## assert /Die Stadt liegt am Fluss \[\[Traisen \(Fluss\)\|Traisen\]\]/ =~ text
   end
 
 end # class TestPageDe
-

data/test/test_page_reader.rb

@@ -0,0 +1,80 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_page_reader.rb
+
+
+require 'helper'
+
+
+class TestPageReader < MiniTest::Test
+
+  def test_basic
+    el = Wikiscript::PageReader.parse( <<TXT )
+=Heading 1==
+==Heading 2==
+===Heading 3===
+
+{|
+|-
+! header1
+! header2
+! header3
+|-
+| row1cell1
+| row1cell2
+| row1cell3
+|-
+| row2cell1
+| row2cell2
+| row2cell3
+|}
+TXT
+
+    pp el
+
+    assert_equal 4, el.size
+    assert_equal [:h1, 'Heading 1'],  el[0]
+    assert_equal [:h2, 'Heading 2'],  el[1]
+    assert_equal [:h3, 'Heading 3'],  el[2]
+    assert_equal [:table, [['header1', 'header2', 'header3'],
+                           ['row1cell1', 'row1cell2', 'row1cell3'],
+                           ['row2cell1', 'row2cell2', 'row2cell3']]],  el[3]
+  end
+
+  def test_parse
+    page = Wikiscript::Page.new( 'Test', text: <<TXT )
+=Heading 1==
+==Heading 2==
+===Heading 3===
+
+{|
+|-
+! header1
+! header2
+! header3
+|-
+| row1cell1
+| row1cell2
+| row1cell3
+|-
+| row2cell1
+| row2cell2
+| row2cell3
+|}
+TXT
+
+    el = page.parse
+    pp el
+
+    assert_equal 4, el.size
+    assert_equal [:h1, 'Heading 1'],  el[0]
+    assert_equal [:h2, 'Heading 2'],  el[1]
+    assert_equal [:h3, 'Heading 3'],  el[2]
+    assert_equal [:table, [['header1', 'header2', 'header3'],
+                           ['row1cell1', 'row1cell2', 'row1cell3'],
+                           ['row2cell1', 'row2cell2', 'row2cell3']]],  el[3]
+  end
+
+end # class TestPageReader

data/test/test_table_reader.rb

@@ -0,0 +1,81 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_table_reader.rb
+
+
+require 'helper'
+
+class TestTableReader < MiniTest::Test
+
+  def test_basic
+    tables = Wikiscript::TableReader.parse( <<TXT )
+{|
+|-
+! header1
+! header2
+! header3
+|-
+| row1cell1
+| row1cell2
+| row1cell3
+|-
+| row2cell1
+| row2cell2
+| row2cell3
+|}
+TXT
+
+    table = tables[0]
+    assert_equal 1, tables.size     ## one table
+    assert_equal 3, table.size      ## three rows
+    assert_equal ['header1', 'header2', 'header3'], table[0]
+    assert_equal ['row1cell1', 'row1cell2', 'row1cell3'], table[1]
+    assert_equal ['row2cell1', 'row2cell2', 'row2cell3'], table[2]
+  end
+
+  def test_basic_ii     ##  with optional (missing) row divider before headers
+    tables = Wikiscript::TableReader.parse( <<TXT )
+{|
+! header1 !! header2 !! header3
+|-
+| row1cell1 || row1cell2 || row1cell3
+|-
+| row2cell1 || row2cell2 || row2cell3
+|}
+TXT
+
+    table = tables[0]
+    assert_equal 1, tables.size     ## one table
+    assert_equal 3, table.size      ## three rows
+    assert_equal ['header1', 'header2', 'header3'], table[0]
+    assert_equal ['row1cell1', 'row1cell2', 'row1cell3'], table[1]
+    assert_equal ['row2cell1', 'row2cell2', 'row2cell3'], table[2]
+  end
+
+  def test_strip_attributes_and_emphases
+    tables = Wikiscript::TableReader.parse( <<TXT )
+{|
+|-
+! style="width:200px;"|Club
+! style="width:150px;"|City
+|-
+|[[Biu Chun Rangers]]||[[Sham Shui Po]]
+|-
+|bgcolor=#ffff44 |''[[Eastern Sports Club|Eastern]]''||[[Mong Kok]]
+|-
+|[[HKFC Soccer Section]]||[[Happy Valley, Hong Kong|Happy Valley]]
+|}
+TXT
+
+table = tables[0]
+assert_equal 1, tables.size     ## one table
+assert_equal 4, table.size      ## four rows
+assert_equal ['Club', 'City'], table[0]
+assert_equal ['[[Biu Chun Rangers]]',            '[[Sham Shui Po]]'], table[1]
+assert_equal ['[[Eastern Sports Club|Eastern]]', '[[Mong Kok]]'],     table[2]
+assert_equal ['[[HKFC Soccer Section]]',         '[[Happy Valley, Hong Kong|Happy Valley]]'],  table[3]
+  end
+
+end # class TestTableReader

metadata

@@ -1,108 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: wikiscript
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &79133900 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79133900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &79133630 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *79133630
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &79133350 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *79133350
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &79133100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.16'
   type: :development
   prerelease: false
-  version_requirements: *79133100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.16'
 description: wikiscript - scripts for wikipedia (get wikitext for page etc.)
 email: opensport@googlegroups.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- HISTORY.md
+- CHANGELOG.md
+- LICENSE.md
 - Manifest.txt
+- NOTES.md
 - README.md
 files:
-- HISTORY.md
+- CHANGELOG.md
+- LICENSE.md
 - Manifest.txt
+- NOTES.md
 - README.md
 - Rakefile
 - lib/wikiscript.rb
 - lib/wikiscript/client.rb
 - lib/wikiscript/page.rb
+- lib/wikiscript/page_reader.rb
+- lib/wikiscript/table_reader.rb
 - lib/wikiscript/version.rb
 - test/helper.rb
+- test/test_link.rb
 - test/test_page.rb
 - test/test_page_de.rb
-- .gemtest
-homepage: https://github.com/wikiscript/wikiscript.ruby
+- test/test_page_reader.rb
+- test/test_table_reader.rb
+homepage: https://github.com/wikiscript/wikiscript
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: wikiscript - scripts for wikipedia (get wikitext for page etc.)
-test_files:
-- test/test_page_de.rb
-- test/test_page.rb
+test_files: []