sportdb 1.9.8 → 1.9.9

data/lib/sportdb/readers/game.rb

@@ -17,37 +17,78 @@ class GameReader
   include FixtureHelpers
 
 
-  attr_reader :include_path
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## to be done
+  end
 
+  def self.from_file( path, more_attribs={} )
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
-  end
+    logger = LogKernel::Logger.root
 
+    ### NOTE: fix-fix-fix - pass in event path!!!!!!! (not fixture path!!!!)
+    
+    ## - ## note: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - ## - see textutils/utils.rb
+    ## - text = File.read_utf8( path )
 
-  def read( name, more_attribs={} )
-    reader = EventReader.new( @include_path )
-    reader.read( name )
+    reader = EventReader.from_file( path )
+    reader.read()
 
     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?? 
+    if fixtures.empty?
+      ## logger.warn "no fixtures found for event - >#{name}<; assume fixture name is the same as event"
+      ## change extension from .yml to .txt
+      fixtures_with_path = [ path.sub('.yml','.txt') ]
+    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
+
+      dir = File.dirname( path ) # use dir for fixtures
+
+      fixtures_with_path = fixtures.map do |fx|
+        fx_new = "#{dir}/#{fx}.txt"   # add path upfront
+        logger.debug "fx: #{fx_new} | >#{fx}< + >#{dir}<"
+        fx_new
+      end
+    end
+
+    ## fix-fix-fix: change file extension to ??
+    text_ary = []
+    fixtures_with_path.each do |fixture_path|
+       text_ary << File.read_utf8( fixture_path )
     end
+
+    self.from_string( event, text_ary, more_attribs )
   end
 
 
-  def read_fixtures_from_string( event_key, text_or_text_ary )  # load from string (e.g. passed in via web form)
+  def self.from_string( event, text_or_text_ary, more_attribs={} )
+    ### fix - fix -fix:
+    ##  change event to event_or_event_key !!!!!  - allow event_key as string passed in
+    GameReader.new( event, text_or_text_ary, more_attribs )
+  end  
+
+
+  def initialize( event, text_or_text_ary, more_attribs={} )
+    ### fix - fix -fix:
+    ##  change event to event_or_event_key !!!!!  - allow event_key as string passed in
+
+    ## todo/fix: how to add opts={} ???
+    @event             = event
+    @text_or_text_ary  = text_or_text_ary
+    @more_attribs      = more_attribs
+  end
+
 
-    if text_or_text_ary.is_a?( String )
-      text_ary = [text_or_text_ary]
+  def read()
+    if @text_or_text_ary.is_a?( String )
+      text_ary = [@text_or_text_ary]
     else
-      text_ary = text_or_text_ary
+      text_ary = @text_or_text_ary
     end
 
     ## reset cached values
@@ -59,10 +100,9 @@ class GameReader
       ##  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 )
+      reader = LineReader.from_string( text )
 
-      load_fixtures_worker( event_key, reader )
+      read_fixtures_worker( @event.key, reader )
     end
 
     ## fix add prop ??
@@ -70,35 +110,7 @@ class GameReader
   end
 
 
-  def read_fixtures( event_key, name )  # load from file system
-
-    ## todo: move name_real_path code to LineReaderV2 ????
-    pos = name.index( '!/')
-    if pos.nil?
-      name_real_path = 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_real_path = name[ (pos+2)..-1 ]
-    end
-
-
-    path = "#{include_path}/#{name_real_path}.txt"
-
-    logger.info "parsing data '#{name}' (#{path})..."
-    
-    SportDb.lang.lang = SportDb.lang.classify_file( path )
-
-    reader = LineReader.new( path )
-    
-    load_fixtures_worker( event_key, reader )
-
-    Prop.create_from_fixture!( name, path )
-  end
-
-
-  def load_fixtures_worker( event_key, reader )
+  def read_fixtures_worker( event_key, reader )
     ## NB: assume active activerecord connection
 
     ## reset cached values

data/lib/sportdb/readers/ground.rb

@@ -11,17 +11,31 @@ class GroundReader
 #  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={} )
+    GroundReader.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 )
+    reader = ValuesReader.from_string( @text, @more_attribs )
 
     reader.each_line do |new_attributes, values|
       Ground.create_or_update_from_values( new_attributes, values )

data/lib/sportdb/readers/league.rb

@@ -11,16 +11,32 @@ class LeagueReader
 #  e.g. lets you use Usage instead of Model::Usage
   include Models
 
-  attr_reader :include_path
+
+  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
+
+  def self.from_string( text, more_attribs={} )
+    LeagueReader.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|
       League.create_or_update_from_values( new_attributes, values )

data/lib/sportdb/readers/season.rb

@@ -12,16 +12,29 @@ class SeasonReader
   include Models
 
 
-  attr_reader :include_path
-
+  def self.from_zip( zip_file, entry_path )
+    ## to be done
+  end
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
+  def self.from_file( path )
+    ## 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 )
   end
 
+  def self.from_string( text )
+    SeasonReader.new( text )
+  end  
+
+
+  def initialize( text )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+  end
 
-  def read( name, more_attribs={} )
-    reader = LineReaderV2.new( name, include_path )
+  def read()
+    reader = LineReader.from_string( @text )
 
 ####
 ## fix!!!!!

data/lib/sportdb/readers/squad_club.rb

@@ -22,39 +22,40 @@ class ClubSquadReader
   include FixtureHelpers
 
 
-  attr_reader :include_path
-
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## to be done
+  end
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
+  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
 
+  def self.from_string( text, more_attribs={} )
+    ClubSquadReader.new( text, more_attribs )
+  end  
 
-  def read( name, more_attribs={} )
-    ## note:
-    #    event_id and team_id required!!
 
-    ## todo: move name_real_path code to LineReaderV2 ????
-    pos = name.index( '!/')
-    if pos.nil?
-      name_real_path = 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_real_path = name[ (pos+2)..-1 ]
-    end
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
+
 
-    path = "#{include_path}/#{name_real_path}.txt"
 
-    logger.info "parsing data '#{name}' (#{path})..."
+  def read()
+    ## note:
+    #    event_id and team_id required!!
 
     # event
-    @event = Event.find( more_attribs[:event_id] )
+    @event = Event.find( @more_attribs[:event_id] )
     pp @event
 
     ## note: use @team - share/use in worker method
-    @team = Team.find( more_attribs[:team_id] )
+    @team = Team.find( @more_attribs[:team_id] )
     pp @team
 
     ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
@@ -62,11 +63,11 @@ class ClubSquadReader
     ## mapping tables for persons per country (indexed by country code); reset
     @country_persons_cache = {}
 
-    reader = LineReader.new( path )
+    reader = LineReader.from_string( @text )
 
     read_worker( reader )
 
-    Prop.create_from_fixture!( name, path )  
+    ## Prop.create_from_fixture!( name, path )  
   end
 
 

data/lib/sportdb/readers/squad_national_team.rb

@@ -19,44 +19,44 @@ class NationalTeamSquadReader
   include FixtureHelpers
 
 
-  attr_reader :include_path
-
+  def self.from_zip( zip_file, entry_path, more_attribs={} )
+    ## to be done
+  end
 
-  def initialize( include_path, opts = {} )
-    @include_path = include_path
+  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
 
+  def self.from_string( text, more_attribs={} )
+    NationalTeamSquadReader.new( text, more_attribs )
+  end  
 
-  def read( name, more_attribs={} )
-    ## note:
-    #    event_id and team_id required!!
 
-    ## todo: move name_real_path code to LineReaderV2 ????
-    pos = name.index( '!/')
-    if pos.nil?
-      name_real_path = 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_real_path = name[ (pos+2)..-1 ]
-    end
+  def initialize( text, more_attribs={} )
+    ## todo/fix: how to add opts={} ???
+    @text = text
+    @more_attribs = more_attribs
+  end
 
-    path = "#{include_path}/#{name_real_path}.txt"
 
-    logger.info "parsing data '#{name}' (#{path})..."
+  def read()
+    ## note:
+    #    event_id and team_id required!!
 
     # event
-    @event = Event.find( more_attribs[:event_id] )
+    @event = Event.find( @more_attribs[:event_id] )
     pp @event
 
     ## note: use @team - share/use in worker method
-    @team = Team.find( more_attribs[:team_id] )
+    @team = Team.find( @more_attribs[:team_id] )
     pp @team
 
     ### SportDb.lang.lang = LangChecker.new.analyze( name, include_path )
 
-    reader = LineReader.new( path )
+    reader = LineReader.from_string( @text )
 
 
     ##########
@@ -71,7 +71,7 @@ class NationalTeamSquadReader
 
     read_worker( reader )
 
-    Prop.create_from_fixture!( name, path )  
+    ## Prop.create_from_fixture!( name, path )  
   end
 
 

data/lib/sportdb/readers/team.rb

@@ -11,17 +11,30 @@ class TeamReader
 #  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
 
-  attr_reader :include_path
+  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
 
+  def self.from_string( text, more_attribs={} )
+    TeamReader.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|
       Team.create_or_update_from_values( new_attributes, values )

data/lib/sportdb/version.rb

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