worlddb 0.3.0 → 0.3.1

data/db/america/countries.txt

@@ -22,7 +22,7 @@ sv, El Salvador,   SLV
   
 ar, Argentina,     ARG, 2780400,  40518425, south america|es
 bo, Bolivia,       BOL, 1098581,  10907778, south america|es
-br, Brazil,        BRA, 8514215, 192380000, south america|pt
+br, Brazil,        BRA, 8514215, 192380000, south america|pt-br
 cl, Chile,         CHI,  755696,  16763470, south america|es
 co, Colombia,      COL, 1138748,  46413791, south america|es
 ec, Ecuador,       ECU,  258238,  15007343, south america|es

data/lib/worlddb.rb

@@ -49,6 +49,9 @@ module WorldDB
     Runner.new.run(ARGV)
   end
   
+  def self.create
+    CreateDB.up
+  end
 
   # load built-in (that is, bundled within the gem) named seeds
   # - pass in an array of seed names e.g. [ 'countries', 'at/cities', 'de/cities' ] etc.
@@ -60,6 +63,74 @@ module WorldDB
     end
   end
 
+  def self.fixtures  # all builtin fixtures; helper for covenience
+
+  ['africa/countries',
+   'america/countries',
+   'america/br/regions',
+   'america/br/cities',
+   'america/ca/regions',
+   'america/ca/cities',
+   'america/mx/cities',
+   'america/us/regions',
+   'america/us/cities',
+   'america/ve/regions',
+   'america/ve/cities',
+   'asia/countries',
+   'asia/jp/cities',
+   'europe/countries',
+   'europe/at/regions',
+   'europe/at/cities',
+   'europe/be/cities',
+   'europe/by/cities',
+   'europe/ch/cities',
+   'europe/cy/cities',
+   'europe/de/regions',
+   'europe/de/cities',
+   'europe/dk/cities',
+   'europe/en/cities',
+   'europe/es/cities',
+   'europe/fr/cities',
+   'europe/gr/cities',
+   'europe/hr/cities',
+   'europe/it/cities',
+   'europe/nl/cities',
+   'europe/pt/cities',
+   'europe/ro/cities',
+   'europe/ru/cities',
+   'europe/sc/cities',
+   'europe/tr/cities',
+   'europe/ua/cities',
+   'oceania/countries',
+   'oceania/au/cities'
+   ]
+  end
+
+
+  def self.read( ary )
+    reader = Reader.new
+    ary.each do |name|
+      reader.load_builtin( name )
+    end
+  end
+
+  def self.read_all  # load all builtins (using plain text reader); helper for convenience
+    reader = Reader.new
+
+    # too big for heroku free db plan (10,000 record limit)
+    #  - sorry, can't load by default
+    fixture_excludes = [
+      'america/br/cities',
+      'america/ve/cities'
+    ]
+    
+    ary = fixtures - fixture_excludes
+    
+    ary.each do |name|
+     reader.load_builtin( name )
+    end # each name
+  end # method load_all
+
 
   class Deleter
     ## todo: move into its own file???    

data/lib/worlddb/cli/opts.rb

@@ -47,7 +47,17 @@ class Opts
     return false if @create.nil?   # default create flag is false
     @create == true
   end
-  
+
+
+  def setup=(boolean)
+    @setup = boolean
+  end
+
+  def setup?
+    return false if @setup.nil?   # default create flag is false
+    @setup == true
+  end
+
 
   def delete=(boolean)
     @delete = boolean

data/lib/worlddb/cli/runner.rb

@@ -22,6 +22,7 @@ class Runner
 
       ## NB: reserve -c for use with -c/--config
       cmd.on( '--create', 'Create DB schema' ) { opts.create = true }
+      cmd.on( '--setup',  "Create DB schema 'n' load builtin world data" ) { opts.setup = true }
 
       ### todo: in future allow multiple search path??
       cmd.on( '-i', '--include PATH', "Data path (default is #{opts.data_path})" ) { |path| opts.data_path = path }
@@ -91,19 +92,18 @@ EOS
 
     ActiveRecord::Base.establish_connection( db_config )
     
-    if opts.create?
-      CreateDB.up
-    end
-    
-    if opts.delete?
-       WorldDB.delete!
-    end
-
-
-    if opts.countries? || opts.regions? || opts.cities?
-      Reader.new( logger ).run( opts, args )  # load/read plain text country/region/city fixtures
+    if opts.setup?
+      WorldDB.create
+      WorldDB.read_all
     else
-      Loader.new( logger ).run( opts, args ) # load ruby fixtures
+      WorldDB.create   if opts.create?
+      WorldDB.delete!  if opts.delete?
+
+      if opts.countries? || opts.regions? || opts.cities?
+        Reader.new( logger ).run( opts, args )  # load/read plain text country/region/city fixtures
+      else
+        Loader.new( logger ).run( opts, args ) # load ruby fixtures
+      end
     end
 
     dump_stats

data/lib/worlddb/models/city.rb

@@ -10,8 +10,11 @@ class City < ActiveRecord::Base
   
   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
+
+
   def self.create_from_ary!( cities, more_values={} )
     cities.each do |values|
       
