sportdb 1.9.8 → 1.9.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c13885608b50ec48f29c56dc3429313008d3461c
+  data.tar.gz: 04a9877e31779ca9d2d0a6487798a9c3bd12064c
+SHA512:
+  metadata.gz: 7f1d24676dd2a3eeb115b508fc63def91b9384720d64f74ce6ab2f8ef7252b4c0d6db83829ad78d6c917f0fd9fa8ef83943983da78ddfde5d95526bd51853218
+  data.tar.gz: 2741036308c8e6491867c3967a4e9c741fff68df5bec4b6c5051e1de66109ded0a187ca84f54dd5a92e0bebbcfb3063c491bfe179afd72ccc19929608d5603b6

data/Manifest.txt

@@ -54,6 +54,8 @@ lib/sportdb/models/world/country.rb
 lib/sportdb/models/world/region.rb
 lib/sportdb/patterns.rb
 lib/sportdb/reader.rb
+lib/sportdb/reader_file.rb
+lib/sportdb/reader_zip.rb
 lib/sportdb/readers/assoc.rb
 lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb

data/lib/sportdb.rb

@@ -99,6 +99,8 @@ require 'sportdb/readers/squad_club'    # roster
 require 'sportdb/readers/squad_national_team'
 require 'sportdb/readers/team'
 require 'sportdb/reader'
+require 'sportdb/reader_file'
+require 'sportdb/reader_zip'
 
 
 
@@ -232,9 +234,12 @@ end  # module SportDb
 #####
 # auto-load/require some addons
 
+## puts 'before auto-load (require) sportdb addons'
+## puts '  before sportdb/update'
 require 'sportdb/update'
+## puts '  before sportdb/service'
 require 'sportdb/service'
-
+## puts 'after auto-load (require) sportdb addons'
 
 
 

data/lib/sportdb/reader.rb

@@ -2,7 +2,7 @@
 
 module SportDb
 
-class Reader
+class ReaderBase
 
   include LogUtils::Logging
 
@@ -13,18 +13,8 @@ class Reader
   include SportDb::Matcher # lets us use match_teams_for_country etc.
 
 
-  attr_reader :include_path
-
-  def initialize( include_path, opts={})
-    @include_path = include_path
-  end
-
   def load_setup( name )
-    path = "#{include_path}/#{name}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-
-    reader = FixtureReader.new( path )
+    reader = create_fixture_reader( name )
 
     reader.each do |fixture_name|
       load( fixture_name )
@@ -34,20 +24,20 @@ class Reader
 
   def load( name )   # convenience helper for all-in-one reader
 
-    logger.debug "enter load( name=>>#{name}<<, include_path=>>#{include_path}<<)"
-
+    logger.debug "enter load( name=>>#{name}<<)"    ## formerly also printed -> include_path=>>#{include_path}<<
 
     if match_players_for_country( name ) do |country_key|
-            country = Country.find_by_key!( country_key )
-            reader = PersonDb::PersonReader.new( include_path )
-            reader.read( name, country_id: country.id )
+            ## country = Country.find_by_key!( country_key )
+            ## fix-fix-fix-fix-fix-fix: change to new format e.g. from_file, from_zip etc!!!
+            ## reader = PersonDb::PersonReader.new( include_path )
+            ## reader.read( name, country_id: country.id )
           end
     elsif name =~ /\/squads\/([a-z0-9]{3,})$/    # e.g. ajax.txt bayern.txt etc.
       ## note: for now assume club (e.g. no dash (-) allowed for country code e.g. br-brazil etc.)
       team = Team.find_by_key!( $1 )
       ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
-      reader = ClubSquadReader.new( include_path )
-      reader.read( name, team_id: team.id, event_id: @event.id )
+      reader = create_club_squad_reader( name, team_id: team.id, event_id: @event.id )
+      reader.read()
     elsif name =~ /\/squads\/([a-z]{2,3})-[^\/]+$/
       ## fix: add to country matcher new format
       ##   name is country! and parent folder is type name e.g. /squads/br-brazil
@@ -70,65 +60,65 @@ class Reader
         team = Team.find_by_key!( $1 )
       end
       ## note: pass in @event.id - that is, last seen event (e.g. parsed via GameReader/MatchReader)
-      reader = NationalTeamSquadReader.new( include_path )
-      reader.read( name, team_id: team.id, event_id: @event.id )
+      reader = create_national_team_squad_reader( name, team_id: team.id, event_id: @event.id  )
+      reader.read()
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
-      reader = SeasonReader.new( include_path )
-      reader.read( name )
+      reader = create_season_reader( name )
+      reader.read()
     elsif name =~ /(?:^|\/)assocs/  # NB: ^assocs or also possible national-teams!/assocs
-      reader = AssocReader.new( include_path )
-      reader.read( name )
+      reader = create_assoc_reader( name )
+      reader.read()
     elsif match_stadiums_for_country( name ) do |country_key|
             country = Country.find_by_key!( country_key )
-            reader = GroundReader.new( include_path )
-            reader.read( name, country_id: country.id )
+            reader = create_ground_reader( name, country_id: country.id )
+            reader.read()
           end
     elsif match_leagues_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/leagues/
             # auto-add country code (from folder structure) for country-specific leagues
             #  e.g. at/leagues
             country = Country.find_by_key!( country_key )
-            reader = LeagueReader.new( include_path )
-            reader.read( name, club: true, country_id: country.id )
+            reader = create_league_reader( name, club: true, country_id: country.id )
+            reader.read()
           end
     elsif name =~ /(?:^|\/)leagues/   # NB: ^leagues or also possible world!/leagues  - NB: make sure goes after leagues_for_country!!
-      reader = LeagueReader.new( include_path )
-      reader.read( name )
+      reader = create_league_reader( name )
+      reader.read()
     elsif match_teams_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/teams/
             # auto-add country code (from folder structure) for country-specific teams
             #  e.g. at/teams at/teams.2 de/teams etc.
             country = Country.find_by_key!( country_key )
-            reader = TeamReader.new( include_path )
-            reader.read( name, country_id: country.id )
+            reader = create_team_reader( name, country_id: country.id )
+            reader.read()
           end
     elsif match_clubs_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/clubs/
             # auto-add country code (from folder structure) for country-specific clubs
             #  e.g. at/teams at/teams.2 de/teams etc.                
             country = Country.find_by_key!( country_key )
-            reader = TeamReader.new( include_path )
-            reader.read( name, club: true, country_id: country.id )  ## note: always sets club flag to true
+            reader = create_team_reader( name, club: true, country_id: country.id )   ## note: always sets club flag to true
+            reader.read()
           end
     elsif name =~ /(?:^|\/)teams/   ## fix: check if teams rule above (e.g. /^teams/ )conflicts/matches first ???
       ### fix: use new NationalTeamReader ??? why? why not?
-      reader = TeamReader.new( include_path )
-      reader.read( name )  ## note: always sets club flag to true / national to true
+      reader = create_team_reader( name )   ## note: always sets club flag to true / national to true
+      reader.read()
     elsif name =~ /(?:^|\/)clubs/
       ### fix: use new ClubReader ??? why? why not?
-      reader = TeamReader.new( include_path )
-      reader.read( name, club: true )   ## note: always sets club flag to true / national to false
+      reader = create_team_reader( name, club: true )     ## note: always sets club flag to true / national to false
+      reader.read()
     elsif name =~ /\/(\d{4}|\d{4}[_\-]\d{2})(--[^\/]+)?\// ||
           name =~ /\/(\d{4}|\d{4}[_\-]\d{2})$/
 
       # note: allow 2013_14 or 2013-14 (that, is dash or underscore)
 
       # note: keep a "public" reference of last event in @event  - e.g. used/required by squads etc.
-      eventreader = EventReader.new( include_path )
-      eventreader.read( name )
+      eventreader = create_event_reader( name )
+      eventreader.read()
       @event    = eventreader.event
 
       # e.g. must match /2012/ or /2012_13/  or   /2012--xxx/ or /2012_13--xx/
       #  or   /2012 or /2012_13   e.g. brazil/2012 or brazil/2012_13
-      reader = GameReader.new( include_path )
-      reader.read( name )
+      reader = create_game_reader( name )
+      reader.read()
     else
       logger.error "unknown sportdb fixture type >#{name}<"
       # todo/fix: exit w/ error

data/lib/sportdb/reader_file.rb

