sportdb 1.4.2 → 1.5.0

data/Rakefile

@@ -23,7 +23,7 @@ Hoe.spec 'sportdb' do
   # self.history_file = 'History.md'
   
   self.extra_deps = [
-    ['worlddb', '~> 1.4.0'],  # NB: worlddb already includes
+    ['worlddb', '~> 1.5.0'],  # NB: worlddb already includes
                                #         - commander
                                #         - logutils
                                #         - textutils

data/lib/sportdb/models/team.rb

@@ -6,11 +6,12 @@ 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 _)
+  REGEX_KEY  = /^[a-z]{3,}$/
+  REGEX_CODE = /^[A-Z][A-Z0-9][A-Z0-9_]?$/  # must start w/ letter a-z (2 n 3 can be number or underscore _)
 
   ## todo/fix: must be 3 or more letters (plus allow digits e.g. salzburgii, muenchen1980, etc.) - why? why not??
-  validates :key,  :format => { :with => /^[a-z]{2,}$/, :message => 'expected two or more lowercase letters a-z' }
-  validates :code, :format => { :with => REGEX_CODE, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
+  validates :key,  :format => { :with => REGEX_KEY,  :message => 'expected three or more lowercase letters a-z' }
+  validates :code, :format => { :with => REGEX_CODE, :message => 'expected three uppercase letters A-Z (and 0-9_)' }, :allow_nil => true
 
   has_many :event_teams, :class_name => 'EventTeam'  # join table (events+teams)
   has_many :events, :through => :event_teams

data/lib/sportdb/reader.rb

@@ -376,7 +376,7 @@ private
             logger.warn "city with key #{value_city_key} missing"
             ## todo: log errors to db log??? 
           end
-        elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code e.g. FCB, RBS, etc.
+        elsif value =~ /^[A-Z][A-Z0-9][A-Z0-9_]?$/   ## assume two or three-letter code e.g. FCB, RBS, etc.
           attribs[ :code ] = value
         elsif value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
           value_country = Country.find_by_key!( value )

data/lib/sportdb/schema.rb

@@ -80,14 +80,27 @@ create_table :games do |t|
   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    :score3    # verlaengerung (opt)
-  t.integer    :score4
-  t.integer    :score5    # elfmeter (opt)
-  t.integer    :score6
+  t.integer    :score1ot  # overtime - team 1 (opt)
+  t.integer    :score2ot  # overtime - team 2 (opt)
+  t.integer    :score1p   # penalty  - team 1 (opt)
+  t.integer    :score2p   # penalty  - team 2 (opt) elfmeter (opt)
+  t.integer    :score1i   # half time / first third (opt)
+  t.integer    :score2i   # half time - team 2
+  t.integer    :score1ii  # second third (opt)
+  t.integer    :score2ii  # second third - team2 (opt)
   t.references :next_game  # for hinspiel bei rueckspiel in knockout game
   t.references :prev_game
+  
+  ### todo> find a better name (toto is not international/english?)
+  ## rename to score12x or pt12x or result12x
   t.string     :toto12x      # 1,2,X,nil  calculate on save
   t.string     :key          # import/export key
+
+  t.integer    :score3    # deprecated  - remove todo: change to score1o or score1o overtime  # verlaengerung (opt)
+  t.integer    :score4    # deprecated - remove todo> change to score2o
+  t.integer    :score5    # deprecated - remove elfmeter (opt)  ## todo> change to score1p  - penality
+  t.integer    :score6    # deprecated - remove
+
   t.timestamps
 end
 

data/lib/sportdb/utils.rb

@@ -24,7 +24,7 @@ module SportDB::FixtureHelpers
     elsif line =~ SportDB.lang.regex_knockout_round
       logger.debug "   setting knockout flag to true"
       true
-    elsif line =~ /K\.O\.|Knockout/
+    elsif line =~ /K\.O\.|K\.o\.|Knockout/
         ## NB: add two language independent markers, that is, K.O. and Knockout
       logger.debug "   setting knockout flag to true (lang independent marker)"
       true
@@ -126,16 +126,23 @@ module SportDB::FixtureHelpers
     # NB: side effect - removes date from line string
     
     # e.g. 2012-09-14 20:30   => YYYY-MM-DD HH:MM
-    regex_db = /\b(\d{4})-(\d{2})-(\d{2})\s+(\d{2}):(\d{2})\b/
+    #  nb: allow 2012-9-3 7:30 e.g. no leading zero required
+    regex_db = /\b(\d{4})-(\d{1,2})-(\d{1,2})\s+(\d{1,2}):(\d{2})\b/
     
     # e.g. 2012-09-14  w/ implied hours (set to 12:00)
-    regex_db2 = /\b(\d{4})-(\d{2})-(\d{2})\b/
+    #  nb: allow 2012-9-3 e.g. no leading zero required
+    regex_db2 = /\b(\d{4})-(\d{1,2})-(\d{1,2})\b/
 
     # e.g. 14.09. 20:30  => DD.MM. HH:MM
-    regex_de = /\b(\d{2})\.(\d{2})\.\s+(\d{2}):(\d{2})\b/
+    #  nb: allow 2.3.2012 e.g. no leading zero required
+    #  nb: allow hour as 20.30  or 3.30 instead of 03.30
+    regex_de = /\b(\d{1,2})\.(\d{1,2})\.\s+(\d{1,2})[:.](\d{2})\b/
     
     # e.g. 14.09.2012 20:30   => DD.MM.YYYY HH:MM
-    regex_de2 = /\b(\d{2})\.(\d{2})\.(\d{4})\s+(\d{2}):(\d{2})\b/
+    #  nb: allow 2.3.2012 e.g. no leading zero required
+    #  nb: allow hour as 20.30
+    regex_de2 = /\b(\d{1,2})\.(\d{1,2})\.(\d{4})\s+(\d{1,2})[:.](\d{2})\b/
+
 
     if line =~ regex_db
       value = "#{$1}-#{$2}-#{$3} #{$4}:#{$5}"
@@ -165,6 +172,11 @@ module SportDB::FixtureHelpers
 
       return DateTime.strptime( value, '%Y-%m-%d %H:%M' )
     elsif line =~ regex_de
+      
+      #### fix/todo:
+      #  get year from event start date!!!!
+      #  do NOT hard code!!!!
+      
       value = "2012-#{$2}-#{$1} #{$3}:#{$4}"
       logger.debug "   date: >#{value}<"
 

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '1.4.2'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &80589280 !ruby/object:Gem::Requirement
+  requirement: &79472040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *80589280
+  version_requirements: *79472040
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &80589060 !ruby/object:Gem::Requirement
+  requirement: &79471820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *80589060
+  version_requirements: *79471820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &80588840 !ruby/object:Gem::Requirement
+  requirement: &79471600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *80588840
+  version_requirements: *79471600
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &80588620 !ruby/object:Gem::Requirement
+  requirement: &79471380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *80588620
+  version_requirements: *79471380
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: