worlddb 0.1.0 → 0.2.0

data/db/at/cities.rb

@@ -1,5 +1,14 @@
 # encoding: utf-8
 
+
+#########
+# sources:
+#  http://en.wikipedia.org/wiki/List_of_cities_and_towns_in_Austria
+#  http://en.wikipedia.org/wiki/List_of_cities_in_Austria_over_5,000_population_(2001_census)
+
+
+
+
 at = Country.find_by_key!( 'at' )
 
 
@@ -20,31 +29,39 @@ regions_at = [
 Region.create_from_ary!( regions_at, country: at )
 
 cities_at = [
-  ['wien',        'Wien|Vienna',      'region:wien'],
+  ['wien',        'Wien|Vienna',      'region:wien',  1664146],
 
-  ['stpoelten',   'St. Pölten', 'region:noe'],
-  ['moedling',    'Mödling|Moedling', 'region:noe'],
-  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt', 'region:noe'],
-  ['horn',        'Horn',       'region:noe'],
+  ['stpoelten',   'St. Pölten',                   'region:noe', 51360],
+  ['wrneustadt',  'Wiener Neustadt|Wr. Neustadt', 'region:noe', 39940],
+  ['moedling',    'Mödling|Moedling',             'region:noe', 20649],
+  ['horn',        'Horn',                         'region:noe',  6411],  # < 10000 pop
 
-  ['linz',        'Linz',        'region:ooe'],
-  ['ried',        'Ried',        'region:ooe'],
+  ['linz',        'Linz',             'region:ooe',   188894],
+  ['wels',        'Wels',             'region:ooe',    58623],
+  ['steyr',       'Steyr',            'region:ooe',    38979],
+  ['ried',        'Ried im Innkreis', 'region:ooe',    11585],
 
-  ['mattersburg', 'Mattersburg', 'region:bgld'],
+  ['eisenstadt',  'Eisenstadt',  'region:bgld', 12367],
+  ['mattersburg', 'Mattersburg', 'region:bgld',  6256],  # < 10000 pop
 
-  ['graz',        'Graz',        'region:stmk'],
-  ['hartberg',    'Hartberg',    'region:stmk'],
-  ['kapfenberg',  'Kapfenberg',  'region:stmk'],
+  ['graz',        'Graz',        'region:stmk',  247698],
+  ['kapfenberg',  'Kapfenberg',  'region:stmk',   21928],
+  ['hartberg',    'Hartberg',    'region:stmk',    6547],   # < 10000 pop
 
-  ['salzburg',    'Salzburg',    'region:sbg'],
-  ['groedig',     'Grödig',      'region:sbg'],
+  ['salzburg',    'Salzburg',    'region:sbg',   149018],
+  ['groedig',     'Grödig',      'region:sbg',     6638],   # < 10000 pop
 
-  ['wolfsberg',   'Wolfsberg',   'region:ktn'],
+  ['klagenfurt',  'Klagenfurt',  'region:ktn',  92397],
+  ['villach',     'Villach',     'region:ktn',  58480],
+  ['wolfsberg',   'Wolfsberg',   'region:ktn',  25361],
 
-  ['innsbruck',   'Innsbruck',   'region:tirol'],
+  ['innsbruck',   'Innsbruck',   'region:tirol',  117693],
   
-  ['altach',      'Altach',     'region:vbg'],
-  ['lustenau',    'Lustenau',   'region:vbg']
+  ['dornbirn',    'Dornbirn',   'region:vbg', 44243],
+  ['feldkirch',   'Feldkirch',  'region:vbg', 30093],
+  ['bregenz',     'Bregenz',    'region:vbg', 27148],
+  ['lustenau',    'Lustenau',   'region:vbg', 20606],
+  ['altach',      'Altach',     'region:vbg',  5704],   # < 10000 pop
 ]
 
 City.create_from_ary!( cities_at, country: at )

data/lib/worlddb.rb

@@ -46,6 +46,42 @@ module WorldDB
     Runner.new.run(ARGV)
   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.
+
+  def self.load( ary )
+    loader = Loader.new
+    ary.each do |name|
+      loader.load_fixtures_builtin( name )
+    end
+  end
+
+
+  class Deleter
+    ## todo: move into its own file???    
+    
+    ## make models available in worlddb module by default with namespace
+    #  e.g. lets you use City instead of Models::City 
+    include WorldDB::Models
+
+    def run( args=[] )
+      # for now delete all tables
+      
+      Country.delete_all
+      City.delete_all
+      Region.delete_all
+      Prop.delete_all
+    end
+    
+  end
+  
+  # delete ALL records (use with care!)
+  def self.delete!
+    Deleter.new.run
+  end # method delete!
+
+  
 end  # module WorldDB
 
 

data/lib/worlddb/cli/runner.rb

@@ -85,7 +85,7 @@ EOS
     end
     
     if opts.delete?
-       # tbd
+       WorldDB.delete!
     end
 
     Loader.new( logger ).run( opts, args ) # load ruby fixtures

data/lib/worlddb/models/city.rb

@@ -26,10 +26,14 @@ class City < ActiveRecord::Base
       
       attr = attr.merge( more_values )
       
+      value_numbers = []
+      
       ## check for optional values
       values[2..-1].each do |value|
         if value.is_a? Country
           attr[ :country_id ] = value.id
+        elsif value.is_a? Numeric
+          value_numbers << value
         elsif value =~ /^region:/   ## region:
           value_region_key = value[7..-1]  ## cut off region: prefix
           value_region = Region.find_by_key!( value_region_key )
@@ -39,6 +43,12 @@ class City < ActiveRecord::Base
         end
       end
       
+      if value_numbers.size > 0
+        attr[ :pop  ] = value_numbers[0]
+        attr[ :area ] = value_numbers[1]
+      end
+
+      
       City.create!( attr )
     end # each city
   end

data/lib/worlddb/schema.rb

@@ -11,10 +11,12 @@ 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 :synonyms  # comma separated list of synonyms
+  t.string  :title, :null => false
+  t.string  :key,   :null => false
+  t.string  :tag,   :null => false  # short three letter tag (FIFA country code)
+  t.string  :synonyms  # comma separated list of synonyms
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
   t.timestamps
 end
 
@@ -23,6 +25,8 @@ create_table :regions do |t|
   t.string :key,    :null => false
   t.string :synonyms  # comma separated list of synonyms
   t.references :country, :null => false
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
   t.timestamps
 end
 
@@ -32,6 +36,9 @@ create_table :cities do |t|
   t.string :synonyms  # comma separated list of synonyms
   t.references :country,  :null => false
   t.references :region    # optional for now
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+  t.boolean :capital, :null => false, :default => false  # is national captial?
   t.timestamps
 end
 

data/lib/worlddb/version.rb

@@ -1,4 +1,4 @@
 
 module WorldDB
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: worlddb
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-05 00:00:00 Z
+date: 2012-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord