worlddb 0.6.6 → 0.6.7

data/Manifest.txt

@@ -3,79 +3,79 @@ Manifest.txt
 README.markdown
 Rakefile
 bin/worlddb
-db/africa/countries.txt
-db/africa/de.countries.yml
-db/africa/en.wikipedia.yml
-db/africa/fifa.yml
-db/africa/iso3.yml
-db/america/br/cities.txt
-db/america/br/regions.txt
-db/america/ca/cities.txt
-db/america/ca/regions.txt
-db/america/countries.motor.yml
-db/america/countries.txt
-db/america/de.countries.yml
-db/america/en.wikipedia.yml
-db/america/es.countries.yml
-db/america/mx/cities.txt
-db/america/mx/regions.txt
-db/america/us/cities.txt
-db/america/us/regions.txt
-db/america/ve/cities.txt
-db/america/ve/regions.txt
-db/asia/countries.txt
-db/asia/de.countries.yml
-db/asia/en.wikipedia.yml
-db/asia/jp/cities.txt
-db/europe/at/cities.txt
-db/europe/at/regions.txt
-db/europe/be/cities.txt
-db/europe/be/regions.txt
-db/europe/bg/cities.txt
-db/europe/by/cities.txt
-db/europe/ch/cities.txt
-db/europe/countries.txt
-db/europe/cy/cities.txt
-db/europe/cz/cities.txt
-db/europe/cz/regions.txt
-db/europe/de.countries.yml
-db/europe/de/cities.txt
-db/europe/de/regions.txt
-db/europe/dk/cities.txt
-db/europe/ee/cities.txt
-db/europe/en.wikipedia.yml
-db/europe/en/cities.txt
-db/europe/en/regions.txt
-db/europe/es.countries.yml
-db/europe/es/cities.txt
-db/europe/es/regions.txt
-db/europe/fi/cities.txt
-db/europe/fr/cities.txt
-db/europe/fr/regions.txt
-db/europe/gr/cities.txt
-db/europe/hr/cities.txt
-db/europe/hu/cities.txt
-db/europe/ie/cities.txt
-db/europe/it/cities.txt
-db/europe/lt/cities.txt
-db/europe/lv/cities.txt
-db/europe/nl/cities.txt
-db/europe/no/cities.txt
-db/europe/pl/cities.txt
-db/europe/pt/cities.txt
-db/europe/ro/cities.txt
-db/europe/rs/cities.txt
-db/europe/ru/cities.txt
-db/europe/sc/cities.txt
-db/europe/se/cities.txt
-db/europe/tr/cities.txt
-db/europe/ua/cities.txt
-db/europe/wa/cities.txt
-db/oceania/au/cities.txt
-db/oceania/countries.txt
-db/oceania/de.countries.yml
-db/oceania/en.wikipedia.yml
-db/tags.yml
+data/africa/countries.txt
+data/africa/de.countries.yml
+data/africa/en.wikipedia.yml
+data/africa/fifa.yml
+data/africa/iso3.yml
+data/america/br/cities.txt
+data/america/br/regions.txt
+data/america/ca/cities.txt
+data/america/ca/regions.txt
+data/america/countries.motor.yml
+data/america/countries.txt
+data/america/de.countries.yml
+data/america/en.wikipedia.yml
+data/america/es.countries.yml
+data/america/mx/cities.txt
+data/america/mx/regions.txt
+data/america/us/cities.txt
+data/america/us/regions.txt
+data/america/ve/cities.txt
+data/america/ve/regions.txt
+data/asia/countries.txt
+data/asia/de.countries.yml
+data/asia/en.wikipedia.yml
+data/asia/jp/cities.txt
+data/europe/at/cities.txt
+data/europe/at/regions.txt
+data/europe/be/cities.txt
+data/europe/be/regions.txt
+data/europe/bg/cities.txt
+data/europe/by/cities.txt
+data/europe/ch/cities.txt
+data/europe/countries.txt
+data/europe/cy/cities.txt
+data/europe/cz/cities.txt
+data/europe/cz/regions.txt
+data/europe/de.countries.yml
+data/europe/de/cities.txt
+data/europe/de/regions.txt
+data/europe/dk/cities.txt
+data/europe/ee/cities.txt
+data/europe/en.wikipedia.yml
+data/europe/en/cities.txt
+data/europe/en/regions.txt
+data/europe/es.countries.yml
+data/europe/es/cities.txt
+data/europe/es/regions.txt
+data/europe/fi/cities.txt
+data/europe/fr/cities.txt
+data/europe/fr/regions.txt
+data/europe/gr/cities.txt
+data/europe/hr/cities.txt
+data/europe/hu/cities.txt
+data/europe/ie/cities.txt
+data/europe/it/cities.txt
+data/europe/lt/cities.txt
+data/europe/lv/cities.txt
+data/europe/nl/cities.txt
+data/europe/no/cities.txt
+data/europe/pl/cities.txt
+data/europe/pt/cities.txt
+data/europe/ro/cities.txt
+data/europe/rs/cities.txt
+data/europe/ru/cities.txt
+data/europe/sc/cities.txt
+data/europe/se/cities.txt
+data/europe/tr/cities.txt
+data/europe/ua/cities.txt
+data/europe/wa/cities.txt
+data/oceania/au/cities.txt
+data/oceania/countries.txt
+data/oceania/de.countries.yml
+data/oceania/en.wikipedia.yml
+data/tags.yml
 lib/worlddb.rb
 lib/worlddb/cli/opts.rb
 lib/worlddb/cli/runner.rb

