worlddb 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af58d58c38775a19ef1a319c7a2964dfb38f690d
-  data.tar.gz: 5370d2cd74dab599b22b62413fffdb57372d259d
+  metadata.gz: e7c9137d81e29c751381a6a489626e295cea4619
+  data.tar.gz: c8fb56e5b4f5bcf7e8364c67c4f795a01d464053
 SHA512:
-  metadata.gz: f59a8cf313525cb89e6d7ebfac67e6bc2329b26cc17d3ee0ecaf5e026298ab43a50c6cfb6163e88b23fabdc34a656e0c77720e90a917a1daa127b2f3183cb325
-  data.tar.gz: f030026f39270272136a0b68556c093c4a5264e670c088235cbfad7ac88e6fae5e5c687161654acf0c5411af3c4e19c7dc82c8bb6c1810402cf1aec0fc50f81e
+  metadata.gz: e338f8332bad32c4e567f4fe7c754e9f90a0ee0fa3d790b9ad59ca856dfcb28d6e2a0bcad0c74ed8ab10245b498b4d4d70dfb17ce971288a717b8573e417b065
+  data.tar.gz: 86ad1f3b50b857a9540320b339a1ef4ee4bcebd2c2d9aa9ff3b71384e638c748003cfba65cf9f7e042dc23c8c8cacd71b9aecab7d9e70320ab92159bfb23d881

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/worlddb/models/city_comp.rb
 lib/worlddb/models/continent.rb
 lib/worlddb/models/continent_comp.rb
 lib/worlddb/models/country.rb
+lib/worlddb/models/country_code.rb
 lib/worlddb/models/country_comp.rb
 lib/worlddb/models/forward.rb
 lib/worlddb/models/lang.rb

data/lib/worlddb.rb

@@ -41,6 +41,7 @@ require 'worlddb/models/continent'
 require 'worlddb/models/continent_comp'
 require 'worlddb/models/country'
 require 'worlddb/models/country_comp'
+require 'worlddb/models/country_code'
 require 'worlddb/models/region'
 require 'worlddb/models/region_comp'
 require 'worlddb/models/city'

data/lib/worlddb/deleter.rb

@@ -14,6 +14,7 @@ module WorldDb
       ## Tagging.delete_all   # - use TagDb.delete!
       ## Tag.delete_all
 
+      CountryCode.delete_all
       Name.delete_all
       Place.delete_all
       City.delete_all

data/lib/worlddb/models/country.rb

@@ -81,17 +81,23 @@ class Country < ActiveRecord::Base
       'SUPR'
     elsif is_dependency?
       'TERR'
+    elsif is_misc?  ## misc(ellaneous) country or dependent territory
+      # todo: use different marker?
+      # territory w/ shared or disputes claims e.g Antartica/Western Sahara/Paracel Islands pg Spratly Islands/etc. 
+      'MISC'
     else
       'CNTY'
     end
   end
 
+
   ###
   #  NB: use is_  for flags to avoid conflict w/ assocs 
   
   def is_supra?()      s? == true;  end
   def is_country?()    c? == true;  end
   def is_dependency?() d? == true;  end
+  def is_misc?()       m? == true;  end
 
 
   def all_names( opts={} )
@@ -114,6 +120,50 @@ class Country < ActiveRecord::Base
   end
 
 
+  def self.search_by_name( q )    ## todo/check: just use search (rename)? why? why not?
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    ## logger = LogKernel::Logger.root
+
+    name = q.strip
+
+    ## 1) first try 1:1 (exact) match
+    cty = Country.find_by_name( name )   # NOTE: assume AR escapes quotes in name ??
+    if cty.nil?
+      ## 2) retry: a) remove all (..) enclosed
+      ##           b) remove all extra spaces (e.g. Cocos (Keeling) Islands => Cocos__Islands => Cocos_Islands)
+      name = name.gsub( /\([^)]+\)/, '' ).strip
+      name = name.gsub( /[ \t]{2,}/, ' ' )
+      cty = Country.find_by_name( name )
+
+      ### NOTE: escape ' for sql like clause
+      ##   for now use '' for escapes, that is, double quotes
+      ##  check - working for postgresql n sqlite?? 
+      name_esc = name.gsub( /'/, "''" )
+
+      ## 3) retry: use SQL like match
+      ##    % is used to match *zero* or more occurrences of any characters
+      ##  todo: check if it matches zero too
+      if cty.nil?
+        cty = Country.where( "name LIKE '%#{name_esc}%'" ).first
+      end
+
+      ## 4) retry: use SQL like match for alternative names match
+      if cty.nil?
+        cty = Country.where( "alt_names LIKE '%#{name_esc}%'" ).first
+      end
+
+      ## 5) retry: use SQL like match for historic names match (e.g. Burma for Myanmar etc.)
+      ##  todo/check: make it optional (pass in opts hash to configure) - why? why not???
+      if cty.nil?
+        cty = Country.where( "hist_names LIKE '%#{name_esc}%'" ).first
+      end
+    end
+
+    cty  # return cty (country); nil if not found
+  end
+
+
   def self.create_or_update_from_values( values, more_attribs={} )
 
       ## key & title

data/lib/worlddb/models/country_code.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+module WorldDb
+  module Model
+
+class CountryCode < ActiveRecord::Base
+
+  self.table_name = 'country_codes'
+
+  belongs_to :country, class_name: 'Country', foreign_key: 'country_id'
+
+
+  scope :by_name,  ->{ order( 'name asc' ) }   # order by name (a-z)
+
+
+  def self.update!
+    ## update (auto-create) country codes from existing countries in db
+
+    ## fix: add/configure logger for ActiveRecord!!!
+    logger = LogKernel::Logger.root
+
+    logger.debug( "delete all (old) country codes" )
+    CountryCode.delete_all
+
+    Country.order(:id).each do |cty|
+      logger.debug( "add country #{cty.key} #{cty.name}" )
+      CountryCode.create!( country_id: cty.id, kind: 'NET',  name: cty.net    )  unless cty.net.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'NUM',  name: cty.num    )  unless cty.num.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'A2',   name: cty.alpha2 )  unless cty.alpha2.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'A3',   name: cty.alpha3 )  unless cty.alpha3.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'FIFA', name: cty.fifa   )  unless cty.fifa.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'IOC',  name: cty.ioc    )  unless cty.ioc.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'FIPS', name: cty.fips   )  unless cty.fips.nil?
+      CountryCode.create!( country_id: cty.id, kind: 'M',    name: cty.motor  )  unless cty.motor.nil?
+    end
+  end
+
+end # class CountryCode
+
+  end # module Model
+end # module WorldDb

data/lib/worlddb/models/forward.rb

@@ -25,6 +25,8 @@ class City < ActiveRecord::Base ; end
 class Lang < ActiveRecord::Base ; end
 class Usage < ActiveRecord::Base ; end
 
+class CountryCode < ActiveRecord::Base ; end
+
   end
 
   # note: convenience alias for Model
@@ -39,15 +41,17 @@ module TagDb
 # add alias? why? why not? # is there a better way?
 #  - just include WorldDb::Models  - why? why not?
 
-Name      = WorldDb::Model::Name
-Place     = WorldDb::Model::Place
-Continent = WorldDb::Model::Continent
-Country   = WorldDb::Model::Country
-Region    = WorldDb::Model::Region
-City      = WorldDb::Model::City
+Name        = WorldDb::Model::Name
+Place       = WorldDb::Model::Place
+Continent   = WorldDb::Model::Continent
+Country     = WorldDb::Model::Country
+Region      = WorldDb::Model::Region
+City        = WorldDb::Model::City
+
+Lang        = WorldDb::Model::Lang
+Usage       = WorldDb::Model::Usage
 
-Lang      = WorldDb::Model::Lang
-Usage     = WorldDb::Model::Usage
+CountryCode = WorldDb::Model::CountryCode
 
   end
 end

data/lib/worlddb/reader.rb

@@ -170,7 +170,7 @@ class ReaderBase
 
       values = line.split(',')
 
-      logger.debug '[>' + values.join( '<|>' ) + '<]'
+      ## logger.debug '[>' + values.join( '<|>' ) + '<]'
 
       if name =~ /iso/
         # special case for iso
@@ -182,7 +182,7 @@ class ReaderBase
       end
 
       ## try to find country
-      cty = find_country( country_name )
+      cty = Country.search_by_name( country_name )
 
       if cty.nil?
         logger.warn "no country match found for >#{country_name}<; skipping line; in [#{name}]"
@@ -217,45 +217,8 @@ class ReaderBase
 
 ####
 # helper methods
-##
-## todo: move to country model !!!!!!
-##   find a good name Country.find  not really possible
-##   superfind ??  use search!!! search_by_name()  Country.search() or lookup?
-##
 ## todo: also add City.search_by_name etc. !!!
 
