sportdb-formats 1.1.6 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c8eb774dbb161f38c9cc4daffb32c8c4ea3d80c
-  data.tar.gz: 3e5b51d861148bba7c2f04c4f8acd30a8be486e8
+SHA256:
+  metadata.gz: a9f1a3d4643a73600d020fd3e34356df44f869eda7a0e1e06479819142f22a57
+  data.tar.gz: 1ae30d054bb50a52785bc13c6f3d568129d28cc5c0f10b88bae964ea88263c94
 SHA512:
-  metadata.gz: 3eee51ac8a01998082b1b00e6397ded3224dac3dad299a001a812f62c83e579246ced7af214b54c3f964211f5faec1cb08e708dd4237b28d7ac1782807de104f
-  data.tar.gz: d257a4f169babec6caf2bd34583a8e01fa1cfb76f3f72d0d13c4f38aadc3ffc2082591c73ed976e9ae7e0bbe08383c0f2f278d1358dc2219d4283912e315bff5
+  metadata.gz: 752dad1c1f27f0ced1b410232d1b187551eda65e7e1a3be55000b3fa00b669bcfc943da7df1c858eafbabc83b05e9914c86d95e8fc14dc6f4fd7b72bcb1b73da
+  data.tar.gz: b92e4b47d4570f54ebd04e3153b05038df6bc5e1f622a45e87d034af38aa5fb31ab7c6d81f4d391a1c99370e5948f13e3f4dff6a00e069d73429e490ec61de91

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+### 1.2.1
+
 ### 0.0.1 / 2019-10-28
 
 * Everything is new. First release.

data/Manifest.txt

@@ -3,16 +3,15 @@ Manifest.txt
 README.md
 Rakefile
 lib/sportdb/formats.rb
-lib/sportdb/formats/country/country_index.rb
 lib/sportdb/formats/country/country_reader.rb
 lib/sportdb/formats/datafile.rb
 lib/sportdb/formats/datafile_package.rb
-lib/sportdb/formats/event/event_index.rb
 lib/sportdb/formats/event/event_reader.rb
 lib/sportdb/formats/goals.rb
-lib/sportdb/formats/league/league_index.rb
+lib/sportdb/formats/ground/ground_reader.rb
 lib/sportdb/formats/league/league_outline_reader.rb
 lib/sportdb/formats/league/league_reader.rb
+lib/sportdb/formats/lines_reader.rb
 lib/sportdb/formats/match/conf_parser.rb
 lib/sportdb/formats/match/mapper.rb
 lib/sportdb/formats/match/mapper_teams.rb
@@ -21,31 +20,11 @@ lib/sportdb/formats/match/match_parser_auto_conf.rb
 lib/sportdb/formats/outline_reader.rb
 lib/sportdb/formats/package.rb
 lib/sportdb/formats/parser_helper.rb
-lib/sportdb/formats/team/club_index.rb
+lib/sportdb/formats/search/sport.rb
+lib/sportdb/formats/search/world.rb
 lib/sportdb/formats/team/club_index_history.rb
 lib/sportdb/formats/team/club_reader.rb
 lib/sportdb/formats/team/club_reader_history.rb
 lib/sportdb/formats/team/club_reader_props.rb
-lib/sportdb/formats/team/national_team_index.rb
-lib/sportdb/formats/team/team_index.rb
 lib/sportdb/formats/team/wiki_reader.rb
 lib/sportdb/formats/version.rb
-test/helper.rb
-test/test_club_index.rb
-test/test_club_index_history.rb
-test/test_club_reader.rb
-test/test_club_reader_history.rb
-test/test_club_reader_props.rb
-test/test_country_index.rb
-test/test_country_reader.rb
-test/test_datafile.rb
-test/test_datafile_package.rb
-test/test_goals.rb
-test/test_league_index.rb
-test/test_league_outline_reader.rb
-test/test_league_reader.rb
-test/test_outline_reader.rb
-test/test_package.rb
-test/test_package_match.rb
-test/test_regex.rb
-test/test_wiki_reader.rb

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-formats' do
   self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email = 'gerald.bauer@gmail.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'

data/lib/sportdb/formats/country/country_reader.rb

