worlddb 0.6.1 → 0.6.2

data/db/america/br/cities.txt

@@ -1,3 +1,6 @@
+#### fix: move region tag  n,ne, etc to regions
+##     no need to duplicate here for every city
+
 assis brasil,	Assis Brasil,	region:ac,n
 brasileia,	Brasileia,	region:ac,n
 cruzeiro do sul,	Cruzeiro Do Sul,	region:ac,n

data/db/america/countries.txt

@@ -7,8 +7,8 @@
 # area (in sq km), pop(ulation)
   
 ca, Canada,        CAN, 9984670,  34278406, north america|en|fr
-mx, Mexico,        MEX, 1972550, 112322757, north america|en
-us, United States, USA, 9629091, 314167157, north america|es
+mx, Mexico,        MEX, 1972550, 112322757, north america|es
+us, United States, USA, 9629091, 314167157, north america|en|es
 
 #####################
 ## central america & caribbean islands

data/db/europe/be/cities.txt

@@ -1,6 +1,6 @@
 
 
-brussel,   Brussel|Bruxelles [Brussels], region:br,  1_048_491, m:1_929_000    ,   # nl|fr|en
+brussel,   Brussel|Bruxelles [Brussels], region:bx,  1_048_491, m:1_929_000    ,   # nl|fr|en
 antwerp,   Antwerpen|Anvers [Antwerp],   region:an, 466_203,  m:960_000
 ghent,     Gent|Gand [Ghent],     region:ov, 235_143
 charleroi, Charleroi, region:ht, 201_550

data/db/europe/be/regions.txt

@@ -5,8 +5,9 @@
 #
 #  NB: using iso three letter codes (cut off first letter is always V or W for NUTS1 region)
 
+## todo: check what code to use for bruxeelles -> br is taken by Babant Wallon
 
-br, Bruxelles|Brussel [Brussels (Capital Region)],  161
+bx, Bruxelles|Brussel [Brussels (Capital Region)],  161
 
 an, Antwerpen [Antwerp],              2_867, flanders|nl
 li, Limburg,                          2_422, flanders|nl

data/db/europe/de/cities.txt

@@ -5,8 +5,8 @@
 ##  - http://en.wikipedia.org/wiki/Largest_urban_areas_of_the_European_Union
 
 
-ruhr,       Ruhrgebiet [Ruhr area],     region:nw, m:7_304_000, metro   , # includes essen, bochum, dortmund, gelsenkirchen
-koelnbonn,  Köln/Bonn  [Cologne-Bonn],  region:nw, m:2_063_000, metro   , # includes koeln, leverkusen,  bergischgladbach, bonn
+ruhr,       Ruhrgebiet [Ruhr area],     region:nw, m:7_304_000, metro   # includes essen, bochum, dortmund, gelsenkirchen
+koelnbonn,  Köln/Bonn  [Cologne-Bonn],  region:nw, m:2_063_000, metro   # includes koeln, leverkusen, bergischgladbach, bonn
 
 
 # Top 10 cities 
@@ -15,7 +15,7 @@ berlin,       Berlin,           region:be,   3_501_872,  m:3_453_000
 hamburg,      Hamburg,          region:hh,   1_798_836,  m:1_794_000
 muenchen,     München [Munich], region:by,   1_378_176,  m:1_355_000
 koeln,        Köln,             region:nw,   1_017_155, metro:koelnbonn, 
-frankfurt,    Frankfurt,        region:he,     691_518   m:2_300_000  ,  # frankfurt metro includes wiesbaden, darmstadt
+frankfurt,    Frankfurt,        region:he,     691_518   m:2_300_000     # frankfurt metro includes wiesbaden, darmstadt
 stuttgart,    Stuttgart,        region:bw,     613_392,  m:1_272_000
 duesseldorf,  Düsseldorf,       region:nw,     592_393
 dortmund,     Dortmund,         region:nw,     580_956, metro:ruhr

data/db/europe/es/regions.txt

@@ -6,7 +6,7 @@ an, Andalucía|Andalusia,  87598
 ar, Aragón,               47720
 as, Asturias,             10604
 ib, Illes Balears|Balearic Islands,   4992 
-pv, Pais Vasco|Basque Country   7235
+pv, Pais Vasco|Basque Country,   7235
 cn, Canarias|Canary Islands,   7447
 cb, Cantábria,                 5321
 cl, Castilla y León,           94225
@@ -17,7 +17,7 @@ ga, Galicia,                   29574
 ri, La Rioja,                   5045
 md, Madrid,                     8028
 mc, Murcia,                    11313
