sportdb 1.8.29 → 1.9.0

data/Manifest.txt

@@ -144,6 +144,7 @@ test/test_lang.rb
 test/test_load.rb
 test/test_national_team_reader.rb
 test/test_reader.rb
+test/test_reader_from_string.rb
 test/test_round_auto.rb
 test/test_round_def.rb
 test/test_round_header.rb

data/lib/sportdb/readers/game.rb

@@ -34,7 +34,6 @@ class GameReader
 
     ## reset cached values
     ##  for auto-number rounds etc.
-
     @last_round_pos = nil
 
     fixtures.each do |fixture|
@@ -43,16 +42,30 @@ class GameReader
   end
 
 
-  def read_fixtures_from_string( event_key, text )  # load from string (e.g. passed in via web form)
+  def read_fixtures_from_string( event_key, text_or_text_ary )  # load from string (e.g. passed in via web form)
 
-    SportDb.lang.lang = SportDb.lang.classify( text )
+    if text_or_text_ary.is_a?( String )
+      text_ary = [text_or_text_ary]
+    else
+      text_ary = text_or_text_ary
+    end
 
-    ## todo/fix: move code into LineReader e.g. use LineReader.fromString() - why? why not?
-    reader = StringLineReader.new( text )
-    
-    read_fixtures_worker( event_key, reader )
+    ## reset cached values
+    ##  for auto-number rounds etc.
+    @last_round_pos = nil
+
+    text_ary.each do |text|
+      ## assume en for now? why? why not?
+      ##  fix (cache) store lang in event table (e.g. auto-add and auto-update)!!!
+      SportDb.lang.lang = SportDb.lang.classify( text )
+
+      ## todo/fix: move code into LineReader e.g. use LineReader.fromString() - why? why not?
+      reader = StringLineReader.new( text )
+
+      load_fixtures_worker( event_key, reader )
+    end
 
-    ## fix add prop 
+    ## fix add prop ??
     ### Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )  
   end
 

data/lib/sportdb/updater.rb

@@ -8,7 +8,7 @@ module SportDb
     ######
     # NB: make models available in sportdb module by default with namespace
     #  e.g. lets you use Team instead of Model::Team
-    include SportDb::Models
+    include Models
 
 
     def map_event_to_dlurl( event )
@@ -17,10 +17,20 @@ module SportDb
       season_key = event.season.key
 
       repo_path, folder_path = map_key_to_repo_n_folder_path( league_key )
+      
       return nil if repo_path.nil?   # no match/mapping found; cancel download
 
       season_path = season_key.gsub( '/', '_')  # convert 2013/14 to 2013_14
 
+      #####
+      # quick hack!!!!
+      # - find something better e.g. more generic/easy to configure etc.
+      if league_key == 'world'   # world cup repo mappings include host country e.g. 2014--brazil etc.
+        season_path = '2006--germany'       if season_path == '2006'
+        season_path = '2010--south-africa'  if season_path == '2010'
+        season_path = '2014--brazil'        if season_path == '2014'
+      end
+
       ###
       # e.g. https://raw.github.com/openfootball/at-austria/master/2013_14
 
@@ -35,22 +45,22 @@ module SportDb
 
       ### allow * for regex match w/ .+
       map = [
-        [ 'at',      'at-austria'  ],
-        [ 'at.*',    'at-austria'  ],
-        [ 'de',      'de-deutschland' ],
-        [ 'de.*',    'de-deutschland'  ],
-        [ 'en',      'en-england' ],
-        [ 'es',      'es-espana' ],
-        [ 'it',      'it-italy' ],
-        [ 'be',      'europe', 'be-belgium' ], # NB: europe/be-belgium
-        [ 'ro',      'europe', 'ro-romania' ],
-        [ 'cl',      'europe-champions-league' ],
-        [ 'el',      'europe-champions-league' ],
-        [ 'br',      'br-brazil' ],
-        [ 'mx',      'mx-mexico' ],  # todo: add mx.* for clausura etc ??
-        [ 'euro',    'euro-cup',   ],
-        [ 'world',   'world-cup'   ],
-        [ 'world.*', 'world-cup'  ]]
+        [ 'at',         'at-austria'  ],
+        [ 'at.*',       'at-austria'  ],
+        [ 'de',         'de-deutschland' ],
+        [ 'de.*',       'de-deutschland'  ],
+        [ 'en',         'en-england' ],
+        [ 'es',         'es-espana' ],
+        [ 'it',         'it-italy' ],
+        [ 'be',         'europe', 'be-belgium' ], # NB: europe/be-belgium
+        [ 'ro',         'europe', 'ro-romania' ],
+        [ 'cl',         'europe-champions-league' ],
+        [ 'el',         'europe-champions-league' ],
+        [ 'br',         'br-brazil' ],
+        [ 'mx',         'mx-mexico' ],  # todo: add mx.* for clausura etc ??
+        [ 'euro',       'euro-cup'  ],
+        [ 'world',      'world-cup' ],
+        [ 'world.*',    'world-cup' ]]
 
       map.each do |entry|
          pattern = entry[0]
@@ -68,25 +78,30 @@ module SportDb
     end
 
     def update_event( event )
-      puts "update event >>#{event.title}<< (#{event.league.key}+#{event.season.key})"
+      logger.info "update event >>#{event.title}<< (#{event.league.key}+#{event.season.key})"
 
       dlbase = map_event_to_dlurl( event )
       if dlbase.nil?
-        puts "  skip download; no download source mapping found"
+        logger.warn "  [Updater] skip download; no download source mapping found for >#{event.key}<"
         return  # cancel download; no mapping found
       end
 
       puts "  using dlbase >>#{dlbase}<<"
 
       if event.sources.nil?
-        puts "  skip download; no download event source configured/found"
+        logger.warn "  [Updater] skip download; no download event source configured/found for >#{event.key}<"
         return
       end
 
       sources = event.sources.gsub(' ','').split(',')   # NB: remove all blanks (leading,trailing,inside)
+
+
+      text_ary = []   # array of fixtures (text)
+
+      ## collect all fixtures (text)
       sources.each_with_index do |source,i|
         dlurl = "#{dlbase}/#{source}.txt"
-        puts "   downloading source (#{i+1}/#{sources.length}) >>#{dlurl}<< ..."     # todo/check: use size for ary or length - does it matter?
+        logger.info "   downloading source (#{i+1}/#{sources.length}) >>#{dlurl}<< ..."     # todo/check: use size for ary or length - does it matter?
 
         # download fixtures into string
         text = Fetcher.read( dlurl )
@@ -107,15 +122,18 @@ module SportDb
         text = text.force_encoding( Encoding::UTF_8 )
         logger.debug "text.encoding.name (after): #{text.encoding.name}"
 
+        text_ary << text
+      end
 
+      ## note: need to pass in all fixtures at once (e.g as array) for @last_pos calc etc to work
+      ##         if multipe "files"/strings are used
+      unless text_ary.empty?
         puts "   importing/reading source..."
         # passing dummy include_path (not needed for reading from string)
         # fix: use/add proper api for reading from string e.g. read and read_file ?? etc.
         reader= GameReader.new( '/tmp' )
-
-        ## todo/fix: offer a version that lets us pass in event (not event.key)
-        #    no need for another event lookup
-        reader.read_fixtures_from_string( event.key, text )
+        ### fix: allow to pass in event (to avoid lookup)
+        reader.read_fixtures_from_string( event.key, text_ary )
       end
     end
 

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.29'
+  VERSION = '1.9.0'
 end
 
 

data/test/helper.rb

@@ -50,6 +50,7 @@ TeamReader         = SportDb::TeamReader
 AssocReader        = SportDb::AssocReader
 SeasonReader       = SportDb::SeasonReader
 LeagueReader       = SportDb::LeagueReader
+EventReader        = SportDb::EventReader
 GameReader         = SportDb::GameReader
 NationalTeamReader = SportDb::NationalTeamReader
 RaceTeamReader     = SportDb::RaceTeamReader

data/test/test_reader.rb

@@ -27,6 +27,7 @@ class TestReader < MiniTest::Unit::TestCase
     leaguereader.read( 'at-austria/leagues', country_id: at.id )
 
     gamereader = GameReader.new( SportDb.test_data_path )
+    ## check/fix: is country_id more_attribs needed? why? why not?
     gamereader.read( 'at-austria/2013_14/bl', country_id: at.id )
 
     bl = Event.find_by_key!( 'at.2013/14' )
@@ -68,6 +69,7 @@ class TestReader < MiniTest::Unit::TestCase
     assert_equal 'ÖFB Cup', atcup.title
 
     gamereader = GameReader.new( SportDb.test_data_path )
+    ## check/fix: is country_id more_attribs needed? why? why not?
     gamereader.read( 'at-austria/2013_14/bl', country_id: at.id )
     gamereader.read( 'at-austria/2013_14/el', country_id: at.id )
 

data/test/test_reader_from_string.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_reader_from_string.rb
+#  or better
+#     rake -I ./lib test
+
+
+require 'helper'
+
+class TestReaderFromString < MiniTest::Unit::TestCase
+
+  def setup
+    WorldDb.delete!
+    SportDb.delete!
+    SportDb.read_builtin
+  end
+
+  def test_bl
+    at = Country.create!( key: 'at', name: 'Austria', code: 'AUT', pop: 1, area: 1)
+    
+    teamreader = TeamReader.new( SportDb.test_data_path )
+    teamreader.read( 'at-austria/teams',   country_id: at.id )
+
+    leaguereader = LeagueReader.new( SportDb.test_data_path )
+    leaguereader.read( 'at-austria/leagues', country_id: at.id )
+
+    eventreader  = EventReader.new( SportDb.test_data_path )
+    eventreader.read( 'at-austria/2013_14/bl' )
+
+    bl = Event.find_by_key!( 'at.2013/14' )
+
+    assert_equal  10, bl.teams.count
+    assert_equal   0, bl.rounds.count
+    assert_equal   0, bl.games.count  # 36x5 = 180
+
+
+    bl_txt    = File.read( "#{SportDb.test_data_path}/at-austria/2013_14/bl.txt" )
+    bl_txt_ii = File.read( "#{SportDb.test_data_path}/at-austria/2013_14/bl_ii.txt" )
+
+    text_ary = [bl_txt,bl_txt_ii]
+
+    ## try reading from string -- fix: /tmp is a placeholder/remove
+    gamereader = GameReader.new( '/tmp' )
+    gamereader.read_fixtures_from_string( bl.key, text_ary )
+
+    assert_equal  36, bl.rounds.count
+    assert_equal 180, bl.games.count  # 36x5 = 180
+    
+    ## check if is stable (update will not create new matches and rounds) on second pass/rerun
+    gamereader.read_fixtures_from_string( bl.key, text_ary )
+
+    assert_equal  36, bl.rounds.count
+    assert_equal 180, bl.games.count  # 36x5 = 180
+  end
+
+
+end # class TestReaderFromString

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.29
+  version: 1.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-08 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &81770130 !ruby/object:Gem::Requirement
+  requirement: &73799290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81770130
+  version_requirements: *73799290
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &81769260 !ruby/object:Gem::Requirement
+  requirement: &73798730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81769260
+  version_requirements: *73798730
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &81768320 !ruby/object:Gem::Requirement
+  requirement: &73860180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81768320
+  version_requirements: *73860180
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81767630 !ruby/object:Gem::Requirement
+  requirement: &73859880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *81767630
+  version_requirements: *73859880
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &81767310 !ruby/object:Gem::Requirement
+  requirement: &73859690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81767310
+  version_requirements: *73859690
 - !ruby/object:Gem::Dependency
   name: persondb
-  requirement: &81767040 !ruby/object:Gem::Requirement
+  requirement: &73859420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81767040
+  version_requirements: *73859420
 - !ruby/object:Gem::Dependency
   name: activerecord-utils
-  requirement: &81766780 !ruby/object:Gem::Requirement
+  requirement: &73859210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81766780
+  version_requirements: *73859210
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &81766370 !ruby/object:Gem::Requirement
+  requirement: &73858900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *81766370
+  version_requirements: *73858900
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &81765650 !ruby/object:Gem::Requirement
+  requirement: &73858630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *81765650
+  version_requirements: *73858630
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &81765420 !ruby/object:Gem::Requirement
+  requirement: &73858440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *81765420
+  version_requirements: *73858440
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81764700 !ruby/object:Gem::Requirement
+  requirement: &73858130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *81764700
+  version_requirements: *73858130
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81764370 !ruby/object:Gem::Requirement
+  requirement: &73857850 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *81764370
+  version_requirements: *73857850
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -299,6 +299,7 @@ files:
 - test/test_load.rb
 - test/test_national_team_reader.rb
 - test/test_reader.rb
+- test/test_reader_from_string.rb
 - test/test_round_auto.rb
 - test/test_round_def.rb
 - test/test_round_header.rb
@@ -354,6 +355,7 @@ test_files:
 - test/test_winner.rb
 - test/test_round_def.rb
 - test/test_utils.rb
+- test/test_reader_from_string.rb
 - test/test_round_header.rb
 - test/test_round_auto.rb
 - test/test_national_team_reader.rb