sportdb 1.9.16 → 1.10.0

data/lib/sportdb/finders/scores.rb

@@ -1,122 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-class ScoresFinder
-
-  include LogUtils::Logging
-
-  # e.g. 1:2 or 0:2 or 3:3  or
-  #      1-1 or 0-2 or 3-3
-  FT_REGEX = /\b
-            (?<score1>\d{1,2})
-               [:\-]
-            (?<score2>\d{1,2})
-           \b/x
-
-
-  # e.g. 1:2nV  => after extra time a.e.t
-    
-  # note: possible ending w/ . -> thus cannot use /b will not work w/ .; use zero look-ahead
-  ET_REGEX = /\b
-               (?<score1>\d{1,2})
-                  [:\-]
-               (?<score2>\d{1,2})
-                  \s?                # allow optional space
-                (?:nV|n\.V\.|aet|a\.e\.t\.)        # allow optional . e.g. nV or n.V.
-               (?=[\s\)\]]|$)/xi
-
-  ## todo: add/allow english markers e.g. pen or p  ??
-
-  # e.g. 5:4iE  => penalty / after penalty a.p
-
-
-  # note: possible ending w/ . -> thus cannot use /b will not work w/ .; use zero look-ahead
-  P_REGEX = /\b
-              (?<score1>\d{1,2})
-                  [:\-]
-              (?<score2>\d{1,2})
-                  \s?                # allow optional space
-                (?:iE|i\.E\.|p|pen|PSO)       # allow optional . e.g. iE or i.E.
-              (?=[\s\)\]]|$)/xi
-
-
-  ## todo: allow all-in-one "literal form a la kicker" e.g.
-  #  2:2 (1:1, 1:0) n.V. 5:1 i.E.
-
-  def initialize
-    # nothing here for now
-  end
-
-  def find!( line, opts={} )
-
-    ### fix: add and match all-in-one literal first, followed by
-
-    # note: always call after find_dates !!!
-    #  scores match date-like patterns!!  e.g. 10-11  or 10:00 etc.
-    #   -- note: score might have two digits too
-
-    ### fix: depending on language allow 1:1 or 1-1
-    ##   do NOT allow mix and match
-    ##  e.g. default to en is  1-1
-    ##    de is 1:1 etc.
-    
-
-    # extract score from line
-    # and return it
-    # NB: side effect - removes date from line string
-
-    score1   = nil
-    score2   = nil
-    
-    score1et = nil
-    score2et = nil
-    
-    score1p  = nil
-    score2p  = nil
-
-    if (md = ET_REGEX.match( line ))
-      score1et = md[:score1].to_i
-      score2et = md[:score2].to_i
-      
-      logger.debug "   score.et: >#{score1et}-#{score2et}<"
-      
-      line.sub!( md[0], '[SCORE.ET]' )
-    end
-
-    if (md = P_REGEX.match( line ))
-      score1p = md[:score1].to_i
-      score2p = md[:score2].to_i
-      
-      logger.debug "   score.p: >#{score1p}-#{score2p}<"
-      
-      line.sub!( md[0], '[SCORE.P]' )
-    end
-
-    ## let full time (ft) standard regex go last - has no marker
-
-    if (md = FT_REGEX.match( line ))
-      score1 = md[:score1].to_i
-      score2 = md[:score2].to_i
-
-      logger.debug "   score: >#{score1}-#{score2}<"
-      
-      line.sub!( md[0], '[SCORE]' )
-    end
-
-    ## todo: how to handle game w/o extra time
-    #   but w/ optional penalty ???  e.g. used in copa liberatores, for example
-    #    retrun 0,0 or nil,nil for extra time score ?? or -1, -1 ??
-    #    for now use nil,nil
-
-    scores = []
-    scores += [score1, score2]       if score1p || score2p || score1et || score2et || score1 || score2
-    scores += [score1et, score2et]   if score1p || score2p || score1et || score2et 
-    scores += [score1p,  score2p]    if score1p || score2p
-
-    scores
-  end
-
-end # class ScoresFinder
-
-end # module SportDb

data/lib/sportdb/lang.rb

@@ -1,216 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-class Lang
-
-  include LogUtils::Logging
-
-  attr_reader :lang
-
-  def initialize
-    # fix/todo: load on demand; only if no fixtures loaded/configured use builtin
-    load_builtin_words
-  end
-
-
-  def load_builtin_words
-    builtin_words = {
-      'en' => 'fixtures/en',
-      'de' => 'fixtures/de',
-      'es' => 'fixtures/es',
-      'fr' => 'fixtures/fr',
-      'it' => 'fixtures/it',
-      'pt' => 'fixtures/pt',
-      'ro' => 'fixtures/ro'
-    }
-
-    load_words( builtin_words, SportDb.config_path )
-  end
-
-
-  def load_words( h, include_path )
-    @lang = 'en'   # make default lang english/en
-    @words = {}  # resets fixtures
-    @cache = {}  # reset cached values
-
-    h.each_with_index do |(key,value),i|
-      name = value
-      path = "#{include_path}/#{name}.yml"
-      logger.debug( "loading words #{key} (#{i+1}/#{h.size}) in '#{name}' (#{path})..." )
-      @words[ key ] = YAML.load( File.read_utf8( path ))
-    end
-
-    @classifier = TextUtils::Classifier.new
-    @words.each_with_index do |(key,value),i|
-      logger.debug "train classifier for #{key} (#{i+1}/#{@words.size})"
-      @classifier.train( key, value )
-    end
-    
-    @classifier.dump  # for debugging dump all words
-  end
-
-  def classify( text )
-    @classifier.classify( text )
-  end
-
-  def classify_file( path )
-    @classifier.classify_file( path )
-  end
-
-  def lang=(value)
-    logger.debug "setting lang to #{value}"
-    
-    if @lang != value
-      
-      ### todo: make reset cached values into method/function for reuse (see load_words)
-      # reset cached values on language change
-      logger.debug "reseting cached lang values (lang changed from #{@lang} to #{value})"
-
-      @cache = {}
-    end
-    
-    @lang = value
-    
-  end
-
-
-  def group
-    @cache[ :group ] ||= group_getter
-  end
-  
-  def round
-    @cache[ :round ] ||= round_getter
-  end
-
-  def knockout_round
-    @cache[ :knockout_round ] ||= knockout_round_getter
-  end
-  
-  def leg1
-    @cache[ :leg1 ] ||= leg1_getter
-  end
-  
-  def leg2
-    @cache[ :leg2 ] ||= leg2_getter
-  end
-
-
-
-  def regex_group
-    @cache [ :regex_group ] ||= regex_group_getter
-  end
-
-  def regex_round
-    @cache[ :regex_round ] ||= regex_round_getter
-  end
-
-  def regex_knockout_round
-    @cache[ :regex_knockout_round ] ||= regex_knockout_round_getter
-  end
-  
-  def regex_leg1
-    @cache[ :regex_leg1 ] ||= regex_leg1_getter
-  end
-  
-  def regex_leg2
-    @cache[ :regex_leg2 ] ||= regex_leg2_getter
-  end
-
-private
-  def group_getter
-    h = @words[ lang ]
-    values = ""   # NB: always construct a new string (do NOT use a reference to hash value)
-    values << h['group']
-    values
-  end
-
-  def round_getter
-    # e.g. Spieltag|Runde|Achtelfinale|Viertelfinale|Halbfinale|Finale
-    
-    ## fix/todo:
-    ##  sort by length first - to allow best match e.g.
-    ##    3rd place play-off  instead of Play-off ?? etc.  - why? why not?
-
-    h = @words[ lang ]
-    values = ""   # NB: always construct a new string (do NOT use a reference to hash value)
-    values << h['round']
-    
-    ### add knockout rounds values too
-    values << "|" << h['round32']
-    values << "|" << h['round16']
-    values << "|" << h['quarterfinals']
-    values << "|" << h['semifinals']
-    values << "|" << h['fifthplace']  if h['fifthplace']   # nb: allow empty/is optional!!
-    values << "|" << h['thirdplace']
-    values << "|" << h['final']
-    values << "|" << h['playoffs']    if h['playoffs']   # nb: allow empty/is optional!!
-    values
-  end
-
-  def leg1_getter
-    h = @words[ lang ]
-    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
-    values << h['leg1']
-    values
-  end
-
-  def leg2_getter
-    h = @words[ lang ]
-    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
-    values << h['leg2']
-    values
-  end
-
-  def knockout_round_getter
-    h = @words[ lang ]
-    values = ""  # NB: always construct a new string (do NOT use a reference to hash value)
-    values << h['round32']
-    values << "|" << h['round16']
-    values << "|" << h['quarterfinals']
-    values << "|" << h['semifinals']
-    values << "|" << h['fifthplace']  if h['fifthplace']   # nb: allow empty/is optional!!
-    values << "|" << h['thirdplace']
-    values << "|" << h['final']
-    values << "|" << h['playoffs']    if h['playoffs']   # nb: allow empty/is optional!!
-    values
-  end
-  
-  def regex_group_getter
-    ## todo: escape for regex?
-    ## NB: let's ignore case (that is, UPCASE,downcase); always use /i flag
-    /#{group}/i
-  end
-  
-  def regex_round_getter
-    ## todo: escape for regex?
-    ## todo: sort by length - biggest words go first? does regex match biggest word automatically?? - check
-    ##  todo/fix: make - optional e.g. convert to ( |-) or better [ \-] ??
-    ## NB: let's ignore case (that is, UPCASE,downcase); always use /i flag
-    /#{round}/i
-  end
-
-  def regex_knockout_round_getter
-    ## todo: escape for regex?
-    ## todo: sort by length - biggest words go first? does regex match biggest word automatically?? - check
-    ##  todo/fix: make - optional e.g. convert to ( |-) or better [ \-] ??
-    ## NB: let's ignore case (that is, UPCASE,downcase); always use /i flag
-    /#{knockout_round}/i
-  end
-
-  def regex_leg1_getter
-    ## todo: escape for regex?
-    ## NB: let's ignore case (that is, UPCASE,downcase); always use /i flag
-    /#{leg1}/i
-  end
-
-  def regex_leg2_getter
-    ## todo: escape for regex?
-    ## NB: let's ignore case (that is, UPCASE,downcase); always use /i flag
-    /#{leg2}/i
-  end
-
-end # class Lang
-
-
-end # module SportDb

