sportdb 1.8.0 → 1.8.1

data/Manifest.txt

@@ -13,15 +13,11 @@ lib/sportdb.rb
 lib/sportdb/cli/main.rb
 lib/sportdb/cli/opts.rb
 lib/sportdb/console.rb
-lib/sportdb/data/fixtures.rb
 lib/sportdb/data/keys.rb
 lib/sportdb/data/models.rb
 lib/sportdb/deleter.rb
 lib/sportdb/lang.rb
 lib/sportdb/models/badge.rb
-lib/sportdb/models/city.rb
-lib/sportdb/models/continent.rb
-lib/sportdb/models/country.rb
 lib/sportdb/models/event.rb
 lib/sportdb/models/event_team.rb
 lib/sportdb/models/forward.rb
@@ -31,10 +27,8 @@ lib/sportdb/models/group.rb
 lib/sportdb/models/group_team.rb
 lib/sportdb/models/league.rb
 lib/sportdb/models/person.rb
-lib/sportdb/models/prop.rb
 lib/sportdb/models/race.rb
 lib/sportdb/models/record.rb
-lib/sportdb/models/region.rb
 lib/sportdb/models/roster.rb
 lib/sportdb/models/round.rb
 lib/sportdb/models/run.rb
@@ -42,6 +36,10 @@ lib/sportdb/models/season.rb
 lib/sportdb/models/team.rb
 lib/sportdb/models/track.rb
 lib/sportdb/models/utils.rb
+lib/sportdb/models/world/city.rb
+lib/sportdb/models/world/continent.rb
+lib/sportdb/models/world/country.rb
+lib/sportdb/models/world/region.rb
 lib/sportdb/reader.rb
 lib/sportdb/schema.rb
 lib/sportdb/service.rb
@@ -79,7 +77,6 @@ lib/sportdb/title.rb
 lib/sportdb/updater.rb
 lib/sportdb/utils.rb
 lib/sportdb/version.rb
-tasks/test.rb
 test/helper.rb
 test/test_changes.rb
 test/test_cursor.rb

data/README.md