@@ -0,0 +1,123 @@
+# encoding: utf-8
+
+module SportDb
+
+## todo: "old" classic reader - rename to FileReader ?? why? why not?
+
+class Reader < ReaderBase
+
+  attr_reader :include_path
+
+  def initialize( include_path, opts={})
+    @include_path = include_path
+  end
+
+  def create_fixture_reader( name )
+    path = "#{@include_path}/#{name}.txt"
+
+    logger.info "parsing data (setup) '#{name}' (#{path})..."
+
+    FixtureReader.from_file( path )
+  end  
+
+  def create_club_squad_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (club squad) '#{name}' (#{path})..."
+    ClubSquadReader.from_file( path, more_attribs )
+  end
+
+  def create_national_team_squad_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (national team squad) '#{name}' (#{path})..."
+    NationalTeamSquadReader.from_file( path, more_attribs )
+  end
+
+  def create_season_reader( name )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (season) '#{name}' (#{path})..."
+    SeasonReader.from_file( path )
+  end
+
+  def create_assoc_reader( name )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (assoc) '#{name}' (#{path})..."
+    AssocReader.from_file( path )
+  end
+
+  def create_ground_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (ground) '#{name}' (#{path})..."
+    GroundReader.from_file( path, more_attribs )
+  end
+
+  def create_league_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (league) '#{name}' (#{path})..."
+    LeagueReader.from_file( path, more_attribs )
+  end
+
+  def create_team_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.txt"
+
+    logger.info "parsing data (team) '#{name}' (#{path})..."
+    TeamReader.from_file( path, more_attribs )
+  end
+
+  def create_event_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    path = "#{@include_path}/#{real_name}.yml"
+
+    logger.info "parsing data (event) '#{name}' (#{path})..."
+    EventReader.from_file( path, more_attribs )
+  end
+
+  def create_game_reader( name, more_attribs={} )
+    real_name = name_to_real_name( name )
+    
+    ## NOTE: pass in .yml as path (that is, event config!!!!)
+    path = "#{@include_path}/#{real_name}.yml"
+
+    logger.info "parsing data (fixture) '#{name}' (#{path})..."
+    GameReader.from_file( path, more_attribs )
+  end
+
+
+  def create_person_reader( name, more_attribs={} )
+    ## fix-fix-fix: change to new format e.g. from_file, from_zip etc!!!
+    ## reader = PersonDb::PersonReader.new( include_path )
+    # reader.read( name, country_id: country.id )
+  end
+
+private
+
+  def name_to_real_name( name )
+    # map name to real_name path
+    # name might include !/ for virtual path (gets cut off)
+    # e.g. at-austria!/w-wien/beers becomse w-wien/beers
+    pos = name.index( '!/')
+    if pos.nil?
+      name # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      # at-austria!/w-wien/beers becomes
+      # w-wien/beers
+      name[ (pos+2)..-1 ]
+    end
+  end # method name_to_real_name
+
+
+end # class Reader
+end # module SportDb

data/lib/sportdb/reader_zip.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module SportDb
+
+
+class ZipReader < ReaderBase
+
+
+
+end # class ZipReader
+
+end # module SportDb

data/lib/sportdb/readers/assoc.rb

@@ -11,17 +11,31 @@ class AssocReader
 #  e.g. lets you use Usage instead of Model::Usage
   include Models
 
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## to be done
+  end
+
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    self.from_string( text, more_attribs )
+  end
 
-  attr_reader :include_path
+  def self.from_string( text, more_attribs={} )
+    AssocReader.new( text, more_attribs )
+  end  
 
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
   end
 
 
-  def read( name, more_attribs={} )
-    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+  def read()
+    reader = ValuesReader.from_string( @text, @more_attribs )
 
     reader.each_line do |new_attributes, values|
       Assoc.create_or_update_from_values( new_attributes, values )
@@ -29,6 +43,5 @@ class AssocReader
   end
 
 
-
 end # class AssocReader
 end # module SportDb

data/lib/sportdb/readers/event.rb

@@ -11,48 +11,43 @@ class EventReader
 #  e.g. lets you use Usage instead of Model::Usage
   include Models
 
-
-  attr_reader :include_path
   attr_reader :event           # returns event record; call read first
+  attr_reader :fixtures        #  fixtures/sources entry from event config
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-
-    @name     = nil
-    @event    = nil
-    @fixtures = []
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## to be done
   end
 
+  def self.from_file( path, more_attribs={} )
+    ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+    text = File.read_utf8( path )
+    
+    config = File.basename( name )  # name a of .yml file
+    
+    self.from_string( text, config, more_attribs )
+  end
 
-  def fixtures
-    ## note: needs to call read first (to set @name, @fixtures, etc.)
-
-    if @fixtures.empty?
-      ## logger.warn "no fixtures found for event - >#{name}<; assume fixture name is the same as event"
-      fixtures_with_path = [ @name ]
-    else
-      ## add path to fixtures (use path from event e.g)
-      #  - bl    + at-austria!/2012_13/bl  -> at-austria!/2012_13/bl
-      #  - bl_ii + at-austria!/2012_13/bl  -> at-austria!/2012_13/bl_ii
+  def self.from_string( text, config, more_attribs={} )
+    EventReader.new( text, config, more_attribs )
+  end  
 
-      dir = File.dirname( @name ) # use dir for fixtures
+  def initialize( text, config, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
 
-      fixtures_with_path = @fixtures.map do |fx|
-        fx_new = "#{dir}/#{fx}"   # add path upfront
-        logger.debug "fx: #{fx_new} | >#{fx}< + >#{dir}<"
-        fx_new
-      end
-    end
+    @config          = config   # name of  event configuration (relative basename w/o path or string)
+    @sources_default = config   # note: use same a config for now
 
-    fixtures_with_path
+    @event    = nil
+    @fixtures = []
   end
 
 
-
-  def read( name, more_attribs={} )
+  def read()
     @fixtures = []    # reset cached fixtures
     @event    = nil   # reset cached event rec
-    @name     = name  # keep name (needed for fixtures attrib getter)
 
 ####
 ## fix!!!!!
@@ -60,17 +55,17 @@ class EventReader
 ##   use Event.create_or_update_from_hash_reader?? or similar
 #   move parsing code to model
 
-    reader = HashReaderV2.new( name, include_path )
+    reader = HashReader.from_string( @text )
 
     event_attribs = {}
-    
+
     ## set default sources to basename by convention
     #  e.g  2013_14/bl  => bl
     #  etc.
     # use fixtures/sources: to override default
 
-    event_attribs[ 'sources' ] = File.basename( name )
-    event_attribs[ 'config'  ] = File.basename( name )  # name a of .yml file
+    event_attribs[ 'sources' ] = @sources_default
+    event_attribs[ 'config'  ] = @config            # name a of .yml file
 
     reader.each_typed do |key, value|