worlddb 1.6.0 → 1.6.1

data/Manifest.txt

@@ -10,6 +10,7 @@ lib/worlddb/console.rb
 lib/worlddb/data/fixtures.rb
 lib/worlddb/deleter.rb
 lib/worlddb/models/city.rb
+lib/worlddb/models/continent.rb
 lib/worlddb/models/country.rb
 lib/worlddb/models/lang.rb
 lib/worlddb/models/prop.rb

data/lib/worlddb/console.rb

@@ -14,12 +14,13 @@ require 'yaml'
 
 ## shortcuts for models
 
-Tag     = WorldDb::Models::Tag
-Tagging = WorldDb::Models::Tagging
-Country = WorldDb::Models::Country
-Region  = WorldDb::Models::Region
-City    = WorldDb::Models::City
-Prop    = WorldDb::Models::Prop
+Tag        = WorldDb::Models::Tag
+Tagging    = WorldDb::Models::Tagging
+Continent  = WorldDb::Models::Continent
+Country    = WorldDb::Models::Country
+Region     = WorldDb::Models::Region
+City       = WorldDb::Models::City
+Prop       = WorldDb::Models::Prop
 
 ## connect to db
 
@@ -36,11 +37,9 @@ ActiveRecord::Base.establish_connection( DB_CONFIG )
 ## test drive
 
 puts "Welcome to world.db, version #{WorldDb::VERSION}!"
-puts "  #{'%6d' % Country.count} countries"
-puts "  #{'%6d' % Region.count} regions"
-puts "  #{'%6d' % City.count} cities"
-puts "  #{'%6d' % Tagging.count} taggings"
-puts "  #{'%6d' % Tag.count} tags"
+
+WorldDb.stats
+
 puts "Ready."
 
 ## some countries

data/lib/worlddb/deleter.rb

@@ -16,6 +16,7 @@ module WorldDb
       City.delete_all
       Region.delete_all
       Country.delete_all
+      Continent.delete_all
       Usage.delete_all
       Lang.delete_all
       Prop.delete_all

data/lib/worlddb/models/continent.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+
+module WorldDb::Models
+
+  class Continent < ActiveRecord::Base
+    
+    has_many :countries
+
+    # NB: allow dots in keys e.g. concacaf.naf etc.    
+    
+  end  # class Continent
+
+end # module WorldDb::Models

data/lib/worlddb/models/country.rb

@@ -5,6 +5,8 @@ module WorldDb::Models
 class Country < ActiveRecord::Base
   self.table_name = 'countries'
 
+  belongs_to :continent, :class_name => 'Continent', :foreign_key => 'continent_id'
+  
   has_many :usages
   has_many :langs, :through => :usages # lang(uage)s through usages (that is, countries_langs) join table
 

data/lib/worlddb/reader.rb

@@ -89,7 +89,11 @@ class Reader
 
   def load( name )
 
-    if name =~ /^lang/
+    if name =~ /^continents/
+       load_continent_defs( name )
+    elsif name =~ /\/continents/
+       load_continent_refs( name )
+    elsif name =~ /^lang/
        load_langs( name )
     elsif name =~ /\/lang/
        load_usages( name )
@@ -158,6 +162,55 @@ class Reader
   end
 
 
+  def load_continent_refs( name )
+    path = "#{include_path}/#{name}.yml"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = HashReader.new( path )
+
+    reader.each do |key, value|
+      country = Country.find_by_key!( key )
+      continent = Continent.find_by_key!( value )
+      country.continent_id = continent.id
+      country.save!
+    end
+
+    Prop.create_from_fixture!( name, path )
+  end
+
+  def load_continent_defs( name, more_values={} )
+    path = "#{include_path}/#{name}.txt"
+
+    logger.info "parsing data '#{name}' (#{path})..."
+
+    reader = ValuesReader.new( path, more_values )
+
+    reader.each_line do |attribs, values|
+
+      ## check optional values
+      values.each_with_index do |value, index|
+        logger.warn "unknown type for value >#{value}<"
+      end
+
+      rec = Continent.find_by_key( attribs[ :key ] )
+      if rec.present?
+        logger.debug "update Continent #{rec.id}-#{rec.key}:"
+      else
+        logger.debug "create Continent:"
+        rec = Continent.new
+      end
+      
+      logger.debug attribs.to_json
+   
+      rec.update_attributes!( attribs )
+
+    end # each lines
+    
+    Prop.create_from_fixture!( name, path )
+     
+  end # load_continent_defs
+
 
   def load_langs( name )
     

data/lib/worlddb/schema.rb

@@ -5,6 +5,18 @@ class CreateDb < ActiveRecord::Migration
 
 def up
 
+create_table :continents do |t|
+  t.string  :title,  :null => false
+  t.string  :key,    :null => false
+  t.string  :synonyms  # comma separated list of synonyms
+
+  ## timestamp at last
+  t.timestamps
+end
+
+add_index :continents, :key,  :unique => true
+
+
 create_table :countries do |t|
   t.string  :title,  :null => false
   t.string  :key,    :null => false
@@ -12,7 +24,8 @@ create_table :countries do |t|
   t.string  :synonyms  # comma separated list of synonyms
   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)
+  t.references :continent
+  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

data/lib/worlddb/stats.rb

@@ -7,6 +7,7 @@ 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' % Region.count} regions"
       puts " #{'%5d' % City.where(m: true).where(c: false).count} metros"

data/lib/worlddb/version.rb

@@ -1,6 +1,6 @@
 
 module WorldDb
-  VERSION = '1.6.0'  # sync version w/ sport.db - why? why not?
+  VERSION = '1.6.1'  # sync version w/ sport.db - why? why not?
 end
 
 ###########################################

data/lib/worlddb.rb

@@ -27,6 +27,7 @@ require 'textutils'
 require 'worlddb/version'
 
 require 'worlddb/models/prop'
+require 'worlddb/models/continent'
 require 'worlddb/models/country'
 require 'worlddb/models/region'
 require 'worlddb/models/city'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worlddb
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &82489880 !ruby/object:Gem::Requirement
+  requirement: &81213940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *82489880
+  version_requirements: *81213940
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &82489650 !ruby/object:Gem::Requirement
+  requirement: &81213720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 4.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *82489650
+  version_requirements: *81213720
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &82489410 !ruby/object:Gem::Requirement
+  requirement: &81213510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *82489410
+  version_requirements: *81213510
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82489190 !ruby/object:Gem::Requirement
+  requirement: &81213290 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *82489190
+  version_requirements: *81213290
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &82488960 !ruby/object:Gem::Requirement
+  requirement: &81213070 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *82488960
+  version_requirements: *81213070
 description: worlddb - world.db command line tool
 email: opensport@googlegroups.com
 executables:
@@ -86,6 +86,7 @@ files:
 - lib/worlddb/data/fixtures.rb
 - lib/worlddb/deleter.rb
 - lib/worlddb/models/city.rb
+- lib/worlddb/models/continent.rb
 - lib/worlddb/models/country.rb
 - lib/worlddb/models/lang.rb
 - lib/worlddb/models/prop.rb