sportdb-structs 0.1.1 → 0.1.2

data/lib/sportdb/structs/structs/team_usage.rb

@@ -1,84 +1,84 @@
-
-module Sports
-
-
-class TeamUsage
-
-  class TeamUsageLine   ## nested class
-    attr_accessor  :team,
-                   :matches,  ## number of matches (played),
-                   :seasons,  ## (optianl) array of seasons, use seasons.size for count
-                   :levels    ## (optional) hash of levels (holds mapping level to TeamUsageLine)
-
-    def initialize( team )
-      @team = team
-
-      @matches  = 0
-      @seasons  = []
-      @levels   = {}
-    end
-  end # (nested) class TeamUsageLine
-
-
-
-  def initialize( opts={} )
-    @lines = {}   # StandingsLines cached by team name/key
-  end
-
-
-  def update( matches, season: '?', level: nil )
-    ## convenience - update all matches at once
-    matches.each_with_index do |match,i| # note: index(i) starts w/ zero (0)
-      update_match( match, season: season, level: level )
-    end
-    self  # note: return self to allow chaining
-  end
-
-  def to_a
-    ## return lines; sort
-
-    # build array from hash
-    ary = []
-    @lines.each do |k,v|
-      ary << v
-    end
-
-    ## for now sort just by name (a-z)
-    ary.sort! do |l,r|
-      ## note: reverse order (thus, change l,r to r,l)
-      l.team <=> r.team
-    end
-
-    ary
-  end  # to_a
-
-
-private
-  def update_match( m, season: '?', level: nil )   ## add a match
-
-    line1 = @lines[ m.team1 ] ||= TeamUsageLine.new( m.team1 )
-    line2 = @lines[ m.team2 ] ||= TeamUsageLine.new( m.team2 )
-
-    line1.matches +=1
-    line2.matches +=1
-
-    ## include season if not seen before (allow season in multiple files!!!)
-    line1.seasons << season    unless line1.seasons.include?( season )
-    line2.seasons << season    unless line2.seasons.include?( season )
-
-    if level
-      line1_level = line1.levels[ level ] ||= TeamUsageLine.new( m.team1 )
-      line2_level = line2.levels[ level ] ||= TeamUsageLine.new( m.team2 )
-
-      line1_level.matches +=1
-      line2_level.matches +=1
-
-      line1_level.seasons << season    unless line1_level.seasons.include?( season )
-      line2_level.seasons << season    unless line2_level.seasons.include?( season )
-    end
-  end  # method update_match
-
-
-end # class TeamUsage
-
-end # module Sports
+
+module Sports
+
+
+class TeamUsage
+
+  class TeamUsageLine   ## nested class
+    attr_accessor  :team,
+                   :matches,  ## number of matches (played),
+                   :seasons,  ## (optianl) array of seasons, use seasons.size for count
+                   :levels    ## (optional) hash of levels (holds mapping level to TeamUsageLine)
+
+    def initialize( team )
+      @team = team
+
+      @matches  = 0
+      @seasons  = []
+      @levels   = {}
+    end
+  end # (nested) class TeamUsageLine
+
+
+
+  def initialize( opts={} )
+    @lines = {}   # StandingsLines cached by team name/key
+  end
+
+
+  def update( matches, season: '?', level: nil )
+    ## convenience - update all matches at once
+    matches.each_with_index do |match,i| # note: index(i) starts w/ zero (0)
+      update_match( match, season: season, level: level )
+    end
+    self  # note: return self to allow chaining
+  end
+
+  def to_a
+    ## return lines; sort
+
+    # build array from hash
+    ary = []
+    @lines.each do |k,v|
+      ary << v
+    end
+
+    ## for now sort just by name (a-z)
+    ary.sort! do |l,r|
+      ## note: reverse order (thus, change l,r to r,l)
+      l.team <=> r.team
+    end
+
+    ary
+  end  # to_a
+
+
+private
+  def update_match( m, season: '?', level: nil )   ## add a match
+
+    line1 = @lines[ m.team1 ] ||= TeamUsageLine.new( m.team1 )
+    line2 = @lines[ m.team2 ] ||= TeamUsageLine.new( m.team2 )
+
+    line1.matches +=1
+    line2.matches +=1
+
+    ## include season if not seen before (allow season in multiple files!!!)
+    line1.seasons << season    unless line1.seasons.include?( season )
+    line2.seasons << season    unless line2.seasons.include?( season )
+
+    if level
+      line1_level = line1.levels[ level ] ||= TeamUsageLine.new( m.team1 )
+      line2_level = line2.levels[ level ] ||= TeamUsageLine.new( m.team2 )
+
+      line1_level.matches +=1
+      line2_level.matches +=1
+
+      line1_level.seasons << season    unless line1_level.seasons.include?( season )
+      line2_level.seasons << season    unless line2_level.seasons.include?( season )
+    end
+  end  # method update_match
+
+
+end # class TeamUsage
+
+end # module Sports

data/lib/sportdb/structs/version.rb

@@ -4,7 +4,7 @@ module SportDb
     module Structs
   MAJOR = 0    ## todo: namespace inside version or something - why? why not??
   MINOR = 1
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/helper.rb

@@ -1,13 +1,13 @@
-## note: use the local version of sportdb gems
-$LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../score-formats/lib' ))
-$LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
-
-
-## minitest setup
-require 'minitest/autorun'
-
-
-## our own code
-require 'sportdb/structs'
-
+## note: use the local version of sportdb gems
+$LOAD_PATH.unshift( File.expand_path( '../date-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../score-formats/lib' ))
+$LOAD_PATH.unshift( File.expand_path( '../sportdb-langs/lib' ))
+
+
+## minitest setup
+require 'minitest/autorun'
+
+
+## our own code
+require 'sportdb/structs'
+

data/test/test_match_status_parser.rb

@@ -1,57 +1,57 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_match_status_parser.rb
-
-
-require 'helper'
-
-
-class TestMatchStatusParser < MiniTest::Test
-
-   Status       = SportDb::Status
-   StatusParser = SportDb::StatusParser
-
-  def test_find
-    [['awarded [cancelled] canceled [ddd]',                        Status::CANCELLED],
-     ['awarded [bbb; canceled] canceled [awarded; comments] eeee', Status::AWARDED],
-     ['aaa bbb ccc ddd eeee',                                      nil],
-    ].each do |rec|
-      line       = rec[0]
-      status_exp = rec[1]
-       puts "line (before): >#{line}<"
-       status = StatusParser.find!( line )
-       puts "status: >#{status}<"
-       puts "line (after): >#{line}<"
-       puts
-
-       if status_exp.nil?
-        assert_nil status
-       else
-        assert_equal status_exp, status
-       end
-    end
-  end # method test_find
-
-  def test_parse
-    [['cancelled ddd',        Status::CANCELLED],
-     ['CANCELLED',            Status::CANCELLED],
-     ['can.',                 Status::CANCELLED],
-     ['awarded; comments',    Status::AWARDED],
-     ['awd. - comments',      Status::AWARDED],
-     ['aaa bbb ccc ddd eeee', nil],
-    ].each do |rec|
-      str        = rec[0]
-      status_exp = rec[1]
-      status     = StatusParser.parse( str )
-
-      if status_exp.nil?     ##  for "silencing" minitest warning - Use assert_nil if expecting nil
-        assert_nil status
-      else
-        assert_equal status_exp, status
-      end
-    end
-  end
-
-end   # class TestMatchStatusParser
-
-
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_match_status_parser.rb
+
+
+require 'helper'
+
+
+class TestMatchStatusParser < MiniTest::Test
+
+   Status       = SportDb::Status
+   StatusParser = SportDb::StatusParser
+
+  def test_find
+    [['awarded [cancelled] canceled [ddd]',                        Status::CANCELLED],
+     ['awarded [bbb; canceled] canceled [awarded; comments] eeee', Status::AWARDED],
+     ['aaa bbb ccc ddd eeee',                                      nil],
+    ].each do |rec|
+      line       = rec[0]
+      status_exp = rec[1]
+       puts "line (before): >#{line}<"
+       status = StatusParser.find!( line )
+       puts "status: >#{status}<"
+       puts "line (after): >#{line}<"
+       puts
+
+       if status_exp.nil?
+        assert_nil status
+       else
+        assert_equal status_exp, status
+       end
+    end
+  end # method test_find
+
+  def test_parse
+    [['cancelled ddd',        Status::CANCELLED],
+     ['CANCELLED',            Status::CANCELLED],
+     ['can.',                 Status::CANCELLED],
+     ['awarded; comments',    Status::AWARDED],
+     ['awd. - comments',      Status::AWARDED],
+     ['aaa bbb ccc ddd eeee', nil],
+    ].each do |rec|
+      str        = rec[0]
+      status_exp = rec[1]
+      status     = StatusParser.parse( str )
+
+      if status_exp.nil?     ##  for "silencing" minitest warning - Use assert_nil if expecting nil
+        assert_nil status
+      else
+        assert_equal status_exp, status
+      end
+    end
+  end
+
+end   # class TestMatchStatusParser
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alphabets
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: season-formats
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: csvreader
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +98,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
 description: sportdb-structs - sport data structures for matches, scores, leagues,
   seasons, rounds, groups, teams, clubs and more
 email: opensport@googlegroups.com
@@ -128,7 +148,6 @@ files:
 - lib/sportdb/structs/match_parser_csv.rb
 - lib/sportdb/structs/match_status_parser.rb
 - lib/sportdb/structs/name_helper.rb
-- lib/sportdb/structs/season.rb
 - lib/sportdb/structs/structs/country.rb
 - lib/sportdb/structs/structs/goal.rb
 - lib/sportdb/structs/structs/group.rb
@@ -146,7 +165,6 @@ files:
 - test/test_match.rb
 - test/test_match_status_parser.rb
 - test/test_name_helper.rb
-- test/test_season.rb
 homepage: https://github.com/sportdb/sport.db
 licenses:
 - Public Domain

data/lib/sportdb/structs/season.rb

@@ -1,199 +0,0 @@
-
-### note: make Season like Date a "top-level" / "generic" class
-
-
-class Season
-  ##
-  ##  todo: add (optional) start_date and end_date - why? why not?
-
-  ## todo/todo/todo/check/check/check !!!
-  ## todo: add a kernel Seaons e.g. Season('2011/12')
-  ##    forward to Season.convert( *args )  - why? why not?
-
-  ## todo: add unicode - too - why? why not? see wikipedia pages, for example
-
-  YYYY_YYYY_RE  = %r{^      ## e.g. 2011-2012 or 2011/2012
-                    (\d{4})
-                      [/-]
-                    (\d{4})
-                   $
-                  }x
-  YYYY_YY_RE  = %r{^       ## e.g. 2011-12 or 2011/12
-                    (\d{4})
-                      [/-]
-                    (\d{2})
-                   $
-                  }x
-  YYYY_Y_RE  = %r{^       ## e.g. 2011-2 or 2011/2
-                  (\d{4})
-                    [/-]
-                  (\d{1})
-                 $
-                }x
-  YYYY_RE     = %r{^       ## e.g. 2011
-                    (\d{4})
-                   $
-                  }x
-
-
-  def self.parse( str )
-    new( *_parse( str ))
-  end
-
-  def self._parse( str )   ## "internal" parse helper
-    if str =~ YYYY_YYYY_RE    ## e.g. 2011/2012
-      [$1.to_i, $2.to_i]
-    elsif str =~ YYYY_YY_RE   ## e.g. 2011/12
-      fst = $1.to_i
-      snd = $2.to_i
-      snd_exp = '%02d' % [(fst+1) % 100]    ## double check: e.g 00 == 00, 01==01 etc.
-      raise ArgumentError, "[Season.parse] invalid year in season >>#{str}<<; expected #{snd_exp} but got #{$2}"   if snd_exp != $2
-      [fst, fst+1]
-    elsif str =~ YYYY_Y_RE    ## e.g. 2011/2
-      fst = $1.to_i
-      snd = $2.to_i
-      snd_exp = '%d' % [(fst+1) % 10]      ## double check: e.g 0 == 0, 1==1 etc.
-      raise ArgumentError, "[Season.parse] invalid year in season >>#{str}<<; expected #{snd_exp} but got #{$2}"   if snd_exp != $2
-      [fst, fst+1]
-    elsif str =~ YYYY_RE      ## e.g. 2011
-      [$1.to_i]
-    else
-      raise ArgumentError, "[Season.parse] unkown season format >>#{str}<<; sorry cannot parse"
-    end
-  end
-
-
-  def self.convert( *args )  ## note: used by Kernel method Season()
-    if args.size == 1 && args[0].is_a?( Season )
-      args[0]  # pass through / along as is 1:1
-    elsif args.size == 1 && args[0].is_a?( String )
-      parse( args[0] )
-    elsif args.size == 1 && args[0].is_a?( Integer ) && args[0] > 9999
-      ## note: allow convenience "hack" such as:
-      # 202021   or 2020_21   => '2020/21' or
-      # 2020_1   or 2020_1    => '2020/21' or
-      # 20202021 or 2020_2021 => '2020/21'
-      str = args[0].to_s
-      parse( "#{str[0..3]}/#{str[4..-1]}" )
-    else ## assume all integer args e.g.  2020 or 2020, 2021 and such
-      new( *args ) ## try conversion with new
-    end
-  end
-
-
-  attr_reader :start_year,
-              :end_year
-
-  def initialize( *args )   ## change args to years - why? why not?
-    if args.size == 1 && args[0].is_a?( Integer )
-      @start_year = args[0]
-      @end_year   = args[0]
-    elsif args.size == 2 && args[0].is_a?( Integer ) &&
-                            args[1].is_a?( Integer )
-      @start_year = args[0]
-      @end_year   = args[1]
-      end_year_exp = @start_year+1
-      raise ArgumentError, "[Season] invalid year in season >>#{to_s}<<; expected #{end_year_exp} but got #{@end_year}"   if end_year_exp != @end_year
-    else
-      pp args
-      raise ArgumentError, "[Season] expected season start year (integer) with opt. end year"
-    end
-  end
-
-
-
-  ## convenience helper  - move to sportdb or such - remove - why - why not???
-  def start_date   ## generate "generic / syntetic start date" - keep helper - why? why not?
-    if year?
-      Date.new( start_year, 1, 1 )
-    else
-      Date.new( start_year 1, 7 )
-    end
-  end
-
-
-  ## single-year season e.g. 2011 if start_year is end_year - todo - find a better name?
-  def year?()  @start_year == @end_year; end
-
-  def prev
-    if year?
-      Season.new( @start_year-1 )
-    else
-      Season.new( @start_year-1, @end_year-1 )
-    end
-  end
-
-  def next
-    if year?
-      Season.new( @start_year+1 )
-    else
-      Season.new( @start_year+1, @end_year+1 )
-    end
-  end
-  alias_method :succ, :next   ## add support for ranges
-
-
-  include Comparable
-  def <=>(other)
-    ## todo/fix/fix:  check if other is_a?( Season )!!!
-    ##  what to return if other type/class ??
-    ## note: check special edge case - year season and other e.g.
-    ##    2010 <=> 2010/2011
-
-    res = @start_year <=> other.start_year
-    res = @end_year   <=> other.end_year     if res == 0
-    res
-  end
-
-
-  def to_formatted_s( format=:default, sep: '/' )
-    if year?
-      '%d' % @start_year
-    else
-      case format
-      when :default, :short, :s   ## e.g. 1999/00 or 2019/20
-        "%d#{sep}%02d" % [@start_year, @end_year % 100]
-      when :long, :l              ## e.g. 1999/2000 or 2019/2020
-        "%d#{sep}%d" % [@start_year, @end_year]
-      else
-        raise ArgumentError, "[Season.to_s] unsupported format >#{format}<"
-      end
-    end
-  end
-  alias_method :to_s, :to_formatted_s
-
-  def key()  to_s( :short ); end
-  alias_method :to_key,  :key
-  alias_method :name,    :key
-  alias_method :title,   :key
-
-  alias_method :inspect, :key  ## note: add inspect debug support change debug output to string!!
-
-
-
-  def to_path( format=:default )
-    case format
-    when :default, :short, :s    ## e.g. 1999-00 or 2019-20
-      to_s( :short, sep: '-' )
-    when :long, :l                ## e.g. 1999-2000 or 2019-2000
-      to_s( :long, sep: '-' )
-    when :archive, :decade, :d    ## e.g. 1990s/1999-00 or 2010s/2019-20
-      "%3d0s/%s" % [@start_year / 10, to_s( :short, sep: '-' )]
-    when :century, :c             ## e.g. 1900s/1990-00 or 2000s/2019-20
-      "%2d00s/%s" % [@start_year / 100, to_s( :short, sep: '-' )]
-    else
-      raise ArgumentError, "[Season.to_path] unsupported format >#{format}<"
-    end
-  end # method to_path
-  alias_method :directory, :to_path   ## keep "legacy" directory alias - why? why not?
-  alias_method :path,      :to_path
-
-end # class Season
-
-
-
-### note: add a convenience "shortcut" season kernel method conversion method
-##  use like Season( '2012/3' )  or such
-module Kernel
-  def Season( *args ) Season.convert( *args ); end
-end