sportdb 1.8.28 → 1.8.29

data/Manifest.txt

@@ -24,15 +24,20 @@ lib/sportdb/finders/date.rb
 lib/sportdb/finders/scores.rb
 lib/sportdb/lang.rb
 lib/sportdb/matcher.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_comp.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/game_comp.rb
 lib/sportdb/models/goal.rb
 lib/sportdb/models/ground.rb
 lib/sportdb/models/group.rb
+lib/sportdb/models/group_comp.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
 lib/sportdb/models/person.rb
@@ -49,6 +54,7 @@ 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_comp.rb
 lib/sportdb/models/track.rb
 lib/sportdb/models/utils.rb
 lib/sportdb/models/world/city.rb
@@ -57,6 +63,7 @@ lib/sportdb/models/world/country.rb
 lib/sportdb/models/world/region.rb
 lib/sportdb/patterns.rb
 lib/sportdb/reader.rb
+lib/sportdb/readers/assoc.rb
 lib/sportdb/readers/event.rb
 lib/sportdb/readers/game.rb
 lib/sportdb/readers/ground.rb
@@ -97,6 +104,12 @@ test/data/at-austria/2013_14/el.yml
 test/data/at-austria/leagues.txt
 test/data/at-austria/teams.txt
 test/data/at-austria/teams_2.txt
+test/data/national-teams/assocs.txt
+test/data/national-teams/europe/assocs.txt
+test/data/national-teams/europe/teams.txt
+test/data/national-teams/north-america/assocs.txt
+test/data/national-teams/north-america/teams.txt
+test/data/national-teams/teams.txt
 test/data/players/europe/de-deutschland/players.txt
 test/data/players/south-america/br-brazil/players.txt
 test/data/world-cup/1930/cup.txt
@@ -123,6 +136,7 @@ test/data/world-cup/teams_1954.txt
 test/data/world-cup/teams_1962.txt
 test/data/world-cup/teams_1974.txt
 test/helper.rb
+test/test_assoc_reader.rb
 test/test_changes.rb
 test/test_cursor.rb
 test/test_date.rb

data/README.md

@@ -5,8 +5,8 @@
 [![Build Status](https://secure.travis-ci.org/geraldb/sport.db.ruby.png?branch=master)](http://travis-ci.org/geraldb/sport.db.ruby)
 -->
 
-* home  :: [github.com/geraldb/sport.db.ruby](https://github.com/geraldb/sport.db.ruby)
-* bugs  :: [github.com/geraldb/sport.db.ruby/issues](https://github.com/geraldb/sport.db.ruby/issues)
+* home  :: [github.com/sportdb/sport.db.ruby](https://github.com/sportdb/sport.db.ruby)
+* bugs  :: [github.com/sportdb/sport.db.ruby/issues](https://github.com/sportdb/sport.db.ruby/issues)
 * gem   :: [rubygems.org/gems/sportdb](https://rubygems.org/gems/sportdb)
 * rdoc  :: [rubydoc.info/gems/sportdb](http://rubydoc.info/gems/sportdb)
 * forum :: [groups.google.com/group/opensport](https://groups.google.com/group/opensport)

data/Rakefile

@@ -12,7 +12,7 @@ Hoe.spec 'sportdb' do
   self.summary = 'sportdb - sport.db command line tool'
   self.description = summary
 
-  self.urls    = ['https://github.com/geraldb/sport.db.ruby']
+  self.urls    = ['https://github.com/sportdb/sport.db.ruby']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'opensport@googlegroups.com'

data/lib/sportdb.rb

@@ -33,14 +33,19 @@ require 'sportdb/models/world/city'
 require 'sportdb/models/world/country'
 require 'sportdb/models/world/continent'
 require 'sportdb/models/world/region'
+require 'sportdb/models/assoc'
+require 'sportdb/models/assoc_assoc'
 require 'sportdb/models/badge'
 require 'sportdb/models/event'
+require 'sportdb/models/event_comp'
 require 'sportdb/models/event_ground'
 require 'sportdb/models/event_team'
 require 'sportdb/models/game'
+require 'sportdb/models/game_comp'
 require 'sportdb/models/goal'
 require 'sportdb/models/ground'
 require 'sportdb/models/group'
+require 'sportdb/models/group_comp'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
 require 'sportdb/models/person'
@@ -51,6 +56,7 @@ require 'sportdb/models/round'
 require 'sportdb/models/run'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
+require 'sportdb/models/team_comp'
 require 'sportdb/models/track'
 
 require 'sportdb/models/stats/alltime_standing'
@@ -86,6 +92,7 @@ require 'sportdb/matcher'
 require 'sportdb/calc'
 
 
+require 'sportdb/readers/assoc'
 require 'sportdb/readers/event'
 require 'sportdb/readers/game'
 require 'sportdb/readers/ground'

data/lib/sportdb/deleter.rb

@@ -40,6 +40,9 @@ module SportDb
       Season.delete_all
       
       Ground.delete_all   # stadiums
+      
+      Assoc.delete_all       # associations / organizations
+      AssocAssoc.delete_all  # associations / organizations
     end
     
   end # class Deleter

data/lib/sportdb/models/assoc.rb

@@ -0,0 +1,106 @@
+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

data/lib/sportdb/models/assoc_assoc.rb

@@ -0,0 +1,15 @@
+module SportDb
+  module Model
+
+
+class AssocAssoc < ActiveRecord::Base
+  self.table_name = 'assocs_assocs'
+
+  belongs_to :assoc1, class_name: 'Assoc', foreign_key: 'assoc1_id'   # parent assoc
+  belongs_to :assoc2, class_name: 'Assoc', foreign_key: 'assoc2_id'   # child assoc is_member_of parent assoc
+
+end # class AssocAssoc
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/event.rb

@@ -9,8 +9,8 @@ class Event < ActiveRecord::Base
   belongs_to :season
 
 if ActiveRecord::VERSION::MAJOR == 3
-  has_many :rounds, :order => 'pos'  # all (fix and flex) rounds
-  has_many :groups, :order => 'pos'
+  has_many :rounds, order: 'pos'  # all (fix and flex) rounds
+  has_many :groups, order: 'pos'
 else
   has_many :rounds, -> { order('pos') }  # all (fix and flex) rounds
   has_many :groups, -> { order('pos') }
@@ -18,16 +18,18 @@ end
 
   has_many :games, :through => :rounds
 
-  has_many :event_teams,    :class_name => 'EventTeam'
+  has_many :event_teams,  class_name: 'EventTeam'
   has_many :teams, :through => :event_teams
 
-  has_many :event_grounds,  :class_name => 'EventGround'
+  has_many :event_grounds,  class_name: 'EventGround'
   has_many :grounds, :through => :event_grounds
 
 
   before_save :on_before_save
 
+
   def add_teams_from_ary!( team_keys )
+    ## move to depreciated? used in event reader? why? why not?
     team_keys.each do |team_key|
       team = Team.find_by_key!( team_key )
       self.teams << team
@@ -43,11 +45,6 @@ end
     "#{league.title} #{season.title}"
   end
 
-  def full_title   # includes season (e.g. year)
-    puts "*** depreciated API call Event#full_title; use Event#title instead; full_title will get removed"
-    "#{league.title} #{season.title}"    
-  end
-
 
   #####################
   ## convenience helper for text parser/reader

data/lib/sportdb/models/event_comp.rb

@@ -0,0 +1,21 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+#############################################################
+# collect depreciated or methods for future removal here
+# - keep for now for compatibility (for old code)
+
+class Event
+
+  def full_title   # includes season (e.g. year)
+    puts "*** depreciated API call Event#full_title; use Event#title instead; full_title will get removed"
+    "#{league.title} #{season.title}"    
+  end
+
+end # class Event
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/forward.rb

@@ -18,6 +18,7 @@ module SportDb
   ## nb: for now only team and league use worlddb tables
   #   e.g. with belongs_to assoc (country,region)
 
+  class Assoc  < ActiveRecord::Base ; end
   class Team < ActiveRecord::Base ; end
   class League < ActiveRecord::Base ; end
   class Ground < ActiveRecord::Base ; end
@@ -33,6 +34,7 @@ module WorldDb
   # add alias? why? why not? # is there a better way?
   #  - just include SportDb::Models  - why? why not?
   #  - just include once in loader??
+  Assoc  = SportDb::Model::Assoc
   Team   = SportDb::Model::Team
   League = SportDb::Model::League
   Ground = SportDb::Model::Ground

data/lib/sportdb/models/game.rb

@@ -92,165 +92,18 @@ class Game < ActiveRecord::Base
 
   ### getter/setters for deprecated attribs (score3,4,5,6) n national
   
-  def score3()   score1et  end
-  def score4()   score2et  end
   def score1ot() score1et  end
   def score2ot() score2et  end
-  def score5()   score1p   end
-  def score6()   score2p   end
 
-  def score3=(value)   self.score1et = value  end
-  def score4=(value)   self.score2et = value  end
   def score1ot=(value) self.score1et = value  end
   def score2ot=(value) self.score2et = value  end
-  def score5=(value)   self.score1p = value   end
-  def score6=(value)   self.score2p = value   end
 
 
-
-  def self.create_knockouts_from_ary!( games, round )
-    Game.create_from_ary!( games, round, true )
-  end
-
-  def self.create_from_ary!( games, round, knockout=false )
-
-### fix:
-#  replace knockout=false with more attribs
-#    see create teams and than merge attribs
-
-    games.each_with_index do |values,index|
-      
-      value_pos      = index+1
-      value_scores   = []
-      value_teams    = []
-      value_knockout = knockout
-      value_play_at  = round.start_at  # if no date present use it from round
-      value_group    = nil
-      
-      ### lets you use arguments in any order
-      ##   makes pos optional (if not present counting from 1 to n)
-      
-      values.each do |value|
-        if value.kind_of? Numeric
-          value_pos = value
-        elsif value.kind_of?( TrueClass ) || value.kind_of?( FalseClass )
-          value_knockout = value
-        elsif value.kind_of? Array
-          value_scores = value
-        elsif value.kind_of? Team
-          value_teams << value
-        elsif value.kind_of? Group
-          value_group = value
-        elsif value.kind_of?( Date ) || value.kind_of?( Time ) || value.kind_of?( DateTime )
-          value_play_at = value
-        else
-          # issue an error/warning here
-        end
-      end
-
-      Game.create!(
-        :round     => round,
-        :pos       => value_pos,
-        :team1     => value_teams[0],
-        :score1    => value_scores[0],
-        :score2    => value_scores[1],
-        :score1et  => value_scores[2],
-        :score2et  => value_scores[3],
-        :score1p   => value_scores[4],
-        :score2p   => value_scores[5],
-        :team2     => value_teams[1],
-        :play_at   => value_play_at,
-        :group     => value_group,     # Note: group is optional (may be null/nil)
-        :knockout  => value_knockout )
-    end # each games
-  end
-
-  def self.create_pairs_from_ary_for_group!( pairs, group )
-    
-    pairs.each do |pair|
-      game1_attribs = {
-        :round     =>pair[0][5],
-        :pos       =>pair[0][0],
-        :team1     =>pair[0][1],
-        :score1    =>pair[0][2][0],
-        :score2    =>pair[0][2][1],
-        :team2     =>pair[0][3],
-        :play_at   =>pair[0][4],
-        :group     =>group }
-
-      game2_attribs = {
-        :round     =>pair[1][5],
-        :pos       =>pair[1][0],
-        :team1     =>pair[1][1],
-        :score1    =>pair[1][2][0],
-        :score2    =>pair[1][2][1],
-        :team2     =>pair[1][3],
-        :play_at   =>pair[1][4],
-        :group     =>group }
-  
-      game1 = Game.create!( game1_attribs )
-      game2 = Game.create!( game2_attribs )
-
-      # linkup games
-      game1.next_game_id = game2.id
-      game1.save!
-  
-      game2.prev_game_id = game1.id
-      game2.save!
-    end # each pair
-  end
-
-  def self.create_knockout_pairs_from_ary!( pairs, round1, round2 )
-    
-    pairs.each do |pair|
-      game1_attribs = {
-        :round     =>round1,
-        :pos       =>pair[0][0],
-        :team1     =>pair[0][1],
-        :score1    =>pair[0][2][0],
-        :score2    =>pair[0][2][1],
-        :team2     =>pair[0][3],
-        :play_at   =>pair[0][4] }
-
-      game2_attribs = {
-        :round     =>round2,
-        :pos       =>pair[1][0],
-        :team1     =>pair[1][1],
-        :score1    =>pair[1][2][0],
-        :score2    =>pair[1][2][1],
-        :score1et  =>pair[1][2][2],
-        :score2et  =>pair[1][2][3],
-        :score1p   =>pair[1][2][4],
-        :score1p   =>pair[1][2][5],
-        :team2     =>pair[1][3],
-        :play_at   =>pair[1][4],
-        :knockout  =>true }
-  
-      game1 = Game.create!( game1_attribs )
-      game2 = Game.create!( game2_attribs )
-
-      # linkup games
-      game1.next_game_id = game2.id
-      game1.save!
-  
-      game2.prev_game_id = game1.id
-      game2.save!
-    end # each pair
-  end
-
-
-  def over?   # game over?
-    play_at <= Time.now
-  end
-
+  # game over?
+  def over?()     play_at <= Time.now;  end
   ## fix/todo: already added by ar magic ??? remove code
-  def knockout?
-    knockout == true
-  end
-
-  def complete?
-    score1.present? && score2.present?
-  end
+  def knockout?() knockout == true;  end
+  def complete?() score1.present? && score2.present?;  end
 
 
 ############# convenience helpers for styling