data/Rakefile

@@ -1,6 +1,9 @@
 require 'hoe'
 require './lib/worlddb/version.rb'
 
+## NB: plugin (hoe-manifest) not required; just used for future testing/development
+Hoe::plugin :manifest   # more options for manifests (in the future; not yet)
+
 Hoe.spec 'worlddb' do
   
   self.version = WorldDB::VERSION
@@ -14,12 +17,15 @@ Hoe.spec 'worlddb' do
   self.email   = 'opensport@googlegroups.com'
     
   # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.markdown'
-  self.history_file = 'History.markdown'
+  #  - auto-added from Manifest.txt (see define_spec in class Hoe)
+  # self.readme_file  = 'README.markdown'
+  # self.history_file = 'History.markdown'
   
   self.extra_deps = [
     ['activerecord', '~> 3.2']  # NB: will include activesupport,etc.
     ### ['sqlite3',      '~> 1.3']  # NB: install on your own; remove dependency
   ]
+  
+  self.licenses = ['Public Domain']
 
 end

data/{db → data}/africa/countries.txt

@@ -54,7 +54,9 @@ rw, Rwanda, RWA,  26_338,  11_689_696,    Kigali,  un|fifa
 st, São Tomé and Príncipe, STP,  1_001,  183_176,  São Tomé,  un|fifa
 
 sn, Senegal, SEN, 196_723,  12_855_153,     Dakar,  un|fifa
-sc, Seychelles, SEY,  451, 84_000,  Victoria,  un|fifa
+
+## NB: sc renamed to ey (sc used for Scottland)
+ey, Seychelles, SEY,  451, 84_000,  Victoria,  un|fifa
 sl, Sierra Leone, SLE,  71_740,  5_485_998,    Freetown,  un|fifa
 
 so, Somalia, SOM,  637_657, 10_085_638,     Mogadishu,  un|fifa

data/{db → data}/europe/countries.txt

@@ -16,7 +16,7 @@ sm, San Marino, SMR,  61,  32_404,  City of San Marino,  un|fifa
 ## NB:
 #
 #  countries also include:
-#    england (en), scotland (ab for Alba (scotland in scotish gaelic) - sc (Seychellen),so,st,sl,sa,sn,sd all taken)
+#    england (en), scotland (sc) - nb: Seychellen renamed from sc to ey
 #   use nd for northern ireland (ni (nicaragua),no, nr (naru) taken - anything better - anything common?)
 #    - use ul for ulster? better?
 #
