worlddb 2.0.5 → 2.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 45f7ea9e8342b1543e5b5ffc4a3248eb556f3ba2
+  data.tar.gz: 8e8fc8668c5ff107626dc1300212fad1cf7b84cc
+SHA512:
+  metadata.gz: fef9a54a76351aa639ce10ed5e423daec71aef3b366ec9a0b9b457751b8f12170a2fde3433f0a36bcb9996bed6959c741ed3246091f433725ac6442ac1564df5
+  data.tar.gz: 8e3e5f08bf075a1da28d5af49e252798dae7383a30fff7e5e5d368babb8e15736729eac3dce83245407b950127ff775c6b0d29d4ea069f0810210765ca61878c

data/lib/worlddb/models/country.rb

@@ -42,6 +42,15 @@ class Country < ActiveRecord::Base
   scope :by_pop,   ->{ order( 'pop desc' ) }   # order by pop(ulation)
   scope :by_area,  ->{ order( 'area desc') }   # order by area (in square km)
 
+  scope :by_num,      ->{ order( 'num asc' ) }   # order by numeric country code
+  scope :by_alpha2,   ->{ order( 'alpha2 asc' ) }
+  scope :by_alpha3,   ->{ order( 'alpha2 asc' ) }
+  scope :by_fifa,     ->{ order( 'fifa asc' ) }   # football
+  scope :by_ioc,      ->{ order( 'ioc asc' ) }    # olympics
+  scope :by_motor,    ->{ order( 'motor asc' ) }  # designated signs; motor vehicle license plate
+  scope :by_net,      ->{ order( 'net asc' ) }    # internet cc top level domain; ccTLD
+
+
   before_create :on_create
   before_update :on_update
 

data/lib/worlddb/models/country_comp.rb

@@ -15,6 +15,12 @@ class Country
 
   scope :by_title, ->{ order( 'name asc' ) }   # order by title (a-z)
 
+  def iso2()       alpha2;              end
+  def iso2=(value) self.alpha2 = value; end
+
+  def iso3()       alpha3;              end
+  def iso3=(value) self.alpha3 = value; end
+
 
   def synonyms()       alt_names;      end
   def synonyms=(value) self.alt_names = value; end

data/lib/worlddb/reader.rb

@@ -53,14 +53,13 @@ class ReaderBase
        ## use match_usage( name ) - why? why not?? ???
        r = create_usage_reader( name )
        r.read()
-    elsif name =~ /\/fifa/
-       load_xxx( 'fifa', name )
-    elsif name =~ /\/iso3/
-       load_xxx( 'iso3', name )
-    elsif name =~ /\/internet/
-       load_xxx( 'net', name )
-    elsif name =~ /\/motor/
-       load_xxx( 'motor', name )
+    elsif name =~ /\/fifa/     ||
+          name =~ /\/fips/     ||
+          name =~ /\/internet/ ||
+          name =~ /\/ioc/      ||
+          name =~ /\/iso/      ||
+          name =~ /\/motor/
+       load_codes( name )
     elsif name =~ /^tag.*\.\d$/
        ## todo: pass along opts too
        ## use match_tags( name ) - why? why not?? ???
@@ -163,16 +162,62 @@ class ReaderBase
     end # each lines
   end # load_continent_defs
 
-  ### use CountryAttr Reader
-  def load_xxx( xxx, name )
-    reader = create_hash_reader( name )
+  def load_codes( name )
+    reader = create_line_reader( name )
 
-    reader.each do |key, value|
-      country = Country.find_by_key!( key )
-      country.send( "#{xxx}=", value )
-      country.save!
+    reader.each_line do |line|
+
+      values = line.split(',')
+
+      logger.debug '[>' + values.join( '<|>' ) + '<]'
+
+      if name =~ /iso/
+        # special case for iso
+        #  country ref, alpha2, alpha3, num
+        country_name = values[0].strip
+      else
+        #  code, country ref
+        country_name = values[1].strip
+      end
+
+      ## try to find country
+      cty = Country.find_by_name( country_name )
+      if cty.nil?
+        ## retry: remove all () enclosed
+        cty = Country.find_by_name( country_name.gsub( /\([^)]+\)/, '' ).strip )
+      end
+      
+      if cty.nil?
+        logger.warn "no country match found for >#{country_name}<; skipping line; in [#{name}]"
+        next
+      end
+
+      if name =~ /\/fifa/
+        cty.fifa = values[0].strip
+      elsif name =~ /\/fips/
+        cty.fips = values[0].strip
+      elsif name =~ /\/internet/
+        # NOTE: remove (optional) leading . e.g. .at becomes at
+        cty.net  = values[0].sub( /^\s*\./,'' ).strip  
+      elsif name =~ /\/ioc/
+        cty.ioc = values[0].strip
+      elsif name =~ /\/motor/
+        cty.motor = values[0].strip
+      elsif name =~ /\/iso/
+        cty.alpha2 = values[1].strip
+        cty.alpha3 = values[2].strip
+        # NOTE: num is a string!!! use (rename to) num_str - why? why not?
+        cty.num    = values[3].strip
+      else
+        logger.warn "warn: unknown country code type; skipping line; in [#{name}]"
+        next
+      end
+
+      cty.save!
     end
+
   end
 
+
 end # class ReaderBase
 end # module WorldDb

data/lib/worlddb/reader_file.rb

@@ -69,6 +69,12 @@ class Reader < ReaderBase
     ValuesReader.from_file( path, more_attribs )
   end
 
+  def create_line_reader( name )
+    path = "#{@include_path}/#{name}.txt"
+    logger.info "parsing data (line) '#{name}' (#{path})..."
+
+    LineReader.from_file( path )
+  end
 
 #  def create_tag_reader( name )
 #    ## fix: change to new from_file() style

data/lib/worlddb/reader_zip.rb

@@ -114,6 +114,12 @@ class ZipReader < ReaderBase
     ValuesReader.from_zip( @zip_file, path, more_attribs )
   end
 
+  def create_line_reader( name )
+    path = name_to_zip_entry_path( name )
+    logger.info "parsing data (line) in zip '#{name}' (#{path})..."
+
+    LineReader.from_zip( @zip_file, path )
+  end
 
 #  def create_tag_reader( name )
 #    ## fix: change to new from_file() style

data/lib/worlddb/schema.rb

@@ -92,12 +92,16 @@ 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
 
-  # extras
-  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
+  # extras - country codes
+  t.string  :motor      # optional  motor (vehicle) licene plate code (bumper sticker)
+  t.string  :alpha2       # optional iso two letter country code
+  t.string  :alpha3       # optional iso three letter country code
+  t.string  :num        #  optional iso numeric country code - NOTE: same numeric code as string!!! e.g. 043 etc.
   t.string  :fifa       # optional fifa country code
+  t.string  :ioc
+  t.string  :fips
   t.string  :net        # optional internet top level domain (tld)
+
   t.string  :wikipedia  # optional wikipedia page name -- en.wikipedia.org/wiki/<name>
 
   ## timestamp at last

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 = 5
+  PATCH = 6
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,115 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 2.0.5
-  prerelease: 
+  version: 2.0.6
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &75136710 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75136710
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &75136360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75136360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &75135990 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.9
   type: :runtime
   prerelease: false
-  version_requirements: *75135990
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: tagutils
-  requirement: &75135720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75135720
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &75135460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *75135460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &75135230 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75135230
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &75134990 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75134990
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &75132620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *75132620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &75132200 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *75132200
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
 description: worlddb - world.db command line tool
 email: openmundi@googlegroups.com
 executables:
@@ -120,6 +146,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.md
 files:
+- ".gemtest"
 - HISTORY.md
 - Manifest.txt
 - README.md
@@ -167,33 +194,31 @@ files:
 - test/test_model_country.rb
 - test/test_model_region.rb
 - test/test_models.rb
-- .gemtest
 homepage: https://github.com/worlddb/world.db.ruby
 licenses:
 - Public Domain
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: worlddb - world.db command line tool
 test_files:
 - test/test_model_comp.rb