sportdb-models 1.19.0 → 2.0.3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sportdb-models
 version: !ruby/object:Gem::Version
-  version: 1.19.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-11 00:00:00.000000000 Z
+date: 2020-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb-models
@@ -42,30 +42,36 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.16'
+        version: '3.22'
 description: sportdb-models - sport.db schema 'n' models for easy (re)use
 email: opensport@googlegroups.com
 executables: []
@@ -79,46 +85,35 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- lib/sportdb/calc.rb
-- lib/sportdb/deleter.rb
 - lib/sportdb/models.rb
-- lib/sportdb/models/assoc.rb
-- lib/sportdb/models/assoc_assoc.rb
-- lib/sportdb/models/badge.rb
-- lib/sportdb/models/event.rb
-- lib/sportdb/models/event_ground.rb
-- lib/sportdb/models/event_team.rb
-- lib/sportdb/models/forward.rb
-- lib/sportdb/models/game.rb
-- lib/sportdb/models/goal.rb
-- lib/sportdb/models/ground.rb
-- lib/sportdb/models/group.rb
-- lib/sportdb/models/group_team.rb
-- lib/sportdb/models/league.rb
-- lib/sportdb/models/person.rb
-- lib/sportdb/models/roster.rb
-- lib/sportdb/models/round.rb
-- lib/sportdb/models/season.rb
-- lib/sportdb/models/stage.rb
-- lib/sportdb/models/stage_team.rb
-- lib/sportdb/models/stats/alltime_standing.rb
-- lib/sportdb/models/stats/alltime_standing_entry.rb
-- lib/sportdb/models/stats/event_standing.rb
-- lib/sportdb/models/stats/event_standing_entry.rb
-- lib/sportdb/models/stats/group_standing.rb
-- lib/sportdb/models/stats/group_standing_entry.rb
-- lib/sportdb/models/team.rb
-- lib/sportdb/models/team_compat.rb
+- lib/sportdb/models/deleter.rb
+- lib/sportdb/models/formats.rb
+- lib/sportdb/models/models/assoc.rb
+- lib/sportdb/models/models/badge.rb
+- lib/sportdb/models/models/event.rb
+- lib/sportdb/models/models/forward.rb
+- lib/sportdb/models/models/goal.rb
+- lib/sportdb/models/models/ground.rb
+- lib/sportdb/models/models/group.rb
+- lib/sportdb/models/models/league.rb
+- lib/sportdb/models/models/lineup.rb
+- lib/sportdb/models/models/match.rb
+- lib/sportdb/models/models/person.rb
+- lib/sportdb/models/models/round.rb
+- lib/sportdb/models/models/season.rb
+- lib/sportdb/models/models/stage.rb
+- lib/sportdb/models/models/stats/alltime_standing.rb
+- lib/sportdb/models/models/stats/event_standing.rb
+- lib/sportdb/models/models/stats/group_standing.rb
+- lib/sportdb/models/models/team.rb
+- lib/sportdb/models/models/world/city.rb
+- lib/sportdb/models/models/world/continent.rb
+- lib/sportdb/models/models/world/country.rb
+- lib/sportdb/models/models/world/state.rb
+- lib/sportdb/models/schema.rb
+- lib/sportdb/models/stats.rb
 - lib/sportdb/models/utils.rb
-- lib/sportdb/models/world/city.rb
-- lib/sportdb/models/world/continent.rb
-- lib/sportdb/models/world/country.rb
-- lib/sportdb/models/world/state.rb
-- lib/sportdb/patterns.rb
-- lib/sportdb/schema.rb
-- lib/sportdb/standings.rb
-- lib/sportdb/stats.rb
-- lib/sportdb/version.rb
+- lib/sportdb/models/version.rb
 - test/helper.rb
 - test/test_changes.rb
 - test/test_cursor.rb

data/lib/sportdb/calc.rb

@@ -1,279 +0,0 @@
-# encoding: utf-8
-
-module SportDb
-
-############
-##
-##  fix/todo: obsolete
-##   - use new Standings class 
-
-
-##############################################
-# helper/ builds standings table in memory
-#  - find a better module name for StandingsHelper ?? why? why not?
-
-
-module StandingsHelper
-
-  ## todo:
-  ##  add team_id to struct - why? why not?  - saves a db lookup?
-  class Stats
-     ### fix/todo: change/rename :pos to :rank
-     attr_accessor :pos, :played, :won, :lost, :drawn,
-                   :goals_for, :goals_against, :pts,
-                   :recs
-
-     def initialize
-       @pos           = nil    # use 0? why? why not?
-       @played        = 0
-       @won           = 0
-       @lost          = 0
-       @drawn         = 0
-       @goals_for     = 0
-       @goals_against = 0
-       @pts           = 0
-       @recs          = 0
-       # note: appearances (event) count  or similar
-       #   is recs counter (number of (stats) records)
-     end
-
-     def add( rec )
-       ### fix: add plus + operator too!
-       
-       # note: will NOT update/add pos (ranking)
-       self.played        += rec.played
-       self.won           += rec.won
-       self.lost          += rec.lost
-       self.drawn         += rec.drawn
-       self.goals_for     += rec.goals_for
-       self.goals_against += rec.goals_against
-       self.pts           += rec.pts
-       self.recs          += rec.recs
-
-       self # return self stats rec
-     end # method add
-  end  # class Stats
-
-
-  def self.calc( games, opts={} )
-     
-     ##
-     #  possible opts include:
-     #    pts_won:              3 or 2 or n   (default 3)
-     #    pts_exclude_scorep    false or true (default false)  -- exclude penalty shotout scores (e.g. count a draw/tie - no winner)
-     #
-    recs = calc_stats( games, opts )
-
-    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
-    recs= update_ranking( recs )
-
-    pp recs
-    recs
-  end
-
-
-
-  def self.calc_for_events( events, opts={} )
-
-    ## todo:
-    ##  - add tracker for appeareances (stats records counter)
-
-    alltime_recs = {}  # stats recs indexed by team_key
-
-    events.each do |event|
-      puts "  update standings for #{event.title}"
-      recs = calc_stats( event.games, opts )
-
-      recs.each do |team_key, rec|
-        alltime_rec = alltime_recs[ team_key ] || Stats.new
-
-        ## add stats values
-        alltime_rec.add( rec )
-
-        alltime_recs[ team_key ] = alltime_rec 
-      end
-    end
-
-
-    ### fix:
-    # - make merge team into a helper method (for reuse)
-
-    ## check for merging teams
-    # e.g. all time world cup
-    #   Germany incl. West Germany
-    #   Russia  incl. Soviet Union etc.
-    
-    # todo: change opts para to :includes  instead of :merge ? why? why not??
-
-    merge = opts[:merge]
-    if merge
-      puts "  merging teams (stats records):"
-      pp merge
-
-      merge.each do |k,v|
-        # note: assume key is destition team key and
-        #         value is source team key  e.g.  'GER' => 'FRG'
-        #         or array (for mulitple teamss e.g.  'GER' => ['FRG','GDR']
-        team_key_dest = k.to_s
-
-        if v.kind_of? Array
-          team_keys_src = v
-        else
-          team_keys_src = [v]    # turn single value arg into array w/ single item
-        end
-        team_keys_src = team_keys_src.map { |src| src.to_s }  # turn all to string (might be symbol)
-
-        alltime_rec_dest = alltime_recs[ team_key_dest ] || Stats.new
-
-        team_keys_src.each do |team_key_src|
-          alltime_rec_src  = alltime_recs[ team_key_src]
-
-          if alltime_rec_src  # stats record found?
-            alltime_rec_dest.add( alltime_rec_src )  # add stats values
-            alltime_recs.delete( team_key_src )      # remove old src entry
-          end
-        end
-
-        alltime_recs[ team_key_dest ] = alltime_rec_dest
-      end
-    end
-
-    ## update pos (that is, ranking e.g. 1.,2., 3. etc.)
-    alltime_recs= update_ranking( alltime_recs )
-
-    ## pp alltime_recs
-    alltime_recs
-  end
-
-
-
-  def self.calc_stats( games, opts={} )
-
-    ## fix:
-    #   passing in e.g. pts for win (3? 2? etc.)
-    #    default to 3 for now
-
-    # note:
-    #   returns stats records w/ stats records counter always set to one (recs==1)
-
-    ## todo/fix: find a better way to include logger (do NOT hardcode usage of root logger)!!!
-    logger = LogUtils::Logger.root
-
-
-    ## lets you pass in 2 as an alterantive, for example
-    pts_won  = opts[:pts_won] || 3
-
-    ## lets you exclude penalty shootout (e.g. match gets scored as draw/tie 1 pt each)
-    #  e.g. why? used for alltime standings formula in world cup, for example
-    #   todo: check other standings - exclude penalty shootout too - e.g. championsleague ?? if yes - make it true as default??
-    pts_exclude_scorep = opts[:pts_exclude_scorep].present? ? opts[:pts_exclude_scorep] : false
-
-
-    recs = {}
-
-    games.each_with_index do |g,i|   # note: index(i) starts w/ zero (0)
-      puts "  [#{i+1}] #{g.team1.title} - #{g.team2.title}  #{g.score_str}"
-      unless g.over?
-        puts "    !!!! skipping match - not yet over (play_at date in the future)"
-        next
-      end
-      unless g.complete?
-        logger.error "[StandingsHelper.calc_stats] skipping match #{g.team1.title} - #{g.team2.title} - scores incomplete #{g.score_str}"
-        next
-      end
-
-      rec1 = recs[ g.team1.key ] || Stats.new
-      rec2 = recs[ g.team2.key ] || Stats.new
-
-      ## set stats records counter to one if new (first) record update 
-      rec1.recs = 1   if rec1.recs == 0
-      rec2.recs = 1   if rec2.recs == 0
-
-      rec1.played += 1
-      rec2.played += 1
-
-      ## check - if winner (excludes penalty shootout scores in calc? start w/ extra time e.g winneret)
-      if pts_exclude_scorep
-         winner = g.winneret || g.winner90     ## if no extra time (et) score; try 90min (regular time score)
-      else
-         winner = g.winner   ## note: might include penalty shoot scores
-      end
-
-      if winner == 1
-        rec1.won  += 1
-        rec2.lost += 1
-        rec1.pts  += pts_won
-      elsif winner == 2
-        rec1.lost  += 1
-        rec2.won   += 1
-        rec2.pts   += pts_won
-      else  ## assume drawn/tie (that is, 0)
-        rec1.drawn += 1
-        rec2.drawn += 1
-        rec1.pts   += 1
-        rec2.pts   += 1
-      end
-
-      rec1.goals_for     += g.score1
-      rec1.goals_against += g.score2
-      
-      rec2.goals_for     += g.score2
-      rec2.goals_against += g.score1
-
-      ## add overtime and penalty??
-      ##  - for now add only overtime if present
-      
-      rec1.goals_for     += (g.score1et-g.score1)  if g.score1et.present?
-      rec1.goals_against += (g.score2et-g.score2)  if g.score2et.present?
-
-      rec2.goals_for     += (g.score2et-g.score2)  if g.score2et.present?
-      rec2.goals_against += (g.score1et-g.score1)  if g.score1et.present?
-
-      recs[ g.team1.key ] = rec1
-      recs[ g.team2.key ] = rec2
-    end  # each game
-
-    recs # return records; hash indexed by team key
-  end # method calc
-
-
-  def self.update_ranking( recs )
-    #############################
-    ### calc ranking / pos
-    ##
-    ## fix/allow sampe pos e.g. all 1 or more than one team 3rd etc.
-    ##   see sportbook for an example
-
-    # build array from hash
-    ary = []
-    recs.each do |k,v|
-      ary << [k,v]
-    end
-
-    ary.sort! do |l,r|
-      ## note: reverse order (thus, change l,r to r,l)
-      value =  r[1].pts <=> l[1].pts
-      if value == 0    # same pts try goal diff
-        value =   (r[1].goals_for-r[1].goals_against) <=> (l[1].goals_for-l[1].goals_against)
-        if value == 0  # same goal diff too; try assume more goals better for now
-          value =   r[1].goals_for <=> l[1].goals_for
-        end
-      end
-      value
-    end
-
-    ## update pos using ordered array
-    ary.each_with_index  do |rec,i|
-      k = rec[0]
-      v = rec[1]
-      v.pos = i+1    ## add ranking (e.g. 1,2,3 etc.)  - note: i starts w/ zero (0)
-      recs[ k ] = v   ## update recs
-    end
-    
-    recs
-  end # method update_ranking
-
-  
-end # module StandingsHelper
-
-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