data/lib/sportdb/matcher.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-module Matcher
-
-  include WorldDb::Matcher
-
-  def match_leagues_for_country( name, &blk )
-    match_xxx_for_country( name, 'leagues', &blk )
-  end
-
-  def match_teams_for_country( name, &blk )
-    match_xxx_for_country( name, 'teams', &blk )
-  end
-
-  def match_clubs_for_country( name, &blk )
-    match_xxx_for_country( name, 'clubs', &blk )
-  end
-
-  def match_players_for_country( name, &blk )
-    match_xxx_for_country( name, 'players', &blk )
-  end
-
-  def match_stadiums_for_country( name, &blk )
-    match_xxx_for_country( name, 'stadiums', &blk )
-  end
-
-end # module Matcher
-
-end # module SportDb

data/lib/sportdb/models/assoc.rb

@@ -1,106 +0,0 @@
-module SportDb
-  module Model
-
-class Assoc < ActiveRecord::Base
-
-  has_many :parent_assoc_assocs, class_name: 'AssocAssoc', foreign_key: 'assoc2_id'
-  ## child_assocs - use child_assocs?  - (direct) member/child assocs instead of member?
-  has_many :member_assoc_assocs,  class_name: 'AssocAssoc', foreign_key: 'assoc1_id'
-
-
-  ## note: split member_assocs into two sets (into national=true and national=false)
-  # e.g. fifa has six member confederations (non-national) and 216 national assocs
-if ActiveRecord::VERSION::MAJOR == 3
-  has_many :all_assocs, class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
-  has_many :sub_assocs,  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs,  conditions: { national: false }
-  has_many :national_assocs,  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs,  conditions: { national: true }
-else
-  ## note: includes all member (sub assocs + national assocs) - rename to member_assocs?
-  has_many :all_assocs, class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
-  ## use zone/region as name instead of sub ( for confederatons,zones,etc.)
-  has_many :sub_assocs,      -> { where( national: false ) },  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
-  has_many :national_assocs, -> { where( national: true )  },  class_name: 'Assoc', :source => :assoc2, :through => :member_assoc_assocs
-end
-
-  ## for now can have more than one (direct) parent assoc
-  ##   e.g. Africa Fed and Arab League Fed
-  has_many :parent_assocs, class_name: 'Assoc', :source => :assoc1, :through => :parent_assoc_assocs
-
-  # assoc only can have one direct team for now (uses belongs_to on other side) 
-  # has_one :team
-
-
-  def self.create_or_update_from_values( new_attributes, values )
-
-    ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogUtils::Logger.root
-
-    assoc_keys = []   # by default no association (e.g. fifa,uefa,etc.)
-
-    ## check optional values
-    values.each_with_index do |value, index|
-      if value =~ /^(18|19|20)[0-9]{2}$/  ## assume founding year -- allow 18|19|20
-        ## logger.info "  founding/opening year #{value}"
-        new_attributes[ :since ] = value.to_i
-      elsif value =~ /\/{2}/  # assume it's an address line e.g.  xx // xx
-        logger.info "  found address line #{value}"
-        ## new_attributes[ :address ] = value
-      elsif value =~ /^(?:[a-z]{2}\.)?wikipedia:/  # assume it's wikipedia e.g. [es.]wikipedia:
-        logger.info "  found wikipedia line #{value}; skipping for now"
-      elsif value =~ /(^www\.)|(\.com$)/  # FIX: !!!! use a better matcher not just www. and .com
-        new_attributes[ :web ] = value
-      ## elsif value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
-      ##  ## fix: allow country letter with three e.g. eng,sco,wal,nir, etc. !!!
-      ##  value_country = Country.find_by_key!( value )
-      ##  new_attributes[ :country_id ] = value_country.id
-      elsif value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
-        ## fix: allow country letter with three e.g. eng,sco,wal,nir, etc. !!!
-        ## fix: if country does NOT match / NOT found - just coninue w/ next match!!!!
-        #   - just issue an error/warn do NOT crash
-        value_country = Country.find_by_key!( value )
-        new_attributes[ :country_id ] = value_country.id 
-        ## note: if country present - assume it's a national assoc, thus, set flag to true
-        new_attributes[ :national ] = true
-      elsif value =~ /^[a-z|]+$/   ##  looks like a tag list e.g. fifa|uefa or fifa|caf or ocf? 
-        logger.info "  trying adding assocs using keys >#{value}<"
-        assoc_keys = value.split('|')
-      else
-        ## todo: assume title2 ??
-        # issue warning: unknown type for value
-        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
-      end
-    end
-
-    rec = Assoc.find_by_key( new_attributes[ :key ] )
-    if rec.present?
-      logger.debug "update Assoc #{rec.id}-#{rec.key}:"
-    else
-      logger.debug "create Assoc:"
-      rec = Assoc.new
-    end
-
-    logger.debug new_attributes.to_json
-   
-    rec.update_attributes!( new_attributes )
-
-    unless assoc_keys.empty?
-      ## add team to assocs
-      assoc_keys.each do |assoc_key|
-        assoc = Assoc.find_by_key!( assoc_key )
-        logger.debug "  adding assoc to assoc >#{assoc.title}<"
-        
-        ### todo/fix: how can we delete assoc_assocs? for now only update n create
-        assoc_assoc = AssocAssoc.where( assoc1_id: assoc.id, assoc2_id: rec.id ).first
-        if assoc_assoc.nil?  ## create if does NOT exist yet
-           AssocAssoc.create!( assoc1_id: assoc.id, assoc2_id: rec.id )
-        end
-      end
-    end
-
-  end # create_or_update_from_values
-
-end  # class Assoc
-
-
-  end # module Model
-end # module SportDb