worlddb 0.0.1 → 0.1.0

data/Manifest.txt

@@ -3,8 +3,17 @@ Manifest.txt
 README.markdown
 Rakefile
 bin/worlddb
+db/at/cities.rb
+db/cities.rb
+db/countries.rb
+db/de/cities.rb
 lib/worlddb.rb
 lib/worlddb/cli/opts.rb
 lib/worlddb/cli/runner.rb
+lib/worlddb/loader.rb
+lib/worlddb/models/city.rb
+lib/worlddb/models/country.rb
+lib/worlddb/models/prop.rb
+lib/worlddb/models/region.rb
 lib/worlddb/schema.rb
 lib/worlddb/version.rb

data/db/at/cities.rb

@@ -0,0 +1,53 @@
+# 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

@@ -0,0 +1,263 @@
+# 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

@@ -0,0 +1,109 @@
+# 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

@@ -0,0 +1,51 @@
+# 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' )

data/lib/worlddb/cli/runner.rb

@@ -3,8 +3,7 @@ module WorldDB
 
 class Runner
 
-
-  ### include WorldDB::Models
+  include WorldDB::Models
 
   def initialize
     @logger = Logger.new(STDOUT)
@@ -51,7 +50,7 @@ worlddb - world.db command line tool, version #{VERSION}
 #{cmd.help}
 
 Examples:
-    worlddb at                             # import austrian regions n cities
+    worlddb at/cities                      # import austrian regions n cities
     worlddb -c                             # create database schema
 
 More Examples:
@@ -89,13 +88,8 @@ EOS
        # tbd
     end
 
+    Loader.new( logger ).run( opts, args ) # load ruby fixtures
 
-    args.each do |arg|
-      name = arg     # File.basename( arg, '.*' )
-
-      # tbd
-    end
-    
     dump_stats
     dump_props
     
@@ -106,22 +100,19 @@ EOS
 
   def dump_stats
     # todo: use %5d or similar to format string
-=begin
     puts "Stats:"
     puts "  #{Country.count} countries"
-=end
+    puts "  #{Region.count} regions"
+    puts "  #{City.count} cities"
   end
 
 
   def dump_props
-
-=begin
     # todo: use %5 or similar to format string
     puts "Props:"
     Prop.order( 'created_at asc' ).all.each do |prop|
       puts "  #{prop.key} / #{prop.value} || #{prop.created_at}"
     end
-=end
   end
   
 end # class Runner

data/lib/worlddb/loader.rb

@@ -0,0 +1,75 @@
+module WorldDB
+
+class Loader
+
+## make models available in worlddb module by default with namespace
+#  e.g. lets you use City instead of Models::City 
+  include WorldDB::Models
+
+
+  def initialize( logger=nil )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+  end
+
+  attr_reader :logger
+
+
+  def run( opts, args )
+
+    args.each do |arg|
+      name = arg     # File.basename( arg, '.*' )
+      
+      if opts.load?
+        load_fixtures_builtin( name )
+      else
+        load_fixtures_with_include_path( name, opts.data_path )
+      end
+    end
+    
+  end # method run
+
+
+  def load_fixtures_with_include_path( name, include_path )  # load from file system
+    path = "#{include_path}/#{name}.rb"
+ 
+    puts "*** loading data '#{name}' (#{path})..."
+
+    code = File.read( path )
+    
+    load_fixtures_worker( code )
+  end
+  
+  def load_fixtures_builtin( name ) # load from gem (built-in)
+    path = "#{WorldDB.root}/db/#{name}.rb"
+
+    puts "*** loading data '#{name}' (#{path})..."
+
+    code = File.read( path )
+    
+    load_fixtures_worker( code )
+  end
+  
+
+private
+  def load_fixtures_worker( code )
+    
+    self.class_eval( code )
+
+    # NB: same as
+    #
+    # module WorldDB
+    #   include WorldDB::Models
+    #  <code here>
+    # end
+    
+    # Prop.create!( :key => "db.#{name}.version", :value => SportDB::VERSION )
+    
+  end
+  
+end # class Loader
+end # module WorldDB

data/lib/worlddb/models/city.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+
+module WorldDB::Models
+
+class City < ActiveRecord::Base
+  self.table_name = 'cities'
+
+  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+  belongs_to :region,  :class_name => 'Region',  :foreign_key => 'region_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
+  end
+
+end # class Cities
+
+end # module WorldDB::Models

data/lib/worlddb/models/country.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+
+module WorldDB::Models
+
+class Country < ActiveRecord::Base
+  self.table_name = 'countries'
+
+  has_many :regions, :class_name => 'Region', :foreign_key => 'country_id'
+  has_many :cities,  :class_name => 'City',   :foreign_key => 'country_id'
+
+  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 # class Country
+
+
+end # module WorldDB::Models

data/lib/worlddb/models/prop.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+
+module WorldDB::Models
+
+  class Prop < ActiveRecord::Base
+    
+  end  # class Prop
+  
+end # module WorldDB::Models

data/lib/worlddb/models/region.rb

@@ -0,0 +1,35 @@
+module WorldDB::Models
+
+class Region < ActiveRecord::Base
+
+  belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
+
+  has_many :cities, :class_name => 'City', :foreign_key => 'region_id'
+
+  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 WorldDB::Models

data/lib/worlddb/schema.rb

@@ -3,7 +3,7 @@ module WorldDB
 
 class CreateDB
 
-  ## include WorldDB::Models
+  include WorldDB::Models
 
 
 def self.up
@@ -12,14 +12,38 @@ def self.up
 
 create_table :countries do |t|
   t.string :title, :null => false
-  t.string :tag,   :null => false  # short three letter tag
   t.string :key,   :null => false
+  t.string :tag,   :null => false  # short three letter tag (FIFA country code)
+  t.string :synonyms  # comma separated list of synonyms
   t.timestamps
 end
-    
+
+create_table :regions 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.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
+
+create_table :props do |t|
+  t.string :key,   :null => false
+  t.string :value, :null => false
+  t.timestamps
+end
+
   end # block Schema.define
 
-  ## Prop.create!( key: 'db.schema.version', value: BeerDB::VERSION )
+  Prop.create!( key: 'db.schema.world.version', value: WorldDB::VERSION )
 
 end # method up
 

data/lib/worlddb/version.rb

@@ -1,4 +1,4 @@
 
 module WorldDB
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/worlddb.rb

@@ -19,7 +19,15 @@ require 'active_record'   ## todo: add sqlite3? etc.
 
 # our own code
 
+module WorldDB   # forward reference; more to come later
+end
+
+require 'worlddb/models/prop'
+require 'worlddb/models/country'
+require 'worlddb/models/region'
+require 'worlddb/models/city'
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
+require 'worlddb/loader'
 require 'worlddb/version'
 require 'worlddb/cli/opts'
 require 'worlddb/cli/runner'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -76,9 +76,18 @@ files:
 - README.markdown
 - Rakefile
 - bin/worlddb
+- db/at/cities.rb
+- db/cities.rb
+- db/countries.rb
+- db/de/cities.rb
 - lib/worlddb.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/runner.rb
+- lib/worlddb/loader.rb
+- lib/worlddb/models/city.rb
+- lib/worlddb/models/country.rb
+- lib/worlddb/models/prop.rb
+- lib/worlddb/models/region.rb
 - lib/worlddb/schema.rb
 - lib/worlddb/version.rb
 homepage: http://geraldb.github.com/world.db