geonames_dump 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ed09afdea83aa1dc645d29853e3ebbb6df359d
-  data.tar.gz: 7a93c55528d389494eaecdf5bf3636fe5e920372
+  metadata.gz: eea4b5d481af2b78d1752707d1381d09e67e8d4d
+  data.tar.gz: bfa92a169e784a3a534e688f74d2c28fff5cc59c
 SHA512:
-  metadata.gz: e6d5480e18e38dce459baf68b3e05eb84bed0e0af2d96af3930aca5e3528913e5c09d99fc73c72e5ca7d6cb649f1986f8823ad4b61a9265d0855f52b3843fa4c
-  data.tar.gz: b23c2d146145bdeb3427e72c41a93fdc4bb7a6af88d7d56fc6bc2b6546e9c3b9684f1f25143b8a707770934fee84ce0f4afbcd54944844f61913a6c8089f9f8c
+  metadata.gz: 3740d92c6e4aaf6d4627f73d4100b85439fcc79cfbee02b9805f261a30ee64ea2fbb13983551faee9820b8c3338ab89bcfa0e4c9643ecef11ebc9085d6b734c9
+  data.tar.gz: cbdd2ce8a806a77c2dea9884ac5e070a22eef5d8ec93b2bfcb6bdfe0acbd2d776e1f5d4aac59844d3cde38f05e74d51ea410482eebe5dcf54e8d1513ee83da96

data/lib/generators/geonames_dump/templates/app/models/geonames_alternate_name.rb

@@ -2,7 +2,10 @@ class GeonamesAlternateName < ActiveRecord::Base
   validates_uniqueness_of :alternate_name_id
   before_save :set_alternate_name_first_letters
 
-  belongs_to :geonames_feature, :foreign_key => 'geonameid', :inverse_of => :geonames_alternate_names, :primary_key => 'geonameid'
+  belongs_to :geonames_feature,
+    :inverse_of => :geonames_alternate_names,
+    :primary_key => 'geonameid',
+    :foreign_key => 'geonameid'
   alias_method :feature, :geonames_feature
 
   ##

data/lib/generators/geonames_dump/templates/app/models/geonames_feature.rb

@@ -2,7 +2,10 @@ class GeonamesFeature < ActiveRecord::Base
   validates_uniqueness_of :geonameid
   before_save :set_asciiname_first_letters
 
-  has_many :geonames_alternate_names, :inverse_of => :geonames_feature
+  has_many :geonames_alternate_names,
+    :inverse_of => :geonames_feature,
+    :primary_key => 'geonameid',
+    :foreign_key => 'geonameid'
   alias_method :alternate_names, :geonames_alternate_names
 
   ##

data/lib/geonames_dump/version.rb

@@ -1,3 +1,3 @@
 module GeonamesDump
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

data/lib/tasks/import.rake

@@ -5,7 +5,7 @@ require 'geonames_dump'
 
 namespace :geonames_dump do
   namespace :import do
-    CACHE_DIR = "#{Rails.root}/db/geonames_cache"
+    CACHE_DIR = Rails.root.join('db', 'geonames_cache')
 
     GEONAMES_FEATURES_COL_NAME = [
         :geonameid, :name, :asciiname, :alternatenames, :latitude, :longitude,
@@ -28,7 +28,7 @@ namespace :geonames_dump do
     task :prepare do
       Dir::mkdir(CACHE_DIR) rescue nil
       disable_logger
-      disable_validations if ENV['QUICK']
+      disable_validations if ENV['SKIP_VALIDATION']
     end
 
     desc 'Import ALL geonames data.'
@@ -82,7 +82,12 @@ namespace :geonames_dump do
                                  txt_file: 'alternateNames.txt')
 
       File.open(txt_file) do |f|
-        insert_data(f, GEONAMES_ALTERNATE_NAMES_COL_NAME, GeonamesAlternateName, :title => "Alternate names", :buffer => 10000)
+        insert_data(f,
+                    GEONAMES_ALTERNATE_NAMES_COL_NAME,
+                    GeonamesAlternateName,
+                    :title => "Alternate names",
+                    :buffer => 10000,
+                    :primary_key => [:alternate_name_id, :geonameid])
       end
     end
 
@@ -199,6 +204,7 @@ namespace :geonames_dump do
       file_size = file_fd.stat.size
       title = options[:title] || 'Feature Import'
       buffer = options[:buffer] || 1000
+      primary_key = options[:primary_key] || :geonameid
       progress_bar = ProgressBar.create(:title => title, :total => file_size, :format => '%a |%b>%i| %p%% %t')
 
       # create block array
@@ -233,10 +239,19 @@ namespace :geonames_dump do
         # create or update object
         #if filter?(attributes) && (block && block.call(attributes))
         blocks.add_block do
-          if attributes.include?(:geonameid)
-            object = klass.where(geonameid: attributes[:geonameid]).first_or_initialize
-            object.update_attributes(attributes)
-            object.save if object.new_record? || object.changed?
+          primary_keys = primary_key.is_a?(Array) ? primary_key : [primary_key]
+          if primary_keys.all? { |key| attributes.include?(key) }
+            if ENV['QUICK']
+              object = klass.create(attributes)
+            else
+              where_condition = {}
+              primary_keys.each do |key|
+                where_condition[key] = attributes[key]
+              end
+              object = klass.where(where_condition).first_or_initialize
+              object.update_attributes(attributes)
+              object.save if object.new_record? || object.changed?
+            end
           else
             klass.create(attributes)
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_dump
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alex Pooley
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar