sportdb 1.8.19 → 1.8.20

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6b49f1d9eb1e2369fca189847d4747a36d6580f1
+  data.tar.gz: 1a9ef5c40c3e83e3d8de49afcabe0a05e59ae982
+SHA512:
+  metadata.gz: 4c6cde7744335707e17253705a4f321bdd6c08384d550ad58c7853fd3d4e5efd097c137d43d7fe5a08d078390277481c9bb0e36d2db74e60f534fac1e0f9d2c9
+  data.tar.gz: 698495bbde6338c1855414963b0fd601af31c7926492d5269dbcf7af87007dd3581c759cc3266795b70600ad31c562d31f3a6224b5edbc4e6614f7f3a8f8c9b6

data/Manifest.txt

@@ -108,17 +108,20 @@ test/data/at-austria/2013_14/bl_ii.txt
 test/data/at-austria/2013_14/el.txt
 test/data/at-austria/2013_14/el.yml
 test/data/at-austria/leagues.txt
-test/data/at-austria/setups/2013_14.txt
-test/data/at-austria/setups/all.txt
-test/data/at-austria/setups/teams.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
+test/data/world-cup/1930/cup.txt
+test/data/world-cup/1930/cup.yml
+test/data/world-cup/leagues.txt
+test/data/world-cup/seasons.txt
+test/data/world-cup/teams.txt
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb
 test/test_lang.rb
 test/test_reader.rb
+test/test_round_auto.rb
 test/test_round_def.rb
 test/test_round_header.rb
 test/test_scores.rb

data/lib/sportdb/readers/game.rb

@@ -32,6 +32,11 @@ class GameReader
     event    = reader.event      ## was fetch_event( name )
     fixtures = reader.fixtures   ## was fetch_event_fixtures( name )
 
+    ## reset cached values
+    ##  for auto-number rounds etc.
+
+    @last_round_pos = nil
+
     fixtures.each do |fixture|
       read_fixtures( event.key, fixture )  ## use read_for or read_for_event - why ??? why not?? 
     end
@@ -90,6 +95,10 @@ class GameReader
     @last_date     = nil
 
 
+    #####
+    #  fix: move to read and share event/known_teams
+    #    for all 1-n fixture files (no need to configure every time!!)
+
     @event = Event.find_by_key!( event_key )
     
     logger.debug "Event #{@event.key} >#{@event.title}<"
@@ -178,6 +187,11 @@ class GameReader
     # start_at = start_at.beginning_of_day
     # end_at   = end_at.end_of_day
 
+    # note: make sure start_at/end_at is date only (e.g. use start_at.to_date)
+    #   sqlite3 saves datetime in date field as datetime, for example (will break date compares later!)
+    start_at = start_at.to_date
+    end_at   = end_at.to_date
+
 
     pos   = find_round_pos!( line )
     title = find_round_def_title!( line )
@@ -235,8 +249,23 @@ class GameReader
     #  add an example here
     group_title, group_pos = find_group_title_and_pos!( line )
 
+    ## todo/check/fix:
+    #   make sure  Round of 16  will not return pos 16 -- how? possible?
+    #   add unit test too to verify
     pos = find_round_pos!( line )
 
+    ## check if pos available; if not auto-number/calculate
+    if pos.nil?
+      pos = (@last_round_pos||0)+1
+      logger.debug( "  no round pos found; auto-number round - use (#{pos})" )
+    end
+
+    # store pos for auto-number next round if missing
+    #  - note: only if greater/bigger than last; use max
+    #  - note: last_round_pos might be nil - thus set to 0
+    @last_round_pos = [pos,@last_round_pos||0].max
+
+
     title = find_round_header_title!( line )
 
     ## NB: use extracted round title for knockout check
@@ -399,13 +428,17 @@ class GameReader
         pp Round.all
       end
 
+      # store pos for auto-number next round if missing
+      #  - note: only if greater/bigger than last; use max
+      #  - note: last_round_pos might be nil - thus set to 0
+      @last_round_pos = [round.pos,@last_round_pos||0].max
+
       ## note: will crash (round.pos) if round is nil
       logger.debug( "  using round #{round.pos} >#{round.title}< start_at: #{round.start_at}, end_at: #{round.end_at}" )
     else
       ## use round from last round header
       round = @round
     end
-    
 
 
     ### check if games exists
@@ -543,9 +576,12 @@ class GameReader
       
       ## todo: check for no records
       ##  e.g. if game[0].present? or just if game[0]  ??
-      
-      round_attribs[:start_at] = games[0].play_at
-      round_attribs[:end_at  ] = games[-1].play_at
+
+      # note: make sure start_at/end_at is date only (e.g. use play_at.to_date)
+      #   sqlite3 saves datetime in date field as datetime, for example (will break date compares later!)
+
+      round_attribs[:start_at] = games[0].play_at.to_date
+      round_attribs[:end_at  ] = games[-1].play_at.to_date
 
       logger.debug round_attribs.to_json
       round.update_attributes!( round_attribs )

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.19'
+  VERSION = '1.8.20'
 end
 
 

data/test/data/world-cup/1930/cup.txt

@@ -0,0 +1,71 @@
+##############################################
+# World Cup 1930 Uruguay, 13 July - 30 July
+
+
+Group 1 | Argentina      Chile     France   Mexico
+Group 2 | Yugoslavia     Brazil    Bolivia
+Group 3 | Uruguay        Romania   Peru
+Group 4 | United States  Paraguay  Belgium
+
+
+Matchday 1 | 13 July
+Matchday 2 | 14 July
+Matchday 3 | 15 July
+Matchday 4 | 16 July
+Matchday 5 | 17 July
+Matchday 6 | 18 July
+Matchday 7 | 19 July
+Matchday 8 | 20 July
+Matchday 9 | 21 July
+Matchday 10 | 22 July
+
+### - test auto-numbering (do NOTE predefine)
+## (11) Semi-finals | 26 July - 27 July
+## (12) Final | 30 July
+
+
+
+Group 1:
+
+(1) 13 July   France 4-1 Mexico @ Estadio Pocitos, Montevideo
+(5) 15 July   Argentina 1-0 France @ Estadio Parque Central, Montevideo
+(6) 16 July   Chile 3-0 Mexico @ Estadio Parque Central, Montevideo
+(10) 19 July   Chile 1-0 France @ Estadio Centenario, Montevideo
+(11) 19 July   Argentina 6-3 Mexico @ Estadio Centenario, Montevideo
+(15) 22 July   Argentina 3-1 Chile @ Estadio Centenario, Montevideo
+
+
+Group 2:
+
+(3) 14 July   Yugoslavia 2-1 Brazil @ Estadio Parque Central, Montevideo
+(7) 17 July   Yugoslavia 4-0 Bolivia @ Estadio Parque Central, Montevideo
+(12) 20 July   Brazil 4-0 Bolivia @ Estadio Centenario, Montevideo
+
+
+Group 3:
+
+(4) 14 July   Romania 3-1 Peru @ Estadio Pocitos, Montevideo
+(9) 18 July   Uruguay 1-0 Peru @ Estadio Centenario, Montevideo
+(14) 21 July   Uruguay 4-0 Romania @ Estadio Centenario, Montevideo
+
+
+Group 4:
+
+(2) 13 July   United States 3-0 Belgium @ Estadio Parque Central, Montevideo
+(8) 17 July   United States 3-0 Paraguay @ Estadio Parque Central, Montevideo
+(13) 20 July   Paraguay 1-0 Belgium @ Estadio Centenario, Montevideo
+
+
+### (11) Semi-finals
+### (12) Final
+
+Semi-finals
+
+(16) 26 July   Argentina 6-1 United States @ Estadio Centenario, Montevideo
+(17) 27 July   Uruguay 6-1 Yugoslavia @ Estadio Centenario, Montevideo
+
+
+Final
+
+(18) 30 July   Uruguay 4-2 Argentina @ Estadio Centenario, Montevideo
+

data/test/data/world-cup/1930/cup.yml

@@ -0,0 +1,23 @@
+##############################################
+# World Cup 1930 Uruguay, 13 July - 30 July
+
+league: world
+season: 1930
+start_at: 1930-07-13
+
+# 13 Teams
+
+teams:
+- arg # Argentina
+- bra # Brazil
+- bol # Bolivia
+- chi # Chile
+- uru # Uruguay
+- per # Peru
+- par # Paraguay
+- mex # Mexico
+- usa # United States
+- fra # France
+- yug # Yugoslavia (-2003)
+- bel # Belgium
+- rou # Romania

data/test/data/world-cup/leagues.txt

@@ -0,0 +1,5 @@
+####################
+# Leagues
+
+world,   World Cup
+

data/test/data/world-cup/seasons.txt

@@ -0,0 +1,4 @@
+#####################
+# Seasons / Years
+
+1930

data/test/data/world-cup/teams.txt

@@ -0,0 +1,16 @@
+#############################
+# 13 Teams
+
+arg, Argentina,     ARG, ar
+bra, Brazil,        BRA, br
+bol, Bolivia,       BOL, bo
+chi, Chile,         CHI, cl
+uru, Uruguay,       URU, uy
+per, Peru,          PER, pe
+par, Paraguay,      PAR, py
+mex, Mexico,        MEX, mx
+usa, United States, USA, us
+fra, France,        FRA, fr
+yug, Yugoslavia,    YUG, rs
+rou, Romania,       ROU, ro
+bel, Belgium,       BEL, be

data/test/helper.rb

@@ -69,9 +69,11 @@ end
 Country    = WorldDb::Model::Country
 
 League     = SportDb::Model::League
+Season     = SportDb::Model::Season
 Event      = SportDb::Model::Event
 Team       = SportDb::Model::Team
 
+Round      = SportDb::Model::Round
 Game       = SportDb::Model::Game
 GameCursor = SportDb::Model::GameCursor
 
@@ -79,6 +81,7 @@ GameCursor = SportDb::Model::GameCursor
 # Reader shortcuts
 
 TeamReader   = SportDb::TeamReader
+SeasonReader = SportDb::SeasonReader
 LeagueReader = SportDb::LeagueReader
 GameReader   = SportDb::GameReader
 

data/test/test_round_auto.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_round_auto.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestRoundAuto < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    ## SportDb.read_builtin
+
+    add_countries
+  end
+
+  def add_countries
+    countries = [
+      ['ar', 'Argentina',     'ARG' ],
+      ['br', 'Brazil',        'BRA' ],
+      ['bo', 'Bolivia',       'BOL' ],
+      ['cl', 'Chile',         'CHI' ],
+      ['uy', 'Uruguay',       'URU' ],
+      ['pe', 'Peru',          'PER' ],
+      ['py', 'Paraguay',      'PAR' ],
+      ['mx', 'Mexico',        'MEX' ],
+      ['us', 'United States', 'USA' ],
+      ['fr', 'France',        'FRA' ],
+      ['rs', 'Serbia',        'SRB' ],
+      ['be', 'Belgium',       'BEL' ],
+      ['ro', 'Romania',       'ROU' ]]
+
+    countries.each do |country|
+      key   = country[0]
+      name  = country[1]
+      code  = country[2]
+      Country.create!( key: key, name: name, code: code, pop: 1, area: 1)
+    end
+  end
+
+
+  def test_world_cup_1930
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'world-cup/teams' )
+
+    assert_equal  13, Team.count
+
+    ar = Team.find_by_key!( 'arg' )
+    br = Team.find_by_key!( 'bra' )
+    be = Team.find_by_key!( 'bel' )
+
+    assert_equal 'Argentina', ar.title
+    assert_equal 'Brazil',    br.title
+    assert_equal 'Belgium',   be.title
+
+    assert_equal 'ARG', ar.code
+    assert_equal 'BRA', br.code
+
+
+    seasonreader = SeasonReader.new( SportDb.test_data_path )
+    seasonreader.read( 'world-cup/seasons')
+
+    assert_equal 1, Season.count
+
+    y = Season.find_by_key!( '1930' )
+    assert_equal '1930', y.title
+
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'world-cup/leagues' )
+
+    assert_equal 1, League.count
+
+    l = League.find_by_key!( 'world' )
+    assert_equal 'World Cup', l.title
+
+
+    gamereader = GameReader.new( SportDb.test_data_path )
+    gamereader.read( 'world-cup/1930/cup' )
+
+    assert_equal 1, Event.count
+
+    w = Event.find_by_key!( 'world.1930' )
+
+    assert_equal  13, w.teams.count
+    assert_equal  18, w.games.count
+    assert_equal  12, w.rounds.count
+
+    ##
+    # auto-numbered knock-out rounds
+    r11 = Round.find_by_pos!( 11 )
+
+    assert_equal 'Semi-finals', r11.title
+    assert_equal 2,             r11.games.count
+
+    r12 = Round.find_by_pos!( 12 )
+
+    assert_equal 'Final', r12.title
+    assert_equal 1,       r12.games.count
+
+  end  # method test_world_cup_1930
+
+
+end # class TestRoundAuto

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.19
-  prerelease: 
+  version: 1.8.20
 platform: ruby
 authors:
 - Gerald Bauer
