worlddb 0.6.5 → 0.6.6

data/Manifest.txt

@@ -6,6 +6,8 @@ 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
@@ -86,6 +88,7 @@ lib/worlddb/models/region.rb
 lib/worlddb/models/tag.rb
 lib/worlddb/models/tagging.rb
 lib/worlddb/reader.rb
+lib/worlddb/readers/hash_reader.rb
 lib/worlddb/readers/line_reader.rb
 lib/worlddb/readers/values_reader.rb
 lib/worlddb/schema.rb

data/db/africa/fifa.yml

@@ -0,0 +1,10 @@
+
+
+### some comments
+##
+
+ao: ANG
+bj: BEN
+bw: BOT
+bf: BFA
+bi: BDI

data/db/africa/iso3.yml

@@ -0,0 +1,6 @@
+
+ao: ANG
+bj: BEN
+bw: XOO
+bf: XFA
+bi: BDI

data/db/asia/countries.txt

@@ -76,7 +76,7 @@ kz, Kazakhstan,  KAZ,  2_724_900,  16_600_000,    un|fifa|uefa|europe|central as
 sa, Saudi Arabia, KSA,  1_960_582,  27_136_977,  un|fifa|middle_east|western_asia|arabian peninsula|g20
 
 il, Israel, ISR,           20_770,   7_653_600,  un|fifa|middle_east|western_asia|fertile crescent
-pn, Palestine, PAL,         6_220,   4_260_636,  middle_east|western_asia|fertile crescent
+ps, Palestine, PAL,         6_220,   4_260_636,  middle_east|western_asia|fertile crescent
 
 ## add to middle east?
 

data/db/europe/countries.txt

@@ -10,10 +10,15 @@ md, Moldova, MDA,  33_846,  3_559_500,   Chișinău,  un|fifa
 sm, San Marino, SMR,  61,  32_404,  City of San Marino,  un|fifa
 
 
+
+
+
 ## NB:
 #
 #  countries also include:
-#    england (en), scotland (sc)
+#    england (en), scotland (ab for Alba (scotland in scotish gaelic) - sc (Seychellen),so,st,sl,sa,sn,sd all taken)
+#   use nd for northern ireland (ni (nicaragua),no, nr (naru) taken - anything better - anything common?)
+#    - use ul for ulster? better?
 #
 #  also turkey, russia, georiga, etc.
 #   note: the uefa country kazachstan is listed in asia
@@ -77,7 +82,7 @@ en, England,       ENG,     130_395,  53_013_000,  country:gb, fifa   # NB: FIFA
 ## 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?
 wa, Wales,         WAL,      20_779,   3_064_000,  country:gb, fifa
-
+nd, Northern Ireland, NIR,   13_843,   1_810_900,  Belfast, country:gb, fifa
 
 
 fo, Faroe Islands,  FRO,    1_399,      49_267,  country:dk
@@ -95,6 +100,7 @@ mk, Macedonia,    MKD,     25_713,   2_082_370,  un|fifa
 no, Norway,       NOR,    385_155,   4_993_300,  un|fifa|schengen|uefa
 is, Iceland,      ISL,    103_000,     318_452,  un|fifa|schengen|uefa
 
+va, Vatican City, VAT,          1,        836,   Vatican City
 
 ## todo/fix: add missing countries
 

data/lib/worlddb.rb

@@ -32,6 +32,7 @@ require 'worlddb/schema'       # NB: requires worlddb/models (include WorldDB::M
 require 'worlddb/utils'
 require 'worlddb/readers/line_reader'
 require 'worlddb/readers/values_reader'
+require 'worlddb/readers/hash_reader'
 require 'worlddb/reader'
 require 'worlddb/loader'
 require 'worlddb/cli/opts'
@@ -68,6 +69,8 @@ module WorldDB
   def self.fixtures  # all builtin fixtures; helper for covenience
 
   ['africa/countries',
+   'africa/fifa',
+   'africa/iso3',
    'america/countries',
    'america/br/regions',
    'america/br/cities',

data/lib/worlddb/reader.rb

@@ -75,7 +75,14 @@ class Reader
   #  load from gem (built-in)
 
   def load_builtin( name )  ## convenience helper (requires proper named files w/ convention)
-    if name =~ /\/countries/
+
+## add motor, wikipedia, net, etc.
+
+    if name =~ /\/fifa/
+       load_fifa_builtin( name )
+    elsif name =~ /\/iso3/
+       load_iso3_builtin( name )
+    elsif name =~ /\/countries/
        load_countries_builtin( name )
     elsif name =~ /\/([a-z]{2})\/cities/
        load_cities_builtin( $1, name )
@@ -106,6 +113,59 @@ class Reader
   end
 
 
+  def load_iso3_builtin( name )
+    path = "#{WorldDB.root}/db/#{name}.yml"
+
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    reader = HashReader.new( logger, path )
+    
+    ### fix: use each on reader!!! move normalize into reader
+    reader.hash.each do |key_wild, value_wild|
+    
+      # normalize
+      # - key n value as string (not symbols, bool? int? array?)
+      # - remove leading and trailing whitespace
+      key   = key_wild.to_s.strip
+      value = value_wild.to_s.strip
+      
+      puts ">>#{key}<< >>#{value}<<"
+    
+      country = Country.find_by_key!( key )
+      country.iso3 = value
+      country.save!
+    
+    end
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+  end
+
+  def load_fifa_builtin( name )
+    path = "#{WorldDB.root}/db/#{name}.yml"
+
+    puts "*** parsing data '#{name}' (#{path})..."
+
+    reader = HashReader.new( logger, path )
+    
+    reader.hash.each do |key_wild, value_wild|
+    
+      # normalize
+      key   = key_wild.to_s.strip
+      value = value_wild.to_s.strip
+      
+      puts ">>#{key}<< >>#{value}<<"
+    
+      country = Country.find_by_key!( key )
+      country.fifa = value
+      country.save!
+    
+    end
+
+    Prop.create!( key: "db.#{fixture_name_to_prop_key(name)}.version", value: "file.txt.#{File.mtime(path).strftime('%Y.%m.%d')}" )
+  end
+
+
+
 private
   def load_fixtures_with_include_path_for( clazz, name, include_path, more_values={} )  # load from file system
     path = "#{include_path}/#{name}.txt"

data/lib/worlddb/readers/hash_reader.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+
+class HashReader
+
+  def initialize( logger=nil, path )
+    if logger.nil?
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    else
+      @logger = logger
+    end
+    
+    @path = path
+
+    ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see worlddb/utils.rb
+    @hash = YAML.load( File.read_utf8( @path ))
+  end
+
+  attr_reader :logger, :hash
+  
+end # class HashReader

data/lib/worlddb/schema.rb

@@ -24,9 +24,15 @@ create_table :countries do |t|
   t.timestamps
  
   # extras
-  t.string  :motor   # optional auto motor (vehicle) licene plate
+  t.string  :motor      # optional auto motor (vehicle) licene plate
+  t.string  :iso2       # optional iso two letter country code
+  t.string  :iso3       # optional iso three letter country code
+  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>
 end
 
+
 add_index :countries, :key,  :unique => true
 add_index :countries, :code, :unique => true
 

data/lib/worlddb/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-29 00:00:00 Z
+date: 2012-11-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -136,6 +136,8 @@ files:
 - 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
@@ -216,6 +218,7 @@ files:
 - lib/worlddb/models/tag.rb
 - lib/worlddb/models/tagging.rb
 - lib/worlddb/reader.rb
+- lib/worlddb/readers/hash_reader.rb
 - lib/worlddb/readers/line_reader.rb
 - lib/worlddb/readers/values_reader.rb
 - lib/worlddb/schema.rb