sportdb 0.8.0 → 0.8.1

data/db/at/2011_12/cup.rb

@@ -10,7 +10,8 @@ ofb = Event.create!( key:   'at.cup.2011/12',
                      title: 'ÖFB Cup 2011/12',
                      start_at: Time.cet( '2011-10-10 17:00' ),
                      league:   League.find_by_key!('at.cup'),
-                     season:   Season.find_by_key!('2011/12'))
+                     season:   Season.find_by_key!('2011/12'),
+                     team3: false )  # no game for 3rd/4th place
 
 
 sturm       = Team.find_by_key!( 'sturm' )

data/db/at/2012_13/cup.rb

@@ -7,7 +7,8 @@ cup = Event.create!( key:      'at.cup.2012/13',
                      title:    'ÖFB Cup 2012/13',
                      start_at: Time.cet( '2012-07-13 00:00' ),
                      league:   League.find_by_key!('at.cup'),
-                     season:   Season.find_by_key!('2012/13'))
+                     season:   Season.find_by_key!('2012/13'),
+                     team3: false )  # no game for 3rd/4th place)
 
 
 ## 10 Bundeliga Teams

data/db/at/2012_13/cup.txt

@@ -54,7 +54,7 @@ LASK Linz - SV Grödig          2:0                               2012-09-25 19:
 TSV St. Johann - FC Lustenau      0:3                            2012-09-25 19:00
 SC Sollenau - FC Wacker Innsbruck    1:1 1:5nV                   2012-09-25 19:00
 Villacher SV - SC Wiener Neustadt        3:1                     2012-09-25 19:00
-FC Dornbirn - Austria Wien       2:3                              2012-09-25 20:30
+FC Dornbirn - Austria Wien       2:3                             2012-09-25 20:30
 ASK Bad Vöslau - SV Mattersburg     2:3                          2012-09-26 16:00
 Union St. Florian - SV Ried      1:1 1:1nV 5:6iE                 2012-09-26 19:00
 USV Allerheiligen - Rapid Wien  1:4                              2012-09-26 19:00

data/db/cl/2011_12/cl.rb

@@ -9,7 +9,8 @@ cl = Event.create!( key:      'cl.2011/12',
                     title:    'Champions League 2011/12',
                     start_at: Time.cet( '2011-10-10 17:00' ),
                     league:   League.find_by_key!('cl'),
-                    season:   Season.find_by_key!('2011/12'))
+                    season:   Season.find_by_key!('2011/12'),
+                    team3: false )
 
 
 inter     = Team.find_by_key!( 'inter' )

data/db/cl/2011_12/el.rb

@@ -9,7 +9,8 @@ el = Event.create!( key: 'el.2011/12',
                     title: 'Europa League 2011/12',
                     start_at: Time.cet( '2011-10-10 17:00' ),
                     league:  League.find_by_key!('el'),
-                    season:  Season.find_by_key!('2011/12'))
+                    season:  Season.find_by_key!('2011/12'),
+                    team3: false )
 
 az       = Team.find_by_key!( 'az' )
 valencia = Team.find_by_key!( 'valencia' )

data/db/cl/2012_13/cl.rb

@@ -9,7 +9,8 @@ cl = Event.create!( key:      'cl.2012/13',
                     title:    'Champions League 2012/13',
                     start_at: Time.cet( '2012-09-18 18:30' ),
                     league:   League.find_by_key!('cl'),
-                    season:   Season.find_by_key!('2012/13'))
+                    season:   Season.find_by_key!('2012/13'),
+                    team3: false )
 
 porto         = Team.find_by_key!( 'porto' )
 kiew          = Team.find_by_key!( 'kiew' )

data/lib/sportdb/models/event.rb

@@ -19,6 +19,27 @@ class Event < ActiveRecord::Base
       self.teams << team
     end
   end
+  
+  ###########################
+  ## convenience helpers
+
+  def self.find_at_2012_13!
+    self.find_by_key!( 'at.2012/13' )
+  end
+  
+  def self.find_at_cup_2012_13!
+    self.find_by_key!( 'at.cup.2012/13' )
+  end
+  
+  def self.find_cl_2012_13!
+    self.find_by_key!( 'cl.2012/13' )
+  end
+  
+  def self.find_euro_2012!
+    self.find_by_key!( 'euro.2012')
+  end
+  
+
 
 end # class Event
 

data/lib/sportdb/models/team.rb

@@ -6,8 +6,10 @@ class Team < ActiveRecord::Base
   has_many :home_games, :class_name => 'Game', :foreign_key => 'team1_id'
   has_many :away_games, :class_name => 'Game', :foreign_key => 'team2_id'
 
+  REGEX_CODE = /^[A-Z][A-Z0-9_]{2}$/  # must start w/ letter a-z (2 n 3 can be number or underscore _)
+
   validates :key,  :format => { :with => /^[a-z]{2,}$/, :message => 'expected two or more lowercase letters a-z' }
-  validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
+  validates :code, :format => { :with => REGEX_CODE, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
 
 
   ### fix - how to do it with has_many macro? use finder_sql?
@@ -46,7 +48,7 @@ class Team < ActiveRecord::Base
           attr[ :country_id ] = value.id
         elsif value.is_a? City
           attr[ :city_id ] = value.id 
-        elsif value =~ /^[A-Z_]{3}$/    ## assume its three letter code (e.g. ITA)
+        elsif value =~ REGEX_CODE   ## 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

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.8.0'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Gerald Bauer