sportdb 1.6.6 → 1.6.7

data/Manifest.txt

@@ -28,12 +28,15 @@ 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/person.rb
 lib/sportdb/models/prop.rb
+lib/sportdb/models/race.rb
 lib/sportdb/models/region.rb
+lib/sportdb/models/roster.rb
 lib/sportdb/models/round.rb
 lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb
+lib/sportdb/models/track.rb
 lib/sportdb/reader.rb
 lib/sportdb/schema.rb
 lib/sportdb/stats.rb

data/Rakefile

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

data/lib/sportdb.rb

@@ -40,12 +40,15 @@ require 'sportdb/models/goal'
 require 'sportdb/models/group'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
-require 'sportdb/models/player'
+require 'sportdb/models/person'
 require 'sportdb/models/prop'
+require 'sportdb/models/race'
 require 'sportdb/models/region'
+require 'sportdb/models/roster'
 require 'sportdb/models/round'
 require 'sportdb/models/season'
 require 'sportdb/models/team'
+require 'sportdb/models/track'
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 require 'sportdb/utils'
 require 'sportdb/reader'

data/lib/sportdb/deleter.rb

@@ -10,7 +10,8 @@ module SportDb
     def run
       # for now delete all tables
       
-      Team.delete_all
+      Goal.delete_all
+
       Game.delete_all
       Event.delete_all
       EventTeam.delete_all
@@ -18,6 +19,14 @@ module SportDb
       GroupTeam.delete_all
       Round.delete_all
       Badge.delete_all
+      
+      Race.delete_all
+      Roster.delete_all
+
+      Track.delete_all
+      Person.delete_all
+      Team.delete_all
+      
       League.delete_all
       Season.delete_all
     end

data/lib/sportdb/models/goal.rb

@@ -4,7 +4,7 @@ module SportDb::Models
 class Goal < ActiveRecord::Base
 
     belongs_to :game
-    belongs_to :player
+    belongs_to :person
 
 end  # class Goal
 

data/lib/sportdb/models/league.rb

@@ -13,6 +13,42 @@ class League < ActiveRecord::Base
   belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
 
 
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    values.each_with_index do |value, index|
+      if value =~ /^club$/   # club flag
+        new_attributes[ :club ] = true
+      elsif value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
+        value_country = Country.find_by_key!( value )
+        new_attributes[ :country_id ] = value_country.id
+      else
+        ## todo: assume title2 ??
+        ## assume title2 if title2 is empty (not already in use)
+        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    rec = League.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update League #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create League:"
+      rec = League.new
+    end
+      
+    logger.debug new_attributes.to_json
+   
+    rec.update_attributes!( new_attributes )
+  end # create_or_update_from_values
+
+
+
   def self.create_from_ary!( leagues, more_values={} )
     leagues.each do |values|
       

data/lib/sportdb/models/{player.rb → person.rb}

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

data/lib/sportdb/models/race.rb

@@ -0,0 +1,16 @@
+module SportDb::Models
+
+
+class Race < ActiveRecord::Base
+
+    belongs_to :track
+    belongs_to :event
+    
+    ### fix/todo: add runs/records  (records - join table - run/race+person)
+    ## has_many :runs    # e.g. Test Drive, Quali 1, Quali 2, Quali 3, Race
+    ## run - has_many  records? - run_stats?  - what name to use?
+
+end  # class Race
+
+
+end # module SportDb::Models

data/lib/sportdb/models/roster.rb

@@ -0,0 +1,12 @@
+module SportDb::Models
+
+class Roster < ActiveRecord::Base
+
+  belongs_to :event
+  belongs_to :team
+  belongs_to :person
+
+end  # class Roster
+
+
+end # module SportDb::Models

data/lib/sportdb/models/team.rb

@@ -27,6 +27,50 @@ class Team < ActiveRecord::Base
   belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
 
 