-na, Navarra                    10390
+na, Navarra,                   10390
 vc, Valencia,                 23255
 
 ## autonomous cities

data/lib/worlddb/console.rb

@@ -55,6 +55,9 @@ AT = Country.find_by_key( 'at' )
 DE = Country.find_by_key( 'de' )
 EN = Country.find_by_key( 'en' )
 
+GB = Country.find_by_key( 'gb' )
+EU = Country.find_by_key( 'eu' )
+
 US = Country.find_by_key( 'us' )
 CA = Country.find_by_key( 'ca' )
 MX = Country.find_by_key( 'mx' )
@@ -67,6 +70,11 @@ VIE = City.find_by_key( 'wien' )
 
 ## todo: add some predefined tags (e.g. europe, america, g8, euro, etc.)
 
+EURO    = Tag.find_by_key( 'euro' )
+EUROPE  = Tag.find_by_key( 'europe' )
+ASIA    = Tag.find_by_key( 'asia' )
+PACIFIC = Tag.find_by_key( 'pacific' )
+
 
 ## turn on activerecord logging to console
 

data/lib/worlddb/models/city.rb

@@ -15,6 +15,17 @@ class City < ActiveRecord::Base
   validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
 
 
+  def title_w_synonyms
+    return title if synonyms.blank?
+    
+    buf = ''
+    buf << title
+    buf << ' | '
+    buf << synonyms.split('|').join(' | ')
+    buf
+  end
+
+
   def self.create_from_ary!( cities, more_values={} )
     cities.each do |values|
       

data/lib/worlddb/models/country.rb

@@ -7,6 +7,10 @@ class Country < ActiveRecord::Base
 
   has_many :regions, :class_name => 'Region', :foreign_key => 'country_id'
   has_many :cities,  :class_name => 'City',   :foreign_key => 'country_id'
+  
+  ## self referencing hierachy within countries e.g. EU > GB > EN
+  belongs_to :parent,    :class_name => 'Country', :foreign_key => 'country_id'
+  has_many   :countries, :class_name => 'Country', :foreign_key => 'country_id'
 
   has_many :taggings, :as => :taggable
   has_many :tags,     :through => :taggings
@@ -15,6 +19,17 @@ class Country < ActiveRecord::Base
   validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }
 
 
+  def title_w_synonyms
+    return title if synonyms.blank?
+    
+    buf = ''
+    buf << title
+    buf << ' | '
+    buf << synonyms.split('|').join(' | ')
+    buf
+  end
+
+
   def self.create_from_ary!( countries )
     countries.each do |values|
       

data/lib/worlddb/models/region.rb

@@ -12,6 +12,18 @@ class Region < ActiveRecord::Base
   validates :key, :format => { :with => /^[a-z]{2,}$/, :message => 'expected two or more lowercase letters a-z' }
   validates :code, :format => { :with => /^[A-Z_]{2,3}$/, :message => 'expected two or three uppercase letters A-Z (and _)' }, :allow_nil => true
 
+
+  def title_w_synonyms
+    return title if synonyms.blank?
+    
+    buf = ''
+    buf << title
+    buf << ' | '
+    buf << synonyms.split('|').join(' | ')
+    buf
+  end
+
+
   def self.create_from_ary!( regions, more_values={} )
     regions.each do |values|
             

data/lib/worlddb/readers/values_reader.rb

@@ -36,7 +36,15 @@ class ValuesReader
         next
       end
 
-      # remove leading and trailing whitespace
+
+      # pass 1) remove possible trailing eol comment
+      ##  e.g    -> nyc, New York   # Sample EOL Comment Here (with or without commas,,,,)
+      ## becomes -> nyc, New York
+
+      line = line.sub( /\s+#.+$/, '' )
+
+      # pass 2) remove leading and trailing whitespace
+      
       line = line.strip
 
       puts "line: >>#{line}<<"
@@ -47,6 +55,7 @@ class ValuesReader
 
       values = values.map { |value| value.strip }
 
+      ##### todo remove support of comment column? (NB: must NOT include commas)
       # pass 2) remove comment columns
       
       values = values.select do |value|
@@ -57,14 +66,6 @@ class ValuesReader
           true
         end
       end
-
-      # pass 3) remove comments inside columns
-
-      values = values.map do |value|
-        value = value.sub( /\s+#.+$/, '' )
-        value
-      end
-      
       
       puts "  values: >>#{values.join('<< >>')}<<"
             

data/lib/worlddb/version.rb

@@ -1,5 +1,5 @@
 
 module WorldDB
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-24 00:00:00 Z
+date: 2012-11-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord