sportdb 1.6.4 → 1.6.5

data/Manifest.txt

@@ -24,9 +24,11 @@ lib/sportdb/models/event.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/group.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
+lib/sportdb/models/player.rb
 lib/sportdb/models/prop.rb
 lib/sportdb/models/region.rb
 lib/sportdb/models/round.rb

data/lib/sportdb.rb

@@ -36,9 +36,11 @@ require 'sportdb/models/continent'
 require 'sportdb/models/event'
 require 'sportdb/models/event_team'
 require 'sportdb/models/game'
+require 'sportdb/models/goal'
 require 'sportdb/models/group'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
+require 'sportdb/models/player'
 require 'sportdb/models/prop'
 require 'sportdb/models/region'
 require 'sportdb/models/round'

data/lib/sportdb/models/game.rb

@@ -8,6 +8,8 @@ class Game < ActiveRecord::Base
   
   belongs_to :round
   belongs_to :group   # group is optional
+  
+  has_many :goals
 
   before_save :calc_toto12x
 

data/lib/sportdb/models/goal.rb

@@ -0,0 +1,12 @@
+module SportDb::Models
+
+
+class Goal < ActiveRecord::Base
+
+    belongs_to :game
+    belongs_to :player
+
+end  # class Goal
+
+
+end # module SportDb::Models

data/lib/sportdb/models/player.rb

@@ -0,0 +1,11 @@
+module SportDb::Models
+
+
+class Player < ActiveRecord::Base
+
+  has_many :goals
+
+end  # class Player
+
+
+end # module SportDb::Models

data/lib/sportdb/reader.rb

@@ -529,9 +529,18 @@ private
     team1_key = find_team1!( line )
     team2_key = find_team2!( line )
 
-    date  = find_date!( line )
+    if is_postponed?( line )
+      postponed  = true
+      date_v2    = find_date!( line )
+      date       = find_date!( line )
+    else
+      postponed = false
+      date_v2   = nil
+      date      = find_date!( line )
+    end
+
     scores = find_scores!( line )
-        
+
     logger.debug "  line: >#{line}<"
 
 
@@ -553,7 +562,9 @@ private
       score2ot:  scores[3],
       score1p:   scores[4],
       score2p:   scores[5],
-      play_at:   date,
+      play_at:    date,
+      play_at_v2: date_v2,
+      postponed: postponed,
       knockout:  @knockout_flag,
       group_id:  @group.present? ? @group.id : nil
     }

data/lib/sportdb/schema.rb

@@ -23,6 +23,32 @@ end
 add_index :teams, :key, :unique => true
 
 
+create_table :players do |t|
+  t.string      :key,      :null => false   # import/export key
+  t.string      :name,     :null => false
+  t.string      :synonyms  # comma separated list of synonyms
+
+  t.date        :born_at     # optional date of birth (birthday)
+  t.references  :country,   :null => false
+  t.timestamps
+end
+
+create_table :goals do |t|
+  t.references  :player,   :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.timestamps
+end
+
+
 create_table :events do |t|
   t.string      :key,      :null => false   # import/export key
   t.references  :league,   :null => false
@@ -68,7 +94,12 @@ create_table :games do |t|
   t.references :group      # note: group is optional
   t.references :team1,    :null => false
   t.references :team2,    :null => false
-  t.datetime   :play_at,  :null => 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.integer    :score1
@@ -84,6 +115,8 @@ create_table :games do |t|
   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
@@ -133,6 +166,8 @@ create_table :leagues do |t|  ## also for cups/conferences/tournaments/world ser
   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?
   ## todo: add t.boolean  :national flag? for national teams?
   ## t.boolean  :international, :null => false, :default => false  # national league or international?

data/lib/sportdb/utils.rb

@@ -5,6 +5,11 @@
 
 module SportDb::FixtureHelpers
 
+  def is_postponed?( line )
+    # check if line include postponed marker e.g. =>
+    line =~ /=>/
+  end
+
   def is_round?( line )
     line =~ SportDb.lang.regex_round
   end

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &81413720 !ruby/object:Gem::Requirement
+  requirement: &74970830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.6'
   type: :runtime
   prerelease: false
-  version_requirements: *81413720
+  version_requirements: *74970830
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &81413460 !ruby/object:Gem::Requirement
+  requirement: &74970610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *81413460
+  version_requirements: *74970610
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &81413240 !ruby/object:Gem::Requirement
+  requirement: &74970390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *81413240
+  version_requirements: *74970390
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &81413020 !ruby/object:Gem::Requirement
+  requirement: &74970170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *81413020
+  version_requirements: *74970170
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -89,9 +89,11 @@ files:
 - lib/sportdb/models/event_team.rb
 - lib/sportdb/models/forward.rb
 - lib/sportdb/models/game.rb
+- lib/sportdb/models/goal.rb
 - lib/sportdb/models/group.rb
 - lib/sportdb/models/group_team.rb
 - lib/sportdb/models/league.rb
+- lib/sportdb/models/player.rb
 - lib/sportdb/models/prop.rb
 - lib/sportdb/models/region.rb
 - lib/sportdb/models/round.rb