geonames_dump 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449ac0186316849284960960df5200fa5830053c
-  data.tar.gz: 647d2b017b3c9cdc5ef44c4fde827e74b3492ebd
+  metadata.gz: 51ed09afdea83aa1dc645d29853e3ebbb6df359d
+  data.tar.gz: 7a93c55528d389494eaecdf5bf3636fe5e920372
 SHA512:
-  metadata.gz: df1f520a053206501c209a3b23a9b1cd9385ac18dbc05d91f3176c533dd355853b733aa066e3f9d1afd6f07da856fc2d5a3455797d5027bfe0fd123e939591ef
-  data.tar.gz: 1e3a7f6ed3f2b63dcc83565a532fdad2bb4cb3e70a56006c87e9097a963cedb61e5e26bbc9491cfc6caa37289f54652460a0990e4dbd3dfafdf340594da34dbe
+  metadata.gz: e6d5480e18e38dce459baf68b3e05eb84bed0e0af2d96af3930aca5e3528913e5c09d99fc73c72e5ca7d6cb649f1986f8823ad4b61a9265d0855f52b3843fa4c
+  data.tar.gz: b23c2d146145bdeb3427e72c41a93fdc4bb7a6af88d7d56fc6bc2b6546e9c3b9684f1f25143b8a707770934fee84ce0f4afbcd54944844f61913a6c8089f9f8c

data/README.md

@@ -89,13 +89,13 @@ Search order is the following :
 2. Alternate names (names in non-latin alphabets)
 3. First level admin subdivisions
 4. Second level admin subdivisions
-5. Countries
-6. Features (lakes, montains and others various features)
+5. Features (lakes, mountains and others various features)
 
 Now to find a city for example :
 
 ```
 GeonamesDump.search('paris')
+GeonamesDump.search('東京') # tokyo :-)
 ```
 
 If your request is ambiguous, like not searching Dublin in Ireland but Dublin