-  def find_country( country_name )
-
-    name = country_name.strip
-
-    ## 1) first try 1:1 (exact) match
-    cty = Country.find_by_name( name )   # NOTE: assume AR escapes quotes in name ??
-    if cty.nil?
-      ## 2) retry: remove all () enclosed
-      name = name.gsub( /\([^)]+\)/, '' ).strip
-      cty = Country.find_by_name( name )
-
-      ### NOTE: escape ' for sql like clause
-      ##   for now use '' for escapes, that is, double quotes
-      ##  check - working for postgresql n sqlite?? 
-      name_esc = name.gsub( /'/, "''" )
-
-      ## 3) retry: use SQL like match
-      ##    % is used to match *zero* or more occurrences of any characters
-      ##  todo: check if it matches zero too
-      if cty.nil?
-        cty = Country.where( "name LIKE '%#{name_esc}%'" ).first
-      end
-
-      ## 4) retry: use SQL like match for alternative names match
-      if cty.nil?
-        cty = Country.where( "alt_names LIKE '%#{name_esc}%'" ).first
-      end
-    end
-    cty  # return cty (country); nil if not found
-  end # method find_country
-
-
 
 end # class ReaderBase
 end # module WorldDb

data/lib/worlddb/schema.rb

@@ -75,6 +75,15 @@ end
 add_index :continents, :key, unique: true
 
 
+create_table :country_codes do |t|
+  t.string     :name, null: false
+  t.string     :kind, null: false   # e.g. ALPHA2,NUM,FIFA,IOC,FIPS,NET,etc.
+  t.references :country, null: false
+end
+
+add_index :country_codes, [:name, :kind], unique: true
+
+
 create_table :countries do |t|
   t.string     :name,   null: false
   t.string     :slug,   null: false   # auto-generate default
@@ -82,6 +91,7 @@ create_table :countries do |t|
   t.references :place,  null: false
   t.string     :code,   null: false  # short three letter code (FIFA country code e.g. ITA)
   t.string     :alt_names  # comma separated list of alternate names (synonyms)
+  t.string     :hist_names # comma separated list of historic names (no longer in use)
   t.integer    :pop,    null: false    # population count
   t.integer    :area,   null: false    #  area in square km (sq. km)
   t.references :continent
@@ -92,6 +102,10 @@ create_table :countries do |t|
   t.boolean :c,  null: false, default: false   # country flag (is this needed?)
   t.boolean :d,  null: false, default: false   # dependency flag
 
+  t.boolean :m,  null: false, default: false   # misc(ellaneous) flag
+  # misc use for territories w/ shared or disputed claims
+  #   e.g. Antartica/Western Sahara/Paracel Islands/Spratly Islands/etc.
+
   # extras - country codes
   t.string  :motor      # optional  motor (vehicle) licene plate code (bumper sticker)
   t.string  :alpha2       # optional iso two letter country code

data/lib/worlddb/stats.rb

@@ -8,17 +8,21 @@ module WorldDb
     def tables
       puts "Stats:"
       puts " #{'%5d' % Continent.count} continents"
-      puts " #{'%5d' % Country.count} countries (#{Country.where(s: true).count} supras, #{Country.where(d:true).count} deps)"
+      puts " #{'%5d' % Country.count} countries (#{Country.where(s: true).count} supras, #{Country.where(d:true).count} deps), #{Country.where(m:true).count} miscs)"
       puts " #{'%5d' % Region.count} regions"
       puts " #{'%5d' % City.where(m: true).where(c: false).count} metros"
       puts " #{'%5d' % City.where(c: true).count} cities (#{City.where(c: true).where(m: true).count} metros)"
       puts " #{'%5d' % City.where(d: true).count} districts"
-#      puts " #{'%5d' % Tag.count} tags"
-#      puts " #{'%5d' % Tagging.count} taggings"
       puts " #{'%5d' % Place.count} places"
       puts " #{'%5d' % Name.count} names"
+
       puts " #{'%5d' % Lang.count} langs"
       puts " #{'%5d' % Usage.count} usages"
+
+      puts " #{'%5d' % CountryCode.count} (country) codes"
+
+#      puts " #{'%5d' % Tag.count} tags"
+#      puts " #{'%5d' % Tagging.count} taggings"
     end
 
   end # class Stats

data/lib/worlddb/version.rb

@@ -4,7 +4,7 @@ module WorldDb
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
   MINOR = 0
-  PATCH = 7
+  PATCH = 8
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -163,6 +163,7 @@ files:
 - lib/worlddb/models/continent.rb
 - lib/worlddb/models/continent_comp.rb
 - lib/worlddb/models/country.rb
+- lib/worlddb/models/country_code.rb
 - lib/worlddb/models/country_comp.rb
 - lib/worlddb/models/forward.rb
 - lib/worlddb/models/lang.rb