@@ -38,6 +41,8 @@ class City < ActiveRecord::Base
           attr[ :country_id ] = value.id
         elsif value.is_a? Numeric
           value_numbers << value
+        elsif value =~ /^[A-Z_]{3}$/    ## assume its three letter code (e.g. NYC,VIE,etc.)
+          attr[ :code ] = value
         elsif value =~ /^region:/   ## region:
           value_region_key = value[7..-1]  ## cut off region: prefix
           value_region = Region.find_by_key!( value_region_key )

data/lib/worlddb/models/country.rb

@@ -11,6 +11,10 @@ class Country < ActiveRecord::Base
   has_many :taggings, :as => :taggable
   has_many :tags,     :through => :taggings
 
+  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.create_from_ary!( countries )
     countries.each do |values|
       
@@ -18,7 +22,7 @@ class Country < ActiveRecord::Base
       attr = {
         :key   => values[0],
         :title => values[1],
-        :tag   => values[2]
+        :code  => values[2]
       }
       
       value_numbers = []

data/lib/worlddb/models/region.rb

@@ -9,6 +9,7 @@ class Region < ActiveRecord::Base
   has_many :taggings, :as => :taggable
   has_many :tags,     :through => :taggings
 
+  validates :key, :format => { :with => /^[a-z]{2,}$/, :message => 'expected two or more lowercase letters a-z' }
 
   def self.create_from_ary!( regions, more_values={} )
     regions.each do |values|

data/lib/worlddb/reader.rb

@@ -45,14 +45,14 @@ class Reader
 
   def load_regions_with_include_path( country_key, name, include_path )
     country = Country.find_by_key!( country_key )
-    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+    puts "Country #{country.key} >#{country.title} (#{country.code})<"
 
     load_fixtures_with_include_path_for( Region, name, include_path, country_id: country.id )
   end
 
   def load_cities_with_include_path( country_key, name, include_path )  
     country = Country.find_by_key!( country_key )
-    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+    puts "Country #{country.key} >#{country.title} (#{country.code})<"
 
     load_fixtures_with_include_path_for( City, name, include_path, country_id: country.id )
   end
@@ -60,20 +60,33 @@ class Reader
   ##################################
   #  load from gem (built-in)
 
+  def load_builtin( name )  ## convenience helper (requires proper named files w/ convention)
+    if name =~ /\/countries/
+       load_countries_builtin( name )
+    elsif name =~ /\/([a-z]{2})\/cities/
+       load_cities_builtin( $1, name )
+    elsif name =~ /\/([a-z]{2})\/regions/
+       load_regions_builtin( $1, name )
+    else
+       puts "*** error: unknown world.db fixture type >#{name}<"
+       # todo/fix: exit w/ error
+    end
+  end
+
   def load_countries_builtin( name ) 
     load_fixtures_builtin_for( Country, name )
   end
 
   def load_regions_builtin( country_key, name )
     country = Country.find_by_key!( country_key )
-    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+    puts "Country #{country.key} >#{country.title} (#{country.code})<"
   
     load_fixtures_builtin_for( Region, name, country_id: country.id )
   end
   
   def load_cities_builtin( country_key, name )
     country = Country.find_by_key!( country_key )
-    puts "Country #{country.key} >#{country.title} (#{country.tag})<"
+    puts "Country #{country.key} >#{country.title} (#{country.code})<"
 
     load_fixtures_builtin_for( City, name, country_id: country.id )
   end
@@ -166,7 +179,7 @@ private
           value_region = Region.find_by_key!( value_region_key )
           attribs[ :region_id ] = value_region.id
         elsif value =~ /^[A-Z]{3}$/  ## assume three-letter code
-          attribs[ :tag ] = value    # todo: rename to code??
+          attribs[ :code ] = value
         elsif value =~ /^\d+$/    ## numeric
           value_numbers << value.to_i
         elsif (values.size==(index+3)) && value =~ /^[a-z0-9\| ]+$/   # tags must be last entry

data/lib/worlddb/schema.rb

@@ -11,9 +11,9 @@ def self.up
   ActiveRecord::Schema.define do
 
 create_table :countries do |t|
-  t.string  :title, :null => false
-  t.string  :key,   :null => false
-  t.string  :tag,   :null => false  # short three letter tag (FIFA country code)
+  t.string  :title,  :null => false
+  t.string  :key,    :null => false
+  t.string  :code,   :null => false  # short three letter code (FIFA country code e.g. ITA)
   t.string  :synonyms  # comma separated list of synonyms
   t.string  :motor   # optional auto motor (vehicle) licene plate
   t.integer :pop     # optional population count
@@ -34,6 +34,7 @@ end
 create_table :cities do |t|
   t.string :title, :null => false
   t.string :key,   :null => false
+  t.string :code     # short three letter code (ITAT/airport code e.g. NYC or VIE)
   t.string :synonyms  # comma separated list of synonyms
   t.references :country,  :null => false
   t.references :region    # optional for now

data/lib/worlddb/version.rb

@@ -1,5 +1,5 @@
 
 module WorldDB
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-11 00:00:00 Z
+date: 2012-11-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord