sportdb-models 1.15.0 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfd4954a8fe9eafb1880ac4d2ce1aef869c7e52a
-  data.tar.gz: 5ccd5c5c17e87a810660342ae15bbb74ec37db24
+  metadata.gz: 98fbd2db0f79206ed3154c7ce08822218cea175c
+  data.tar.gz: 199637ebcaa4e7fa0477c2eb412400c8303a5c6d
 SHA512:
-  metadata.gz: 94a92900f689e5da69210adb12a4e0265dddd14059cb17dc176d6c017e52db032234c7c6bae38db07e65102c92b6383d56cdc0f99d8f99d4ee53ac7d40ed353f
-  data.tar.gz: 90357b9ea35cb0d8e62d9fbc48096cbf76db007c9443c4e8e81de59e4a50ae18fcd525344648ab30e91fe2665c11120d757c1c16541a78dc6541fab50f1881cd
+  metadata.gz: 8d0392d3701140c5af5495115eb0836931f378a0b9e30b33afe8281ceb66dc948176dd89ddf0dd3fbc1d3c255ce49781c4d5335c5988f2187a8ed65fd8db0f29
+  data.tar.gz: 6d087ae871a039444129dbc40afa3c0da415539d5a741cea95acd7117e6421adec737adf97f5ac7549f103f8d02d0f7356a9a4c869318cb4d04ed2ef0fa205fe

data/Manifest.txt

@@ -18,6 +18,7 @@ lib/sportdb/finders/date.rb
 lib/sportdb/finders/goals.rb
 lib/sportdb/finders/scores.rb
 lib/sportdb/lang.rb
+lib/sportdb/mapper_teams.rb
 lib/sportdb/matcher.rb
 lib/sportdb/models.rb
 lib/sportdb/models/assoc.rb
@@ -86,6 +87,7 @@ test/data/at-austria/2013_14/squads/austria.txt
 test/data/at-austria/2013_14/squads/salzburg.txt
 test/data/at-austria/2014_15/1-bundesliga-ii.txt
 test/data/at-austria/2014_15/1-bundesliga.yml
+test/data/at-austria/2015_16/1-bundesliga-v2.yml
 test/data/at-austria/2015_16/1-bundesliga.yml
 test/data/at-austria/2015_16/cup.yml
 test/data/at-austria/leagues.txt

data/lib/sportdb/mapper_teams.rb

@@ -0,0 +1,24 @@
+# encoding: UTF-8
+
+module SportDb
+
+class TeamMapper
+  def initialize( recs )
+    @mapper = TextUtils::TitleMapper2.new( recs, 'team' )
+  end
+
+  def find_teams!( line ) # Note: returns an array - note: plural! (teamsssss)
+    @mapper.find_keys!( line )
+  end
+
+  def find_team!( line )  # Note: returns key (string or nil)
+    @mapper.find_key!( line )
+  end
+
+  def map_teams!( line )
+    @mapper.map_titles!( line )
+  end
+end # class TeamMapper
+
+end # module SportDb
+

data/lib/sportdb/models.rb

@@ -65,6 +65,7 @@ require 'sportdb/utils_goals'
 require 'sportdb/matcher'
 require 'sportdb/calc'       # fix/todo: obsolete - replace w/ standings
 require 'sportdb/standings'
+require 'sportdb/mapper_teams'
 
 
 require 'sportdb/finders/goals'   # no: requires FixturesHelpers

data/lib/sportdb/readers/event.rb

@@ -79,29 +79,39 @@ class EventReader
 
       ## puts "processing event attrib >>#{key}<< >>#{value}<<..."
 
-      if key == 'league'
-        league = League.find_by_key( value.to_s.strip )
+      if key.downcase == 'league'   ## note: allow league, League, etc.
+        league_key = value.to_s.strip
+        ## check if league_key includes uppercase letters (e.g. Deutsche Bundesliga and NOT de etc.)
+        if league_key =~ /[A-Z]/
+          ## assume league name (NOT league key); try to lookup leauge key in database
+          league = League.find_by( title: league_key )
+          ##  todo: add synonyms/alt names - why? why not??
+        else
+          ## assume "verbatim/literal" team_key (use as is 1:1)
+          league = League.find_by( key: league_key )
+        end
 
         ## check if it exists
-        if league.present?
+        if league.present?    ## todo: just use if league  (no present?) ???
           event_attribs['league_id'] = league.id
         else
-          logger.error "league with key >>#{value.to_s.strip}<< missing"
+          logger.error "league with key >>#{league_key}<< missing"
           exit 1
         end
        
-      elsif key == 'season'
-        season = Season.find_by_key( value.to_s.strip )
+      elsif key.downcase == 'season'   ## note: allow season, Season, etc.
+        season_key = value.to_s.strip
+        season = Season.find_by( key: season_key )
 
         ## check if it exists
         if season.present?
           event_attribs['season_id'] = season.id
         else
-          logger.error "season with key >>#{value.to_s.strip}<< missing"
+          logger.error "season with key >>#{season_key}<< missing"
           exit 1
         end
         
-      elsif key == 'start_at' || key == 'begin_at'
+      elsif key == 'start_at' || key == 'begin_at' || key.downcase == 'start date'
         
         if value.is_a?(DateTime) || value.is_a?(Date)
           start_at = value
@@ -131,7 +141,7 @@ class EventReader
         ground_ids = []
         value.each do |item|
           ground_key = item.to_s.strip
-          ground = Ground.find_by_key( ground_key )
+          ground = Ground.find_by( key: ground_key )
           if ground.nil?
             puts "[warn] ground/stadium w/ key >#{ground_key}< not found; skipping ground"
           else
@@ -145,7 +155,7 @@ class EventReader
         ## for now always assume false  # todo: fix - use value and convert to boolean if not boolean
         event_attribs['team3'] = false
 
-      elsif key == 'teams' || key.downcase =~ /teams/
+      elsif key.downcase =~ /teams/  ## note: allow teams, Teams, 18 teams, 18 Teams etc. 
         ## assume teams value is an array
 
         ### check if key includes number of teams; if yes - use for checksum/assert
@@ -211,7 +221,8 @@ class EventReader
 
     logger.debug "find event - league_id: #{league_id}, season_id: #{season_id}"
 
-    event = Event.find_by_league_id_and_season_id( league_id, season_id )
+    event = Event.find_by( league_id: league_id,
+                           season_id: season_id )
 
     ## check if it exists
     if event.present?

data/lib/sportdb/readers/game.rb

@@ -2,27 +2,6 @@
 
 module SportDb
 
-
-class TeamMapper
-  def initialize( recs )
-    @mapper = TextUtils::TitleMapper2.new( recs, 'team' )
-  end
-
-  def find_teams!( line ) # Note: returns an array - note: plural! (teamsssss)
-    @mapper.find_keys!( line )
-  end
-
-  def find_team!( line )  # Note: returns key (string or nil)
-    @mapper.find_key!( line )
-  end
-
-  def map_teams!( line )
-    @mapper.map_titles!( line )
-  end
-end # class TeamMapper
-
-
-
 class GameReader
 
   include LogUtils::Logging

data/lib/sportdb/rsssf_reader.rb

@@ -1,17 +1,14 @@
 # encoding: UTF-8
 
 ##
-#
-#  todo/fix: cleanup, remove stuff not needed for "simple" rsssf format/style
-#
-##   for now lets only support leagues with rounds (no cups/knockout rounds n groups)
+## note: for now lets only support leagues with rounds (no cups/knockout rounds n groups)
 ##     (re)add later when needed (e.g. for playoffs etc.)
 
 
 module SportDb
 
 
-class RsssfGameReader
+class RsssfGameReader    ### todo: rename to RsssfLeagueMatchReader ( or use league/cup option?) - why? why not??
 
   include LogUtils::Logging
 
@@ -19,37 +16,32 @@ class RsssfGameReader
 #  e.g. lets you use Usage instead of Model::Usage
   include Models
 
-## value helpers e.g. is_year?, is_taglist? etc.
-  include TextUtils::ValueHelper
-
-  include FixtureHelpers
-
   ##
   ## todo: add from_file and from_zip too
 
-  def self.from_string( event_key, text )
-    ### fix - fix -fix:
-    ##  change event to event_or_event_key !!!!!  - allow event_key as string passed in
-    self.new( event_key, text )
+  def self.from_string( event_or_event_key, text )
+    self.new( event_or_event_key, text )
   end
 
-  def initialize( event_key, text )
-    ### fix - fix -fix:
-    ##  change event to event_or_event_key !!!!!  - allow event_key as string passed in
-
+  def initialize( event_or_event_key, text )
     ## todo/fix: how to add opts={} ???
-    @event_key         = event_key
-    @text              = text
+    @event_or_event_key = event_or_event_key
+    @text               = text
   end
 
 
   def read
     ## note: assume active activerecord connection
-    @event = Event.find_by!( key: @event_key )
+    
+    if @event_or_event_key.kind_of?( Event )
+      @event= @event_or_event_key
+    else   ## assume string
+      @event = Event.find_by!( key: @event_or_event_key )
+    end
 
     logger.debug "Event #{@event.key} >#{@event.title}<"
 
-    @team_mapper = TextUtils::TitleMapper.new( @event.teams, 'team' )
+    @mapper_teams = TeamMapper.new( @event.teams )
 
     ## reset cached values
     @patch_round_ids = []
@@ -57,14 +49,77 @@ class RsssfGameReader
     @last_round    = nil
     @last_date     = nil
     
-    ## always use english (en) for now
-    SportDb.lang.lang = 'en'
-
     reader = LineReader.from_string( @text )
     parse_fixtures( reader )    
   end   # method load_fixtures
 
 
+
+  RSSSF_FT_REGEX = /\b
+             (?<score1>\d{1,2})
+                -
+             (?<score2>\d{1,2})
+               \b/x
+
+  def find_rsssf_scores!( line ) 
+    # e.g. 1-1 or 0-2 or 3-3
+    
+    m = RSSSF_FT_REGEX.match( line )
+    if m
+      score1 = m[:score1].to_i
+      score2 = m[:score2].to_i
+
+      logger.debug "   score: >#{score1}-#{score2}<"
+      
+      line.sub!( m[0], '[SCORE]' )
+    else
+      score1   = nil
+      score2   = nil  
+    end
+
+    scores = [score1, score2]
+    scores
+  end  # method find_rsssf_scores!
+
+
+  def find_rsssf_date!( line, opts={} )
+    finder = RsssfDateFinder.new
+    finder.find!( line, opts )
+  end
+
+
+  RSSSF_ROUND_REGEX = /\b
+               (?<round>Round)
+                  \s
+               (?<pos>\d{1,3})
+                  \b/x   
+
+  def is_rsssf_round?( line )
+    RSSSF_ROUND_REGEX.match( line ).nil? == false   ## match found if not nil
+  end
+
+  def find_rsssf_round!( line )
+    ## todo: check if \b works for run on [Apr 13] too ??
+    ## todo:  allow multiple spaces after round ??
+
+    m = RSSSF_ROUND_REGEX.match( line )
+    if m
+      title = m[0]     ## note: title is complete match e.g. Round 1, Round 2, etc.
+      pos   = m[:pos].to_i
+
+      logger.debug "   title: >#{title}<, pos: >#{pos}<"
+      
+      line.sub!( m[0], '[ROUND]' )
+    else
+      ## fix: add logger.warn no round pos found in line
+      title = nil
+      pos   = nil
+    end
+    
+    [title,pos]   ## return array; note: [nil,nil] if nothing found
+  end # method find_rsssf_round!
+
+
   def parse_round_header( line )
 
     ## todo/fix:
@@ -76,9 +131,6 @@ class RsssfGameReader
     
     logger.debug "parsing round header line: >#{line}<"
 
-    ### todo/fix/check:  move cut off optional comment in reader for all lines? why? why not?
-    cut_off_end_of_line_comment!( line )  # cut off optional comment starting w/ #
-
     ## check for date in header first e.g. Round 36 [Jul 20]  !!
     ##   avoid "conflict" with getting "wrong" round number from date etc.
     date = find_rsssf_date!( line, start_at: @event.start_at )
@@ -86,10 +138,7 @@ class RsssfGameReader
       @last_date = date
     end
     
-    ## 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 )
+    title, pos = find_rsssf_round!( line )
 
     ## check if pos available; if not auto-number/calculate
     if pos.nil?
@@ -97,11 +146,6 @@ class RsssfGameReader
         fail( "round pos required in rsssf; sorry")
     end
 
-    title = find_round_header_title!( line )
-
-    ## Note: use extracted round title for knockout check
-    ## knockout_flag = is_knockout_round?( title )
-
     logger.debug "  line: >#{line}<"
         
     ## Note: dummy/placeholder start_at, end_at date
@@ -125,6 +169,7 @@ class RsssfGameReader
       round_attribs = round_attribs.merge( {
         event_id: @event.id,
         pos:      pos,
+        ##  todo: add num e.g. num == pos for round 1, round 2, etc. - why? why not??
         start_at: Date.parse('1911-11-11'),
         end_at:   Date.parse('1911-11-11')
       })
@@ -149,9 +194,10 @@ class RsssfGameReader
   def parse_game( line )
     logger.debug "parsing game (fixture) line: >#{line}<"
 
-    @team_mapper.map_titles!( line )
-    team1_key = @team_mapper.find_key!( line )
-    team2_key = @team_mapper.find_key!( line )
+    @mapper_teams.map_teams!( line )
+    team_keys = @mapper_teams.find_teams!( line ) 
+    team1_key = team_keys[0]
+    team2_key = team_keys[1]
 
     ## note: if we do NOT find two teams; return false - no match found
     if team1_key.nil? || team2_key.nil?
@@ -170,9 +216,7 @@ class RsssfGameReader
       date = @last_date    # no date found; (re)use last seen date
     end
 
-    ## fix/todo: use find_rsssf_scores!( line )
-    ##   use rsssf specific score finder!!!
-    scores = find_scores!( line )
+    scores = find_rsssf_scores!( line )
 
     logger.debug "  line: >#{line}<"
 