+
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    values.each_with_index do |value, index|
+      if value =~ /^city:/   ## city:
+        value_city_key = value[5..-1]  ## cut off city: prefix
+        value_city = City.find_by_key( value_city_key )
+        if value_city.present?
+          new_attributes[ :city_id ] = value_city.id
+        else
+          ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
+          logger.warn "city with key #{value_city_key} missing"
+          ## todo: log errors to db log??? 
+        end
+      elsif value =~ /^[A-Z][A-Z0-9][A-Z0-9_]?$/   ## assume two or three-letter code e.g. FCB, RBS, etc.
+        new_attributes[ :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 )
+        new_attributes[ :country_id ] = value_country.id
+      else
+        ## todo: assume title2 ??
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    rec = Team.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update Team #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Team:"
+      rec = Team.new
+    end
+      
+    logger.debug new_attributes.to_json
+   
+    rec.update_attributes!( new_attributes )
+  end # create_or_update_from_values
+
+
   def self.create_from_ary!( teams, more_values={} )
     teams.each do |values|
       

data/lib/sportdb/models/track.rb

@@ -0,0 +1,46 @@
+module SportDb::Models
+
+class Track < ActiveRecord::Base
+
+  has_many :races
+
+  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+
+
+  def self.create_or_update_from_values( new_attributes, values )
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    ## check optional values
+    values.each_with_index do |value, index|
+      if value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
+        value_country = Country.find_by_key!( value )
+        new_attributes[ :country_id ] = value_country.id
+      else
+        ## todo: assume title2 ??
+        ## assume title2 if title2 is empty (not already in use)
+        ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
+        # issue warning: unknown type for value
+        logger.warn "unknown type for value >#{value}< - key #{new_attributes[:key]}"
+      end
+    end
+
+    rec = Track.find_by_key( new_attributes[ :key ] )
+    if rec.present?
+      logger.debug "update Track #{rec.id}-#{rec.key}:"
+    else
+      logger.debug "create Track:"
+      rec = Track.new
+    end
+      
+    logger.debug new_attributes.to_json
+   
+    rec.update_attributes!( new_attributes )
+  end # create_or_update_from_values
+
+
+end  # class Track
+
+
+end # module SportDb::Models

data/lib/sportdb/reader.rb

@@ -83,7 +83,9 @@ class Reader
         ## assume single fixture name
         name = rec
         
-        if name =~ /^seasons/
+        if name  =~ /^circuits/
+          load_tracks( name )
+        elsif name =~ /^seasons/
           load_seasons( name )
         elsif name =~ /^leagues/
           if name =~ /club/
@@ -146,13 +148,32 @@ class Reader
 
     reader = ValuesReader.new( path, more_values )
 
-    load_leagues_worker( reader )
+    reader.each_line do |new_attributes, values|
+      League.create_or_update_from_values( new_attributes, values )
+    end # each lines
     
     Prop.create_from_fixture!( name, path )
      
   end # load_leagues
 
 
+  def load_tracks( name, more_values={} )
+
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = ValuesReader.new( path, more_values )
+
+    reader.each_line do |new_attributes, values|
+      Track.create_or_update_from_values( new_attributes, values )
+    end # each lines
+    
+    Prop.create_from_fixture!( name, path )
+
+  end # load_tracks
+
+
   def load_seasons( name )
     path = "#{include_path}/#{name}.yml"
 
@@ -160,6 +181,12 @@ class Reader
 
     reader = HashReader.new( path )
 
+####
+## fix!!!!!
+##   use Season.create_or_update_from_hash or similar
+##   use Season.create_or_update_from_hash_reader?? or similar
+#   move parsing code to model
+
     reader.each_typed do |key, value|
 
       ## puts "processing event attrib >>#{key}<< >>#{value}<<..."
@@ -207,6 +234,12 @@ class Reader
 
     logger.info "parsing data '#{name}' (#{path})..."
 
+####
+## fix!!!!!
+##   use Event.create_or_update_from_hash or similar
+##   use Event.create_or_update_from_hash_reader?? or similar
+#   move parsing code to model
+
     reader = HashReader.new( path )
 
     event_attribs = {}
@@ -323,7 +356,9 @@ class Reader
 
     reader = ValuesReader.new( path, more_values )
 
-    load_teams_worker( reader )
+    reader.each_line do |new_attributes, values|
+      Team.create_or_update_from_values( new_attributes, valus )
+    end # each lines
     
     Prop.create_from_fixture!( name, path )
   end # load_teams
@@ -332,86 +367,6 @@ private
 
   include SportDB::FixtureHelpers
 
-  def load_leagues_worker( reader )
-
-    reader.each_line do |attribs, values|
-
-      ## check optional values
-      values.each_with_index do |value, index|
-        if value =~ /^club$/   # club flag
-          attribs[ :club ] = true
-        elsif value =~ /^[a-z]{2}$/  ## assume two-letter country key e.g. at,de,mx,etc.
-          value_country = Country.find_by_key!( value )
-          attribs[ :country_id ] = value_country.id
-        else
-          ## todo: assume title2 ??
-          ## assume title2 if title2 is empty (not already in use)
-          ##  and if it title2 contains at least two letter e.g. [a-zA-Z].*[a-zA-Z]
-          # issue warning: unknown type for value
-          logger.warn "unknown type for value >#{value}<"
-        end
-      end
-
-      rec = League.find_by_key( attribs[ :key ] )
-      if rec.present?
-        logger.debug "update League #{rec.id}-#{rec.key}:"
-      else
-        logger.debug "create League:"
-        rec = League.new
-      end
-      
-      logger.debug attribs.to_json
-   
-      rec.update_attributes!( attribs )
-
-    end # each lines
-
-  end # load_leagues_worker
-
-
-  def load_teams_worker( reader )
- 
-    reader.each_line do |attribs, values|
-
-      ## check optional values
-      values.each_with_index do |value, index|
-        if value =~ /^city:/   ## city:
-          value_city_key = value[5..-1]  ## cut off city: prefix
-          value_city = City.find_by_key( value_city_key )
-          if value_city.present?
-            attribs[ :city_id ] = value_city.id
-          else
-            ## todo/fix: add strict mode flag - fail w/ exit 1 in strict mode
-            logger.warn "city with key #{value_city_key} missing"
-            ## todo: log errors to db log??? 
-          end
-        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 )
-          attribs[ :country_id ] = value_country.id
-        else
-          ## todo: assume title2 ??
-          # issue warning: unknown type for value
-          logger.warn "unknown type for value >#{value}<"
-        end
-      end
-
-      rec = Team.find_by_key( attribs[ :key ] )
-      if rec.present?
-        logger.debug "update Team #{rec.id}-#{rec.key}:"
-      else
-        logger.debug "create Team:"
-        rec = Team.new
-      end
-      
-      logger.debug attribs.to_json
-   
-      rec.update_attributes!( attribs )
-
-    end # each lines
-  end # method load_teams_worker
-
   def load_fixtures_worker( event_key, reader )
    
     ## assume active activerecord connection

data/lib/sportdb/schema.rb

@@ -23,18 +23,26 @@ end
 add_index :teams, :key, :unique => true
 
 
-create_table :players do |t|
+create_table :persons do |t|    # use people ? instead of persons (person/persons makes it easier?)
   t.string      :key,      :null => false   # import/export key
   t.string      :name,     :null => false
   t.string      :synonyms  # comma separated list of synonyms
 
+  ## todo: add gender flag (male/female -man/lady  how?)
   t.date        :born_at     # optional date of birth (birthday)
-  t.references  :country,   :null => false
+  ## todo: add country of birth  might not be the same as nationality
+
+  t.references  :city
+  t.references  :region
+  t.references  :country,   :null => false   # use for nationality? or rename to nationality?
+
+
   t.timestamps
 end
 
+# join table: person+game(team1+team2+event(season+league))
 create_table :goals do |t|
-  t.references  :player,   :null => false
+  t.references  :person,   :null => false
   t.references  :game,     :null => false
   t.integer   :minute
   t.integer   :offset    # e.g. 45' +3 or 90' +2
@@ -49,6 +57,38 @@ create_table :goals do |t|
 end
 
 
+create_table :tracks do |t|    # e.g. Formula 1 circuits or Apline Ski resorts/slops/pistes
+  t.string      :key,      :null => false   # import/export key
+  t.string      :name,     :null => false
+  t.string      :synonyms  # comma separated list of synonyms
+
+  t.references  :city
+  t.references  :region
+  t.references  :country,   :null => false
+  t.timestamps
+end
+
+
+# join table -> event(season+league)+track
+create_table :races do |t|     # e.g. Formula 1 race (Grand Prix Monaco) or Alpine Ski race (Downhill Lake Louise)
+  t.references :track
+  t.references :event
+  t.integer    :pos,      :null => false   # Race #1,#2,#3,#4 etc.
+  
+  t.datetime   :start_at
+  t.timestamps
+end
+
+# join table -> person+team+event(season+league)
+create_table :rosters do |t|   # use squads as an alternative name? why? why not??
+  t.references :person
+  t.references :team
+  t.references :event
+  t.integer    :pos,      :null => false
+  t.timestamps
+end
+
+
 create_table :events do |t|
   t.string      :key,      :null => false   # import/export key
   t.references  :league,   :null => false

data/lib/sportdb/stats.rb

@@ -6,12 +6,17 @@ module SportDb
 
     def tables
       puts "Stats:"
-      puts "  #{Event.count} events  /  #{Round.count} rounds  /  #{Group.count} groups"
       puts "  #{League.count} leagues  /  #{Season.count} seasons"
-      puts "  #{Country.count} countries / #{Region.count} regions / #{City.count} cities"
+      puts "  #{Event.count} events (league+season recs)  /  #{Round.count} rounds  /  #{Group.count} groups"
       puts "  #{Team.count} teams"
       puts "  #{Game.count} games"
       puts "  #{Badge.count} badges"
+
+      puts "  #{Track.count} tracks / #{Race.count} races (track+event recs)"
+      puts "  #{Person.count} persons / #{Roster.count} rosters (person+team+event recs)"
+      puts "  #{Goal.count} goals (person+game recs)"
+
+      puts "  #{Country.count} countries / #{Region.count} regions / #{City.count} cities"
       
       ## todo: add tags / taggings from worlddb
     end

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.6.6'
+  VERSION = '1.6.7'
 end
 
 ###########################################

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &72206260 !ruby/object:Gem::Requirement
+  requirement: &73513280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *72206260
+  version_requirements: *73513280
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &72206040 !ruby/object:Gem::Requirement
+  requirement: &73513060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *72206040
+  version_requirements: *73513060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &73407120 !ruby/object:Gem::Requirement
+  requirement: &73512840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *73407120
+  version_requirements: *73512840
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &73406900 !ruby/object:Gem::Requirement
+  requirement: &73512620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *73406900
+  version_requirements: *73512620
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -93,12 +93,15 @@ files:
 - lib/sportdb/models/group.rb
 - lib/sportdb/models/group_team.rb
 - lib/sportdb/models/league.rb
-- lib/sportdb/models/player.rb
+- lib/sportdb/models/person.rb
 - lib/sportdb/models/prop.rb
+- lib/sportdb/models/race.rb
 - lib/sportdb/models/region.rb
+- lib/sportdb/models/roster.rb
 - lib/sportdb/models/round.rb
 - lib/sportdb/models/season.rb
 - lib/sportdb/models/team.rb
+- lib/sportdb/models/track.rb
 - lib/sportdb/reader.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/stats.rb