sportdb 1.8.28 → 1.8.29

data/lib/sportdb/models/game_comp.rb

@@ -0,0 +1,157 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+#############################################################
+# collect depreciated or methods for future removal here
+# - keep for now for compatibility (for old code)
+
+class Game
+
+  ### getter/setters for deprecated attribs (score3,4,5,6) n national
+  def score3()   score1et  end
+  def score4()   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 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
+
+end # class Game
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/group.rb

@@ -6,23 +6,16 @@ module SportDb
 class Group < ActiveRecord::Base
 
 if ActiveRecord::VERSION::MAJOR == 3
-  has_many :games, :order => 'pos'
+  has_many :games, order: 'pos'
 else
   has_many :games, -> { order('pos') }
 end
 
   belongs_to :event
-  
-  has_many :group_teams, :class_name => 'GroupTeam'
+
+  has_many :group_teams, class_name: 'GroupTeam'
   has_many :teams, :through => :group_teams
-      
-  def add_teams_from_ary!( team_keys )
-    team_keys.each do |team_key|
-      team = Team.find_by_key!( team_key )
-      self.teams << team
-    end
-  end
-      
+
 end # class Group
   
   

data/lib/sportdb/models/group_comp.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+#############################################################
+# collect depreciated or methods for future removal here
+# - keep for now for compatibility (for old code)
+
+class Group
+
+  def add_teams_from_ary!( team_keys )
+    team_keys.each do |team_key|
+      team = Team.find_by_key!( team_key )
+      self.teams << team
+    end
+  end
+
+end # class Group
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/team.rb

@@ -23,13 +23,16 @@ class Team < ActiveRecord::Base
   has_many :event_teams, class_name: 'EventTeam'  # join table (events+teams)
   has_many :events, :through => :event_teams
 
+  # note: team belongs_to a single (optinal) assoc for now (national assoc may have many assocs)
+  belongs_to :assoc
 
   ### fix!!! - how to do it with has_many macro? use finder_sql?
   ##  finder_sql is depreciated in Rails 4!!!
+  #   use -> { where()  } etc.  -- try it if it works
   ##   keep as is! best solution ??
   ##   a discussion here -> https://github.com/rails/rails/issues/9726
   ##   a discussion here (not really helpful) -> http://stackoverflow.com/questions/2125440/activerecord-has-many-where-two-columns-in-table-a-are-primary-keys-in-table-b
-  
+
   def games
     Game.where( 'team1_id = ? or team2_id = ?', id, id ).order( 'play_at' )
   end
@@ -53,7 +56,8 @@ class Team < ActiveRecord::Base
   def self.create_or_update_from_values( new_attributes, values )
 
     ## fix: add/configure logger for ActiveRecord!!!
-    logger = LogKernel::Logger.root
+    logger = LogUtils::Logger.root
+
 
     ## check optional values
     values.each_with_index do |value, index|
@@ -81,6 +85,8 @@ class Team < ActiveRecord::Base
         new_attributes[ :code ] = 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. !!!
+        ## 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
       else
@@ -97,61 +103,15 @@ class Team < ActiveRecord::Base
       logger.debug "create Team:"
       rec = Team.new
     end
-      
+
     logger.debug new_attributes.to_json
-   
-    rec.update_attributes!( new_attributes )
-  end # create_or_update_from_values
 
+    rec.update_attributes!( new_attributes )
 
-  def self.create_from_ary!( teams, more_values={} )
-    teams.each do |values|
-      
-      ## key & title required
-      attr = {
-        key: values[0]
-      }
-
-      ## title (split of optional synonyms)
-      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
-      titles = values[1].split('|')
-      
-      attr[ :title ]    =  titles[0]
-      ## add optional synonyms
-      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
-
-      
-      attr = attr.merge( more_values )
-      
-      ## check for optional values
-      values[2..-1].each do |value|
-        if value.is_a? Country
-          attr[ :country_id ] = value.id
-        elsif value.is_a? City
-          attr[ :city_id ] = value.id 
-        elsif value =~ /#{TEAM_CODE_PATTERN}/   ## assume its three letter code (e.g. ITA or S04 etc.)
-          attr[ :code ] = value
-        elsif value =~ /^city:/   ## city:
-          value_city_key = value[5..-1]  ## cut off city: prefix
-          value_city = City.find_by_key!( value_city_key )
-          attr[ :city_id ] = value_city.id
-        else
-          attr[ :title2 ] = value
-        end
-      end
+  end # create_or_update_from_values
 
-      ## check if exists
-      team = Team.find_by_key( values[0] )
-      if team.present?
-        puts "*** warning team with key '#{values[0]}' exists; skipping create"
-      else      
-        Team.create!( attr )
-      end
-    end # each team
-  end
-  
 end  # class Team
-  
+
 
   end # module Model
 end # module SportDb

data/lib/sportdb/models/team_comp.rb

@@ -0,0 +1,64 @@
+# encoding: utf-8
+
+module SportDb
+  module Model
+
+#############################################################
+# collect depreciated or methods for future removal here
+# - keep for now for compatibility (for old code)
+
+class Team
+
+
+  def self.create_from_ary!( teams, more_values={} )
+    teams.each do |values|
+      
+      ## key & title required
+      attr = {
+        key: values[0]
+      }
+
+      ## title (split of optional synonyms)
+      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
+      titles = values[1].split('|')
+      
+      attr[ :title ]    =  titles[0]
+      ## add optional synonyms
+      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
+
+      
+      attr = attr.merge( more_values )
+      
+      ## check for optional values
+      values[2..-1].each do |value|
+        if value.is_a? Country
+          attr[ :country_id ] = value.id
+        elsif value.is_a? City
+          attr[ :city_id ] = value.id 
+        elsif value =~ /#{TEAM_CODE_PATTERN}/   ## assume its three letter code (e.g. ITA or S04 etc.)
+          attr[ :code ] = value
+        elsif value =~ /^city:/   ## city:
+          value_city_key = value[5..-1]  ## cut off city: prefix
+          value_city = City.find_by_key!( value_city_key )
+          attr[ :city_id ] = value_city.id
+        else
+          attr[ :title2 ] = value
+        end
+      end
+
+      ## check if exists
+      team = Team.find_by_key( values[0] )
+      if team.present?
+        puts "*** warning team with key '#{values[0]}' exists; skipping create"
+      else      
+        Team.create!( attr )
+      end
+    end # each team
+  end
+
+end # class Team
+
+
+
+  end # module Model
+end # module SportDb

data/lib/sportdb/models/world/country.rb

@@ -4,7 +4,8 @@ module WorldDb
   module Model
 
   class Country
-    has_many :teams,          class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'
+    has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'
+    has_one  :assoc,   class_name: 'SportDb::Model::Assoc',  foreign_key: 'country_id'
 
     # fix: require active record 4
     # has_many :clubs,           -> { where club: true },  class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'

data/lib/sportdb/reader.rb

@@ -117,6 +117,9 @@ class Reader
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
       reader = SeasonReader.new( include_path )
       reader.read( name )
+    elsif name =~ /(?:^|\/)assocs/  # NB: ^assocs or also possible national-teams!/assocs
+      reader = AssocReader.new( include_path )
+      reader.read( name )
     elsif match_stadiums_for_country( name ) do |country_key|
             country = Country.find_by_key!( country_key )
             reader = GroundReader.new( include_path )

data/lib/sportdb/readers/assoc.rb

@@ -0,0 +1,34 @@
+# encoding: UTF-8
+
+module SportDb
+
+
+class AssocReader
+
+  include LogUtils::Logging
+
+## make models available by default with namespace
+#  e.g. lets you use Usage instead of Model::Usage
+  include Models
+
+
+  attr_reader :include_path
+
+
+  def initialize( include_path, opts = {} )
+    @include_path = include_path
+  end
+
+
+  def read( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      Assoc.create_or_update_from_values( new_attributes, values )
+    end # each lines
+  end
+
+
+
+end # class AssocReader
+end # module SportDb

data/lib/sportdb/schema.rb

@@ -20,6 +20,8 @@ create_table :teams do |t|
   t.string  :address
   t.string  :web
 
+  t.references :assoc   # optional: national football assoc(iation), for example - used for national teams
+
   ### fix: remove and add virtual attribute in model instead
   t.boolean  :national, null: false, default: false  # is it a national selection team (not a club)?
   t.timestamps
@@ -230,7 +232,8 @@ add_index :games, :round_id      # fk round_id index
 add_index :games, :group_id      # fk group_id index
 add_index :games, :next_game_id  # fk next_game_id index
 add_index :games, :prev_game_id  # fk next_game_id index
-
+add_index :games, :team1_id
+add_index :games, :team2_id
 
 
 # todo: remove id from join table (without extra fields)? why?? why not??
@@ -298,6 +301,40 @@ create_table :badges do |t|
 end
 
 
+create_table :assocs do |t|
+  t.string     :key,   null: false
+  t.string     :title, null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
+
+  t.integer    :since     # founding year
+  t.string     :web
+
+  ### if national assoc - has (optional) country ref
+  t.references :country   # note: optional - only used/set (required) for national assocs (or subnational too?)
+  t.boolean    :national,    null: false, default: false
+
+  ## add :world flag for FIFA? - just check if parent is null? for root assoc(s)? why? why not?
+  ## add :regional flag for continental subdivision?
+  t.boolean :continental,      null: false, default: false
+  t.boolean :intercontinental, null: false, default: false  # e.g. arab football league (africa+western asia/middle east)
+  t.timestamps
+end
+
+add_index :assocs, :key, unique: true
+
+
+
+create_table :assocs_assocs do |t|
+  t.references :assoc1, null: false   # parent assoc
+  t.references :assoc2, null: false   # child assoc is_member_of parent assoc
+  t.timestamps
+end
+
+add_index :assocs_assocs, [:assoc1_id,:assoc2_id], unique: true
+add_index :assocs_assocs, :assoc1_id
+add_index :assocs_assocs, :assoc2_id
+
+
+
 ############################################
 # stats tables