sportdb 1.7.0 → 1.7.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7821792672d5e971444ef9f51adb41f7cb2059b1
+  data.tar.gz: 256d782e620f2cd78adba12da7b207053a9d0c6c
+SHA512:
+  metadata.gz: 571e77542ea420347b555d023846f9c5fb374452c0bbcf3663c7fb543a2fdb877ebf505699c84589d28c13911b387820e98ae7385ba21c475acefb9c21673dcb
+  data.tar.gz: b1fcafb80a003779928c2a2c2c7c610414993f2cecf287507b8807a901c75c81ec68accf4d1cceae2cc371860b7640d674b18246ea428ad3d57419cea9e11bf3

data/lib/sportdb/console.rb

@@ -75,8 +75,8 @@ EURO2008 = Event.find_by_key( 'euro.2008' )
 EURO2012 = Event.find_by_key( 'euro.2012' )
 EURO = EURO2012  # add alias
 
-BL = Event.find_by_key( 'de.2012/13' )
-PL = Event.find_by_key( 'en.2012/13' )
+BL = Event.find_by_key( 'de.2013/14' )
+PL = Event.find_by_key( 'en.2013/14' )
 
 ### some club teams
 

data/lib/sportdb/models/game.rb

@@ -16,11 +16,19 @@ class Game < ActiveRecord::Base
   ### getter/setters for deprecated attribs (score3,4,5,6) n national
   
   def score3
-    score1ot
+    score1et
   end
 
   def score4
-    score2ot
+    score2et
+  end
+  
+  def score1ot
+    score1et
+  end
+
+  def score2ot
+    score2et
   end
 
   def score5
@@ -32,11 +40,19 @@ class Game < ActiveRecord::Base
   end
 
   def score3=(value)
-    self.score1ot = value
+    self.score1et = value
   end
 
   def score4=(value)
-    self.score2ot = value
+    self.score2et = value
+  end
+
+  def score1ot=(value)
+    self.score1et = value
+  end
+
+  def score2ot=(value)
+    self.score2et = value
   end
 
   def score5=(value)
@@ -95,8 +111,8 @@ class Game < ActiveRecord::Base
         :team1     => value_teams[0],
         :score1    => value_scores[0],
         :score2    => value_scores[1],
-        :score1ot  => value_scores[2],
-        :score2ot  => value_scores[3],
+        :score1et  => value_scores[2],
+        :score2et  => value_scores[3],
         :score1p   => value_scores[4],
         :score2p   => value_scores[5],
         :team2     => value_teams[1],
@@ -159,8 +175,8 @@ class Game < ActiveRecord::Base
         :team1     =>pair[1][1],
         :score1    =>pair[1][2][0],
         :score2    =>pair[1][2][1],
-        :score1ot  =>pair[1][2][2],
-        :score2ot  =>pair[1][2][3],
+        :score1et  =>pair[1][2][2],
+        :score2et  =>pair[1][2][3],
         :score1p   =>pair[1][2][4],
         :score1p   =>pair[1][2][5],
         :team2     =>pair[1][3],
@@ -192,7 +208,7 @@ class Game < ActiveRecord::Base
       self.toto12x = '2'
     end
   end
-  
+
 
   def over?   # game over?
     play_at <= Time.now
@@ -215,6 +231,9 @@ class Game < ActiveRecord::Base
     ## NB: remove if calc?
     buf << 'game-team-winner '  if complete? && (score1 >  score2)
     buf << 'game-team-draw '    if complete? && (score1 == score2)
+    buf << 'game-knockout '     if knockout?
+    ### fix: loser - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals)
+    buf << 'game-team-loser '   if complete? && (score1 < score2)
     buf
   end
   
@@ -223,10 +242,45 @@ class Game < ActiveRecord::Base
     ## NB: remove if calc?
     buf << 'game-team-winner '  if complete? && (score2 >  score1)
     buf << 'game-team-draw '    if complete? && (score2 == score1)
+    buf << 'game-knockout '     if knockout?
+    ### fix: loser - add method for checking winner/loser on ko pairs using (1st leg/2nd leg totals)
+    buf << 'game-team-loser '   if complete? && (score2 < score1)
     buf
   end
 
 
+  def play_at_str( format = nil )
+    ## e.g. use like
+    #  play_at_str  or
+    #  play_at_str( :db ) etc.
+    if format == :db
+      play_at.strftime( '%Y-%m-%d %H:%M %z' )  # NB: removed seconds (:%S)
+    else
+      play_at.strftime( "%a. %d. %b. / %H:%M" )
+    end
+  end
+
+
+  def score_str
+    return ' - ' if score1.blank? && score2.blank?
+    
+    if score1p.present? && score2p.present?    # im Elfmeterschiessen i.E.?
+      "#{score1_str} : #{score2_str} / #{score1et} : #{score2et} n.V. / #{score1p} : #{score2p} i.E."
+    elsif score1et.present? && score2et.present?  # nach Verlaengerung n.V.?
+      "#{score1_str} : #{score2_str} / #{score1et} : #{score2et} n.V."
+    else
+      "#{score1_str} : #{score2_str}"
+    end
+  end
+
+  def score1_str
+    if score1.blank? then '-' else score1.to_s end
+  end
+
+  def score2_str
+    if score2.blank? then '-' else score2.to_s end
+  end
+
 
 end # class Game
 

data/lib/sportdb/models/team.rb

@@ -11,7 +11,7 @@ class Team < ActiveRecord::Base
 
   ## todo/fix: must be 3 or more letters (plus allow digits e.g. salzburgii, muenchen1980, etc.) - why? why not??
   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
+  validates :code, :format => { :with => REGEX_CODE, :message => 'expected two or three uppercase letters A-Z (and 0-9_; must start with A-Z)' }, :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

@@ -75,12 +75,12 @@ class Reader
             load_leagues( name, club: true, country_id: country.id )
           end
     elsif name =~ /(?:^|\/)leagues/   # NB: ^leagues or also possible world!/leagues  - NB: make sure goes after leagues_for_country!!
-      if name =~ /club/
+      if name =~ /-cup!?\//   # NB: -cup/ or -cup!/ 
+        # e.g. national team tournaments/leagues (e.g. world-cup/ or euro-cup/)
+        load_leagues( name )
+      else
         # e.g. leagues_club
         load_leagues( name, club: true )
-      else
-        # e.g. leagues
-        load_leagues( name )
       end
     elsif match_teams_for_country( name ) do |country_key|   # name =~ /^([a-z]{2})\/teams/
             # auto-add country code (from folder structure) for country-specific teams
@@ -89,16 +89,18 @@ class Reader
             load_teams( name, club: true, country_id: country.id )
           end
     elsif name =~ /(?:^|\/)teams/
-      if name =~ /club/
+      if name =~ /-cup!?\//   # NB: -cup/ or -cup!/ 
+        # assume national teams
+        # e.g. world-cup/teams  amercia-cup/teams_northern
+        load_teams( name, national: true )
+      else
         # club teams (many countries)
         # e.g. club/europe/teams
         load_teams( name, club: true )
-      else
-        # assume national teams
-        # e.g. world/teams  amercia/teams_n
-        load_teams( name, national: true )
       end
-    elsif name =~ /\/(\d{4}|\d{4}_\d{2})\//   # e.g. must match /2012/ or /2012_13/
+    elsif name =~ /\/(\d{4}|\d{4}_\d{2})\// || name =~ /\/(\d{4}|\d{4}_\d{2})$/
+      # e.g. must match /2012/ or /2012_13/
+      #  or   /2012 or /2012_13   e.g. brazil/2012 or brazil/2012_13
       load_event( name )
       event    = fetch_event( name )
       fixtures = fetch_event_fixtures( name )
@@ -205,7 +207,7 @@ class Reader
     end # each key,value
 
     if fixtures.empty?
-      logger.warn "no fixtures found for event - >#{name}<; assume fixture name is the same as event"
+      ## logger.warn "no fixtures found for event - >#{name}<; assume fixture name is the same as event"
       fixtures = [name]
     else
       ## add path to fixtures (use path from event e.g)
@@ -323,6 +325,8 @@ class Reader
       elsif key == 'team3'
         ## for now always assume false  # todo: fix - use value and convert to boolean if not boolean
         event_attribs['team3'] = false
+      elsif key == 'fixtures'
+        ## skip fixtures for now (NOT yet stored in db; for now reload file to get fixtures)
       else
         ## todo: add a source location struct to_s or similar (file, line, col)
         logger.error "unknown event attrib #{key}; skipping attrib"
@@ -776,8 +780,8 @@ private
     game_attribs = {
       score1:    scores[0],
       score2:    scores[1],
-      score1ot:  scores[2],
-      score2ot:  scores[3],
+      score1et:  scores[2],
+      score2et:  scores[3],
       score1p:   scores[4],
       score2p:   scores[5],
       play_at:    date,

data/lib/sportdb/schema.rb

@@ -178,8 +178,8 @@ 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    :score1ot  # overtime - team 1 (opt)
-  t.integer    :score2ot  # overtime - team 2 (opt)
+  t.integer    :score1et  # extratime - team 1 (opt)
+  t.integer    :score2et  # extratime - 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)

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 end
 
 

metadata

@@ -1,60 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.7.0
-  prerelease: 
+  version: 1.7.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &19798968 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *19798968
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &19798656 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *19798656
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19798248 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *19798248
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19797936 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *19797936
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.6'
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -123,6 +134,7 @@ files:
 homepage: https://github.com/geraldb/sport.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: ! '******************************************************************************
 
 
@@ -140,22 +152,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: sportdb
-rubygems_version: 1.7.2
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: sportdb - sport.db command line tool
 test_files:
 - test/test_lang.rb