sportdb 0.5.3 → 0.5.4

data/Manifest.txt

@@ -14,6 +14,7 @@ db/at/2012_13/cup.rb
 db/at/2012_13/cup.txt
 db/at/2012_13/cup_fixtures.rb
 db/at/badges.rb
+db/at/cities.rb
 db/at/teams.rb
 db/cities.rb
 db/cl/2011_12/cl.rb
@@ -25,6 +26,7 @@ db/countries.rb
 db/de/2012_13/bl.rb
 db/de/2012_13/bl.txt
 db/de/2012_13/bl_fixtures.rb
+db/de/cities.rb
 db/de/teams.rb
 db/en/2012_13/pl.rb
 db/en/2012_13/pl.txt
@@ -66,6 +68,7 @@ lib/sportdb/models/group.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
 lib/sportdb/models/prop.rb
+lib/sportdb/models/region.rb
 lib/sportdb/models/round.rb
 lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb

data/db/at/cities.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+
+at = Country.find_by_key!( 'at' )
+
+
+## 9 Bundeslaender
+
+regions_at = [
+  ['wien',  'Wien'], # Wien
+  ['noe',   'NÖ'],      # Niederösterreich
+  ['ooe',   'OÖ'],      # Oberösterreich
+  ['bgld',  'Bgld.'],   # Burgenland
+  ['stmk',  'Stmk.'],   # Steiermark
+  ['sbg',   'Sbg.'],    # Salzburg
+  ['ktn',   'Ktn.'],    # Kärnten
+  ['tirol', 'Tirol'],   # Tirol 
+  ['vbg',   'Vbg.']     # Vorarlberg
+]
+
+Region.create_from_ary!( regions_at, country: at )
+
+cities_at = [
+  ['wien',        'Wien|Vienna',      'region:wien'],
+
+  ['stpoelten',   'St. Pölten', 'region:noe'],
+  ['moedling',    'Mödling|Moedling', 'region:noe'],
+  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt', 'region:noe'],
+  ['horn',        'Horn',       'region:noe'],
+
+  ['linz',        'Linz',        'region:ooe'],
+  ['ried',        'Ried',        'region:ooe'],
+
+  ['mattersburg', 'Mattersburg', 'region:bgld'],
+
+  ['graz',        'Graz',        'region:stmk'],
+  ['hartberg',    'Hartberg',    'region:stmk'],
+  ['kapfenberg',  'Kapfenberg',  'region:stmk'],
+
+  ['salzburg',    'Salzburg',    'region:sbg'],
+  ['groedig',     'Grödig',      'region:sbg'],
+
+  ['wolfsberg',   'Wolfsberg',   'region:ktn'],
+
+  ['innsbruck',   'Innsbruck',   'region:tirol'],
+  
+  ['altach',      'Altach',     'region:vbg'],
+  ['lustenau',    'Lustenau',   'region:vbg']
+]
+
+City.create_from_ary!( cities_at, country: at )
+
+
+Prop.create!( key: 'db.at.cities.version', value: '1' )

data/db/at/teams.rb

@@ -15,16 +15,16 @@ bl = [
 ]
 
 ersteliga = [
-  [ 'ksv',       'Kapfenberger SV 1919', 'Erste Liga/Stmk.', 'KSV' ],
-  [ 'altach',    'SCR Altach',           'Erste Liga/Vbg.',  'ALT' ],
-  [ 'austrial',  'SC Austria Lustenau',  'Erste Liga/Vbg.',  'LUS' ],
-  [ 'stpoelten', 'SKN St. Pölten',       'Erste Liga/NÖ',    'POE' ],
-  [ 'linz',      'FC Blau-Weiß Linz',    'Erste Liga/OÖ',    'BWL' ],
-  [ 'groedig',   'SV Grödig',            'Erste Liga/Sbg.',  'GRO' ],
-  [ 'lustenau',  'FC Lustenau 1907|FC Lustenau',     'Erste Liga/Vbg.',  'LUS' ],
-  [ 'vienna',    'Vienna FC 1894',       'Erste Liga/Wien',  'VIE' ],
-  [ 'hartberg',  'TSV Hartberg',         'Erste Liga/Stmk.', 'HAR' ],
-  [ 'horn',      'SV Horn',              'Erste Liga/NÖ',    'HOR' ]
+  [ 'ksv',       'Kapfenberger SV 1919', 'Erste Liga/Stmk.', 'KSV', 'city:kapfenberg'],
+  [ 'altach',    'SCR Altach',           'Erste Liga/Vbg.',  'ALT', 'city:altach' ],
+  [ 'austrial',  'SC Austria Lustenau',  'Erste Liga/Vbg.',  'LUS', 'city:lustenau' ],
+  [ 'stpoelten', 'SKN St. Pölten',       'Erste Liga/NÖ',    'POE', 'city:stpoelten' ],
+  [ 'linz',      'FC Blau-Weiß Linz',    'Erste Liga/OÖ',    'BWL', 'city:linz' ],
+  [ 'groedig',   'SV Grödig',            'Erste Liga/Sbg.',  'GRO', 'city:groedig' ],
+  [ 'lustenau',  'FC Lustenau 1907|FC Lustenau',     'Erste Liga/Vbg.',  'LUS', 'city:lustenau' ],
+  [ 'vienna',    'Vienna FC 1894',       'Erste Liga/Wien',  'VIE', 'city:wien' ],
+  [ 'hartberg',  'TSV Hartberg',         'Erste Liga/Stmk.', 'HAR', 'city:hartberg' ],
+  [ 'horn',      'SV Horn',              'Erste Liga/NÖ',    'HOR', 'city:horn' ]
 ]
 
 rlwest = [

data/db/cities.rb

@@ -1,26 +1,6 @@
 # encoding: utf-8
 
 
-
-### todo/fix: add regions (Stmk., NOE, OOE, etc,)
-
-cities_at = [
-  ['wien',        'Wien|Vienna'],
-  ['innsbruck',   'Innsbruck'],
-  ['moedling',    'Mödling|Moedling'],
-  ['salzburg',    'Salzburg'],
-  ['graz',        'Graz'],
-  ['linz',        'Linz'],
-  ['mattersburg', 'Mattersburg'],
-  ['ried',        'Ried'],
-  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt'],
-  ['wolfsberg',   'Wolfsberg']
-]
-
-at = Country.find_by_key!( 'at' )
-City.create_from_ary!( cities_at, country: at )
-
-
 cities_en = [
   ['manchester',  'Manchester'],
   ['london',      'London'],
@@ -41,31 +21,6 @@ en = Country.find_by_key!( 'en' )
 City.create_from_ary!( cities_en, country: en )
 
 
-cities_de = [
-  ['hoffenheim',    'Hoffenheim'],
-  ['nuernberg',     'Nürnberg'],
-  ['stuttgart',     'Stuttgart'],
-  ['augsburg',      'Augsburg'],
-  ['wolfsburg',     'Wolfsburg'],
-  ['fuerth',        'Fürth'],
-  ['muenchen',      'München'],
-  ['gelsenkirchen', 'Gelsenkirchen'],
-  ['dortmund',      'Dortmund'],
-  ['frankfurt',     'Frankfurt'],
-  ['hannover',      'Hannover'],
-  ['leverkusen',    'Leverkusen'],
-  ['duesseldorf',   'Düsseldorf'],
-  ['hamburg',       'Hamburg'],
-  ['mainz',         'Mainz'],
-  ['mgladbach',     "Mönchengladbach|M'gladbach" ],
-  ['freiburg',      'Freiburg'],
-  ['bremen',        'Bremen']
-]
-
-de = Country.find_by_key!( 'de' )
-City.create_from_ary!( cities_de, country: de )
-
-
 cities_es = [
   ['bilbao',    'Bilbao'],
   ['valencia',  'Valencia'],

data/db/de/cities.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+
+de = Country.find_by_key!( 'de' )
+
+cities_de = [
+  ['hoffenheim',    'Hoffenheim'],
+  ['nuernberg',     'Nürnberg'],
+  ['stuttgart',     'Stuttgart'],
+  ['augsburg',      'Augsburg'],
+  ['wolfsburg',     'Wolfsburg'],
+  ['fuerth',        'Fürth'],
+  ['muenchen',      'München'],
+  ['gelsenkirchen', 'Gelsenkirchen'],
+  ['dortmund',      'Dortmund'],
+  ['frankfurt',     'Frankfurt'],
+  ['hannover',      'Hannover'],
+  ['leverkusen',    'Leverkusen'],
+  ['duesseldorf',   'Düsseldorf'],
+  ['hamburg',       'Hamburg'],
+  ['mainz',         'Mainz'],
+  ['mgladbach',     "Mönchengladbach|M'gladbach" ],
+  ['freiburg',      'Freiburg'],
+  ['bremen',        'Bremen']
+]
+
+City.create_from_ary!( cities_de, country: de )
+
+
+Prop.create!( key: 'db.de.cities.version', value: '1' )

data/db/leagues.rb

@@ -1,24 +1,48 @@
 # encoding: utf-8
 
-League.create!( key: 'at',     title: 'Österr. Bundesliga', club: true )
-League.create!( key: 'at.cup', title: 'ÖFB Cup',            club: true )
+#############################
+## national leagues & cups
 
-League.create!( key: 'cl', title: 'Champions League', club: true )
-League.create!( key: 'el', title: 'Europa League',    club: true )
+at = Country.find_by_key!( 'at' )
+de = Country.find_by_key!( 'de' )
+en = Country.find_by_key!( 'en' )
+ro = Country.find_by_key!( 'ro' )
+mx = Country.find_by_key!( 'mx' )
 
-League.create!( key: 'de', title: 'Deutsche Bundesliga', club: true )
-League.create!( key: 'en', title: 'English Premier League', club: true )
-League.create!( key: 'ro', title: 'Romania Liga 1', club: true )
 
-League.create!( key: 'mx.apertura', title: 'México Primera División Apertura', club: true )
+leagues_club = [
+ [ 'at',          'Österr. Bundesliga',     at ],
+ [ 'at.cup',      'ÖFB Cup',                at ],
+ [ 'de',          'Deutsche Bundesliga',    de ],
+ [ 'en',          'English Premier League', en ],
+ [ 'ro',          'Romania Liga 1',         ro ],
+ [ 'mx.apertura', 'México Primera División Apertura', mx ]
+]
 
+League.create_from_ary!( leagues_club, club: true )
 
 
-League.create!( key: 'euro', title: 'Euro',            club: false )
+########################################
+## international leagues w/ football clubs teams
 
-League.create!( key: 'wm',   title: 'World Cup',       club: false )   ## change key to world??
-League.create!( key: 'wmq',  title: 'World Cup Quali', club: false )
+leagues_club_intl = [
+  [ 'cl', 'Champions League' ],
+  [ 'el', 'Europa League' ]
+]
 
+League.create_from_ary!( leagues_club_intl, club: true )
+
+
+#######################################
+## internationl tournaments & cups w/ national teams
+
+leagues_intl = [
+  [ 'euro', 'Euro'      ],
+  [ 'wm',   'World Cup' ],   ## change key to world??
+  [ 'wmq',  'World Cup Quali' ]
+]
+
+League.create_from_ary!( leagues_intl, club: false )
 
 
 

data/lib/sportdb.rb

@@ -34,6 +34,7 @@ require 'sportdb/models/group'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
 require 'sportdb/models/prop'
+require 'sportdb/models/region'
 require 'sportdb/models/round'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
@@ -101,6 +102,7 @@ module SportDB
       Round.delete_all
       Prop.delete_all
       Country.delete_all
+      Region.delete_all
       City.delete_all
       Badge.delete_all
       League.delete_all

data/lib/sportdb/cli/runner.rb

@@ -121,7 +121,7 @@ EOS
     puts "Stats:"
     puts "  #{Event.count} events  /  #{Round.count} rounds  /  #{Group.count} groups"
     puts "  #{League.count} leagues  /  #{Season.count} seasons"
-    puts "  #{Country.count} countries / #{City.count} cities"
+    puts "  #{Country.count} countries / #{Region.count} regions / #{City.count} cities"
     puts "  #{Team.count} teams"
     puts "  #{Game.count} games"
     puts "  #{Badge.count} badges"

data/lib/sportdb/models/city.rb

@@ -4,6 +4,7 @@ class City < ActiveRecord::Base
   self.table_name = 'cities'
 
   belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'Region',  :foreign_key => 'country_id'
 
   has_many :teams, :class_name => 'Team', :foreign_key => 'city_id'
 
@@ -11,8 +12,6 @@ class City < ActiveRecord::Base
   def self.create_from_ary!( cities, more_values={} )
     cities.each do |values|
       
-      ## todo/fix: split optional synonyms from title (see team for example)      
-      
       ## key & title & country required
       attr = {
         key: values[0]
@@ -32,6 +31,10 @@ class City < ActiveRecord::Base
       values[2..-1].each do |value|
         if value.is_a? Country
           attr[ :country_id ] = value.id
+        elsif value =~ /^region:/   ## region:
+          value_region_key = value[7..-1]  ## cut off region: prefix
+          value_region = Region.find_by_key!( value_region_key )
+          attr[ :region_id ] = value_region.id
         else
           # issue warning: unknown type for value
         end

data/lib/sportdb/models/country.rb

@@ -4,8 +4,10 @@ module SportDB::Models
 class Country < ActiveRecord::Base
   self.table_name = 'countries'
 
-  has_many :cities, :class_name => 'City', :foreign_key => 'country_id'
-  has_many :teams,  :class_name => 'Team', :foreign_key => 'country_id'
+  has_many :regions, :class_name => 'Region', :foreign_key => 'country_id'
+  has_many :cities,  :class_name => 'City',   :foreign_key => 'country_id'
+  has_many :teams,   :class_name => 'Team',   :foreign_key => 'country_id'
+  has_many :leagues, :class_name => 'League', :foreign_key => 'country_id'
 
   def self.create_from_ary!( countries )
     countries.each do |values|

data/lib/sportdb/models/event.rb

@@ -6,6 +6,7 @@ class Event < ActiveRecord::Base
   belongs_to :season
   
   has_many :rounds, :order => 'pos'  # all (fix and flex) rounds
+  has_many :games, :through => :rounds
   
   has_many :groups, :order => 'pos'
   

data/lib/sportdb/models/league.rb

@@ -8,8 +8,32 @@ class League < ActiveRecord::Base
   ## league (cup/conference/series/etc.) + season (year) = event
   
   has_many :events
-  
-  ### has_many :seasons ## through events  add
+  has_many :seasons, :through => :events
+
+
+  def self.create_from_ary!( leagues, more_values={} )
+    leagues.each do |values|
+      
+      ## key & title required
+      attr = {
+        key:   values[0],
+        title: values[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
+        else
+          # issue warning: unknown type for value
+        end
+      end
+
+      League.create!( attr )
+    end # each league
+  end
 
 end  # class League
 

data/lib/sportdb/models/region.rb

@@ -0,0 +1,38 @@
+module SportDB::Models
+
+class Region < ActiveRecord::Base
+
+  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+
+  has_many :cities, :class_name => 'City', :foreign_key => 'region_id'
+  has_many :teams, :through => :cities
+
+
+  def self.create_from_ary!( regions, more_values={} )
+    regions.each do |values|
+            
+      ## key & title & country required
+      attr = {
+        key:   values[0],
+        title: values[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
+        else
+          # issue warning: unknown type for value
+        end
+      end
+      
+      Region.create!( attr )
+    end # each region
+  end
+
+end # class Region
+
+
+end # module Models::SportDB

data/lib/sportdb/schema.rb

@@ -20,11 +20,19 @@ create_table :countries do |t|
   t.timestamps
 end
 
+create_table :regions do |t|
+  t.string :title,  :null => false
+  t.string :key,    :null => false
+  t.references :country, :null => false
+  t.timestamps
+end
+
 create_table :cities do |t|
   t.string :title, :null => false
   t.string :key,   :null => false
   t.string :synonyms  # comma separated list of synonyms
   t.references :country,  :null => false
+  t.references :region    # optional for now
   t.timestamps
 end
 
@@ -149,10 +157,10 @@ create_table :seasons do |t|  ## also used for years
 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.references :country,   :null => false   ### todo: create "virtual" country for international leagues e.g. use int? or world (ww?)/europe (eu)/etc. similar? already taken??
-  t.boolean  :club,          :null => false, :default => false  # club teams or national teams?
+  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??
+  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??

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -97,6 +97,7 @@ files:
 - db/at/2012_13/cup.txt
 - db/at/2012_13/cup_fixtures.rb
 - db/at/badges.rb
+- db/at/cities.rb
 - db/at/teams.rb
 - db/cities.rb
 - db/cl/2011_12/cl.rb
@@ -108,6 +109,7 @@ files:
 - db/de/2012_13/bl.rb
 - db/de/2012_13/bl.txt
 - db/de/2012_13/bl_fixtures.rb
+- db/de/cities.rb
 - db/de/teams.rb
 - db/en/2012_13/pl.rb
 - db/en/2012_13/pl.txt
@@ -149,6 +151,7 @@ files:
 - lib/sportdb/models/group_team.rb
 - lib/sportdb/models/league.rb
 - lib/sportdb/models/prop.rb
+- lib/sportdb/models/region.rb
 - lib/sportdb/models/round.rb
 - lib/sportdb/models/season.rb
 - lib/sportdb/models/team.rb