sportdb 1.8.1 → 1.8.2

data/Manifest.txt

@@ -19,10 +19,12 @@ lib/sportdb/deleter.rb
 lib/sportdb/lang.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

data/lib/sportdb.rb

@@ -37,9 +37,11 @@ require 'sportdb/models/world/continent'
 require 'sportdb/models/world/region'
 require 'sportdb/models/badge'
 require 'sportdb/models/event'
+require 'sportdb/models/event_ground'
 require 'sportdb/models/event_team'
 require 'sportdb/models/game'
 require 'sportdb/models/goal'
+require 'sportdb/models/ground'
 require 'sportdb/models/group'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
@@ -52,6 +54,7 @@ require 'sportdb/models/run'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/track'
+
 require 'sportdb/models/utils'   # e.g. GameCursor
 
 ## add backwards compatible namespace (delete later!)

data/lib/sportdb/deleter.rb

@@ -16,6 +16,7 @@ module SportDb
       Game.delete_all
       Event.delete_all
       EventTeam.delete_all
+      EventGround.delete_all
       Group.delete_all
       GroupTeam.delete_all
       Round.delete_all
@@ -31,6 +32,8 @@ module SportDb
       
       League.delete_all
       Season.delete_all
+      
+      Ground.delete_all   # stadiums
     end
     
   end # class Deleter

data/lib/sportdb/models/event.rb

@@ -6,15 +6,19 @@ class Event < ActiveRecord::Base
 
   belongs_to :league
   belongs_to :season
-  
+
   has_many :rounds, :order => 'pos'  # all (fix and flex) rounds
   has_many :games, :through => :rounds
-  
+
   has_many :groups, :order => 'pos'
-  
-  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 :grounds, :through => :event_grounds
+
+
   before_save :on_before_save
 
   def add_teams_from_ary!( team_keys )

data/lib/sportdb/models/event_ground.rb

@@ -0,0 +1,12 @@
+module SportDb::Model
+
+
+class EventGround < ActiveRecord::Base
+  self.table_name = 'events_grounds'
+
+  belongs_to :event
+  belongs_to :ground
+end # class EventGround
+
+
+end # module SportDb::Model

data/lib/sportdb/models/forward.rb

@@ -17,6 +17,7 @@ module SportDb::Model
 
   class Team < ActiveRecord::Base ; end
   class League < ActiveRecord::Base ; end
+  class Ground < ActiveRecord::Base ; end
 
 end
 
@@ -28,5 +29,6 @@ module WorldDb::Model
   #  - just include once in loader??
   Team   = SportDb::Model::Team
   League = SportDb::Model::League
+  Ground = SportDb::Model::Ground
 
 end

data/lib/sportdb/models/game.rb

@@ -3,14 +3,18 @@ module SportDb::Model
 
 class Game < ActiveRecord::Base
 
-  belongs_to :team1, :class_name => 'Team', :foreign_key => 'team1_id'
-  belongs_to :team2, :class_name => 'Team', :foreign_key => 'team2_id'
+  belongs_to :team1, class_name: 'Team', foreign_key: 'team1_id'
+  belongs_to :team2, class_name: 'Team', foreign_key: 'team2_id'
   
   belongs_to :round
   belongs_to :group   # group is optional
   
+  belongs_to :ground  # ground is optional
+  belongs_to :city,  class_name: 'WorldDb::Model::City', foreign_key: 'city_id'   # city   is optioanl (remove?? redundant?? use ground ??)
+
   has_many :goals
 
+
   before_save :calc_winner
 
 

data/lib/sportdb/models/ground.rb

@@ -0,0 +1,91 @@
+module SportDb::Model
+
+class Ground < ActiveRecord::Base
+
+  belongs_to :country, class_name: 'WorldDb::Model::Country', foreign_key: 'country_id'
+  belongs_to :city,    class_name: 'WorldDb::Model::City',    foreign_key: 'city_id'
+
+  has_many :games
+
+
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    logger.debug "  [Ground]  values >#{values.join('<>')}<"
+
+    city_title = ''
+
+    values.each_with_index do |value, index|
+      if value =~ /^[12][0-9]{3}$/  ## assume founding year
+        # skip founding/opening year fow now
+        logger.info "  found year #{value}; skipping for now"
+      elsif value =~ /^[1-9][0-9_]+[0-9]$/   # number; assume capacity e.g. 12_541 or similar
+        # todo/fix: check how to differentiate between founding year and capacity if capcity islike year
+        #  - by position ??  year is first entry, capacity is second ??? -add/fix
+
+        # skip capacity
+        logger.info "  found capacity #{value}; skipping for now"
+      elsif value =~ /^[A-Z]{1,3}$/  # assume; state/region code e-g B | TX etc.
+        # skip region/state code
+        logger.info "  found region/state code #{value}; skipping for now"
+      elsif value =~ /\/{2}/  # assume it's an address line e.g.  xx // xx
+        logger.info "  found address line #{value}; skipping for now"
+      elsif value =~ /^clubs:/ # assume it's clubs line  e.g. clubs: Santos
+        logger.info "  found clubs line #{value}; skipping for now"
+      elsif value =~ /^(?:[a-z]{2}\.)?wikipedia:/  # assume it's wikipedia e.g. [es.]wikipedia:
+        logger.info "  found wikipedia line #{value}; skipping for now"
+      else
+        logger.info "  found city >#{value}< for ground >#{new_attributes[ :key ]}<"
+
+        city_title = value.dup   # remember for auto-add city
+        
+        ## todo: assume title2 ??
+        ## assume title2 if title2 is empty (not already in use)
+        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
+        # issue warning: unknown type for value
+        # logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    logger.debug " find ground key: #{new_attributes[ :key ]}"
+
+    rec = Ground.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update Ground #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Ground:"
+      rec = Ground.new
+    end
+
+    logger.debug new_attributes.to_json
+
+    rec.update_attributes!( new_attributes )
+
+    #### try to auto-add city
+
+    if city_title.present?
+      city_values = [city_title]
+      city_attributes = {
+        country_id: rec.country_id,
+        # region_id:  rec.region_id    ### todo/fix: add region if present
+      }
+
+      # todo: add convenience helper create_or_update_from_title
+      city = City.create_or_update_from_values( city_values, city_attributes )
+
+      ### fix/todo: set new autoadd flag too?
+      ##  e.g. check if updated? e.g. timestamp created <> updated otherwise assume created?
+
+      ## now at last add city_id to brewery!
+      rec.city_id = city.id
+      rec.save!
+    end
+  end # create_or_update_from_values
+
+
+end # class Ground
+
+end # module SportDb::Model

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

@@ -5,7 +5,9 @@
 module WorldDb::Model
 
   class City
-    has_many :teams, class_name: 'SportDb::Model::Team', foreign_key: 'city_id'
+    has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'city_id'
+    has_many :grounds, class_name: 'SportDb::Model::Ground', foreign_key: 'city_id'
+    has_many :games,   :through => :grounds
   end
 
 end # module WorldDb::Model

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

@@ -5,6 +5,7 @@ module WorldDb::Model
   class Continent
     has_many :teams,   :through => :countries
     has_many :leagues, :through => :countries
+    has_many :grounds, :through => :countries
   end # class Continent
 
 end # module WorldDb::Model

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

@@ -7,6 +7,7 @@ module WorldDb::Model
   class Country
     has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'
     has_many :leagues, class_name: 'SportDb::Model::League', foreign_key: 'country_id'
+    has_many :grounds, class_name: 'SportDb::Model::Ground', foreign_key: 'country_id'
   end # class Country
 
 end # module WorldDb::Model

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

@@ -5,7 +5,8 @@
 module WorldDb::Model
 
   class Region
-    has_many :teams, class_name: 'SportDb::Model::Team', :through => :cities
+    has_many :teams,   class_name: 'SportDb::Model::Team',   :through => :cities
+    has_many :grounds, class_name: 'SportDb::Model::Ground', :through => :cities
   end # class Region
 
 end # module WorldDb::Model

data/lib/sportdb/reader.rb

@@ -22,6 +22,10 @@ module Matcher
     match_xxx_for_country( name, 'skiers', &blk )
   end
 
+  def match_stadiums_for_country( name, &blk )
+    match_xxx_for_country( name, 'stadiums', &blk )
+  end
+
 end # module Matcher
 
 
@@ -92,6 +96,10 @@ class Reader
       load_records( name, race_id: race.id ) # e.g. 2013/04-gp-monaco.txt in formula1.db
     elsif name =~ /(?:^|\/)seasons/  # NB: ^seasons or also possible at-austria!/seasons
       load_seasons( name )
+    elsif match_stadiums_for_country( name ) do |country_key|
+            country = Country.find_by_key!( country_key )
+            load_stadiums( name, country_id: country.id )
+          end
     elsif match_leagues_for_country( name ) do |country_key|  # name =~ /^([a-z]{2})\/leagues/
             # auto-add country code (from folder structure) for country-specific leagues
             #  e.g. at/leagues
@@ -137,6 +145,15 @@ class Reader
     end
   end # method load
 
+ 
+  def load_stadiums( name, more_attribs={} )
+    reader = ValuesReaderV2.new( name, include_path, more_attribs )
+
+    reader.each_line do |new_attributes, values|
+      Ground.create_or_update_from_values( new_attributes, values )
+    end # each lines
+  end
+
 
   def load_leagues( name, more_attribs={} )
 
@@ -351,8 +368,18 @@ class Reader
         
         event_attribs['end_at'] = end_at
 
-      elsif key == 'teams'
+      elsif key == 'grounds' || key == 'stadiums' || key == 'venues'
+        ## assume grounds value is an array
         
+        ground_ids = []
+        value.each do |item|
+          ground_key = item.to_s.strip
+          ground = Ground.find_by_key!( ground_key )
+          ground_ids << ground.id
+        end
+        
+        event_attribs['ground_ids'] = ground_ids
+      elsif key == 'teams'
         ## assume teams value is an array
         
         team_ids = []
@@ -684,9 +711,13 @@ private
     @event = Event.find_by_key!( event_key )
     
     logger.debug "Event #{@event.key} >#{@event.title}<"
-    
-    @known_teams = @event.known_teams_table
-    
+
+    ### fix: use build_title_table_for ??? why? why not??
+    @known_teams  = @event.known_teams_table
+
+    @known_grounds  = TextUtils.build_title_table_for( @event.grounds )
+
+
     parse_fixtures( reader )
     
   end   # method load_fixtures
@@ -812,6 +843,12 @@ private
 
     scores = find_scores!( line )
 
+
+    map_ground!( line )
+    ground_key = find_ground!( line )
+    ground =   ground_key.nil? ? nil : Ground.find_by_key!( ground_key )
+
+
     logger.debug "  line: >#{line}<"
 
 
@@ -820,6 +857,7 @@ private
     team1 = Team.find_by_key!( team1_key )
     team2 = Team.find_by_key!( team2_key )
 
+
     ### check if games exists
     ##  with this teams in this round if yes only update
     game = Game.find_by_round_id_and_team1_id_and_team2_id(
@@ -837,6 +875,7 @@ private
       play_at_v2: date_v2,
       postponed: postponed,
       knockout:  @knockout_flag,
+      ground_id: ground.present? ? ground.id : nil,
       group_id:  @group.present? ? @group.id : nil
     }
 

data/lib/sportdb/schema.rb

@@ -6,26 +6,46 @@ class CreateDb < ActiveRecord::Migration
 def up
 
 create_table :teams do |t|
-  t.string  :key,   :null => false   # import/export key
-  t.string  :title, :null => false
+  t.string  :key,   null: false   # import/export key
+  t.string  :title, null: false
   t.string  :title2
   t.string  :code     # make it not null?  - three letter code (short title)
   t.string  :synonyms  # comma separated list of synonyms
-  t.references :country,   :null => false
+  t.references :country,   null: false
   t.references :city     # NB: city is optional (should be required for clubs e.g. non-national teams)
-  t.boolean  :club,     :null => false, :default => false  # is it a club (not a national team)?
-  
+  t.boolean  :club,     null: false, default: false  # is it a club (not a national team)?
+
   ### 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.boolean  :national, null: false, default: false  # is it a national selection team (not a club)?
+  t.timestamps
+end
+
+add_index :teams, :key, unique: true
+
+
+create_table :grounds do |t|
+  t.string     :key,      null: false   # import/export key
+  t.string     :title,    null: false 
+  t.string     :synonyms   # comma separated list of synonyms
+  
+  t.references :country,  null: false
+  t.references :city     # todo: make city required ???
+
+  ### fix/todo: add since/founded/opened/build attrib  eg. 2011 or 1987
+  ##   - add capacity e.g. 40_000
+  ##  fix: add address !!!! etc
+
+  ## add region ??? or just use region from city ?? 
+
   t.timestamps
 end
 
-add_index :teams, :key, :unique => true
+add_index :grounds, :key, unique: true
 
 
 create_table :persons do |t|    # use people ? instead of persons (person/persons makes it easier?)
-  t.string      :key,      :null => false   # import/export key
-  t.string      :name,     :null => false
+  t.string      :key,      null: false   # import/export key
+  t.string      :name,     null: false
   t.string      :synonyms  # comma separated list of synonyms
   t.string      :code       # three letter code (short title)
 
@@ -35,48 +55,48 @@ create_table :persons do |t|    # use people ? instead of persons (person/person
 
   t.references  :city
   t.references  :region
-  t.references  :country,   :null => false
+  t.references  :country,   null: false
 
-  t.references  :nationality, :null => false  # by default assume same as country of birth (see above)
+  t.references  :nationality, null: false  # by default assume same as country of birth (see above)
 
   t.timestamps
 end
 
 # join table: person+game(team1+team2+event(season+league))
 create_table :goals do |t|
-  t.references  :person,   :null => false
-  t.references  :game,     :null => false
+  t.references  :person,   null: false
+  t.references  :game,     null: false
   t.integer   :minute
   t.integer   :offset    # e.g. 45' +3 or 90' +2
   t.integer   :score1
   t.integer   :score2
   
   ## type of goal (penalty, owngoal)
-  t.boolean   :penalty,   :null => false, :default => false
-  t.boolean   :owngoal,   :null => false, :default => false  # de: Eigentor -> # todo: find better name?
+  t.boolean   :penalty,   null: false, default: false
+  t.boolean   :owngoal,   null: false, default: false  # de: Eigentor -> # todo: find better name?
 
   t.timestamps
 end
 
 
 create_table :tracks do |t|    # e.g. Formula 1 circuits or Apline Ski resorts/slops/pistes
-  t.string      :key,      :null => false   # import/export key
-  t.string      :title,     :null => false
+  t.string      :key,       null: false   # import/export key
+  t.string      :title,     null: false
   t.string      :synonyms   # comma separated list of synonyms
   t.string      :code       # three letter code (short title)
 
   t.references  :city
   t.references  :region
-  t.references  :country,   :null => false
+  t.references  :country,   null: false
   t.timestamps
 end
 
 
 # join table -> event(season+league)+track
 create_table :races do |t|     # e.g. Formula 1 race (Grand Prix Monaco) or Alpine Ski race (Downhill Lake Louise)
-  t.references :track,    :null => false
-  t.references :event,    :null => false
-  t.integer    :pos,      :null => false   # Race #1,#2,#3,#4 etc.
+  t.references :track,    null: false
+  t.references :event,    null: false
+  t.integer    :pos,      null: false   # Race #1,#2,#3,#4 etc.
 
   ## todo: add auto-created key (for import/export) e.g.
 
@@ -85,8 +105,8 @@ create_table :races do |t|     # e.g. Formula 1 race (Grand Prix Monaco) or Alpi
 end
 
 create_table :runs do |t|
-  t.references :race,     :null => false
-  t.integer    :pos,      :null => false
+  t.references :race,     null: false
+  t.integer    :pos,      null: false
 
   t.datetime   :start_at
   t.timestamps
@@ -96,9 +116,9 @@ end
 create_table :records do |t|   # use TimeRecord? instead of simple record
  t.references :race  # optional either race or run references
  t.references :run
- t.references :person,  :null => false
+ t.references :person,  null: false
  t.integer    :pos      # 1,2,3, etc or 0
- t.boolean    :completed,  :null => false, :default => true    # completed race - find better name?
+ t.boolean    :completed,  null: false, default: true    # completed race - find better name?
  t.string     :state   # find a better name? e.g. retired, e.g.
  t.string     :comment  #   find a better name ?  e.g.  collision damage (if ret) for formula 1
  t.time       :time
@@ -111,22 +131,22 @@ end
 
 # join table -> person+team+event(season+league)
 create_table :rosters do |t|   # use squads as an alternative name? why? why not??
-  t.references :person,  :null => false
-  t.references :team,    :null => false
+  t.references :person,  null: false
+  t.references :team,    null: false
   t.references :event      # make required?
-  t.integer    :pos,      :null => false
+  t.integer    :pos,      null: false
 
   t.timestamps
 end
 
 
 create_table :events do |t|
-  t.string      :key,      :null => false   # import/export key
-  t.references  :league,   :null => false
-  t.references  :season,   :null => false
-  t.date        :start_at, :null => false    # NB: only use date (w/o time)
+  t.string      :key,      null: false   # import/export key
+  t.references  :league,   null: false
+  t.references  :season,   null: false
+  t.date        :start_at, null: false    # NB: only use date (w/o time)
   t.date        :end_at   # make it required???  # NB: only use date (w/o time)
-  t.boolean     :team3,    :null => false, :default => true   ## e.g. Champions League has no 3rd place (only 1st and 2nd/final)
+  t.boolean     :team3,    null: false, default: true   ## e.g. Champions League has no 3rd place (only 1st and 2nd/final)
 
   #### track 1-n sources (from repos)  - # todo move to its own table later
   ## NB: relative to event.yml - use mapper to "resolve" to full path w/ repo; use league+season keys
@@ -137,18 +157,18 @@ create_table :events do |t|
   t.timestamps
 end
 
-add_index :events, :key, :unique => true 
+add_index :events, :key, unique: true
 
 
 create_table :rounds do |t|
-  t.references :event,    :null => false
-  t.string     :title,    :null => false
+  t.references :event,    null: false
+  t.string     :title,    null: false
   t.string     :title2
-  t.integer    :pos,      :null => false
+  t.integer    :pos,      null: false
   ## add new table stage/stages for grouping rounds in group rounds and playoff rounds, for example???
   ## # "regular" season (group) games or post-season (playoff) knockouts (k.o's)
-  t.boolean    :knockout, :null => false, :default => false
-  t.date   :start_at, :null => false     # NB: only use date (w/o time)
+  t.boolean    :knockout, null: false, default: false
+  t.date   :start_at, null: false     # NB: only use date (w/o time)
   t.date   :end_at    # todo: make it required e.g. :null => false    # NB: only use date (w/o time)
 
   t.timestamps
@@ -158,9 +178,9 @@ add_index :rounds, :event_id  # fk event_id index
 
 
 create_table :groups do |t|     # Teamgruppe (zB Gruppe A, Gruppe B, etc.)
-  t.references :event,    :null => false
-  t.string     :title,    :null => false
-  t.integer    :pos,      :null => false
+  t.references :event,    null: false
+  t.string     :title,    null: false
+  t.integer    :pos,      null: false
   t.timestamps
 end
 
@@ -169,19 +189,23 @@ add_index :groups, :event_id  # fk event_id index
 
 create_table :games do |t|
   t.string     :key          # import/export key
-  t.references :round,    :null => false
-  t.integer    :pos,      :null => false
+  t.references :round,    null: false
+  t.integer    :pos,      null: false
   t.references :group      # note: group is optional
-  t.references :team1,    :null => false
-  t.references :team2,    :null => false
+  t.references :team1,    null: false
+  t.references :team2,    null: false
 
-  t.datetime   :play_at,   :null => false
-  t.boolean    :postponed, :null => false, :default => false
+  t.datetime   :play_at,   null: false
+  t.boolean    :postponed, null: false, default: false
   t.datetime   :play_at_v2   # optional old date (when postponed)
   t.datetime   :play_at_v3   # optional odl date (when postponed twice)
 
-  t.boolean    :knockout, :null => false, :default => false
-  t.boolean    :home,     :null => false, :default => true    # is team1 play at home (that is, at its home stadium)
+  t.references :ground    # optional - stadium (lets you get city,region,country,etc)
+  t.references :city      # optional - convenience for ground.city_id ???
+
+
+  t.boolean    :knockout, null: false, default: false
+  t.boolean    :home,     null: false, default: true    # is team1 play at home (that is, at its home stadium)
   t.integer    :score1
   t.integer    :score2
   t.integer    :score1et  # extratime - team 1 (opt)
@@ -201,7 +225,7 @@ create_table :games do |t|
   t.timestamps
 end
 
-add_index :games, :key, :unique => true 
+add_index :games, :key,  unique: true
 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
@@ -211,40 +235,52 @@ add_index :games, :prev_game_id  # fk next_game_id index
 
 # todo: remove id from join table (without extra fields)? why?? why not??
 create_table :events_teams do |t|
-  t.references :event, :null => false
-  t.references :team,  :null => false
+  t.references :event, null: false
+  t.references :team,  null: false
   t.timestamps
 end
 
-add_index :events_teams, [:event_id,:team_id], :unique => true 
+add_index :events_teams, [:event_id,:team_id], unique: true
 add_index :events_teams, :event_id
 
 
+# todo: remove id from join table (without extra fields)? why?? why not??
+create_table :events_grounds do |t|
+  t.references :event,   null: false
+  t.references :ground,  null: false
+  t.timestamps
+end
+
+add_index :events_grounds, [:event_id,:ground_id], unique: true
+add_index :events_grounds, :event_id
+
+
+
 create_table :groups_teams do |t|
-  t.references :group, :null => false
-  t.references :team,  :null => false
+  t.references :group, null: false
+  t.references :team,  null: false
   t.timestamps
 end
 
-add_index :groups_teams, [:group_id,:team_id], :unique => true 
+add_index :groups_teams, [:group_id,:team_id], unique: true
 add_index :groups_teams, :group_id
-    
-    
+
+
 ### todo: add models and some seed data
 
 create_table :seasons do |t|  ## also used for years
-  t.string :key,   :null => false
-  t.string :title, :null => false   # e.g. 2011/12, 2012/13 ### what to do w/ 2012? for world cup etc?
+  t.string :key,   null: false
+  t.string :title, null: false   # e.g. 2011/12, 2012/13 ### what to do w/ 2012? for world cup etc?
   t.timestamps
 end
 
 create_table :leagues do |t|  ## also for cups/conferences/tournaments/world series/etc.
-  t.string     :key,   :null => false
-  t.string     :title, :null => false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
+  t.string     :key,   null: false
+  t.string     :title, null: false     # e.g. Premier League, Deutsche Bundesliga, World Cup, Champions League, etc.
   t.references :country   ##  optional for now ,   :null => false   ### todo: create "virtual" country for international leagues e.g. use int? or world (ww?)/europe (eu)/etc. similar? already taken??
  
   ## fix: rename to :clubs from :club
-  t.boolean    :club,          :null => false, :default => false  # club teams or national teams?
+  t.boolean    :club,          null: false, default: false  # club teams or national teams?
   ## todo: add t.boolean  :national flag? for national teams?
   ## t.boolean  :international, :null => false, :default => false  # national league or international?
   ## t.boolean  :cup     ## or regular season league??
@@ -252,12 +288,12 @@ create_table :leagues do |t|  ## also for cups/conferences/tournaments/world ser
 end
 
 create_table :badges do |t|
-  t.references  :team,  :null => false
+  t.references  :team,  null: false
   ## todo/fix: use event insead of league+season ??
   ## t.references  :event, :null => false   # event => league+season
-  t.references  :league, :null => false
-  t.references  :season, :null => false
-  t.string      :title, :null => false   # Meister, Weltmeister, Europameister, Cupsieger, Vize-Meister, Aufsteiger, Absteiger, etc.
+  t.references  :league, null: false
+  t.references  :season, null: false
+  t.string      :title,  null: false   # Meister, Weltmeister, Europameister, Cupsieger, Vize-Meister, Aufsteiger, Absteiger, etc.
   t.timestamps
 end
 

data/lib/sportdb/stats.rb

@@ -17,6 +17,8 @@ module SportDb
       puts "  #{Person.count} persons / #{Roster.count} rosters (person+team+event recs)"
       puts "  #{Goal.count} goals (person+game recs)"
 
+      puts "  #{Ground.count}  grounds|stadiums"
+
       puts "  #{Country.count} countries / #{Region.count} regions / #{City.count} cities"
       
       ## todo: add tags / taggings from worlddb

data/lib/sportdb/utils.rb

@@ -528,6 +528,17 @@ module SportDb::FixtureHelpers
     map_teams!( line )
   end
 
+
+  def find_ground!( line )
+    TextUtils.find_key_for!( 'ground', line )
+  end
+
+  ## todo/fix: pass in known_grounds as a parameter? why? why not?
+  def map_ground!( line )
+    TextUtils.map_titles_for!( 'ground', line, @known_grounds )
+  end
+
+
   def find_track!( line )
     TextUtils.find_key_for!( 'track', line )
   end

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-09 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &20011296 !ruby/object:Gem::Requirement
+  requirement: &5976588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *20011296
+  version_requirements: *5976588
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &20009076 !ruby/object:Gem::Requirement
+  requirement: &5974812 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *20009076
+  version_requirements: *5974812
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &20104680 !ruby/object:Gem::Requirement
+  requirement: &5973264 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *20104680
+  version_requirements: *5973264
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &20102280 !ruby/object:Gem::Requirement
+  requirement: &5987700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *20102280
+  version_requirements: *5987700
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &20099184 !ruby/object:Gem::Requirement
+  requirement: &5981688 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *20099184
+  version_requirements: *5981688
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -97,10 +97,12 @@ files:
 - lib/sportdb/lang.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