sportdb 0.6.0 → 0.7.0

data/Manifest.txt

@@ -14,9 +14,7 @@ db/at/2012_13/cup.rb
 db/at/2012_13/cup.txt
 db/at/2012_13/cup_fixtures.rb
 db/at/badges.rb
-db/at/cities.rb
 db/at/teams.rb
-db/cities.rb
 db/cl/2011_12/cl.rb
 db/cl/2011_12/el.rb
 db/cl/2012_13/cl.rb
@@ -25,11 +23,9 @@ db/cl/teams.rb
 db/copa/sud_2012_13.rb
 db/copa/sud_2012_13.txt
 db/copa/teams.rb
-db/countries.rb
 db/de/2012_13/bl.rb
 db/de/2012_13/bl.txt
 db/de/2012_13/bl_fixtures.rb
-db/de/cities.rb
 db/de/teams.rb
 db/en/2012_13/pl.rb
 db/en/2012_13/pl.txt
@@ -68,6 +64,7 @@ lib/sportdb/models/city.rb
 lib/sportdb/models/country.rb
 lib/sportdb/models/event.rb
 lib/sportdb/models/event_team.rb
+lib/sportdb/models/forward.rb
 lib/sportdb/models/game.rb
 lib/sportdb/models/group.rb
 lib/sportdb/models/group_team.rb

data/Rakefile

@@ -18,7 +18,8 @@ Hoe.spec 'sportdb' do
   self.history_file = 'History.markdown'
   
   self.extra_deps = [
-    ['activerecord', '~> 3.2']  # NB: will include activesupport,etc.
+    ['activerecord', '~> 3.2'],  # NB: will include activesupport,etc.
+    ['worlddb', '~> 0.2.0']
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]
 

data/lib/sportdb.rb

@@ -1,7 +1,6 @@
 ###
 # NB: for local testing run like:
 #
-# 1.8.x: ruby -Ilib -rrubygems lib/sportdb.rb
 # 1.9.x: ruby -Ilib lib/sportdb.rb
 
 # core and stlibs
@@ -16,14 +15,12 @@ require 'erb'
 # rubygems
 
 require 'active_record'   ## todo: add sqlite3? etc.
+require 'worlddb'
 
 
 # our own code
 
-
-module SportDB   # forward reference; more to come later
-end
-
+require 'sportdb/models/forward'
 require 'sportdb/models/badge'
 require 'sportdb/models/city'
 require 'sportdb/models/country'
@@ -100,10 +97,6 @@ module SportDB
       Group.delete_all
       GroupTeam.delete_all
       Round.delete_all
-      Prop.delete_all
-      Country.delete_all
-      Region.delete_all
-      City.delete_all
       Badge.delete_all
       League.delete_all
       Season.delete_all

data/lib/sportdb/cli/opts.rb

@@ -11,6 +11,15 @@ class Opts
     @create == true
   end
   
+  def world=(boolean)
+    @world = boolean
+  end
+
+  def world?
+    return false if @world.nil?   # default populate world tables flag is false
+    @world == true
+  end
+
 
   def generate=(boolean)
     @generate = boolean

data/lib/sportdb/cli/runner.rb

@@ -23,20 +23,22 @@ class Runner
     
       cmd.banner = "Usage: sportdb [options]"
 
-      cmd.on( '-e', '--event KEY', 'Event to Load or Generate' ) { |key| opts.event = key; }
-      cmd.on( '-g', '--generate', 'Generate Fixtures from Template' ) { opts.generate = true }
+      cmd.on( '-e', '--event KEY', 'Event to load or generate' ) { |key| opts.event = key; }
+      cmd.on( '-g', '--generate', 'Generate fixtures from template' ) { opts.generate = true }
 
       ## todo: change to different flag??   use -c/--config ???
-      cmd.on( '-c', '--create', 'Create DB Schema' ) { opts.create = true }
+      cmd.on( '-c', '--create', 'Create DB schema' ) { opts.create = true }
+
+      cmd.on( '--world', "Populate world tables with builtin data (version #{WorldDB::VERSION})" ) { opts.world = true }
 
       cmd.on( '--delete', 'Delete all records' ) { opts.delete = true }
       
-      cmd.on( '--load', 'Use Loader for Builtin Sports Data' ) { opts.load = true }
+      cmd.on( '--load', 'Use loader for builtin sports data' ) { opts.load = true }
       
-      cmd.on( '-o', '--output PATH', "Output Path (default is #{opts.output_path})" ) { |path| opts.output_path = path }
+      cmd.on( '-o', '--output PATH', "Output path (default is #{opts.output_path})" ) { |path| opts.output_path = path }
 
       ### todo: in future allow multiple search path??
-      cmd.on( '-i', '--include PATH', "Data Path (default is #{opts.data_path})" ) { |path| opts.data_path = path }
+      cmd.on( '-i', '--include PATH', "Data path (default is #{opts.data_path})" ) { |path| opts.data_path = path }
 
       cmd.on( '-v', '--version', "Show version" ) do
         puts SportDB.banner
@@ -90,11 +92,21 @@ EOS
     ActiveRecord::Base.establish_connection( db_config )
     
     if opts.create?
-      CreateDB.up
+      CreateDB.up  # nb: includes WorldDB:CreateDB.up for tables -> countries,regions,cities,props 
     end
     
     if opts.delete?
       SportDB.delete!
+      WorldDB.delete!  # countries,regions,cities,props
+    end
+    
+    if opts.world?
+      WorldDB.load([
+        'countries',
+        'cities',
+        'at/cities',
+        'de/cities'
+      ])
     end
 
     if opts.event.present?

data/lib/sportdb/models/city.rb

@@ -1,50 +1,14 @@
-module SportDB::Models
 
-class City < ActiveRecord::Base
-  self.table_name = 'cities'
+## todo: how to best extends city model?
 
-  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
-  belongs_to :region,  :class_name => 'Region',  :foreign_key => 'region_id'
-
-  has_many :teams, :class_name => 'Team', :foreign_key => 'city_id'
-
-  
-  def self.create_from_ary!( cities, more_values={} )
-    cities.each do |values|
-      
-      ## key & title & country required
-      attr = {
-        key: values[0]
-      }
-      
-      ## title (split of optional synonyms)
-      # e.g. FC Bayern Muenchen|Bayern Muenchen|Bayern
-      titles = values[1].split('|')
-      
-      attr[ :title ]    =  titles[0]
-      ## add optional synonyms
-      attr[ :synonyms ] =  titles[1..-1].join('|')  if titles.size > 1
-      
-      attr = attr.merge( more_values )
-      
-      ## check for optional values
-      values[2..-1].each do |value|
-        if value.is_a? Country
-          attr[ :country_id ] = value.id
-        elsif value =~ /^region:/   ## region:
-          value_region_key = value[7..-1]  ## cut off region: prefix
-          value_region = Region.find_by_key!( value_region_key )
-          attr[ :region_id ] = value_region.id
-        else
-          # issue warning: unknown type for value
-        end
-      end
-      
-      City.create!( attr )
-    end # each city
+module WorldDB::Models
+  class City
+    has_many :teams, :class_name => 'Team', :foreign_key => 'city_id'
   end
-
-end # class Cities
+end # module WorldDB::Models
 
 
-end # module Models::SportDB
+## moved to models/forward
+#  module SportDB::Models
+#  City = WorldDB::Models::City
+# end # module SportDB::Models

data/lib/sportdb/models/country.rb

@@ -1,29 +1,18 @@
-module SportDB::Models
+# encoding: utf-8
 
+## todo: how to best extends country model?
 
-class Country < ActiveRecord::Base
-  self.table_name = 'countries'
+module WorldDB::Models
 
-  has_many :regions, :class_name => 'Region', :foreign_key => 'country_id'
-  has_many :cities,  :class_name => 'City',   :foreign_key => 'country_id'
-  has_many :teams,   :class_name => 'Team',   :foreign_key => 'country_id'
-  has_many :leagues, :class_name => 'League', :foreign_key => 'country_id'
+  class Country
+    has_many :teams,   :class_name => 'Team',   :foreign_key => 'country_id'
+    has_many :leagues, :class_name => 'League', :foreign_key => 'country_id'
+  end # class Country
 
-  def self.create_from_ary!( countries )
-    countries.each do |values|
-      
-      ## key & title required
-      attr = {
-        :key   => values[0],
-        :title => values[1],
-        :tag   => values[2]
-      }
-      
-      Country.create!( attr )
-    end # each country
-  end
+end # module WorldDB::Models
 
-end # class Country
 
-
-end # module Models::SportDB
+## moved to models/forward
+# module SportDB::Models
+#  Country = WorldDB::Models::Country
+# end # module SportDB::Models

data/lib/sportdb/models/forward.rb

@@ -0,0 +1,33 @@
+
+### forward references
+##   require first to resolve circular references
+
+module SportDB ; end
+
+module SportDB::Models
+
+  ## todo: why? why not use include WorldDB::Models here???
+
+  Country = WorldDB::Models::Country
+  Region  = WorldDB::Models::Region
+  City    = WorldDB::Models::City
+  Prop    = WorldDB::Models::Prop
+
+  ## nb: for now only team and league use worlddb tables
+  #   e.g. with belongs_to assoc (country,region)
+
+  class Team < ActiveRecord::Base ; end
+  class League < ActiveRecord::Base ; end
+
+end
+
+
+module WorldDB::Models
+
+  # 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
+
+end

data/lib/sportdb/models/league.rb

@@ -10,7 +10,7 @@ class League < ActiveRecord::Base
   has_many :events
   has_many :seasons, :through => :events
   
-  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+  belongs_to :country, :class_name => 'WorldDB::Models::Country', :foreign_key => 'country_id'
 
 
   def self.create_from_ary!( leagues, more_values={} )

data/lib/sportdb/models/prop.rb

@@ -1,10 +1,7 @@
-module SportDB::Models
+# encoding: utf-8
 
 
-class Prop < ActiveRecord::Base
-    
-end  # class Prop
-  
-  
-
-end # module SportDB::Models
+## moved to models/forward
+#  module SportDB::Models
+#    Prop = WorldDB::Models::Prop
+#  end # module SportDB::Models

data/lib/sportdb/models/region.rb

@@ -1,38 +1,16 @@
-module SportDB::Models
+# encoding: utf-8
 
-class Region < ActiveRecord::Base
+## todo: how to best extends country model?
 
-  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+module WorldDB::Models
 
-  has_many :cities, :class_name => 'City', :foreign_key => 'region_id'
-  has_many :teams, :through => :cities
+  class Region
+    has_many :teams, :through => :cities
+  end # class Region
 
+end # module WorldDB::Models
 
-  def self.create_from_ary!( regions, more_values={} )
-    regions.each do |values|
-            
-      ## key & title & country required
-      attr = {
-        key:   values[0],
-        title: values[1]
-      }
-
-      attr = attr.merge( more_values )
-      
-      ## check for optional values
-      values[2..-1].each do |value|
-        if value.is_a? Country
-          attr[ :country_id ] = value.id
-        else
-          # issue warning: unknown type for value
-        end
-      end
-      
-      Region.create!( attr )
-    end # each region
-  end
-
-end # class Region
-
-
-end # module Models::SportDB
+## moved to models/forward
+# module SportDB::Models
+#  Region = WorldDB::Models::Region
+# end # module SportDB::Models

data/lib/sportdb/models/team.rb

@@ -13,9 +13,9 @@ class Team < ActiveRecord::Base
   
   has_many :badges   # Winner, 2nd, Cupsieger, Aufsteiger, Absteiger, etc.
 
-  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
-  belongs_to :city,    :class_name => 'City',    :foreign_key => 'city_id'
-  
+  belongs_to :country, :class_name => 'WorldDB::Models::Country', :foreign_key => 'country_id'
+  belongs_to :city,    :class_name => 'WorldDB::Models::City',    :foreign_key => 'city_id'
+
 
   def self.create_from_ary!( teams, more_values={} )
     teams.each do |values|

data/lib/sportdb/schema.rb

@@ -8,40 +8,24 @@ class CreateDB
 #  e.g. lets you use Team instead of Models::Team 
   include SportDB::Models
 
-  
+
 def self.up
+
+  WorldDB::CreateDB.up   # tables countries,regions,cities,props
   
   ActiveRecord::Schema.define do
 
-create_table :countries do |t|
-  t.string :title, :null => false
-  t.string :tag,   :null => false  # short three letter tag (FIFA country code)
-  t.string :key,   :null => false
-  t.timestamps
-end
-
-create_table :regions do |t|
-  t.string :title,  :null => false
-  t.string :key,    :null => false
-  t.references :country, :null => false
-  t.timestamps
-end
-
-create_table :cities do |t|
-  t.string :title, :null => false
-  t.string :key,   :null => false
-  t.string :synonyms  # comma separated list of synonyms
-  t.references :country,  :null => false
-  t.references :region    # optional for now
-  t.timestamps
-end
+=begin
+## todo:fix - use if table.exists? why? why not?
 
 create_table :props do |t|
   t.string :key,   :null => false
   t.string :value, :null => false
   t.timestamps
 end
-    
+=end
+
+
 create_table :teams do |t|
   t.string  :title, :null => false
   t.string  :title2
@@ -180,7 +164,7 @@ end
   end # block Schema.define
 
 
-  Prop.create!( key: 'db.schema.version', value: SportDB::VERSION )
+  Prop.create!( key: 'db.schema.sport.version', value: SportDB::VERSION )
 
 end # method up
 

data/lib/sportdb/version.rb

@@ -1,4 +1,4 @@
 
 module SportDB
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sportdb
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-04 00:00:00 Z
+date: 2012-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -33,9 +33,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: worlddb
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,11 +62,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,7 +77,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: sportdb - sport.db command line tool
 email: opensport@googlegroups.com
 executables: 
@@ -99,9 +115,7 @@ files:
 - db/at/2012_13/cup.txt
 - db/at/2012_13/cup_fixtures.rb
 - db/at/badges.rb
-- db/at/cities.rb
 - db/at/teams.rb
-- db/cities.rb
 - db/cl/2011_12/cl.rb
 - db/cl/2011_12/el.rb
 - db/cl/2012_13/cl.rb
@@ -110,11 +124,9 @@ files:
 - db/copa/sud_2012_13.rb
 - db/copa/sud_2012_13.txt
 - db/copa/teams.rb
-- db/countries.rb
 - db/de/2012_13/bl.rb
 - db/de/2012_13/bl.txt
 - db/de/2012_13/bl_fixtures.rb
-- db/de/cities.rb
 - db/de/teams.rb
 - db/en/2012_13/pl.rb
 - db/en/2012_13/pl.txt
@@ -153,6 +165,7 @@ files:
 - lib/sportdb/models/country.rb
 - lib/sportdb/models/event.rb
 - lib/sportdb/models/event_team.rb
+- lib/sportdb/models/forward.rb
 - lib/sportdb/models/game.rb
 - lib/sportdb/models/group.rb
 - lib/sportdb/models/group_team.rb

data/db/at/cities.rb

@@ -1,53 +0,0 @@
-# encoding: utf-8
-
-at = Country.find_by_key!( 'at' )
-
-
-## 9 Bundeslaender
-
-regions_at = [
-  ['wien',  'Wien'], # Wien
-  ['noe',   'NÖ'],      # Niederösterreich
-  ['ooe',   'OÖ'],      # Oberösterreich
-  ['bgld',  'Bgld.'],   # Burgenland
-  ['stmk',  'Stmk.'],   # Steiermark
-  ['sbg',   'Sbg.'],    # Salzburg
-  ['ktn',   'Ktn.'],    # Kärnten
-  ['tirol', 'Tirol'],   # Tirol 
-  ['vbg',   'Vbg.']     # Vorarlberg
-]
-
-Region.create_from_ary!( regions_at, country: at )
-
-cities_at = [
-  ['wien',        'Wien|Vienna',      'region:wien'],
-
-  ['stpoelten',   'St. Pölten', 'region:noe'],
-  ['moedling',    'Mödling|Moedling', 'region:noe'],
-  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt', 'region:noe'],
-  ['horn',        'Horn',       'region:noe'],
-
-  ['linz',        'Linz',        'region:ooe'],
-  ['ried',        'Ried',        'region:ooe'],
-
-  ['mattersburg', 'Mattersburg', 'region:bgld'],
-
-  ['graz',        'Graz',        'region:stmk'],
-  ['hartberg',    'Hartberg',    'region:stmk'],
-  ['kapfenberg',  'Kapfenberg',  'region:stmk'],
-
-  ['salzburg',    'Salzburg',    'region:sbg'],
-  ['groedig',     'Grödig',      'region:sbg'],
-
-  ['wolfsberg',   'Wolfsberg',   'region:ktn'],
-
-  ['innsbruck',   'Innsbruck',   'region:tirol'],
-  
-  ['altach',      'Altach',     'region:vbg'],
-  ['lustenau',    'Lustenau',   'region:vbg']
-]
-
-City.create_from_ary!( cities_at, country: at )
-
-
-Prop.create!( key: 'db.at.cities.version', value: '1' )

data/db/cities.rb

@@ -1,263 +0,0 @@
-# encoding: utf-8
-
-
-cities_en = [
-  ['manchester',  'Manchester'],
-  ['london',      'London'],
-  ['liverpool',   'Liverpool'],
-  ['birmingham',  'Birmingham'],  # e.g.Aston Villa
-  ['westbrom',    'West Bromwich'],
-  ['newcastle',   'Newcastle upon Tyne'],
-  ['stoke',       'Stoke-on-Trent'],
-  ['sunderland',  'Sunderland'],
-  ['wigan',       'Wigan'],
-  ['southampton', 'Southampton'],
-  ['reading',     'Reading'],
-  ['norwich',     'Norwich'],
-  ['swansea',     'Swansea']
-]
-
-en = Country.find_by_key!( 'en' )
-City.create_from_ary!( cities_en, country: en )
-
-
-cities_es = [
-  ['bilbao',    'Bilbao'],
-  ['valencia',  'Valencia'],
-  ['barcelona', 'Barcelona'],
-  ['madrid',    'Madrid'],
-  ['malaga',    'Málaga']
-]
-
-es = Country.find_by_key!( 'es' )
-City.create_from_ary!( cities_es, country: es )
-
-
-cities_fr = [
-  ['lille',       'Lille'],
-  ['paris',       'Paris'],
-  ['marseille',   'Marseille'],
-  ['montpellier', 'Montpellier']
-]
-
-fr = Country.find_by_key!( 'fr' )
-City.create_from_ary!( cities_fr, country: fr )
-
-
-cities_it = [
-  ['turin',   'Turin'],
-  ['milano',  'Mailand|Milano'],
-  ['napoli',  'Neapel|Napoli']
-]
-
-it = Country.find_by_key!( 'it' )
-City.create_from_ary!( cities_it, country: it )
-
-
-cities_pt = [
-  ['porto', 'Porto'],
-  ['braga', 'Braga'],
-  ['lisboa', 'Lissabon|Lisboa']
-]
-
-pt = Country.find_by_key!( 'pt' )
-City.create_from_ary!( cities_pt, country: pt )
-
-
-cities_ru = [
-  ['moskva',      'Moskau|Moskva'],
-  ['stpetersburg','St. Petersburg']
-]
-
-ru = Country.find_by_key!( 'ru' )
-City.create_from_ary!( cities_ru, country: ru )
-
-
-cities_be = [
-  ['brussel',   'Brüssel|Brussel|Bruxelles|Brussels']  # de|nl|fr|en   - RCA Anderlecht
-]
-
-be = Country.find_by_key!( 'be' )
-City.create_from_ary!( cities_be, country: be )
-
-
-cities_ua = [
-  ['kiev',     'Kiew|Kiev|Kyiv' ],
-  ['donetsk',  'Donezk|Donetsk'],
-  ['kharkov',  'Kharkiv|Kharkov']
-]
-
-ua = Country.find_by_key!( 'ua' )
-City.create_from_ary!( cities_ua, country: ua )
-
-
-cities_nl = [
-  ['amsterdam','Amsterdam'],
-  ['alkmaar','Alkmaar']  ## region: North Holland
-]
-
-nl = Country.find_by_key!( 'nl' )
-City.create_from_ary!( cities_nl, country: nl )
-
-
-cities_hr = [
-  ['zagreb','Zagreb']
-]
-
-hr = Country.find_by_key!( 'hr' )
-City.create_from_ary!( cities_hr, country: hr )
-
-
-cities_gr = [
-  ['piraeus','Piräus|Piraeus']
-]
-
-gr = Country.find_by_key!( 'gr' )
-City.create_from_ary!( cities_gr, country: gr )
-
-
-cities_dk = [
-  ['farum','Farum']  ## region: North Zealand ??
-]
-
-dk = Country.find_by_key!( 'dk' )
-City.create_from_ary!( cities_dk, country: dk )
-
-
-cities_by = [
-  ['borisov','Borissow|Borisov|Barysaw']
-]
-
-by = Country.find_by_key!( 'by' )
-City.create_from_ary!( cities_by, country: by )
-
-
-cities_sc = [
-  ['glasgow','Glasgow']
-]
-
-sc = Country.find_by_key!( 'sc' )
-City.create_from_ary!( cities_sc, country: sc )
-
-
-cities_tr = [
-  ['istanbul','Istanbul']
-]
-
-tr = Country.find_by_key!( 'tr' )
-City.create_from_ary!( cities_tr, country: tr )
-
-
-cities_ro = [
-  ['cluj','Cluj']
-]
-
-ro = Country.find_by_key!( 'ro' )
-City.create_from_ary!( cities_ro, country: ro )
- 
- 
-cities_ch = [
-  ['basel','Basel']
-]
-
-ch = Country.find_by_key!( 'ch' )
-City.create_from_ary!( cities_ch, country: ch )
-
-
-cities_cy = [
-  ['nikosia','Nikosia|Nicosia']
-]
-
-cy = Country.find_by_key!( 'cy' )
-City.create_from_ary!( cities_cy, country: cy )
-
-
-
-cities_mx = [
-  ['mexico',        'México' ],
-  ['cancun',        'Cancún' ],
-  ['guadalajara',   'Guadalajara' ],
-  ['tuxtla',        'Tuxtla Gutiérrez' ],
-  ['leon',          'León' ],
-  ['morelia',       'Morelia' ],
-  ['monterrey',     'Monterrey' ],
-  ['pachuca',       'Pachuca' ],
-  ['puebla',        'Puebla' ],
-  ['queretaro',     'Querétaro' ],
-  ['sanluispotosi', 'San Luis Potosì' ],
-  ['torreon',       'Torreón' ],
-  ['tijuana',       'Tijuana' ],
-  ['toluca',        'Toluca' ],
-  ['sannicolas',    'San Nicolás de los Garza' ]
-]
-
-mx = Country.find_by_key!( 'mx' )
-City.create_from_ary!( cities_mx, country: mx )
-
-
-regions_ca = [
-  ['on', 'Ontario'],
-  ['qc', 'Quebec'],
-  ['ns', 'Nova Scotia'],
-  ['nb', 'New Brunswick'],
-  ['mb', 'Manitoba'],
-  ['bc', 'British Columbia'],
-  ['pe', 'Prince Edward Island'],
-  ['sk', 'Saskatchewan'],
-  ['ab', 'Alberta'],
-  ['nl', 'Newfoundland and Labrador']
-]
-
-cities_ca = [
-  ['montreal',  'Montreal',  'region:qc'],
-  ['ottawa',    'Ottawa',    'region:on'],
-  ['toronto',   'Toronto',   'region:on'],
-  ['winnipeg',  'Winnipeg',  'region:mb'],
-  ['calgary',   'Calgary',   'region:ab'],
-  ['edmonton',  'Edmonton',  'region:ab'],
-  ['vancouver', 'Vancouver', 'region:bc']
-]
-
-ca = Country.find_by_key!( 'ca' )
-Region.create_from_ary!( regions_ca, country: ca )
-City.create_from_ary!( cities_ca, country: ca )
-
-
-regions_us = [
-  ['ca', 'California'],
-  ['ny', 'New York'],
-  ['ma', 'Massachusetts'],
-  ['pa', 'Pennsylvania'],
-  ['il', 'Illinois'],
-  ['oh', 'Ohio'],
-  ['mi', 'Michigan'],
-  ['tn', 'Tennessee'],
-  ['tx', 'Texas'],
-  ['az', 'Arizona']
-]
-
-cities_us = [
-  ['newyork',      'New York',     'region:ny'],
-  ['buffalo',      'Buffalo',      'region:ny'],
-  ['philadelphia', 'Philadelphia', 'region:pa'],
-  ['boston',       'Boston',       'region:ma'],
-  ['chicago',      'Chicago',      'region:il'],
-  ['columbus',     'Columbus',     'region:oh'],
-  ['detroit',      'Detroit',      'region:mi'],
-  ['nashville',    'Nashville',    'region:tn'],
-  ['dallas',       'Dallas',       'region:tx'],
-  ['phoenix',      'Phoenix',      'region:az'],
-  ['losangeles',   'Los Angeles',  'region:ca'],
-  ['sanjose',      'San Jose',     'region:ca'],
-  ['anaheim',      'Anaheim',      'region:ca'],
-  ['stlouis',      'St. Louis'],
-  ['pittsburgh',   'Pittsburgh'],
-  ['washington',   'Washington']
-]
-
-us = Country.find_by_key!( 'us' )
-Region.create_from_ary!( regions_us, country: us )
-City.create_from_ary!( cities_us, country: us )
-
-
-Prop.create!( key: 'db.cities.version', value: '1' )

data/db/countries.rb

@@ -1,109 +0,0 @@
-# encoding: utf-8
-
-## NB: for keys use internet domain/iso two letter code 
-#
-# more info about iso country codes:
-#  -> http://en.wikipedia.org/wiki/ISO_3166-1
-#  two letter codes   -> http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
-#  three letter codes -> http://en.wikipedia.org/wiki/ISO_3166-1_alpha-3
-#
-#  for three letter codes use fifa code or iso code
-#  - fifa three letter country codes
-#    -> http://en.wikipedia.org/wiki/List_of_FIFA_country_codes
-#    -> differences (fifa,ioc,iso) -> http://en.wikipedia.org/wiki/Comparison_of_IOC,_FIFA,_and_ISO_3166_country_codes 
-
-
-countries = [
-
-  ####################
-  ### europe 
-
-  ## [ 'ad', 'Andorra',      'AND' ],
-  ## [ 'al', 'Albanien',     'ALB' ],
-  ## [ 'am', 'Armenien',     'ARM' ],
-  [ 'at', 'Österreich',   'AUT' ],
-  [ 'be', 'Belgien',      'BEL' ],
-  ## [ 'bg', 'Bulgarien',  'BUL' ],  # NB: ISO (BGR) <> FIFA (BUL)
-  [ 'by', 'Weißrussland', 'BLR' ],
-  [ 'ch', 'Schweiz',      'SUI' ],  # NB: ISO (CHE) <> FIFA (SUI)
-  [ 'cy', 'Zypern',       'CYP' ],
-  [ 'cz', 'Tschechien',   'CZE' ],
-  [ 'de', 'Deutschland',  'GER' ],  # NB: ISO (DEU) <> FIFA (GER)
-  [ 'dk', 'Dänemark',     'DEN' ],  # NB: ISO (DNK) <> FIFA (DEN)
-  [ 'en', 'England',      'ENG' ],  # NB: FIFA (ENG); not a valid iso country n internet domain / it's uk - what to use - anything better?
-  [ 'es', 'Spanien',      'ESP' ],
-  [ 'fi', 'Finnland',     'FIN' ],
-  [ 'fo', 'Färöer',       'FRO' ],
-  [ 'fr', 'Frankreich',   'FRA' ],
-  [ 'ge', 'Georgien',     'GEO' ],
-  [ 'gr', 'Griechenland', 'GRE' ],  # NB: ISO (GRC) <> FIFA (GRE)
-  [ 'hr', 'Kroatien',     'CRO' ],  # NB: ISO (HRV) <> FIFA (CRO);  local name: Hrvatska
-  ## [ 'hu', 'Ungarn',       'HUN' ],
-  [ 'ie', 'Irland',       'IRL' ],
-  [ 'it', 'Italien',      'ITA' ],
-  [ 'kz', 'Kasachstan',   'KAZ' ],
-  ## [ 'mt', 'Malta',        'MLT' ],
-  [ 'nl', 'Niederlande',  'NED' ],  # NB: ISO (NLD) <> FIFA (NED)
-  [ 'pl', 'Polen',        'POL' ],
-  [ 'pt', 'Portugal',     'POR' ],  # NB: ISO (PRT) <> FIFA (POR)
-  [ 'ro', 'Rumänien',     'ROU' ],
-  [ 'rs', 'Serbien',      'SRB' ],
-  [ 'ru', 'Russland',     'RUS' ],
-  [ 'sc', 'Schottland',   'SCO' ],  # NB: FIFA (SCO); not a valid iso country/internet domain - it's uk - what to use - anything better?
-  [ 'se', 'Schweden',     'SWE' ],
-  [ 'si', 'Slowenien',    'SVN' ],
-  [ 'sk', 'Slowakei',     'SVK' ],
-  [ 'tr', 'Türkei',       'TUR' ],
-  [ 'ua', 'Ukraine',      'UKR' ],
-
-  ##############
-  ## south america
-  
-  [ 'ar', 'Argentinien',   'ARG' ],
-  [ 'br', 'Brasilien',     'BRA' ],
-  [ 'cl', 'Chile',         'CHI' ],
-  [ 'py', 'Paraguay',      'PAR' ],
-  [ 'uy', 'Uruguay',       'URU' ],
-  [ 'ec', 'Ecuador',       'ECU' ],
-  [ 'co', 'Colombia',      'COL' ],
-
-  #####################
-  #### north/central america & caribbean islands
-  
-  [ 'ca', 'Kanada',        'CAN' ],
-  [ 'mx', 'Mexiko',        'MEX' ],
-  [ 'us', 'United States', 'USA' ],
-  [ 'hn', 'Honduras',      'HON' ],
-  [ 'cr', 'Costa Rica',    'CRC' ],
-  [ 'sv', 'El Salvador',   'SLV' ],
-  [ 'gy', 'Guyana',        'GUY' ],
-  
-  ########################
-  ## africa
-  
-  [ 'dz', 'Algerien',       'ALG' ],
-  [ 'ci', 'Elfenbeinküste', 'CIV' ],
-  [ 'gh', 'Ghana',          'GHA' ],
-  [ 'cm', 'Kamerun',        'CMR' ],
-  [ 'ng', 'Nigeria',        'NGA' ],
-  [ 'za', 'Südafrika',      'RSA' ],
-
-  #############################
-  ## asia w/ australia
-
-  [ 'au', 'Australien', 'AUS' ],
-  [ 'jp', 'Japan',      'JPN' ],
-  [ 'kp', 'Nordkorea',  'PRK' ],
-  [ 'kr', 'Südkorea',   'KOR' ],
-
-  ###############################
-  ## oceania
-  
-  [ 'nz', 'Neuseeland', 'NZL' ]
-]
-
-
-Country.create_from_ary!( countries )
-
-
-Prop.create!( key: 'db.countries.version', value: '1' )

data/db/de/cities.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-de = Country.find_by_key!( 'de' )
-
-regions_de = [
-  ['bw', 'Baden-Württemberg'],
-  ['by', 'Bayern'],
-  ['be', 'Berlin'],
-  ['bb', 'Brandenburg'],
-  ['hb', 'Bremen'],
-  ['hh', 'Hamburg'],
-  ['he', 'Hessen'],
-  ['mv', 'Mecklenburg-Vorpommern'],
-  ['ni', 'Niedersachsen'],
-  ['nw', 'Nordrhein-Westfalen'],
-  ['rp', 'Rheinland-Pfalz'],
-  ['sl', 'Saarland'],
-  ['sn', 'Sachsen'],
-  ['st', 'Sachsen-Anhalt'],
-  ['sh', 'Schleswig-Holstein'],
-  ['th', 'Thüringen']
-]
-
-Region.create_from_ary!( regions_de, country: de )
-
-
-cities_de = [
-  ['muenchen',      'München',       'region:by'],
-  ['nuernberg',     'Nürnberg',      'region:by'],
-  ['augsburg',      'Augsburg',      'region:by'],
-  ['fuerth',        'Fürth',         'region:by'],
-  ['stuttgart',     'Stuttgart',     'region:bw'],
-  ['hoffenheim',    'Hoffenheim',    'region:bw'],
-  ['freiburg',      'Freiburg',      'region:bw'],
-  ['hannover',      'Hannover',      'region:ni'],
-  ['wolfsburg',     'Wolfsburg',     'region:ni'],
-  ['gelsenkirchen', 'Gelsenkirchen', 'region:nw'],
-  ['dortmund',      'Dortmund',      'region:nw'],
-  ['leverkusen',    'Leverkusen',    'region:nw'],
-  ['duesseldorf',   'Düsseldorf',    'region:nw'],
-  ['mgladbach',     "Mönchengladbach|M'gladbach", 'region:nw' ],
-  ['frankfurt',     'Frankfurt',     'region:he'],
-  ['mainz',         'Mainz',         'region:rp'],
-  ['hamburg',       'Hamburg',       'region:hh'],
-  ['bremen',        'Bremen',        'region:hb']
-]
-
-City.create_from_ary!( cities_de, country: de )
-
-
-Prop.create!( key: 'db.de.cities.version', value: '1' )