worlddb 0.2.2 → 0.3.0

data/db/america/ve/regions.txt

@@ -0,0 +1,46 @@
+#-------------------------------------------------------------------------------
+# Country: Venezuela
+# Sources:
+# - http://es.wikipedia.org/wiki/Organizaci%C3%B3n_territorial_de_Venezuela
+#-------------------------------------------------------------------------------
+
+
+#-------------------------------------------------------------------------------
+# Table: regions_ve
+# Note : In Venezuela, the political-territorial division of each region is
+#        called "Federal Entity" or "State". Each of these states is at the same
+#        time divided into several areas called "Municipalities". The list of
+#        cities in this table corresponds to the capitals of each of these
+#        municipalities.
+#        Population data were not added because the information shown on
+#        Wikipedia is outdated. Currently being revised 2011 Census data on the
+#        website of the National Statistics Institute
+#        http://www.ine.gov.ve/CENSO2011/index.htm
+#-------------------------------------------------------------------------------
+
+am, Amazonas
+an, Anzoátegui
+ap, Apure
+ar, Aragua
+ba, Barinas
+bo, Bolívar
+ca, Carabobo
+co, Cojedes
+da, Delta Amacuro
+dc, Distrito Capital
+fa, Falcón
+gu, Guárico
+la, Lara
+me, Mérida
+mi, Miranda
+mo, Monagas
+ne, Nueva Esparta
+po, Portuguesa
+su, Sucre
+ta, Táchira
+tr, Trujillo
+va, Vargas
+ya, Yaracuy
+zu, Zulia
+
+

data/db/asia/countries.txt

@@ -0,0 +1,14 @@
+##################################
+### asia (includes middle east)
+##
+
+## NB: uefa country kazakhstan is listed here 
+## NB: australia is listed in oceania (w/ australia)
+
+
+jp, Japan,        JPN
+kp, North Korea,  PRK
+kr, South Korea,  KOR
+in, India,        IND
+kz, Kazakhstan,   KAZ, uefa
+

data/db/europe/at/cities.txt

@@ -0,0 +1,32 @@
+wien,        Wien|Vienna,                  region:wien, 1664146
+stpoelten,   St. Pölten,                   region:noe,   51360
+wrneustadt,  Wiener Neustadt|Wr. Neustadt, region:noe,   39940
+moedling,    Mödling|Moedling,             region:noe,   20649
+horn,        Horn,                         region:noe,    6411,  # < 10000 pop
+
+linz,        Linz,             region:ooe,   188894
+wels,        Wels,             region:ooe,    58623
+steyr,       Steyr,            region:ooe,    38979
+ried,        Ried im Innkreis, region:ooe,    11585
+
+eisenstadt,  Eisenstadt,  region:bgld, 12367
+mattersburg, Mattersburg, region:bgld,  6256,  # < 10000 pop
+
+graz,        Graz,        region:stmk,  247698
+kapfenberg,  Kapfenberg,  region:stmk,   21928
+hartberg,    Hartberg,    region:stmk,    6547,   # < 10000 pop
+
+salzburg,    Salzburg,    region:sbg,   149018
+groedig,     Grödig,      region:sbg,     6638,   # < 10000 pop
+
+klagenfurt,  Klagenfurt,  region:ktn,  92397
+villach,     Villach,     region:ktn,  58480
+wolfsberg,   Wolfsberg,   region:ktn,  25361
+
+innsbruck,   Innsbruck,   region:tirol,  117693
+
+dornbirn,    Dornbirn,   region:vbg, 44243
+feldkirch,   Feldkirch,  region:vbg, 30093
+bregenz,     Bregenz,    region:vbg, 27148
+lustenau,    Lustenau,   region:vbg, 20606
+altach,      Altach,     region:vbg,  5704,  # < 10000 pop

data/db/europe/at/regions.txt

@@ -0,0 +1,17 @@
+#########
+# sources:
+#  http://en.wikipedia.org/wiki/List_of_cities_and_towns_in_Austria
+#  http://en.wikipedia.org/wiki/List_of_cities_in_Austria_over_5,000_population_(2001_census)
+
+
+## 9 Bundeslaender
+
+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

data/db/europe/be/cities.txt

@@ -0,0 +1 @@
+brussel,  Brüssel|Brussel|Bruxelles|Brussels,  # de|nl|fr|en   - RCA Anderlecht

data/db/europe/by/cities.txt

@@ -0,0 +1 @@
+borisov, Borissow|Borisov|Barysaw

data/db/europe/ch/cities.txt

@@ -0,0 +1 @@
+basel, Basel

data/db/europe/countries.txt

@@ -0,0 +1,65 @@
+####################
+### europe 
+
+
+## NB:
+#
+#  countries also include:
+#    england (en), scotland (sc)
+#
+#  also turkey, russia, georiga, etc.
+#   note: the uefa country kazachstan is listed in asia
+
+
+## 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 
+
+
+ad, Andorra,     AND
+al, Albania,     ALB
+am, Armenia,     ARM
+at, Austria,     AUT, europe|uefa|eu|un
+be, Belgium,     BEL, europe|uefa|eu|un|benelux
+bg, Bulgaria,    BUL,  # NB: ISO (BGR) <> FIFA (BUL)
+by, Belarus,     BLR
+ch, Switzerland, SUI, europe|uefa|un,  # NB: ISO (CHE) <> FIFA (SUI)
+cy, Cyprus,      CYP
+cz, Czech Republic, CZE
+de, Germany,  GER,  # NB: ISO (DEU) <> FIFA (GER)
+dk, Denmark,     DEN,  # NB: ISO (DNK) <> FIFA (DEN)
+en, England,      ENG,  # NB: FIFA (ENG); not a valid iso country n internet domain / its uk - what to use - anything better?
+es, Spain,      ESP
+fi, Finland,     FIN
+fo, Faroe Islands,       FRO
+fr, France,   FRA
+ge, Georgia,     GEO
+gr, Greece, GRE,  # NB: ISO (GRC) <> FIFA (GRE)
+hr, Croatia,     CRO,  # NB: ISO (HRV) <> FIFA (CRO);  local name: Hrvatska
+hu, Hungary,       HUN
+ie, Irland,       IRL
+it, Italy,      ITA
+mt, Malta,        MLT
+nl, Netherlands,  NED,  # NB: ISO (NLD) <> FIFA (NED)
+pl, Poland,        POL
+pt, Portugal,     POR,  # NB: ISO (PRT) <> FIFA (POR)
+ro, Romania,     ROU
+rs, Serbia,      SRB
+ru, Russia,     RUS
+sc, Scotland,   SCO,  # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
+se, Sweden,     SWE
+si, Slovenia,    SVN
+sk, Slovakia,     SVK
+tr, Turkey,       TUR
+ua, Ukraine,      UKR
+mk, Macedonia,    MKD
+no, Norway,       NOR
+is, Iceland,      ISL

data/db/europe/cy/cities.txt

@@ -0,0 +1 @@
+nikosia, Nikosia|Nicosia

data/db/europe/de/cities.txt

@@ -0,0 +1,18 @@
+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|Mgladbach, region:nw
+frankfurt,     Frankfurt,     region:he
+mainz,         Mainz,         region:rp
+hamburg,       Hamburg,       region:hh
+bremen,        Bremen,        region:hb

data/db/europe/de/regions.txt

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

data/db/europe/dk/cities.txt

@@ -0,0 +1 @@
+farum, Farum

data/db/europe/en/cities.txt

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

data/db/europe/es/cities.txt

@@ -0,0 +1,5 @@
+bilbao,    Bilbao
+valencia,  Valencia
+barcelona, Barcelona
+madrid,    Madrid
+malaga,    Málaga

data/db/europe/fr/cities.txt

@@ -0,0 +1,4 @@
+lille, Lille
+paris, Paris
+marseille, Marseille
+montpellier, Montpellier

data/db/europe/gr/cities.txt

@@ -0,0 +1 @@
+piraeus, Piräus|Piraeus

data/db/europe/hr/cities.txt

@@ -0,0 +1 @@
+zagreb, Zagreb

data/db/europe/it/cities.txt

@@ -0,0 +1,4 @@
+turin,   Turin
+milano,  Mailand|Milano
+napoli,  Neapel|Napoli
+

data/db/europe/nl/cities.txt

@@ -0,0 +1,2 @@
+amsterdam, Amsterdam
+alkmaar, Alkmaar  ## region: North Holland

data/db/europe/pt/cities.txt

@@ -0,0 +1,3 @@
+porto, Porto
+braga, Braga
+lisboa, Lissabon|Lisboa

data/db/europe/ro/cities.txt

@@ -0,0 +1 @@
+cluj, Cluj

data/db/europe/ru/cities.txt

@@ -0,0 +1,2 @@
+moskva,       Moskau|Moskva
+stpetersburg, St. Petersburg

data/db/europe/sc/cities.txt

@@ -0,0 +1 @@
+glasgow, Glasgow

data/db/europe/tr/cities.txt

@@ -0,0 +1 @@
+istanbul, Istanbul

data/db/europe/ua/cities.txt

@@ -0,0 +1,3 @@
+kiev,    Kiew|Kiev|Kyiv
+donetsk, Donezk|Donetsk
+kharkov, Kharkiv|Kharkov

data/db/oceania/au/cities.txt

@@ -0,0 +1,2 @@
+
+## add australian regions and cities here

data/db/oceania/countries.txt

@@ -0,0 +1,5 @@
+###############################
+## australia & oceania
+
+au, Australia, AUS
+nz, New Zealand, NZL

data/db/tags.yml

@@ -0,0 +1,13 @@
+
+## some tags
+
+continents: europe, america, asia, africa, oceania
+americas: north america, south america, central america, caribbean islands
+orgs: un, eu, mercosur, nafta
+football: uefa, afc, ofc, caf, csf, concacaf
+
+europe: benelux,euro
+
+
+# regions
+brasil: s|South,se|Southeast,co|Centerwest,ne|Northeast,n|North

data/lib/worlddb.rb

@@ -26,7 +26,10 @@ require 'worlddb/models/prop'
 require 'worlddb/models/country'
 require 'worlddb/models/region'
 require 'worlddb/models/city'
+require 'worlddb/models/tag'
+require 'worlddb/models/tagging'
 require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::Models)
+require 'worlddb/reader'
 require 'worlddb/loader'
 require 'worlddb/version'
 require 'worlddb/cli/opts'
@@ -68,9 +71,11 @@ module WorldDB
     def run( args=[] )
       # for now delete all tables
       
-      Country.delete_all
+      Tagging.delete_all
+      Tag.delete_all
       City.delete_all
       Region.delete_all
+      Country.delete_all
       Prop.delete_all
     end
     

data/lib/worlddb/cli/opts.rb

@@ -2,6 +2,43 @@ module WorldDB
 
 class Opts
 
+  def country=(value)
+    @country = value
+  end
+  
+  def country
+    @country   # NB: option has no default; return nil  ## || '.'
+  end
+
+
+  def countries=(boolean)
+    @countries = boolean
+  end
+
+  def countries?
+    return false if @countries.nil?   # default countries flag is false
+    @countries == true
+  end
+
+  def regions=(boolean)
+    @regions = boolean
+  end
+
+  def regions?
+    return false if @regions.nil?   # default regions flag is false
+    @regions == true
+  end
+
+  def cities=(boolean)
+    @cities = boolean
+  end
+
+  def cities?
+    return false if @cities.nil?   # default cities flag is false
+    @cities == true
+  end
+
+
   def create=(boolean)
     @create = boolean
   end

data/lib/worlddb/cli/runner.rb

@@ -20,15 +20,26 @@ class Runner
     
       cmd.banner = "Usage: worlddb [options]"
 
-      ## todo: change to different flag??   use -c/--config ???
-      cmd.on( '-c', '--create', 'Create DB Schema' ) { opts.create = true }
+      ## NB: reserve -c for use with -c/--config
+      cmd.on( '--create', 'Create DB schema' ) { opts.create = true }
 
-      cmd.on( '--delete', 'Delete all records' ) { opts.delete = true }
+      ### 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( '--country KEY', "Default country for regions 'n' cities" ) { |key| opts.country = key; }
+
+      ## todo: add (generic) alias -t/--type cities for --cities
+      ##                           -t/--type regions for --regions
+      ##                           -t/--type countries for --countries  --why? why not?
       
-      cmd.on( '--load', 'Use Loader for Builtin World Data' ) { opts.load = true }
+      cmd.on( '--countries', 'Use country plain text fixture reader' ) { opts.countries = true }
+      cmd.on( '--regions',   'Use regions plain text fixture reader' ) { opts.regions   = true }
+      cmd.on( '--cities',    'Use cities  plain text fixture reader' ) { opts.cities    = true }
+
+      ## todo: change to --builtin?? more clear why? why not?
+      cmd.on( '--load', 'Use loader for builtin world data' ) { opts.load = true }
       
-      ### 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( '--delete', 'Delete all records' ) { opts.delete = true }
 
       cmd.on( '-v', '--version', "Show version" ) do
         puts WorldDB.banner
@@ -50,8 +61,8 @@ worlddb - world.db command line tool, version #{VERSION}
 #{cmd.help}
 
 Examples:
-    worlddb at/cities                      # import austrian regions n cities
-    worlddb -c                             # create database schema
+    worlddb at/cities                      # import austrian cities
+    worlddb --create                       # create database schema
 
 More Examples:
     worlddb                                # show stats (table counts, table props)
@@ -71,8 +82,8 @@ EOS
     puts "working directory: #{Dir.pwd}"
  
     db_config = {
-     :adapter  => 'sqlite3',
-     :database => "#{opts.output_path}/world.db"
+      adapter:  'sqlite3',
+      database: "#{opts.output_path}/world.db"
     }
   
     puts "Connecting to db using settings: "
@@ -88,7 +99,12 @@ EOS
        WorldDB.delete!
     end
 
-    Loader.new( logger ).run( opts, args ) # load ruby fixtures
+
+    if opts.countries? || opts.regions? || opts.cities?
+      Reader.new( logger ).run( opts, args )  # load/read plain text country/region/city fixtures
+    else
+      Loader.new( logger ).run( opts, args ) # load ruby fixtures
+    end
 
     dump_stats
     dump_props
@@ -104,6 +120,8 @@ EOS
     puts "  #{Country.count} countries"
     puts "  #{Region.count} regions"
     puts "  #{City.count} cities"
+    puts "  #{Tag.count} tags"
+    puts "  #{Tagging.count} taggings"
   end