sportdb-structs 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0da18097a3c12d49e15eeb7963a4b62a030f4672
-  data.tar.gz: 75510bd91eb242f0617671bd115cced1e8e52c3c
+SHA256:
+  metadata.gz: 9569b6727737da1a3c241e4acae88a19ea61e7cc132e752b1d391628424db916
+  data.tar.gz: 37ad5ee8f954dfdb3221060b500eed898461ce957ed257d2dd58e6b6467bae7c
 SHA512:
-  metadata.gz: 8664d51d3ac92e5e1b214d459594806d83af703c8ee601ca37958ac23cbe1822b81396d03bca2f8c304f31cc3891e732dd7d2fc364ecf3218cee15a4565d51b4
-  data.tar.gz: 789287b40ef9f4c8359a3a241836ea2747a53a4406b70e652ca083aca766b96b481bcf2281a79ce88bb81887428139e27e33caa65e7bf741d5c18de78e767158
+  metadata.gz: 4eb9e97280e9a390f188409fd8dab427b96dcc9e0ed9d81de20546254dc02903b9d7c28ab22efbaea0fb7f13cf9ea685c81ab1f88fc67cd69f9d8b017579d3ab
+  data.tar.gz: 4bcb33bdc129b67439817eea7204bd42aaf26a20b0b1962a046eb182d8d48746b38452aa5a177a01c7f522e3bcab203053778d42e75212bde5128405eeb37bf0

data/Manifest.txt

@@ -8,7 +8,6 @@ lib/sportdb/structs/goal_parser_csv.rb
 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
@@ -26,4 +25,3 @@ test/test_csv_reader.rb
 test/test_match.rb
 test/test_match_status_parser.rb
 test/test_name_helper.rb
-test/test_season.rb

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.spec 'sportdb-structs' do
   self.urls = { home: 'https://github.com/sportdb/sport.db' }
 
   self.author = 'Gerald Bauer'
-  self.email = 'opensport@googlegroups.com'
+  self.email  = 'opensport@googlegroups.com'
 
   # switch extension to .markdown for gihub formatting
   self.readme_file  = 'README.md'
@@ -23,6 +23,7 @@ Hoe.spec 'sportdb-structs' do
     ['alphabets',      '>= 1.0.0'],
     ['date-formats',   '>= 1.0.2'],
     ['score-formats',  '>= 0.1.1'],
+    ['season-formats', '>= 0.0.1'],
     ['csvreader',      '>= 1.2.4'],
     ['sportdb-langs',  '>= 0.1.1'],
   ]

data/lib/sportdb/structs/structs/match.rb

@@ -34,7 +34,7 @@ class Match
     @score1agg =  @score2agg = nil  ## full time (all legs) aggregated
 
 
-    update( kwargs )  unless kwargs.empty?
+    update( **kwargs )  unless kwargs.empty?
   end
 
   def update( **kwargs )

data/lib/sportdb/structs/structs/team.rb

@@ -50,7 +50,7 @@ class Team
     @alt_names      = []
     @alt_names_auto = []
 
-    update( kwargs )  unless kwargs.empty?
+    update( **kwargs )  unless kwargs.empty?
   end
 
   def update( **kwargs )

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 = 3
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/lib/sportdb/structs.rb

@@ -1,6 +1,7 @@
 ## 3rd party gems
-require 'alphabets'      # downcase_i18n, unaccent, variants, ...
-require 'date/formats'   # DateFormats.parse, find!, ...
+require 'alphabets'       # downcase_i18n, unaccent, variants, ...
+require 'date/formats'    # DateFormats.parse, find!, ...
+require 'season/formats'  # Season.parse, ...
 require 'score/formats'
 require 'csvreader'
 
@@ -58,8 +59,6 @@ require 'sportdb/structs/version' # let version always go first
 require 'sportdb/structs/config'  # let "global" config "framework" go next - why? why not?
 
 
-require 'sportdb/structs/season'
-
 require 'sportdb/structs/name_helper'
 
 require 'sportdb/structs/structs/country'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-structs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Gerald Bauer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-15 00:00:00.000000000 Z
+date: 2022-11-20 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.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.23'
 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,12 +165,11 @@ 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
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -168,9 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: sportdb-structs - sport data structures for matches, scores, leagues, seasons,
   rounds, groups, teams, clubs and more

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

data/test/test_season.rb