@@ -116,14 +116,22 @@ GeonamesDump.search('dublin, us', type: :city)
 GeonamesDump.search('paris', type: :feature)
 ```
 
+As `GeonamesDump.search` is returning `Feature` objects by default, type should
+specified to search for Countries :
+
+```
+GeonamesDump.search('Ireland', type: :country)
+```
+
 The following types are available :
 
-- admin1, for first level of adminstrative subdivision
-- admin2, for second level of adminstrative subdivision
-- city, for city names
-- feature, for generic names including all the above
-- alternate_name, for names in non-latin alphabets
-- country, for country names
+- `:admin1`, for first level of adminstrative subdivision
+- `:admin2`, for second level of adminstrative subdivision
+- `:city`, for city names
+- `:feature`, for generic names including all the above
+- `:auto`, to find any type of feature (even with non-latin characters) matching the query
+- `:alternate_name`, for names in non-latin alphabets (may be useless)
+- `:country`, for country names
 
 ## Contributing
 

data/lib/generators/geonames_dump/install_generator.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module GeonamesDump
   module Generators
     class InstallGenerator < Rails::Generators::Base
@@ -11,7 +12,13 @@ DESC
       def copy_migrations_files
         Dir.glob(File.join(File.expand_path(File.join('..', 'templates', 'db', 'migrate'), __FILE__), '*')).each do |full_path|
           file = File.basename(full_path, File.extname(full_path))
-          migration_template File.join('db', 'migrate', "#{file}.rb")
+          migration_folder = File.join('db', 'migrate')
+
+          if self.class.migration_exists?(migration_folder, file)
+            say_status("skip", "Migration #{file} already exists", :yellow)
+          else
+            migration_template File.join(migration_folder, "#{file}.rb")
+          end
         end
       end
 

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

@@ -1,13 +1,15 @@
 class GeonamesAlternateName < ActiveRecord::Base
   validates_uniqueness_of :alternate_name_id
-  validates_uniqueness_of :geonameid
   before_save :set_alternate_name_first_letters
 
+  belongs_to :geonames_feature, :foreign_key => 'geonameid', :inverse_of => :geonames_alternate_names, :primary_key => 'geonameid'
+  alias_method :feature, :geonames_feature
+
   ##
   # default search (by alternate name)
   #
   scope :search, lambda { |q|
-    by_alternate_name(q)
+    by_alternate_name_featured(q)
   }
 
   ##
@@ -24,6 +26,13 @@ class GeonamesAlternateName < ActiveRecord::Base
     where(is_preferred_name: true)
   }
 
+  ##
+  # search by name for available features
+  #
+  scope :by_alternate_name_featured, lambda { |q|
+    joins(:geonames_feature).by_alternate_name(q).where(GeonamesFeature.arel_table[:id].not_eq(nil))
+  }
+
   ##
   # search by name
   #
@@ -33,13 +42,6 @@ class GeonamesAlternateName < ActiveRecord::Base
     ret = ret.where("alternate_name LIKE ?", "#{q}%")
   }
 
-  ##
-  # Get associated feature
-  #
-  def feature
-    GeonamesFeature.where(geonameid: self.geonameid)  
-  end
-
   protected
 
   ##

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

@@ -2,6 +2,9 @@ class GeonamesFeature < ActiveRecord::Base
   validates_uniqueness_of :geonameid
   before_save :set_asciiname_first_letters
 
+  has_many :geonames_alternate_names, :inverse_of => :geonames_feature
+  alias_method :alternate_names, :geonames_alternate_names
+
   ##
   # Search for feature, searches might include country (separated by ',')
   #
@@ -39,11 +42,6 @@ class GeonamesFeature < ActiveRecord::Base
     ret
   }
 
-  def alternate_names
-    GeonamesAlternateName.where(geonameid: self.geonameid)
-  end
-
-
   protected
 
   ##

data/lib/generators/geonames_dump/templates/db/migrate/create_geonames_features.rb

@@ -24,7 +24,7 @@ class CreateGeonamesFeatures < ActiveRecord::Migration
       t.integer :geonameid
       t.string :name, length: 200
       t.string :asciiname, length: 200
-      t.string :alternatenames, length: 5000
+      t.text :alternatenames, length: 5000
       t.float :latitude
       t.float :longitude
       t.string :feature_class

data/lib/geonames_dump/version.rb

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

data/lib/geonames_dump.rb

@@ -3,37 +3,32 @@ require "geonames_dump/blocks"
 require "geonames_dump/railtie" #if defined?(Rails)
 
 module GeonamesDump
-  # TODO: remove this logger
-  #ActiveRecord::Base.logger = Logger.new(STDOUT) if Rails.env.development? && !ENV['SILENT']
-
   def self.search(query, options = {})
     ret = nil
 
     type = options[:type] || :auto
     begin
       case type
-      when :auto
+      when :auto # return an array of features
         # city name
         ret = GeonamesCity.search(query)
         # alternate name
-        ret = GeonamesAlternateName.search(query) if ret.blank?
+        ret = GeonamesAlternateName.search(query).map { |alternate| alternate.feature }.compact  if ret.blank?
         # admin1
         ret = GeonamesAdmin1.search(query) if ret.blank?
         # admin2
         ret = GeonamesAdmin2.search(query) if ret.blank?
-        # country
-        ret = GeonamesCountry.search(query) if ret.blank?
         # feature
         ret = GeonamesFeature.search(query) if ret.blank?
-      else
+      else # country, or specific type
         model = "geonames_#{type.to_s}".camelcase.constantize
         ret = model.search(query)
       end
     rescue NameError => e
-      Rails.logger.error "Unknown type for GeonamesDump : #{e}"
-      #raise
+      raise $!, "Unknown type for GeonamesDump, #{$!}", $!.backtrace
     end
 
+
     ret
   end
 end

metadata

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