@@ -1,142 +1,142 @@
-# encoding: utf-8
-
-
-module SportDb
-module Import
-
-
-class CountryReader
-
-
-def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
-  txt = File.open( path, 'r:utf-8' ) { |f| f.read }
-  parse( txt )
-end
-
-def self.parse( txt )
-  new( txt ).parse
-end
-
-
-def initialize( txt )
-  @txt = txt
-end
-
-def parse
-  countries    = []
-  last_country = nil    ## note/check/fix: use countries[-1] - why? why not?
-
-  OutlineReader.parse( @txt ).each do |node|
-
-     node_type = node[0]
-
-     if [:h1, :h2].include?( node_type )
-       ## skip headings (and headings) for now too
-     elsif node_type == :p    ## paragraph
-      lines = node[1]
-      lines.each do |line|
-      if line.start_with?( '|' )
-        ## assume continuation with line of alternative names
-        ##  note: skip leading pipe
-        values = line[1..-1].split( '|' )   # team names - allow/use pipe(|)
-        ## strip and squish (white)spaces
-        #   e.g. East Germany        (-1989)  => East Germany (-1989)
-        values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-        last_country.alt_names += values
-      elsif line =~ /^-[ ]*(\d{4})
-                        [ ]+
-                       (.+)$
-                    /x     ## check for historic lines e.g. -1989
-         year   = $1.to_i
-         parts  = $2.split( /=>|⇒/ )
-         values = parts[0].split( ',' )
-         values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-
-         name = values[0]
-         code = values[1]
-
-         last_country = country = Country.new( name: "#{name} (-#{year})",
-                                               code: code )
-         ## country.alt_names << name    ## note: for now do NOT add name without year to alt_names - gets auto-add by index!!!
-
-         countries << country
-         ## todo/fix: add reference to country today (in parts[1] !!!!)
-      else
-        ## assume "regular" line
-        ##  check if starts with id  (todo/check: use a more "strict"/better regex capture pattern!!!)
-        ##   note: allow country codes upto 4 (!!) e.g. Northern Cyprus
-        if line =~ /^([a-z]{2,4})
-                        [ ]+
-                       (.+)$/x
-          key    = $1
-          values = $2.split( ',' )
-          ## strip and squish (white)spaces
-          #   e.g. East Germany        (-1989)  => East Germany (-1989)
-          values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
-
-          ## note: remove "overlords" from geo-tree marked territories  e.g. UK, US, etc. from name
-          ##    e.g. England › UK      => England
-          ##         Puerto Rico › US  => Puerto Rico
-          geos = split_geo( values[0] )
-          name = geos[0]    ## note: ignore all other geos for now
-
-          ##   note: allow country codes up to 4 (!!) e.g. Northern Cyprus
-          code = if values[1] && values[1] =~ /^[A-Z]{3,4}$/   ## note: also check format
-                   values[1]
-                 else
-                   if values[1]
-                     puts "** !!! ERROR !!! wrong code format >#{values[1]}<; expected three (or four)-letter all up-case"
-                   else
-                     puts "** !!! ERROR !!! missing code for (canonical) country name"
-                   end
-                   exit 1
-                 end
-
-          tags = if values[2]   ## check if tags presents
-                   split_tags( values[2] )
-                 else
-                   []
-                 end
-
-          last_country = country = Country.new( key: key,
-                                                name: name,
-                                                code: code,
-                                                tags: tags )
-          countries << country
-        else
-          puts "** !! ERROR - missing key for (canonical) country name"
-          exit 1
-        end
-      end
-      end  # each line
-    else
-      puts "** !! ERROR - unknown node type / (input) source line:"
-      pp node
-      exit 1
-    end
-  end    # each node
-
-  countries
-end  # method parse
-
-
-
-#######################################
-##  helpers
-def split_tags( str )
-  tags = str.split( /[|<>‹›]/ )   ## allow pipe (|) and (<>‹›) as divider for now - add more? why? why not?
-  tags = tags.map { |tag| tag.strip }
-  tags
-end
-
-def split_geo( str )   ## todo/check: rename to parse_geo(s) - why? why not?
-  ## split into geo tree
-  geos = str.split( /[<>‹›]/ )          ## note: allow > < or › ‹ for now
-  geos = geos.map { |geo| geo.strip }   ## remove all whitespaces
-  geos
-end
-
-end  # class CountryReader
-
-end   # module Import
-end   # module SportDb
+# encoding: utf-8
+
+
+module SportDb
+module Import
+
+
+class CountryReader
+
+
+def self.read( path )   ## use - rename to read_file or from_file etc. - why? why not?
+  txt = File.open( path, 'r:utf-8' ) { |f| f.read }
+  parse( txt )
+end
+
+def self.parse( txt )
+  new( txt ).parse
+end
+
+
+def initialize( txt )
+  @txt = txt
+end
+
+def parse
+  countries    = []
+  last_country = nil    ## note/check/fix: use countries[-1] - why? why not?
+
+  OutlineReader.parse( @txt ).each do |node|
+
+     node_type = node[0]
+
+     if [:h1, :h2].include?( node_type )
+       ## skip headings (and headings) for now too
+     elsif node_type == :p    ## paragraph
+      lines = node[1]
+      lines.each do |line|
+      if line.start_with?( '|' )
+        ## assume continuation with line of alternative names
+        ##  note: skip leading pipe
+        values = line[1..-1].split( '|' )   # team names - allow/use pipe(|)
+        ## strip and squish (white)spaces
+        #   e.g. East Germany        (-1989)  => East Germany (-1989)
+        values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+        last_country.alt_names += values
+      elsif line =~ /^-[ ]*(\d{4})
+                        [ ]+
+                       (.+)$
+                    /x     ## check for historic lines e.g. -1989
+         year   = $1.to_i
+         parts  = $2.split( /=>|⇒/ )
+         values = parts[0].split( ',' )
+         values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+
+         name = values[0]
+         code = values[1]
+
+         last_country = country = Country.new( name: "#{name} (-#{year})",
+                                               code: code )
+         ## country.alt_names << name    ## note: for now do NOT add name without year to alt_names - gets auto-add by index!!!
+
+         countries << country
+         ## todo/fix: add reference to country today (in parts[1] !!!!)
+      else
+        ## assume "regular" line
+        ##  check if starts with id  (todo/check: use a more "strict"/better regex capture pattern!!!)
+        ##   note: allow country codes upto 4 (!!) e.g. Northern Cyprus
+        if line =~ /^([a-z]{2,4})
+                        [ ]+
+                       (.+)$/x
+          key    = $1
+          values = $2.split( ',' )
+          ## strip and squish (white)spaces
+          #   e.g. East Germany        (-1989)  => East Germany (-1989)
+          values = values.map { |value| value.strip.gsub( /[ \t]+/, ' ' ) }
+
+          ## note: remove "overlords" from geo-tree marked territories  e.g. UK, US, etc. from name
+          ##    e.g. England › UK      => England
+          ##         Puerto Rico › US  => Puerto Rico
+          geos = split_geo( values[0] )
+          name = geos[0]    ## note: ignore all other geos for now
+
+          ##   note: allow country codes up to 4 (!!) e.g. Northern Cyprus
+          code = if values[1] && values[1] =~ /^[A-Z]{3,4}$/   ## note: also check format
+                   values[1]
+                 else
+                   if values[1]
+                     puts "** !!! ERROR !!! wrong code format >#{values[1]}<; expected three (or four)-letter all up-case"
+                   else
+                     puts "** !!! ERROR !!! missing code for (canonical) country name"
+                   end
+                   exit 1
+                 end
+
+          tags = if values[2]   ## check if tags presents
+                   split_tags( values[2] )
+                 else
+                   []
+                 end
+
+          last_country = country = Country.new( key: key,
+                                                name: name,
+                                                code: code,
+                                                tags: tags )
+          countries << country
+        else
+          puts "** !! ERROR - missing key for (canonical) country name"
+          exit 1
+        end
+      end
+      end  # each line
+    else
+      puts "** !! ERROR - unknown node type / (input) source line:"
+      pp node
+      exit 1
+    end
+  end    # each node
+
+  countries
+end  # method parse
+
+
+
+#######################################
+##  helpers
+def split_tags( str )
+  tags = str.split( /[|<>‹›]/ )   ## allow pipe (|) and (<>‹›) as divider for now - add more? why? why not?
+  tags = tags.map { |tag| tag.strip }
+  tags
+end
+
+def split_geo( str )   ## todo/check: rename to parse_geo(s) - why? why not?
+  ## split into geo tree
+  geos = str.split( /[<>‹›]/ )          ## note: allow > < or › ‹ for now
+  geos = geos.map { |geo| geo.strip }   ## remove all whitespaces
+  geos
+end
+
+end  # class CountryReader
+
+end   # module Import
+end   # module SportDb

data/lib/sportdb/formats/datafile.rb

@@ -1,59 +1,59 @@
-# encoding: utf-8
-
-
-module Datafile      # note: keep Datafile in its own top-level module/namespace for now - why? why not?
-
-  def self.read( path )   ## todo/check: use as a shortcut helper - why? why not?
-     ## note: always assume utf-8 for now!!!
-     File.open( path, 'r:utf-8') {|f| f.read }
-  end
-
-
-  ########################
-  ## todo/fix: turn into Datafile::Bundle.new  and Bundle#write/save -why? why not?
-  class Bundle
-    def initialize( path )
-      @path = path
-      @buf  = String.new('')
-    end
-
-    def <<(value)
-       if value.is_a?( Array )  ## assume array of datafiles (file paths)
-         datafiles = value
-         datafiles.each do |datafile|
-           text = Datafile.read( datafile )
-           ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
-           text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
-           @buf << text
-           @buf << "\n\n"
-          end
-        else ## assume string (e.g. header, comments, etc.)
-          text = value
-          @buf << text
-          @buf << "\n\n"
-        end
-    end
-    alias_method :write, :<<
-
-    ## todo/fix/check: write only on close? or write on every write and use close for close?
-    def close
-      File.open( @path, 'w:utf-8' ) do |f|
-        f.write @buf
-      end
-    end
-  end  # class Bundle
-
-
-  def self.write_bundle( path, datafiles:, header: nil )
-    bundle = Bundle.new( path )
-    bundle.write( header )   if header
-    datafiles.each do |datafile|
-      text = read( datafile )
-      ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
-      text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
-      bundle.write( text )
-    end
-    bundle.close
-  end
-
-end # module Datafile
+# encoding: utf-8
+
+
+module Datafile      # note: keep Datafile in its own top-level module/namespace for now - why? why not?
+
+  def self.read( path )   ## todo/check: use as a shortcut helper - why? why not?
+     ## note: always assume utf-8 for now!!!
+     File.open( path, 'r:utf-8') {|f| f.read }
+  end
+
+
+  ########################
+  ## todo/fix: turn into Datafile::Bundle.new  and Bundle#write/save -why? why not?
+  class Bundle
+    def initialize( path )
+      @path = path
+      @buf  = String.new('')
+    end
+
+    def <<(value)
+       if value.is_a?( Array )  ## assume array of datafiles (file paths)
+         datafiles = value
+         datafiles.each do |datafile|
+           text = Datafile.read( datafile )
+           ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
+           text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
+           @buf << text
+           @buf << "\n\n"
+          end
+        else ## assume string (e.g. header, comments, etc.)
+          text = value
+          @buf << text
+          @buf << "\n\n"
+        end
+    end
+    alias_method :write, :<<
+
+    ## todo/fix/check: write only on close? or write on every write and use close for close?
+    def close
+      File.open( @path, 'w:utf-8' ) do |f|
+        f.write @buf
+      end
+    end
+  end  # class Bundle
+
+
+  def self.write_bundle( path, datafiles:, header: nil )
+    bundle = Bundle.new( path )
+    bundle.write( header )   if header
+    datafiles.each do |datafile|
+      text = read( datafile )
+      ## todo/fix/check:  move  sub __END__ to Datafile.read and turn it always on  -  why? why not?
+      text = text.sub( /__END__.*/m, '' )    ## note: add/allow support for __END__; use m-multiline flag
+      bundle.write( text )
+    end
+    bundle.close
+  end
+
+end # module Datafile