@@ -185,6 +229,9 @@ class RsssfGameReader
 
     ### check if games exists
     ##  with this teams in this round if yes only update
+    ##
+    ##  todo: add replay flag (true/false)    !!!!!!!!
+    ##    allows same match fixture in round  !!!!!!!!
     game = Game.find_by( round_id: round.id,
                          team1_id: team1.id,
                          team2_id: team2.id )
@@ -240,9 +287,10 @@ class RsssfGameReader
     # line with NO teams  plus include date e.g.
     #   [Jun 17]  etc.
 
-    @team_mapper.map_titles!( line )
-    team1_key = @team_mapper.find_key!( line )
-    team2_key = @team_mapper.find_key!( line )
+    @mapper_teams.map_teams!( line )
+    team_keys= @mapper_teams.find_teams!( line )
+    team1_key = team_keys[0]
+    team2_key = team_keys[1]
 
     date  = find_rsssf_date!( line, start_at: @event.start_at )
 
@@ -263,8 +311,7 @@ class RsssfGameReader
       
     reader.each_line do |line|
 
-      ## fix: use inline/simpler is_rsssf_round?       
-      if is_round?( line )
+      if is_rsssf_round?( line )
         parse_round_header( line )
       elsif try_parse_game( line )
         # do nothing here

data/lib/sportdb/utils_date.rb

@@ -21,12 +21,6 @@ module SportDb
     finder.find!( line, opts )
   end
 
-  def find_rsssf_date!( line, opts={} )
-    finder = RsssfDateFinder.new
-    finder.find!( line, opts )
-  end
-
-
   end # module FixtureHelpers
 end # module SportDb
 

data/lib/sportdb/version.rb

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

data/test/data/at-austria/2015_16/1-bundesliga-v2.yml

@@ -0,0 +1,20 @@
+#########################################################################
+# Österreichische Bundesliga 2015/16  (104. Meisterschaft / 42. Saison)
+
+League:     Österr. Bundesliga
+Season:     2015/16
+Start Date: 2015-07-25
+
+
+10 Teams:
+- RB Salzburg
+- Rapid Wien
+- Sturm Graz
+- Wolfsberger AC
+- SV Ried
+- Austria Wien
+- Admira Wacker
+- SCR Altach    
+- SV Grödig
+- SV Mattersburg     ## Aufsteiger
+

data/test/test_event_reader.rb

@@ -15,25 +15,35 @@ class TestEventReaderXX < MiniTest::Test  # note: TestEventReader alreay defined
     WorldDb.delete!
     SportDb.delete!
     PersonDb.delete!
-  end
 
-  def test_bl
+    ## setup österr. bundesliga
     at     = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
     season = Season.create!( key: '2015/16', title: '2015/16' )
-    bl     = League.create!( key: 'at', title: 'Bundesliga', club: true, country_id: at.id )
+    bl     = League.create!( key: 'at', title: 'Österr. Bundesliga', club: true, country_id: at.id )
 
     ## read teams (required for db key lookup)
     teamreader = TestTeamReader.from_file( 'at-austria/teams', country_id: at.id )
     teamreader.read
     teamreader = TestTeamReader.from_file( 'at-austria/teams_2', country_id: at.id )
     teamreader.read
+  end
 
+  def test_bl
     r = TestEventReader.from_file( 'at-austria/2015_16/1-bundesliga' )
     r.read
 
     assert true   ## if we get here; assume everything ok
   end
 
+  def test_bl_v2
+    r = TestEventReader.from_file( 'at-austria/2015_16/1-bundesliga-v2' )
+    r.read
+
+    assert true   ## if we get here; assume everything ok
+  end
+
+
+
   ### fix/todo:
   ##   to be done - add support for Wiener Sportklub (RL Ost) => Wiener Sportklub lookups
   def xxxx_test_cup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -95,6 +95,7 @@ files:
 - lib/sportdb/finders/goals.rb
 - lib/sportdb/finders/scores.rb
 - lib/sportdb/lang.rb
+- lib/sportdb/mapper_teams.rb
 - lib/sportdb/matcher.rb
 - lib/sportdb/models.rb
 - lib/sportdb/models/assoc.rb
@@ -163,6 +164,7 @@ files:
 - test/data/at-austria/2013_14/squads/salzburg.txt
 - test/data/at-austria/2014_15/1-bundesliga-ii.txt
 - test/data/at-austria/2014_15/1-bundesliga.yml
+- test/data/at-austria/2015_16/1-bundesliga-v2.yml
 - test/data/at-austria/2015_16/1-bundesliga.yml
 - test/data/at-austria/2015_16/cup.yml
 - test/data/at-austria/leagues.txt