@@ -13,114 +12,144 @@ date: 2014-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &74965970 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74965970
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &74964650 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74964650
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &74963290 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74963290
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &74957330 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *74957330
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &74956650 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74956650
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &74954700 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *74954700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &75046310 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *75046310
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75044290 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75044290
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75043540 !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: *75043540
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75042130 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *75042130
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -241,17 +270,20 @@ files:
 - test/data/at-austria/2013_14/el.txt
 - test/data/at-austria/2013_14/el.yml
 - test/data/at-austria/leagues.txt
-- test/data/at-austria/setups/2013_14.txt
-- test/data/at-austria/setups/all.txt
-- test/data/at-austria/setups/teams.txt
 - test/data/at-austria/teams.txt
 - test/data/at-austria/teams_2.txt
+- test/data/world-cup/1930/cup.txt
+- test/data/world-cup/1930/cup.yml
+- test/data/world-cup/leagues.txt
+- test/data/world-cup/seasons.txt
+- test/data/world-cup/teams.txt
 - test/helper.rb
 - test/test_changes.rb
 - test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
 - test/test_reader.rb
+- test/test_round_auto.rb
 - test/test_round_def.rb
 - test/test_round_header.rb
 - test/test_scores.rb
@@ -261,6 +293,7 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -278,31 +311,30 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.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.1.10
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sportdb - sport.db command line tool
 test_files:
+- test/test_changes.rb
+- test/test_cursor.rb
 - test/test_date.rb
 - test/test_lang.rb
-- test/test_cursor.rb
-- test/test_scores.rb
-- test/test_winner.rb
+- test/test_reader.rb
+- test/test_round_auto.rb
 - test/test_round_def.rb
-- test/test_utils.rb
 - test/test_round_header.rb
-- test/test_reader.rb
-- test/test_changes.rb
+- test/test_scores.rb
+- test/test_utils.rb
+- test/test_winner.rb

data/test/data/at-austria/setups/2013_14.txt

@@ -1,17 +0,0 @@
-########################
-# bl 'n' cup 2013/14
-
-
-# Leagues
-at-austria!/leagues
-
-
-# -- Teams
-at-austria!/teams
-at-austria!/teams_2
-
-
-# -- 2013/14 Fixtures
-at-austria!/2013_14/bl
-at-austria!/2013_14/el
-

data/test/data/at-austria/setups/all.txt

@@ -1,17 +0,0 @@
-########################
-# Austria All Fixtures
-
-# -- Leagues
-at-austria!/leagues
-
-# -- Teams
-at-austria!/teams
-at-austria!/teams_2
-
-
-# -- Fixtures
-
-# 2013/14
-at-austria!/2013_14/bl
-at-austria!/2013_14/el
-

data/test/data/at-austria/setups/teams.txt

@@ -1,5 +0,0 @@
-#########
-# Teams
-
-at-austria!/teams
-