@@ -79,8 +79,7 @@ hu, Hungary,          HUN,   93_030,  9_979_000,  supra:eu, un|fifa|eu|uefa|sche
 gb, Great Britain, GBR,     243_610,  63_047_162,  supra:eu, un|eu|g8|g20
 en, England,       ENG,     130_395,  53_013_000,  country:gb, fifa   # NB: FIFA (ENG); not a valid iso country n internet domain / its uk - what to use - anything better?
 
-## nb: sc -> seychellen, use different two letter code st?
-st, Scotland,      SCO,      78_387,   5_254_800,  country:gb, fifa  # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
+sc, Scotland,      SCO,      78_387,   5_254_800,  country:gb, fifa  # NB: FIFA (SCO); not a valid iso country/internet domain - its uk - what to use - anything better?
 wa, Wales,         WAL,      20_779,   3_064_000,  country:gb, fifa
 nd, Northern Ireland, NIR,   13_843,   1_810_900,  Belfast, country:gb, fifa
 

data/lib/worlddb/loader.rb

@@ -45,7 +45,7 @@ class Loader
   end
   
   def load_fixtures_builtin( name ) # load from gem (built-in)
-    path = "#{WorldDB.root}/db/#{name}.rb"
+    path = "#{WorldDB.root}/data/#{name}.rb"
 
     puts "*** loading data '#{name}' (#{path})..."
 

data/lib/worlddb/models/city.rb

@@ -7,30 +7,50 @@ class City < ActiveRecord::Base
 
   belongs_to :country, :class_name => 'Country', :foreign_key => 'country_id'
   belongs_to :region,  :class_name => 'Region',  :foreign_key => 'region_id'
+
+  ## self referencing hierachy within cities e.g. m|metro > c|city > d|district
+
+  ## fix: use condition check for m|d|c flag?? why? why not? (NB: flags are NOT exclusive e.g. possible metro|city)
   
-  has_many :taggings, :as => :taggable
-  has_many :tags,  :through => :taggings
+  ## (1) metro - level up
+  has_many   :cities,    :class_name => 'City', :foreign_key => 'city_id'
 
-  validates :key, :format => { :with => /^[a-z]{3,}$/, :message => 'expected three or more lowercase letters a-z' }
-  validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
+  ## (2) city
+  belongs_to :metro,     :class_name => 'City', :foreign_key => 'city_id'   ## for now alias for parent - use parent?
+  has_many   :districts, :class_name => 'City', :foreign_key => 'city_id'   ## for now alias for cities - use cities?
 
+  ## (3) district - level down
+  belongs_to :city,      :class_name => 'City', :foreign_key => 'city_id'  ## for now alias for parent - use parent?
 
-  def self.by_key  # order by key (a-z)
-    self.order( 'key asc' )
-  end
 
-  def self.by_title  # order by title (a-z)
-    self.order( 'title asc' )
+  ###
+  #  NB: use is_  for flags to avoid conflict w/ assocs (e.g. metro?, city? etc.)
+  
+  def is_metro?
+    m? == true
   end
   
-  def self.by_pop  # order by pop(ulation)
-    self.order( 'pop desc' )
+  def is_city?
+    c? == true
   end
   
-  def self.by_area  # order by area (in square km)
-    self.order( 'area desc')
+  def is_district?
+    d? == true
   end
 
+  
+  has_many :taggings, :as => :taggable
+  has_many :tags,  :through => :taggings
+
+  validates :key, :format => { :with => /^[a-z]{3,}$/, :message => 'expected three or more lowercase letters a-z' }
+  validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }, :allow_nil => true
+
+  scope :by_key,    order( 'key asc' )    # order by key (a-z)
+  scope :by_title,  order( 'title asc' )  # order by title (a-z)
+  scope :by_pop,    order( 'pop desc' )   # order by pop(ulation)
+  scope :by_popm,   order( 'popm desc' )  # order by pop(ulation) metropolitan area
+  scope :by_area,   order( 'area desc' )  # order by area (in square km)
+
   def title_w_synonyms
     return title if synonyms.blank?
     

data/lib/worlddb/models/country.rb

@@ -18,22 +18,29 @@ class Country < ActiveRecord::Base
   validates :key, :format => { :with => /^[a-z]{2}$/, :message => 'expected two lowercase letters a-z' }
   validates :code, :format => { :with => /^[A-Z_]{3}$/, :message => 'expected three uppercase letters A-Z (and _)' }
 
-  def self.by_key  # order by key (a-z)
-    self.order( 'key asc' )
-  end
-
-  def self.by_title  # order by title (a-z)
-    self.order( 'title asc' )
+  scope :by_key,   order( 'key asc' )     # order by key (a-z)
+  scope :by_title, order( 'title asc' )   # order by title (a-z)
+  scope :by_code,  order( 'code asc' )    # order by code (a-z)
+  scope :by_pop,   order( 'pop desc' )    # order by pop(ulation)
+  scope :by_area,  order( 'area desc')    # order by area (in square km)
+ 
+  ###
+  #  NB: use is_  for flags to avoid conflict w/ assocs 
+  
+  def is_supra?  
+    s? == true
   end
   
-  def self.by_pop  # order by pop(ulation)
-    self.order( 'pop desc' )
+  def is_country?
+    c? == true
   end
   
-  def self.by_area  # order by area (in square km)
-    self.order( 'area desc')
+  def is_dependency?
+    d? == true
   end
 
+ 
+ 
   def title_w_synonyms
     return title if synonyms.blank?
     

data/lib/worlddb/models/tag.rb

@@ -13,21 +13,16 @@ module WorldDB::Models
     ## fix/todo: improve regex use   [a-z][a-z0-9] | [a-z][a-z0-9_ ]+[a-z0-9] to only allow spaces and underscore inbetween; do not allow digit as first char 
     validates :key, :format => { :with => /^[a-z0-9_ ]{2,}$/, :message => 'expected two or more lowercase letters a-z or 0-9 digits or space or underscore' }
 
+    scope :by_key,   order( 'key desc' )
+    scope :by_title, order( 'title desc' )
+    
     before_save :on_before_save
 
     def on_before_save
       # replace space with underscore e.g. north america becomes north_america and so on
       self.slug = key.gsub( ' ', '_' )
     end
-    
-    def self.by_key
-      self.order( 'key desc' )
-    end
-    
-    def self.by_title
-      self.order( 'title desc' )
-    end
-    
+      
   end  # class Tag
   
 end # module WorldDB::Models

data/lib/worlddb/reader.rb

@@ -41,11 +41,14 @@ class Reader
   # load from file system
   
   def load_with_include_path( name, include_path )
-    if name =~ /\/countries/
-      load_countries_with_include_path( name, include_path )
+    if name =~ /^([a-z]{3,})\/countries/
+      ## auto-add continent (from folder structure) as tag
+      load_countries_with_include_path( name, include_path, :tags => $1 )
     elsif name =~ /\/([a-z]{2})\/cities/
+      ## auto-add required country code (from folder structure)
       load_cities_with_include_path( $1, name, include_path )
     elsif name =~ /\/([a-z]{2})\/regions/
+      ## auto-add required country code (from folder structure)
       load_regions_with_include_path( $1, name, include_path )
     else
       puts "*** error: unknown world.db fixture type >#{name}<"
@@ -53,8 +56,8 @@ class Reader
     end
   end
 
-  def load_countries_with_include_path( name, include_path )
-    load_fixtures_with_include_path_for( Country, name, include_path )
+  def load_countries_with_include_path( name, include_path, more_values={} )
+    load_fixtures_with_include_path_for( Country, name, include_path, more_values )
   end
 
   def load_regions_with_include_path( country_key, name, include_path )
@@ -82,8 +85,9 @@ class Reader
        load_fifa_builtin( name )
     elsif name =~ /\/iso3/
        load_iso3_builtin( name )
-    elsif name =~ /\/countries/
-       load_countries_builtin( name )
+    elsif name =~ /^([a-z]{3,})\/countries/     # e.g. africa/countries or america/countries
+      ## auto-add continent (from folder structure) as tag
+       load_countries_builtin( name, :tags => $1 )
     elsif name =~ /\/([a-z]{2})\/cities/
        load_cities_builtin( $1, name )
     elsif name =~ /\/([a-z]{2})\/regions/
@@ -94,8 +98,8 @@ class Reader
     end
   end
 
-  def load_countries_builtin( name ) 
-    load_fixtures_builtin_for( Country, name )
+  def load_countries_builtin( name, more_values )
+    load_fixtures_builtin_for( Country, name, more_values )
   end
 
   def load_regions_builtin( country_key, name )
@@ -114,7 +118,7 @@ class Reader
 
 
   def load_iso3_builtin( name )
-    path = "#{WorldDB.root}/db/#{name}.yml"
+    path = "#{WorldDB.root}/data/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
 
@@ -137,11 +141,11 @@ class Reader
     
     end
 
-    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "world.yml.#{WorldDB::VERSION}" )
   end
 
   def load_fifa_builtin( name )
-    path = "#{WorldDB.root}/db/#{name}.yml"
+    path = "#{WorldDB.root}/data/#{name}.yml"
 
     puts "*** parsing data '#{name}' (#{path})..."
 
@@ -161,11 +165,10 @@ class Reader
     
     end
 
-    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "world.yml.#{WorldDB::VERSION}"  )
   end
 
 
-
 private
   def load_fixtures_with_include_path_for( clazz, name, include_path, more_values={} )  # load from file system
     path = "#{include_path}/#{name}.txt"
@@ -180,7 +183,7 @@ private
   end
 
   def load_fixtures_builtin_for( clazz, name, more_values={} ) # load from gem (built-in)
-    path = "#{WorldDB.root}/db/#{name}.txt"
+    path = "#{WorldDB.root}/data/#{name}.txt"
 
     puts "*** parsing data '#{name}' (#{path})..."
 
@@ -199,12 +202,25 @@ private
 
     reader.each_line do |attribs, values|
   
-      value_numbers = []
+      value_numbers     = []
+      value_tag_keys    = []
       
-      ### todo: remove attribs[:tags] from attribs? lets us pass in "default" tags - why? why not?
-      ##
+      ### check for "default" tags - that is, if present attribs[:tags] remove from hash
       
-      value_tags = []
+      if attribs[:tags].present?
+        more_tag_keys = attribs[:tags].split('|')
+        attribs.delete(:tags)
+
+        ## unify; replace _w/ space; remove leading n trailing whitespace
+        more_tag_keys = more_tag_keys.map do |key|
+          key = key.gsub( '_', ' ' )
+          key = key.strip
+          key
+        end
+
+        value_tag_keys += more_tag_keys
+      end
+
 
       if clazz == City
         attribs[ :c ] = true   # assume city type by default (use metro,district to change in fixture)
@@ -256,8 +272,8 @@ private
           value_numbers << value.gsub(/[ _]/, '').to_i
         elsif (values.size==(index+1)) && value =~ /^[a-z0-9\|_ ]+$/   # tags must be last entry
 
-          puts "   processing tags: >>#{value}<<..."
- 
+          puts "   found tags: >>#{value}<<"
+
           tag_keys = value.split('|')
   
           ## unify; replace _w/ space; remove leading n trailing whitespace
@@ -267,15 +283,7 @@ private
             key
           end
           
-          tag_keys.each do |key|
-            tag = Tag.find_by_key( key )
-            if tag.nil?  # create tag if it doesn't exit
-              puts "   creating tag >#{key}<"
-              tag = Tag.create!( key: key )
-            end
-            value_tags << tag
-          end
-    
+          value_tag_keys += tag_keys
         else
           # issue warning: unknown type for value
           puts "!!!! >>>> warning: unknown type for value >#{value}<"
@@ -313,13 +321,26 @@ private
    
       rec.update_attributes!( attribs )
       
-      ## add tags
-      
-      value_tags.each do |tag|
-        rec.tags << tag
+      ##################
+      ## add taggings 
+
+      if value_tag_keys.size > 0
+
+        value_tag_keys.uniq!  # remove duplicates
+        puts "   adding #{value_tag_keys.size} taggings: >>#{value_tag_keys.join('|')}<<..."
+
+        ### fix/todo: check tag_ids and only update diff (add/remove ids)
+
+        value_tag_keys.each do |key|
+          tag = Tag.find_by_key( key )
+          if tag.nil?  # create tag if it doesn't exit
+            puts "   creating tag >#{key}<"
+            tag = Tag.create!( key: key )
+          end
+          rec.tags << tag
+        end
       end
-      
-      ### fix/todo: check tag_ids and only update diff (add/remove ids)
+
         
     end # each_line
             

data/lib/worlddb/schema.rb

@@ -18,10 +18,11 @@ create_table :countries do |t|
   t.integer :pop,    :null => false    # population count
   t.integer :area,   :null => false    #  area in square km (sq. km)
   t.references :country  # for supra(nationals) n depend(encies)
+  
+  ## flags (use single int named flags - why? why not?  
   t.boolean :s,  :null => false, :default => false   # supra(national) flag e.g. eu
   t.boolean :c,  :null => false, :default => false   # country flag (is this needed?)
   t.boolean :d,  :null => false, :default => false   # dependency flag
-  t.timestamps
  
   # extras
   t.string  :motor      # optional auto motor (vehicle) licene plate
@@ -30,6 +31,9 @@ create_table :countries do |t|
   t.string  :fifa       # optional fifa country code
   t.string  :net        # optional internet top level domain (tld)
   t.string  :wikipedia  # optional wikipedia page name -- en.wikipedia.org/wiki/<name>
+
+  ## timestamp at last
+  t.timestamps
 end
 
 
@@ -58,18 +62,21 @@ create_table :cities do |t|
   t.string :synonyms  # comma separated list of synonyms
   t.references :country,  :null => false
   t.references :region    # optional for now
+  t.references :city  # optional parent (e.g. metro for city, or city for district)
   t.integer :pop     # optional population count (city proper)
   t.integer :popm    # optional population count (metropolitan/aglomeration)
   t.integer :area    # optional area in square km (sq. km)
   t.float   :lat   # optional for now
   t.float   :lng   # optional for now
+
+  ## flags (use single int named flags - why? why not?    
   t.boolean :m,  :null => false, :default => false   # metro flag
   t.boolean :c,  :null => false, :default => false   # city flag (is this needed?)
   t.boolean :d,  :null => false, :default => false   # district flag
-  t.references :city  # optional parent (e.g. metro for city, or city for district)
-  t.timestamps
 
   ### t.boolean :capital, :null => false, :default => false  # is national captial?
+  
+  t.timestamps
 end
 
 create_table :tags do |t|

data/lib/worlddb/version.rb

@@ -1,5 +1,5 @@
 
 module WorldDB
-  VERSION = '0.6.6'
+  VERSION = '0.6.7'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-30 00:00:00 Z
+date: 2012-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -55,11 +55,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 3
-        - 0
-        version: "3.0"
+        - 3
+        version: "3.3"
   type: :development
   version_requirements: *id003
 description: worlddb - world.db command line tool
@@ -70,142 +70,85 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
-- db/africa/countries.txt
-- db/america/br/cities.txt
-- db/america/br/regions.txt
-- db/america/ca/cities.txt
-- db/america/ca/regions.txt
-- db/america/countries.txt
-- db/america/mx/cities.txt
-- db/america/mx/regions.txt
-- db/america/us/cities.txt
-- db/america/us/regions.txt
-- db/america/ve/cities.txt
-- db/america/ve/regions.txt
-- db/asia/countries.txt
-- db/asia/jp/cities.txt
-- db/europe/at/cities.txt
-- db/europe/at/regions.txt
-- db/europe/be/cities.txt
-- db/europe/be/regions.txt
-- db/europe/bg/cities.txt
-- db/europe/by/cities.txt
-- db/europe/ch/cities.txt
-- db/europe/countries.txt
-- db/europe/cy/cities.txt
-- db/europe/cz/cities.txt
-- db/europe/cz/regions.txt
-- db/europe/de/cities.txt
-- db/europe/de/regions.txt
-- db/europe/dk/cities.txt
-- db/europe/ee/cities.txt
-- db/europe/en/cities.txt
-- db/europe/en/regions.txt
-- db/europe/es/cities.txt
-- db/europe/es/regions.txt
-- db/europe/fi/cities.txt
-- db/europe/fr/cities.txt
-- db/europe/fr/regions.txt
-- db/europe/gr/cities.txt
-- db/europe/hr/cities.txt
-- db/europe/hu/cities.txt
-- db/europe/ie/cities.txt
-- db/europe/it/cities.txt
-- db/europe/lt/cities.txt
-- db/europe/lv/cities.txt
-- db/europe/nl/cities.txt
-- db/europe/no/cities.txt
-- db/europe/pl/cities.txt
-- db/europe/pt/cities.txt
-- db/europe/ro/cities.txt
-- db/europe/rs/cities.txt
-- db/europe/ru/cities.txt
-- db/europe/sc/cities.txt
-- db/europe/se/cities.txt
-- db/europe/tr/cities.txt
-- db/europe/ua/cities.txt
-- db/europe/wa/cities.txt
-- db/oceania/au/cities.txt
-- db/oceania/countries.txt
 files: 
 - History.markdown
 - Manifest.txt
 - README.markdown
 - Rakefile
 - bin/worlddb
-- db/africa/countries.txt
-- db/africa/de.countries.yml
-- db/africa/en.wikipedia.yml
-- db/africa/fifa.yml
-- db/africa/iso3.yml
-- db/america/br/cities.txt
-- db/america/br/regions.txt
-- db/america/ca/cities.txt
-- db/america/ca/regions.txt
-- db/america/countries.motor.yml
-- db/america/countries.txt
-- db/america/de.countries.yml
-- db/america/en.wikipedia.yml
-- db/america/es.countries.yml
-- db/america/mx/cities.txt
-- db/america/mx/regions.txt
-- db/america/us/cities.txt
-- db/america/us/regions.txt
-- db/america/ve/cities.txt
-- db/america/ve/regions.txt
-- db/asia/countries.txt
-- db/asia/de.countries.yml
-- db/asia/en.wikipedia.yml
-- db/asia/jp/cities.txt
-- db/europe/at/cities.txt
-- db/europe/at/regions.txt
-- db/europe/be/cities.txt
-- db/europe/be/regions.txt
-- db/europe/bg/cities.txt
-- db/europe/by/cities.txt
-- db/europe/ch/cities.txt
-- db/europe/countries.txt
-- db/europe/cy/cities.txt
-- db/europe/cz/cities.txt
-- db/europe/cz/regions.txt
-- db/europe/de.countries.yml
-- db/europe/de/cities.txt
-- db/europe/de/regions.txt
-- db/europe/dk/cities.txt
-- db/europe/ee/cities.txt
-- db/europe/en.wikipedia.yml
-- db/europe/en/cities.txt
-- db/europe/en/regions.txt
-- db/europe/es.countries.yml
-- db/europe/es/cities.txt
-- db/europe/es/regions.txt
-- db/europe/fi/cities.txt
-- db/europe/fr/cities.txt
-- db/europe/fr/regions.txt
-- db/europe/gr/cities.txt
-- db/europe/hr/cities.txt
-- db/europe/hu/cities.txt
-- db/europe/ie/cities.txt
-- db/europe/it/cities.txt
-- db/europe/lt/cities.txt
-- db/europe/lv/cities.txt
-- db/europe/nl/cities.txt
-- db/europe/no/cities.txt
-- db/europe/pl/cities.txt
-- db/europe/pt/cities.txt
-- db/europe/ro/cities.txt
-- db/europe/rs/cities.txt
-- db/europe/ru/cities.txt
-- db/europe/sc/cities.txt
-- db/europe/se/cities.txt
-- db/europe/tr/cities.txt
-- db/europe/ua/cities.txt
-- db/europe/wa/cities.txt
-- db/oceania/au/cities.txt
-- db/oceania/countries.txt
-- db/oceania/de.countries.yml
-- db/oceania/en.wikipedia.yml
-- db/tags.yml
+- data/africa/countries.txt
+- data/africa/de.countries.yml
+- data/africa/en.wikipedia.yml
+- data/africa/fifa.yml
+- data/africa/iso3.yml
+- data/america/br/cities.txt
+- data/america/br/regions.txt
+- data/america/ca/cities.txt
+- data/america/ca/regions.txt
+- data/america/countries.motor.yml
+- data/america/countries.txt
+- data/america/de.countries.yml
+- data/america/en.wikipedia.yml
+- data/america/es.countries.yml
+- data/america/mx/cities.txt
+- data/america/mx/regions.txt
+- data/america/us/cities.txt
+- data/america/us/regions.txt
+- data/america/ve/cities.txt
+- data/america/ve/regions.txt
+- data/asia/countries.txt
+- data/asia/de.countries.yml
+- data/asia/en.wikipedia.yml
+- data/asia/jp/cities.txt
+- data/europe/at/cities.txt
+- data/europe/at/regions.txt
+- data/europe/be/cities.txt
+- data/europe/be/regions.txt
+- data/europe/bg/cities.txt
+- data/europe/by/cities.txt
+- data/europe/ch/cities.txt
+- data/europe/countries.txt
+- data/europe/cy/cities.txt
+- data/europe/cz/cities.txt
+- data/europe/cz/regions.txt
+- data/europe/de.countries.yml
+- data/europe/de/cities.txt
+- data/europe/de/regions.txt
+- data/europe/dk/cities.txt
+- data/europe/ee/cities.txt
+- data/europe/en.wikipedia.yml
+- data/europe/en/cities.txt
+- data/europe/en/regions.txt
+- data/europe/es.countries.yml
+- data/europe/es/cities.txt
+- data/europe/es/regions.txt
+- data/europe/fi/cities.txt
+- data/europe/fr/cities.txt
+- data/europe/fr/regions.txt
+- data/europe/gr/cities.txt
+- data/europe/hr/cities.txt
+- data/europe/hu/cities.txt
+- data/europe/ie/cities.txt
+- data/europe/it/cities.txt
+- data/europe/lt/cities.txt
+- data/europe/lv/cities.txt
+- data/europe/nl/cities.txt
+- data/europe/no/cities.txt
+- data/europe/pl/cities.txt
+- data/europe/pt/cities.txt
+- data/europe/ro/cities.txt
+- data/europe/rs/cities.txt
+- data/europe/ru/cities.txt
+- data/europe/sc/cities.txt
+- data/europe/se/cities.txt
+- data/europe/tr/cities.txt
+- data/europe/ua/cities.txt
+- data/europe/wa/cities.txt
+- data/oceania/au/cities.txt
+- data/oceania/countries.txt
+- data/oceania/de.countries.yml
+- data/oceania/en.wikipedia.yml
+- data/tags.yml
 - lib/worlddb.rb
 - lib/worlddb/cli/opts.rb
 - lib/worlddb/cli/runner.rb
@@ -225,8 +168,8 @@ files:
 - lib/worlddb/utils.rb
 - lib/worlddb/version.rb
 homepage: http://geraldb.github.com/world.db
-licenses: []
-
+licenses: 
+- Public Domain
 post_install_message: 
 rdoc_options: 
 - --main