city_search 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80b8084db7d36585b0b89383d7536a7726522dbad08a9ee3874c2dcac6bfa32
-  data.tar.gz: cfe894eeadc1ce0aea59fc2811c9ca49e0edf66221d0f62e69abd5386e2bd335
+  metadata.gz: ea57bb866eda5cda691cb33823af5de355d8b4d00ba6070df1bc2059c05c4979
+  data.tar.gz: 5456b55982bee572a540a3f2906249ad076f7837b592f38b737b1b607f82b7ef
 SHA512:
-  metadata.gz: a7d4c9274bce0ae8f097763e5c73d145a24ff5539da62c71cdda9008edcbc5f3fc8f57053964c52c1a84669420fcf40735aa0ffb2864b6cec79a0e1401b45b1e
-  data.tar.gz: c6d71984278c657663659c4bcb14e1b6a0b741a6d865caa5b5366616372731d68efe90d36a9610d38d8c727071e8f11b0cc6d4572a42c9feb424d3be7f60703f
+  metadata.gz: 1e27af2e20e2ed7bd0227ecf278a17d8cd9b916ce1f8375cf084bc7c1f20b01a9acc545a7b47d59e7d8d996b3c7ceb73271fd17689ec70aeb3fe6a5090d95056
+  data.tar.gz: e6b5845867e3912c30ff3df5d09083b18650c846abd18ed4d3e55f3ffee5949f183100023893ac29ffe1faf22b6ad9ad9edbd0d0713eb51dd8f3fa96191a0faa

data/.gitignore

@@ -1,2 +1,4 @@
 *.gem
-cities.txt
+GeoLite2-City-Locations-ru.csv
+russia.bin
+subdivisions.bin

data/README.md

@@ -0,0 +1,13 @@
+# City Search
+
+Need automcomplete search for cities?  
+**You are in right place**  
+Sadly for now there is only russia.  
+
+This product includes GeoLite2 data created by MaxMind, available from
+<a href="https://www.maxmind.com">https://www.maxmind.com</a>.
+
+```ruby
+CitySearch.new.search('нижн')
+=> [["Нижнеангарск", "Бурятия"], ["Нижневартовск", "Ханты-Мансийский АО"], ["Нижнекамск", "Татарстан"], ["Нижнесортымский", "Ханты-Мансийский АО"], ["Нижнеудинск", "Иркутская область"], ["Нижний Бестях", "Саха (Якутия)"], ["Нижний Куранах", "Саха (Якутия)"], ["Нижний Ломов", "Пензенская область"], ["Нижний Новгород", "Нижегородская область"], ["Нижний Тагил", "Свердловская область"], ["Нижняя Салда", "Свердловская область"]]
+```

data/Rakefile

@@ -0,0 +1,60 @@
+require 'dawg'
+
+desc 'create divisions.bin from source'
+task :create_divisions do
+  subdivisions = []
+
+  IO.foreach('GeoLite2-City-Locations-ru.csv') do |line|
+    geoname_id, locale_code, continent_code, continent_name,
+    country_iso_code, country_name, subdivision_1_iso_code,
+    subdivision_1_name, subdivision_2_iso_code, subdivision_2_name,
+    city_name, metro_code, time_zone, is_in_european_union = line.split(',')
+    subdivisions << subdivision_1_name.strip.delete('\"')
+  end
+
+  subdivisions.uniq!
+  subdivisions.sort!
+  subdivisions.reject! {|d| d.empty? }
+  subdivisions_hash = {}
+  subdivisions.each_with_index do |subdivision, index|
+    subdivisions_hash[index] = subdivision
+  end
+
+  File.open('subdivisions.bin', 'wb') { |f| f.write(Marshal.dump(subdivisions_hash)) }
+
+end
+
+
+desc 'create dawg file with cities for russia'
+task :create_dawg_russia do
+  cities = []
+  subdivisions = Marshal.load(File.read('subdivisions.bin'))
+  subdivisions_inverted = subdivisions.invert
+
+  IO.foreach('GeoLite2-City-Locations-ru.csv') do |line|
+    geoname_id, locale_code, continent_code, continent_name,
+    country_iso_code, country_name, subdivision_1_iso_code,
+    subdivision_1_name, subdivision_2_iso_code, subdivision_2_name,
+    city_name, metro_code, time_zone, is_in_european_union = line.split(',')
+
+    next if country_iso_code != 'RU'
+
+    subdivision_1_name = subdivision_1_name.strip.delete('\"')
+    city_name = city_name.strip.delete('\"').downcase
+    cities << "#{city_name} #{subdivisions_inverted[subdivision_1_name]}"
+  end
+
+  cities.uniq!
+  cities.sort!
+  cities.reject! {|d| d.empty? }
+
+  dawg = Dawg.new
+  cities.each do |city|
+    dawg.insert(city)
+  end
+
+  dawg.finish
+
+  dawg.save('russia.bin')
+end
+

data/city_search.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'city_search'
-  s.version     = '0.0.2'
-  s.date        = '2019-04-30'
+  s.version     = '0.0.3'
+  s.date        = '2019-05-04'
   s.summary     = "City Search"
   s.description = "Finds cities"
   s.authors     = ["Maksatbek Mansurov"]

data/lib/city_search.rb

@@ -1,33 +1,36 @@
 require 'dawg'
 
 class CitySearch
-  def initialize(country = :all)
-    raise 'country not found' unless country_exists?(country)
-
-    @country = country
-  end
-
   def search(q)
-    results = db.query(q).reject {|r| r.empty? }
+    results = db.query(q.downcase).reject {|r| r.empty? }
     results.map do |r|
       result = r.split(' ')
       code = result.last
       result.pop
-      result += states[code.to_i]
-    end
-  end
 
-  def country_exists?(country)
-    File.exists?(File.dirname(__FILE__) + "/../data/#{country}.bin")
+      city_name = result.join(' ')
+                        .split
+                        .map(&:capitalize)
+                        .join(' ')
+      state = states[code.to_i]
+
+      [city_name, state]
+    end
   end
 
   def db
-    @all ||= Dawg.load(File.dirname(__FILE__) + "/../data/#{@country}.bin")
+    @all ||= Dawg.load(File.join(data_path, 'russia.bin'))
   end
 
   def states
     @states ||= Marshal.load(
-      File.read(File.dirname(__FILE__) + "/../data/#{@country}_states.bin")
+      File.read(File.join(data_path, 'subdivisions.bin'))
     )
   end
+
+  private
+
+  def data_path
+    @data_path ||= File.join(File.dirname(__FILE__), '/../data')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: city_search
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Maksatbek Mansurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dawg
@@ -37,11 +37,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- README.md
+- Rakefile
 - city_search.gemspec
-- data/all.bin
-- data/all_states.bin
 - data/russia.bin
-- data/russia_states.bin
 - lib/city_search.rb
 homepage: http://rubygems.org/gems/city_search
 licenses: