sportdb-formats 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df02092c7b7825d8f490db2a084ee9ea597c1d03
-  data.tar.gz: 1a4668e864faae56d438ba834738ca73b3768810
+  metadata.gz: 0c8eb774dbb161f38c9cc4daffb32c8c4ea3d80c
+  data.tar.gz: 3e5b51d861148bba7c2f04c4f8acd30a8be486e8
 SHA512:
-  metadata.gz: ad775203cc25f042c5b3008833512945ea5345bd9d2cf64787d87c92b163248d6785a52d0731ae2f61d06eb378c0bd8ca9cfa2e91c1dc5da710c9ccfe6bc8de4
-  data.tar.gz: 41fea36796164be0deff4b297b9a7cece1344f9a16ef2fbec184d1f104c353a59ee30e221db4b6c9ccce7ba9009aafb8051593f510f8c81a1fa72d7fb797f5a1
+  metadata.gz: 3eee51ac8a01998082b1b00e6397ded3224dac3dad299a001a812f62c83e579246ced7af214b54c3f964211f5faec1cb08e708dd4237b28d7ac1782807de104f
+  data.tar.gz: d257a4f169babec6caf2bd34583a8e01fa1cfb76f3f72d0d13c4f38aadc3ffc2082591c73ed976e9ae7e0bbe08383c0f2f278d1358dc2219d4283912e315bff5

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

data/lib/sportdb/formats/event/event_index.rb

@@ -1,141 +1,141 @@
-module SportDb
-module Import
-
-
-
-class EventIndex
-
-    def self.build( path )
-      pack = Package.new( path )   ## lets us use direcotry or zip archive
-
-      recs = []
-      pack.each_seasons do |entry|
-        recs += EventInfoReader.parse( entry.read )
-      end
-      recs
-
-      index = new
-      index.add( recs )
-      index
-    end
-
-
-
-    attr_reader :events
-    def initialize
-      @events  = []
-      @leagues = {}
-    end
-
-    def add( recs )
-      @events += recs  ## add to "linear" records
-
-      recs.each do |rec|
-        league = rec.league
-        season = rec.season
-
-        seasons = @leagues[ league.key ] ||= {}
-        seasons[season.key] = rec
-      end
-      ## build search index by leagues (and season)
-    end
-
-    def find_by( league:, season: )
-      league_key = league.is_a?( String ) ? league : league.key
-      season_key = season.is_a?( String ) ? season : season.key
-
-      seasons = @leagues[ league_key ]
-      if seasons
-        seasons[ season_key ]
-      else
-        nil
-      end
-    end # method find_by
-end  ## class EventIndex
-
-
-
-class SeasonIndex
-    def initialize( *args )
-       @leagues = {}   ## use a league hash by years for now; change later
-
-       if args.size == 1 && args[0].is_a?( EventIndex )
-         ## convenience setup/hookup
-         ##  (auto-)add all events from event index
-         add( args[0].events )
-       else
-         pp args
-         raise ArgumentError.new( 'unsupported arguments' )
-       end
-    end
-
-    def add( recs )
-      ## use a lookup index by year for now
-      ##  todo - find something better/more generic for searching/matching date periods!!!
-      recs.each do |rec|
-        league = rec.league
-        season = rec.season
-
-        years = @leagues[ league.key ] ||= {}
-        if season.year?
-          years[season.start_year] ||= []
-          years[season.start_year] << rec
-        else
-          years[season.start_year] ||= []
-          years[season.end_year]   ||= []
-          years[season.start_year] << rec
-          years[season.end_year]   << rec
-        end
-      end
-    end # method add
-
-    def find_by( date:, league: )
-       date = Date.strptime( date, '%Y-%m-%d' )   if date.is_a?( String )
-       league_key = league.is_a?( String ) ? league : league.key
-
-       years = @leagues[ league_key ]
-       if years
-           year = years[ date.year ]
-           if year
-               season_key = nil
-               year.each do |event|
-                 ##  todo/check: rename/use between? instead of include? - why? why not?
-                 if event.include?( date )
-                   season_key = event.season.key
-                   break
-                 end
-               end
-               if season_key.nil?
-                 puts "!! WARN: date >#{date}< out-of-seasons for year #{date.year} in league #{league_key}:"
-                 year.each do |event|
-                   puts "  #{event.season.key} |  #{event.start_date} - #{event.end_date}"
-                 end
-                 ## retry again and pick season with "overflow" at the end (date is great end_date)
-                 year.each do |event|
-                   if date > event.end_date
-                     diff_in_days = date.to_date.jd - event.end_date.to_date.jd
-                     puts "    +#{diff_in_days} days - adding overflow to #{event.season.key} ending on #{event.end_date} ++ #{date}"
-                     season_key = event.season.key
-                     break
-                   end
-                 end
-                 ## exit now for sure - if still empty!!!!
-                 if season_key.nil?
-                   puts "!! ERROR: CANNOT auto-fix / (auto-)append date at the end of an event; check season setup - sorry"
-                   exit 1
-                 end
-               end
-               season_key
-           else
-             nil   ## no year defined / found for league
-           end
-       else
-          nil   ## no league defined / found
-       end
-   end  # method find
-
-end # class SeasonIndex
-
-
-end   # module Import
-end   # module SportDb
+module SportDb
+module Import
+
+
+
+class EventIndex
+
+    def self.build( path )
+      pack = Package.new( path )   ## lets us use direcotry or zip archive
+
+      recs = []
+      pack.each_seasons do |entry|
+        recs += EventInfoReader.parse( entry.read )
+      end
+      recs
+
+      index = new
+      index.add( recs )
+      index
+    end
+
+
+
+    attr_reader :events
+    def initialize
+      @events  = []
+      @leagues = {}
+    end
+
+    def add( recs )
+      @events += recs  ## add to "linear" records
+
+      recs.each do |rec|
+        league = rec.league
+        season = rec.season
+
+        seasons = @leagues[ league.key ] ||= {}
+        seasons[season.key] = rec
+      end
+      ## build search index by leagues (and season)
+    end
+
+    def find_by( league:, season: )
+      league_key = league.is_a?( String ) ? league : league.key
+      season_key = season.is_a?( String ) ? season : season.key
+
+      seasons = @leagues[ league_key ]
+      if seasons
+        seasons[ season_key ]
+      else
+        nil
+      end
+    end # method find_by
+end  ## class EventIndex
+
+
+
+class SeasonIndex
+    def initialize( *args )
+       @leagues = {}   ## use a league hash by years for now; change later
+
+       if args.size == 1 && args[0].is_a?( EventIndex )
+         ## convenience setup/hookup
+         ##  (auto-)add all events from event index
+         add( args[0].events )
+       else
+         pp args
+         raise ArgumentError.new( 'unsupported arguments' )
+       end
+    end
+
+    def add( recs )
+      ## use a lookup index by year for now
+      ##  todo - find something better/more generic for searching/matching date periods!!!
+      recs.each do |rec|
+        league = rec.league
+        season = rec.season
+
+        years = @leagues[ league.key ] ||= {}
+        if season.year?
+          years[season.start_year] ||= []
+          years[season.start_year] << rec
+        else
+          years[season.start_year] ||= []
+          years[season.end_year]   ||= []
+          years[season.start_year] << rec
+          years[season.end_year]   << rec
+        end
+      end
+    end # method add
+
+    def find_by( date:, league: )
+       date = Date.strptime( date, '%Y-%m-%d' )   if date.is_a?( String )
+       league_key = league.is_a?( String ) ? league : league.key
+
+       years = @leagues[ league_key ]
+       if years
+           year = years[ date.year ]
+           if year
+               season_key = nil
+               year.each do |event|
+                 ##  todo/check: rename/use between? instead of include? - why? why not?
+                 if event.include?( date )
+                   season_key = event.season.key
+                   break
+                 end
+               end
+               if season_key.nil?
+                 puts "!! WARN: date >#{date}< out-of-seasons for year #{date.year} in league #{league_key}:"
+                 year.each do |event|
+                   puts "  #{event.season.key} |  #{event.start_date} - #{event.end_date}"
+                 end
+                 ## retry again and pick season with "overflow" at the end (date is great end_date)
+                 year.each do |event|
+                   if date > event.end_date
+                     diff_in_days = date.to_date.jd - event.end_date.to_date.jd
+                     puts "    +#{diff_in_days} days - adding overflow to #{event.season.key} ending on #{event.end_date} ++ #{date}"
+                     season_key = event.season.key
+                     break
+                   end
+                 end
+                 ## exit now for sure - if still empty!!!!
+                 if season_key.nil?
+                   puts "!! ERROR: CANNOT auto-fix / (auto-)append date at the end of an event; check season setup - sorry"
+                   exit 1
+                 end
+               end
+               season_key
+           else
+             nil   ## no year defined / found for league
+           end
+       else
+          nil   ## no league defined / found
+       end
+   end  # method find
+
+end # class SeasonIndex
+
+
+end   # module Import
+end   # module SportDb