@@ -1,141 +0,0 @@
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_season.rb
-
-
-require 'helper'
-
-class TestSeason < MiniTest::Test
-
-
-  def test_to_path
-    assert_equal '2010-11',       Season( '2010-11' ).to_path
-    assert_equal '2010-11',       Season( '2010-2011' ).to_path
-    assert_equal '2010-11',       Season( '2010/11' ).to_path
-    assert_equal '2010-11',       Season( '2010/1' ).to_path
-    assert_equal '2010-11',       Season( '2010/2011' ).to_path
-    assert_equal '2010',          Season( '2010' ).to_path
-
-    assert_equal '2010-11',       Season( 2010, 2011 ).to_path
-    assert_equal '2010-11',       Season( 2010_2011 ).to_path
-    assert_equal '2010-11',       Season( 20102011 ).to_path
-    assert_equal '2010-11',       Season( 201011 ).to_path
-    assert_equal '2010-11',       Season( 20101 ).to_path
-    assert_equal '2010',          Season( 2010 ).to_path
-
-    assert_equal '2010s/2010-11', Season( '2010-11' ).to_path( :decade )
-    assert_equal '2010s/2010-11', Season( '2010-2011' ).to_path( :decade )
-    assert_equal '2010s/2010',    Season( '2010' ).to_path( :decade )
-
-    assert_equal '1999-00',       Season( '1999-00' ).to_path
-    assert_equal '1999-00',       Season( '1999-2000' ).to_path
-    assert_equal '1990s/1999-00', Season( '1999-00' ).to_path( :decade )
-    assert_equal '1990s/1999-00', Season( '1999-2000' ).to_path( :decade )
-
-    assert_equal '2000s/2010-11', Season( '2010-11' ).to_path( :century )
-    assert_equal '2000s/2010-11', Season( '2010-2011' ).to_path( :century )
-    assert_equal '2000s/2010',    Season( '2010' ).to_path( :century )
-
-    assert_equal '1900s/1999-00', Season( '1999-00' ).to_path( :century )
-    assert_equal '1900s/1999-00', Season( '1999-2000' ).to_path( :century )
-  end  # method test_to_path
-
-
-  def test_key
-    assert_equal '2010/11',       Season( '2010-11' ).key
-    assert_equal '2010/11',       Season( '2010-2011' ).key
-    assert_equal '2010/11',       Season( '2010/11' ).key
-    assert_equal '2010/11',       Season( '2010/1' ).key
-    assert_equal '2010/11',       Season( '2010/2011' ).key
-    assert_equal '2010',          Season( '2010' ).key
-
-    assert_equal '1999/00',       Season( '1999-00' ).key
-    assert_equal '1999/00',       Season( '1999-2000' ).key
-  end  # method test_key
-
-
-  def test_years
-    [Season( '1999-00' ),
-     Season( '1999/00' ),
-     Season( '1999/2000' ),
-     Season( 1999, 2000 ),
-     Season( 1999_00 ),   ## allow "hacky" shortcuts - why? why not?
-     Season( 1999_2000 ),
-    ].each do |season|
-      assert_equal 1999, season.start_year
-      assert_equal 2000, season.end_year
-    end
-
-    [Season( '2010/1' ),
-     Season( '2010/11' ),
-     Season( 201011 ),    ## allow "hacky" shortcuts - why? why not?
-     Season( 20102011 ),
-    ].each do |season|
-      assert_equal 2010, season.start_year
-      assert_equal 2011, season.end_year
-    end
-
-    [Season( '1999' ),
-     Season( 1999 ),
-    ].each do |season|
-      assert_equal 1999, season.start_year
-      assert_equal 1999, season.end_year
-    end
-
-    [Season( '2010' ),
-     Season( 2010 ),
-    ].each do |season|
-      assert_equal 2010, season.start_year
-      assert_equal 2010, season.end_year
-    end
-  end
-
-
-  def test_prev
-    assert_equal '2009/10',       Season( '2010-11' ).prev.key
-    assert_equal '2009/10',       Season( '2010-2011' ).prev.key
-    assert_equal '2009',          Season( '2010' ).prev.key
-
-    assert_equal '1998/99',       Season( '1999-00' ).prev.key
-    assert_equal '1998/99',       Season( '1999-2000' ).prev.key
-  end
-
-  def test_next
-    assert_equal '2009/10',       Season( '2008-09' ).next.key
-    assert_equal '2009/10',       Season( '2008-2009' ).next.key
-    assert_equal '2009',          Season( '2008' ).next.key
-
-    assert_equal '1998/99',       Season( '1997-98' ).next.key
-    assert_equal '1998/99',       Season( '1997-1998' ).next.key
-  end
-
-
-  def test_range
-    s2010 = Season( '2010' )..Season( '2019' )
-    pp s2010.to_a
-# => [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019]
-
-    s2010 = Season( '2010-11')..Season( '2019-20')
-    pp s2010.to_a
-# => [2010/11, 2011/12, 2012/13, 2013/14, 2014/15,
-#     2015/16, 2016/17, 2017/18, 2018/19, 2019/20]
-
-    puts s2010 === Season( '2015-16' )  # true
-    puts s2010 === Season( '2015' )     # !!!! false  - why? if using >= <=
-    puts s2010 === Season( '1999-00' )  # false
-    puts s2010 === Season( '2020-21' )  # false
-
-    puts
-    puts s2010.include? Season( '2015-16' )  # true
-    puts s2010.include? Season( '2015' )     # !!! false
-    puts s2010.include? Season( '1999-00' )  # false
-
-    assert_equal true,  Season( '2010-11' ) < Season( '2015' )
-    assert_equal true,  Season( '2015' )    < Season( '2019-20' )
-
-    assert_equal false, Season( '2015' ) == Season( '2015-16' )
-    assert_equal true,  Season( '2015' ) <  Season( '2015-16' )
-    assert_equal true,  Season( '2015' ) == Season( '2015' )
-  end
-
-end # class TestSeason