geonames_rails 0.1.6 → 0.2.0

data/lib/generators/geonames_rails/migration_templates/geonames_tables.rb

@@ -59,9 +59,13 @@ class CreateGeonamesTables < ActiveRecord::Migration
       t.string :country_iso_code_two_letters
       # [9] cc2 : alternate country codes, comma separated, ISO-3166 2-letter country code, 60 characters
       # [10] admin1 code : fipscode (subject to change to iso code), isocode for the us and ch, see file admin1Codes.txt for display names of this code; varchar(20)
+      t.string :admin_1_code
       # [11] admin2 code : code for the second administrative division, a county in the US, see file admin2Codes.txt; varchar(80)
+      t.string :admin_2_code
       # [12] admin3 code : code for third level administrative division, varchar(20)
+      t.string :admin_3_code
       # [13] admin4 code : code for fourth level administrative division, varchar(20)
+      t.string :admin_4_code
       # [14] population : integer
       t.integer :population
       # [15] elevation : in meters, integer
@@ -72,10 +76,23 @@ class CreateGeonamesTables < ActiveRecord::Migration
     end
     
     add_index :cities, :geonames_id, :unique => true
+
+    create_table :divisions do |t|
+      t.integer :country_id
+      t.string :code
+      t.string :full_code
+      t.string :name
+      t.string :ascii_name
+      t.integer :geonames_id
+    end
+
+    add_index :divisions, :full_code, :unique => true
+    add_index :divisions, :code
+    add_index :divisions, :geonames_id, :unique => true
   end
   
   def self.down
     # drop all the tables
-    %w(countries cities).each { |t| drop_table t }
+    %w(countries cities divisions).each { |t| drop_table t }
   end
 end

data/lib/generators/geonames_rails/models_templates/models/country.rb

@@ -1,3 +1,4 @@
 class Country < ActiveRecord::Base
   has_many :cities
+  has_many :divisions
 end

data/lib/generators/geonames_rails/models_templates/models/division.rb

@@ -0,0 +1,3 @@
+class Division < ActiveRecord::Base
+  belongs_to :country
+end

data/lib/geonames_rails/loader.rb

@@ -1,6 +1,7 @@
 require 'geonames_rails/mappings/base'
 require 'geonames_rails/mappings/city'
 require 'geonames_rails/mappings/country'
+require 'geonames_rails/mappings/division'
 require 'zip/zipfilesystem'
 
 module GeonamesRails
@@ -17,8 +18,8 @@ module GeonamesRails
       @puller.pull if @puller # pull geonames files down
       
       load_countries
-      
       load_cities
+      load_divisions
       
       @puller.cleanup if @puller # cleanup the geonames files
     end
@@ -38,14 +39,26 @@ module GeonamesRails
         end
       end
     end
-    
-    def load_cities
-      %w(cities1000 cities5000 cities15000).each do |city_file|
-        load_cities_file(city_file)
+
+    def load_divisions
+      log_message "opening divisions file"
+      File.open(File.join(Rails.root, 'tmp', 'admin1CodesASCII.txt'), 'r') do |f|
+        f.each_line do |line|
+          # skip comments
+          next if line.match(/^#/) || line.match(/^iso/i)
+
+          division_mapping = Mappings::Division.new(line)
+          result = @writer.write_division(division_mapping)
+          
+          #log_message result
+        end
       end
+
     end
     
-    def load_cities_file(city_file)
+    def load_cities
+      city_file = "cities1000"
+
       log_message "Loading city file #{city_file}"
       cities = []
 

data/lib/geonames_rails/mappings/division.rb

@@ -0,0 +1,15 @@
+module GeonamesRails
+  module Mappings
+    class Division < Base
+    protected
+      def mappings
+        {
+          :full_code => 0,
+          :name => 1,
+          :ascii_name => 2,
+          :geonames_id => 3
+        }
+      end
+    end
+  end
+end

data/lib/geonames_rails/puller.rb

@@ -4,7 +4,7 @@ module GeonamesRails
       @temp_geonames_files = []
       target_dir = File.join(Rails.root, 'tmp')
       
-      file_names = %w(cities1000.zip cities5000.zip cities15000.zip admin1CodesASCII.txt countryInfo.txt)
+      file_names = %w(cities1000.zip admin1CodesASCII.txt countryInfo.txt)
       file_names.each do |file_name|
         url = "http://download.geonames.org/export/dump/#{file_name}"
       

data/lib/geonames_rails/writers/active_record.rb

@@ -24,6 +24,23 @@ module GeonamesRails
         "#{created_or_updating} db record for #{iso_code}"
       end
       
+      def write_division(division_mapping)  
+        iso_code = division_mapping[:full_code][0..1]
+        country = Country.find_by_iso_code_two_letter(iso_code)
+      
+        division = Division.find_or_initialize_by_geonames_id(division_mapping[:geonames_id])
+        created_or_updating = division.new_record? ? 'Creating' : 'Updating'
+        division.country_id = country.id
+        division.code = division_mapping[:full_code][3..-1]
+
+        division.attributes = division_mapping.slice(:full_code,
+                                                     :name,
+                                                     :ascii_name,
+                                                     :geonames_id)
+        division.save!
+        
+        "#{created_or_updating} db record for #{division_mapping[:full_code]}"
+      end
 
       
       def write_cities(country_code, city_mappings)    
@@ -42,7 +59,11 @@ module GeonamesRails
                                                  :country_iso_code_two_letters,
                                                  :population,
                                                  :geonames_timezone_id,
-                                                 :geonames_id)
+                                                 :geonames_id,
+                                                 :admin_1_code,
+                                                 :admin_2_code,
+                                                 :admin_3_code,
+                                                 :admin_4_code)
           
             city.save!
           end

data/lib/geonames_rails/writers/dry_run.rb

@@ -7,6 +7,12 @@ module GeonamesRails
         "Dry run of country #{country_mapping[:name]} should have been OK"
       end
       
+      def write_division(division_mapping)
+        raise "must have a of division mapping" unless division_mapping
+        
+        "Dry run of country #{division_mapping[:division_id]} should have been OK"
+      end
+
       def write_cities(country_code, city_mappings)
         raise "can't create cities without a country" unless country_code
         raise "must have a set of city mappings" unless city_mappings

data/lib/tasks/geonames_rails.rake

@@ -2,19 +2,19 @@ require 'geonames_rails'
 
 namespace :geonames_rails do
   desc 'pull down the geonames data from the server'
-  task :pull_data => :environment do
+  task :pull => :environment do
     GeonamesRails::Puller.new.pull
   end
   
   desc 'pull geonames data, load into db, then clean up after itself'
-  task :pull_and_load_data => :environment do
+  task :run => :environment do
     puller = GeonamesRails::Puller.new
     writer = ENV['DRY_RUN'] ? GeonamesRails::Writers::DryRun.new : GeonamesRails::Writers::ActiveRecord.new
     GeonamesRails::Loader.new(puller, writer).load_data
   end
   
   desc 'load the data from files you already have laying about'
-  task :load_data => :environment do
+  task :load => :environment do
     writer = ENV['DRY_RUN'] ? GeonamesRails::Writers::DryRun.new : GeonamesRails::Writers::ActiveRecord.new
     GeonamesRails::Loader.new(nil, writer).load_data
   end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Marius Andra
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-18 00:00:00 +01:00
+date: 2012-04-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/geonames_rails/writers/dry_run.rb
 - lib/geonames_rails/mappings/city.rb
 - lib/geonames_rails/mappings/base.rb
+- lib/geonames_rails/mappings/division.rb
 - lib/geonames_rails/mappings/country.rb
 - lib/geonames_rails/puller.rb
 - lib/geonames_rails/loader.rb
@@ -65,6 +66,7 @@ files:
 - lib/generators/geonames_rails/migration_generator.rb
 - lib/generators/geonames_rails/migration_templates/geonames_tables.rb
 - lib/generators/geonames_rails/models_templates/models/city.rb
+- lib/generators/geonames_rails/models_templates/models/division.rb
 - lib/generators/geonames_rails/models_templates/models/country.rb
 - lib/generators/geonames_rails/models_generator.rb
 - lib/tasks/geonames_rails.rake