@@ -139,9 +139,9 @@ Just install the gem:
 ## Free Open Public Domain Datasets
 
 - [`football.db`](https://github.com/openfootball) - free open public domain football (soccer) data for use in any (programming) language
-- [`formula1.db`](https://github.com/geraldb/formula1.db) - free open public domain Formula 1/Formula One data for use in any (programming) language
-- [`ski.db`](https://github.com/geraldb/ski.db) - free open public domain Ski Alpin/Alpine Ski data for use in any (programming) language
-- [`sport.db`](https://github.com/geraldb/sport.db) - free open public domain sports data for use in any (programming) language
+- [`formula1.db`](https://github.com/opensport/formula1.db) - free open public domain Formula 1/Formula One data for use in any (programming) language
+- [`ski.db`](https://github.com/opensport/ski.db) - free open public domain Ski Alpin/Alpine Ski data for use in any (programming) language
+- [`american-football.db`](https://github.com/opensport/american-football.db) - free open public domain American Football data for use in any (programming) language
 
 
 ## License

data/lib/sportdb.rb

@@ -31,10 +31,11 @@ require 'sportdb/version'
 
 require 'sportdb/title'   ## fix - move to textutils gem
 require 'sportdb/models/forward'
+require 'sportdb/models/world/city'
+require 'sportdb/models/world/country'
+require 'sportdb/models/world/continent'
+require 'sportdb/models/world/region'
 require 'sportdb/models/badge'
-require 'sportdb/models/city'
-require 'sportdb/models/country'
-require 'sportdb/models/continent'
 require 'sportdb/models/event'
 require 'sportdb/models/event_team'
 require 'sportdb/models/game'
@@ -43,10 +44,8 @@ require 'sportdb/models/group'
 require 'sportdb/models/group_team'
 require 'sportdb/models/league'
 require 'sportdb/models/person'
-require 'sportdb/models/prop'
 require 'sportdb/models/race'
 require 'sportdb/models/record'
-require 'sportdb/models/region'
 require 'sportdb/models/roster'
 require 'sportdb/models/round'
 require 'sportdb/models/run'
@@ -54,6 +53,13 @@ require 'sportdb/models/season'
 require 'sportdb/models/team'
 require 'sportdb/models/track'
 require 'sportdb/models/utils'   # e.g. GameCursor
+
+## add backwards compatible namespace (delete later!)
+module SportDb
+  Models = Model
+end
+
+
 require 'sportdb/schema'       # NB: requires sportdb/models (include SportDB::Models)
 require 'sportdb/utils'
 require 'sportdb/reader'
@@ -72,7 +78,6 @@ require 'sportdb/stats'
 #  todo/fix => remove from here and move into console.rb and tasks.rb
 
 require 'sportdb/data/keys'
-require 'sportdb/data/fixtures'
 require 'sportdb/data/models'     # add convenience finders for known fixtures
 
 
@@ -114,7 +119,7 @@ module SportDb
 
   def self.create
     CreateDb.new.up
-    WorldDb::Models::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
+    WorldDb::Model::Prop.create!( key: 'db.schema.sport.version', value: VERSION )
   end
 
   def self.read_setup( setup, include_path )

data/lib/sportdb/data/models.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module SportDb::Models
+module SportDb::Model
 
   ## add convenience finders to some model classes
   
@@ -38,6 +38,6 @@ module SportDb::Models
     
   end # class Event
 
-end # module SportDb::Models
+end # module SportDb::Model
 
 

data/lib/sportdb/models/badge.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 class Badge < ActiveRecord::Base
 
@@ -9,4 +9,5 @@ class Badge < ActiveRecord::Base
 end  # class Badge
   
 
-end # module SportDb::Models
+end # module SportDb::Model
+

data/lib/sportdb/models/event.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-module SportDb::Models
+module SportDb::Model
 
 class Event < ActiveRecord::Base
 
@@ -54,4 +54,4 @@ class Event < ActiveRecord::Base
 
 end # class Event
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/event_team.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class EventTeam < ActiveRecord::Base
@@ -9,4 +9,4 @@ class EventTeam < ActiveRecord::Base
 end # class EventTeam
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/forward.rb

@@ -2,15 +2,15 @@
 ### forward references
 ##   require first to resolve circular references
 
-module SportDb::Models
+module SportDb::Model
 
   ## todo: why? why not use include WorldDb::Models here???
 
-  Continent = WorldDb::Models::Continent
-  Country   = WorldDb::Models::Country
-  Region    = WorldDb::Models::Region
-  City      = WorldDb::Models::City
-  Prop      = WorldDb::Models::Prop
+  Continent = WorldDb::Model::Continent
+  Country   = WorldDb::Model::Country
+  Region    = WorldDb::Model::Region
+  City      = WorldDb::Model::City
+  Prop      = WorldDb::Model::Prop
 
   ## nb: for now only team and league use worlddb tables
   #   e.g. with belongs_to assoc (country,region)
@@ -21,12 +21,12 @@ module SportDb::Models
 end
 
 
-module WorldDb::Models
+module WorldDb::Model
 
   # add alias? why? why not? # is there a better way?
   #  - just include SportDb::Models  - why? why not?
   #  - just include once in loader??
-  Team   = SportDb::Models::Team
-  League = SportDb::Models::League
+  Team   = SportDb::Model::Team
+  League = SportDb::Model::League
 
 end

data/lib/sportdb/models/game.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Game < ActiveRecord::Base
@@ -86,53 +86,19 @@ class Game < ActiveRecord::Base
 
   ### getter/setters for deprecated attribs (score3,4,5,6) n national
   
-  def score3
-    score1et
-  end
-
-  def score4
-    score2et
-  end
-  
-  def score1ot
-    score1et
-  end
-
-  def score2ot
-    score2et
-  end
-
-  def score5
-    score1p
-  end
-
-  def score6
-    score2p
-  end
+  def score3()   score1et  end
+  def score4()   score2et  end
+  def score1ot() score1et  end
+  def score2ot() score2et  end
+  def score5()   score1p   end
+  def score6()   score2p   end
 
-  def score3=(value)
-    self.score1et = value
-  end
-
-  def score4=(value)
-    self.score2et = value
-  end
-
-  def score1ot=(value)
-    self.score1et = value
-  end
-
-  def score2ot=(value)
-    self.score2et = value
-  end
-
-  def score5=(value)
-    self.score1p = value
-  end
-
-  def score6=(value)
-    self.score2p = value
-  end
+  def score3=(value)   self.score1et = value  end
+  def score4=(value)   self.score2et = value  end
+  def score1ot=(value) self.score1et = value  end
+  def score2ot=(value) self.score2et = value  end
+  def score5=(value)   self.score1p = value   end
+  def score6=(value)   self.score2p = value   end
 
 
 
@@ -391,4 +357,4 @@ class Game < ActiveRecord::Base
 end # class Game
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/goal.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Goal < ActiveRecord::Base
@@ -9,4 +9,4 @@ class Goal < ActiveRecord::Base
 end  # class Goal
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/group.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Group < ActiveRecord::Base
@@ -19,5 +19,5 @@ class Group < ActiveRecord::Base
 end # class Group
   
   
-end # module SportDb::Models
+end # module SportDb::Model
 

data/lib/sportdb/models/group_team.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class GroupTeam < ActiveRecord::Base
@@ -9,5 +9,5 @@ class GroupTeam < ActiveRecord::Base
 end # class GroupTeam
 
 
-end # module SportDb::Models
+end # module SportDb::Model
 

data/lib/sportdb/models/league.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class League < ActiveRecord::Base
@@ -10,7 +10,7 @@ class League < ActiveRecord::Base
   has_many :events
   has_many :seasons, :through => :events
   
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
 
 
   def self.create_or_update_from_values( new_attributes, values )
@@ -78,4 +78,4 @@ class League < ActiveRecord::Base
 end  # class League
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/person.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Person < ActiveRecord::Base
@@ -6,16 +6,11 @@ class Person < ActiveRecord::Base
 
   has_many :goals
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
 
 
-  def title    # alias for name
-    name
-  end
-
-  def title=(value)  # alias for name
-    self.name = value
-  end
+  def title()       name               end  # alias for name
+  def title=(value) self.name = value  end  # alias for name
 
 
   def self.create_or_update_from_values( new_attributes, values )
@@ -67,4 +62,5 @@ class Person < ActiveRecord::Base
 end  # class Person
 
 
-end # module SportDb::Models
+end # module SportDb::Model
+

data/lib/sportdb/models/race.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Race < ActiveRecord::Base
@@ -13,4 +13,4 @@ class Race < ActiveRecord::Base
 end  # class Race
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/record.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Record < ActiveRecord::Base
@@ -10,4 +10,4 @@ class Record < ActiveRecord::Base
 end  # class Record
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/roster.rb

@@ -1,4 +1,6 @@
-module SportDb::Models
+module SportDb::Model
+
+### use LineUp, Squad for name? - alias??
 
 class Roster < ActiveRecord::Base
 
@@ -9,4 +11,4 @@ class Roster < ActiveRecord::Base
 end  # class Roster
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/round.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Round < ActiveRecord::Base
@@ -9,5 +9,5 @@ class Round < ActiveRecord::Base
 end # class Round
   
   
-end # module SportDb::Models
+end # module SportDb::Model
 

data/lib/sportdb/models/run.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Run < ActiveRecord::Base
@@ -8,4 +8,4 @@ class Run < ActiveRecord::Base
 end  # class Run
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/season.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Season < ActiveRecord::Base
@@ -8,4 +8,4 @@ class Season < ActiveRecord::Base
 end  # class Season
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/team.rb

@@ -1,4 +1,4 @@
-module SportDb::Models
+module SportDb::Model
 
 
 class Team < ActiveRecord::Base
@@ -32,8 +32,8 @@ class Team < ActiveRecord::Base
 
   has_many :badges   # Winner, 2nd, Cupsieger, Aufsteiger, Absteiger, etc.
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
-  belongs_to :city,    :class_name => 'WorldDb::Models::City',    :foreign_key => 'city_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
+  belongs_to :city,    :class_name => 'WorldDb::Model::City',    :foreign_key => 'city_id'
 
 
 
@@ -129,4 +129,4 @@ class Team < ActiveRecord::Base
 end  # class Team
   
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/track.rb

@@ -1,10 +1,10 @@
-module SportDb::Models
+module SportDb::Model
 
 class Track < ActiveRecord::Base
 
   has_many :races
 
-  belongs_to :country, :class_name => 'WorldDb::Models::Country', :foreign_key => 'country_id'
+  belongs_to :country, :class_name => 'WorldDb::Model::Country', :foreign_key => 'country_id'
 
   #####################
   ## convenience helper for text parser/reader
@@ -55,4 +55,4 @@ class Track < ActiveRecord::Base
 end  # class Track
 
 
-end # module SportDb::Models
+end # module SportDb::Model

data/lib/sportdb/models/utils.rb

@@ -1,5 +1,5 @@
 module SportDb
-  module Models
+  module Model
 
 
 class GameCursor
@@ -74,5 +74,5 @@ class GameCursorState
 end # class GameCursorState
 
 
-  end # module Models
+  end # module Model
 end # module SportDb

data/lib/sportdb/models/world/city.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+## todo: how to best extends city model?
+
+module WorldDb::Model
+
+  class City
+    has_many :teams, class_name: 'SportDb::Model::Team', foreign_key: 'city_id'
+  end
+
+end # module WorldDb::Model
+

data/lib/sportdb/models/{continent.rb → world/continent.rb}

@@ -1,10 +1,10 @@
 # encoding: utf-8
 
-module WorldDb::Models
+module WorldDb::Model
 
   class Continent
     has_many :teams,   :through => :countries
     has_many :leagues, :through => :countries
   end # class Continent
 
-end # module WorldDb::Models
+end # module WorldDb::Model

data/lib/sportdb/models/world/country.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+## todo: how to best extends country model?
+
+module WorldDb::Model
+
+  class Country
+    has_many :teams,   class_name: 'SportDb::Model::Team',   foreign_key: 'country_id'
+    has_many :leagues, class_name: 'SportDb::Model::League', foreign_key: 'country_id'
+  end # class Country
+
+end # module WorldDb::Model
+

data/lib/sportdb/models/world/region.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+## todo: how to best extends country model?
+
+module WorldDb::Model
+
+  class Region
+    has_many :teams, class_name: 'SportDb::Model::Team', :through => :cities
+  end # class Region
+
+end # module WorldDb::Model
+

data/lib/sportdb/version.rb

@@ -1,6 +1,6 @@
 
 module SportDb
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sportdb
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: worlddb
-  requirement: &19980396 !ruby/object:Gem::Requirement
+  requirement: &20011296 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *19980396
+  version_requirements: *20011296
 - !ruby/object:Gem::Dependency
   name: fetcher
-  requirement: &19978320 !ruby/object:Gem::Requirement
+  requirement: &20009076 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *19978320
+  version_requirements: *20009076
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &19975680 !ruby/object:Gem::Requirement
+  requirement: &20104680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *19975680
+  version_requirements: *20104680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &19973184 !ruby/object:Gem::Requirement
+  requirement: &20102280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *19973184
+  version_requirements: *20102280
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &19970100 !ruby/object:Gem::Requirement
+  requirement: &20099184 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.7'
   type: :development
   prerelease: false
-  version_requirements: *19970100
+  version_requirements: *20099184
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -91,15 +91,11 @@ files:
 - lib/sportdb/cli/main.rb
 - lib/sportdb/cli/opts.rb
 - lib/sportdb/console.rb
-- lib/sportdb/data/fixtures.rb
 - lib/sportdb/data/keys.rb
 - lib/sportdb/data/models.rb
 - lib/sportdb/deleter.rb
 - lib/sportdb/lang.rb
 - lib/sportdb/models/badge.rb
-- lib/sportdb/models/city.rb
-- lib/sportdb/models/continent.rb
-- lib/sportdb/models/country.rb
 - lib/sportdb/models/event.rb
 - lib/sportdb/models/event_team.rb
 - lib/sportdb/models/forward.rb
@@ -109,10 +105,8 @@ files:
 - lib/sportdb/models/group_team.rb
 - lib/sportdb/models/league.rb
 - lib/sportdb/models/person.rb
-- lib/sportdb/models/prop.rb
 - lib/sportdb/models/race.rb
 - lib/sportdb/models/record.rb
-- lib/sportdb/models/region.rb
 - lib/sportdb/models/roster.rb
 - lib/sportdb/models/round.rb
 - lib/sportdb/models/run.rb
@@ -120,6 +114,10 @@ files:
 - lib/sportdb/models/team.rb
 - lib/sportdb/models/track.rb
 - lib/sportdb/models/utils.rb
+- lib/sportdb/models/world/city.rb
+- lib/sportdb/models/world/continent.rb
+- lib/sportdb/models/world/country.rb
+- lib/sportdb/models/world/region.rb
 - lib/sportdb/reader.rb
 - lib/sportdb/schema.rb
 - lib/sportdb/service.rb
@@ -157,7 +155,6 @@ files:
 - lib/sportdb/updater.rb
 - lib/sportdb/utils.rb
 - lib/sportdb/version.rb
-- tasks/test.rb
 - test/helper.rb
 - test/test_changes.rb
 - test/test_cursor.rb

data/lib/sportdb/data/fixtures.rb

@@ -1,205 +0,0 @@
-# encoding: utf-8
-
-def find_football_db_path_from_gemfile_gitref!
-  puts "[debug] find_football_db_path..."
-  puts "load path:"
-  pp $LOAD_PATH
-  
-  candidates = []
-  $LOAD_PATH.each do |path|
-    if path =~ /\/(football\.db-[a-z0-9]+)|(football\.db)\//
-      candidates << path.dup
-    end
-  end
-  
-  puts "found candidates:"
-  pp candidates
-  
-  ## cut-off everything after /football.db
-  # e.g. lib/ruby/gems/1.9.1/bundler/gems/football.db-38279c414449/lib becomes
-  #      lib/ruby/gems/1.9.1/bundler/gems/football.db-38279c414449
-  
-  cand = candidates[0]
-  
-  puts "cand before: #{cand}"
-  
-  ## nb: *? is non-greedy many operator
-  
-  ## todo: why not just cut off trailing /lib - is it good enough??
-  # it's easier
-  
-  regex = /(\/football\.db.*?)(\/.*)/
-  cand = cand.sub( regex ) do |_|
-    puts "cutting off >>#{$2}<<"
-    $1
-  end
-  
-  puts "cand after: #{cand}"
-  
-  ## todo:exit with error if not found!!!
-  
-  cand
-end
-
-
-
-module SportDb
-  
-  module Fixtures   # use shortcut/alias Fx?
-  
-  ## todo/ check: remove _FIXTURES and use module namespace instead?
-  
-  
-  SEASONS = [
-    'seasons'
-  ]
-  
-  LEAGUES = [
-    'leagues',
-    'leagues_club'
-  ]
-  
-  ## todo/check: put teams into its own module/namespace (remove _TEAMS?)
-  EUROPE_TEAMS = [
-    'europe/teams'
-  ]
-
-  ## NB: copa america requires jpn as team invitee (from asia)
-  AMERICA_TEAMS = [
-    'world/teams',
-    'america/teams'
-  ]
-  
-  WORLD_TEAMS = [
-    'world/teams',
-    'america/teams',
-    'europe/teams'
-  ]
-
-  AT_TEAMS = [ 'at/teams', 'at/teams2' ]
-  DE_TEAMS = [ 'de/teams' ]
-  EN_TEAMS = [ 'en/teams' ]
-  ES_TEAMS = [ 'es/teams' ]
-  FR_TEAMS = [ 'fr/teams' ]
-  IT_TEAMS = [ 'it/teams' ]
-  RO_TEAMS = [ 'ro/teams' ]
-
-  CLUB_EUROPE_TEAMS =
-    AT_TEAMS +
-    DE_TEAMS +
-    EN_TEAMS +
-    ES_TEAMS +
-    FR_TEAMS +
-    IT_TEAMS + 
-    RO_TEAMS +
-   [
-    'club/europe/teams'
-   ]
-  
-  
-  AR_TEAMS = [ 'ar/teams' ]
-  BR_TEAMS = [ 'br/teams' ]
-  MX_TEAMS = [ 'mx/teams' ]
-  
-  CLUB_AMERICA_TEAMS = 
-    AR_TEAMS +
-    BR_TEAMS +
-    MX_TEAMS +
-  [
-    'america/teams_c',
-    'america/teams_n',
-    'america/teams_s',
-  ]
-  
-  AR_FIXTURES = []
-
-  ### todo: ? get event_key automatically from event_reader ?? why? why not??
-  BR_FIXTURES = [
-    'br/2013/cb'
-  ]
-
-  MX_FIXTURES = [
-    'mx/2012/apertura',
-    'mx/2013/clausura'
-  ]
-
-
-  AT_FIXTURES = [
-    'at/2011_12/bl',
-    'at/2011_12/cup',
-    'at/2012_13/bl',
-    'at/2012_13/cup'
-  ]
-  
-  DE_FIXTURES = [
-    'de/2012_13/bl'
-  ]
-  
-  EN_FIXTURES = [
-    'en/2012_13/pl'
-  ]
-  
-  RO_FIXTURES = [
-    'ro/2012_13/l1'
-  ]
-  
-  
-  EUROPE_FIXTURES = [
-    'euro-cup!/2008/euro',
-    'euro-cup!/2012/euro'
-  ]
-    
-  AMERICA_FIXTURES = [
-    'america/2011/copa',
-    'america/2011/gold',
-    'america/2013/gold',
-    'america/2015/copa'
-  ]
-  
-  WORLD_FIXTURES = [
-    'world/2009/conf',
-    'world/2010/cup',
-    'world/2014/quali_america',
-    'world/2014/quali_europe_c',
-    'world/2014/quali_europe',
-    'world/2014/cup'
-  ]
-  
-  CLUB_EUROPE_FIXTURES = [
-    'club/europe/2011_12/cl',
-    'club/europe/2011_12/el',
-    'club/europe/2012_13/cl',
-    'club/europe/2012_13/el'
-  ]
-  
-  CLUB_AMERICA_FIXTURES = [
-    'club/america/2011_12/cl',
-    'club/america/2012/libertadores',
-    'club/america/2012/sud',
-    'club/america/2012_13/cl',
-    'club/america/2013/libertadores'
-  ]
-  
-  def self.all
-    SEASONS + 
-    LEAGUES +
-    CLUB_AMERICA_TEAMS +
-    AR_FIXTURES +
-    BR_FIXTURES +
-    MX_FIXTURES +
-    CLUB_AMERICA_FIXTURES +
-    CLUB_EUROPE_TEAMS +
-    AT_FIXTURES +
-    DE_FIXTURES +
-    EN_FIXTURES +
-    RO_FIXTURES +
-    CLUB_EUROPE_FIXTURES +
-    WORLD_TEAMS +
-    AMERICA_FIXTURES +
-    EUROPE_FIXTURES +
-    WORLD_FIXTURES
-  end  # method all
-
-  end # module Fixtures
-  
-end # module SportDb

data/lib/sportdb/models/city.rb

@@ -1,14 +0,0 @@
-
-## todo: how to best extends city model?
-
-module WorldDb::Models
-  class City
-    has_many :teams, :class_name => 'SportDb::Models::Team', :foreign_key => 'city_id'
-  end
-end # module WorldDb::Models
-
-
-## moved to models/forward
-#  module SportDb::Models
-#  City = WorldDb::Models::City
-# end # module SportDb::Models

data/lib/sportdb/models/country.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-## todo: how to best extends country model?
-
-module WorldDb::Models
-
-  class Country
-    has_many :teams,   :class_name => 'SportDb::Models::Team',   :foreign_key => 'country_id'
-    has_many :leagues, :class_name => 'SportDb::Models::League', :foreign_key => 'country_id'
-  end # class Country
-
-end # module WorldDb::Models
-
-
-## moved to models/forward
-# module SportDb::Models
-#  Country = WorldDb::Models::Country
-# end # module SportDb::Models

data/lib/sportdb/models/prop.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-
-## moved to models/forward
-#  module SportDb::Models
-#    Prop = WorldDb::Models::Prop
-#  end # module SportDb::Models

data/lib/sportdb/models/region.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-
-## todo: how to best extends country model?
-
-module WorldDb::Models
-
-  class Region
-    has_many :teams, :class_name => 'SportDb::Models::Team', :through => :cities
-  end # class Region
-
-end # module WorldDb::Models
-
-## moved to models/forward
-# module SportDb::Models
-#  Region = WorldDb::Models::Region
-# end # module SportDb::Models

data/tasks/test.rb

@@ -1,163 +0,0 @@
-
-#########################
-#  Fill up sport.db w/ football.db fixtures
-
-
-##############################
-## for testing 
-##
-## NB: use
-#   rake -I ../world.db.ruby/lib -I ../sport.db.ruby/lib update
-
-
-include SportDB::Fixtures   # include fixture constants like WORLD_FIXTURES, EN_FIXTURES etc.
-
-
-##########
-# TODO: configure - copy to your rake file
-
-#  INCLUDE_PATH = "../football.db"
-  
-#  BUILD_DIR = "./db"
-  
-#  SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
-
-
-################
-
-  DB_CONFIG = {
-    :adapter   =>  'sqlite3',
-    :database  =>  SPORT_DB_PATH
-  }
-
-  directory BUILD_DIR
-
- # task :clean do
- #   rm SPORT_DB_PATH if File.exists?( SPORT_DB_PATH )
- # end
-
-  task :env => BUILD_DIR do
-    pp DB_CONFIG
-    ActiveRecord::Base.establish_connection( DB_CONFIG )
-  end
-
- # task :create => :env do
- #   WorldDB.create
- # end
-
-  task :import => :env do
-    reader = SportDB::Reader.new
-    
-    reader.load_seasons_with_include_path( 'seasons', INCLUDE_PATH )
-    
-    reader.load_leagues_with_include_path( 'leagues',      INCLUDE_PATH )
-    reader.load_leagues_with_include_path( 'leagues_club', INCLUDE_PATH, { club: true } )
-  end
-  
-  ### club europe (cl,el)
-  task :club_europe => [:import] do
-    import_fixtures( CLUB_EUROPE_TEAMS, CLUB_EUROPE_FIXTURES )
-  end
-
-  ### club america 
-  task :club_america => [:import] do
-    import_fixtures( CLUB_AMERICA_TEAMS, CLUB_AMERICA_FIXTURES )
-  end
-  
-  task :europe  => [:import] do
-    import_fixtures( EUROPE_TEAMS, EUROPE_FIXTURES )
-  end
-
-  task :america  => [:import] do
-    import_fixtures( AMERICA_TEAMS, AMERICA_FIXTURES )
-  end
-  
-  task :world  => [:import] do
-    import_fixtures( WORLD_TEAMS, WORLD_FIXTURES )
-  end
-
-  ### ar - Argentina
-  task :ar => [:import] do
-    import_fixtures( AR_TEAMS, AR_FIXTURES )
-  end
-
-  ### br - Brasil
-  task :br => [:import] do
-    import_fixtures( BR_TEAMS, BR_FIXTURES )
-  end
-  
-  ### mx - Mexico
-  task :mx => [:import] do
-    import_fixtures( MX_TEAMS, MX_FIXTURES )
-  end
-  
-  #### at - Austria
-  task :at => [:import] do
-    import_fixtures( AT_TEAMS, AT_FIXTURES )
-  end
-  
-  #### de - Deutschland/Germany
-  task :de => [:import] do
-    import_fixtures( DE_TEAMS, DE_FIXTURES )
-  end
-
-  #### en - England
-  task :en => [:import] do
-    import_fixtures( EN_TEAMS, EN_FIXTURES )
-  end
-
-  #### ro - Romania
-  task :ro => [:import] do
-    import_fixtures( RO_TEAMS, RO_FIXTURES )
-  end
-
-
-
-  desc 'worlddb - test loading of builtin fixtures (update)'
-  task :update => [:world]
-  # task :update => [:at, :de, :en, :ro, :ar, :br, :mx]
-
-
-
-  def import_fixtures( teams, fixtures )
-    reader = SportDB::Reader.new
-    reader.load_with_include_path( teams, INCLUDE_PATH )
-    reader.load_with_include_path( fixtures, INCLUDE_PATH )
-  end
-
-
-
-=begin
-
-##################
-# usage sample
-##################
-
-#### step 1) configure tasks in test.rb in your rake file
-
-Rakefile:
-
-INCLUDE_PATH = "../football.db"
-  
-BUILD_DIR = "./db"
-  
-SPORT_DB_PATH = "#{BUILD_DIR}/sport.db"
-
-
-#### step 2) include tasks in test.rb
-
-SPORT_DB_RUBY_PATH = "../sport.db.ruby"
-WORLD_DB_RUBY_PATH = "../world.db.ruby"
-
-require "#{WORLD_DB_RUBY_PATH}/lib/worlddb.rb"
-require "#{SPORT_DB_RUBY_PATH}/lib/sportdb.rb"
-
-require "#{SPORT_DB_RUBY_PATH}/tasks/test.rb"
-
-Shell:
-
-### step 3) call on command line
-
-$ rake -I ../world.db.ruby/lib -I ../sport.db.ruby/lib update
-
-=end