city_search 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f803d9046a66a99e13fbe8a14dd14b10b3b1bf3
-  data.tar.gz: 91cf04bfec8449b83aedd8680961521c0431ad6e
+SHA256:
+  metadata.gz: b80b8084db7d36585b0b89383d7536a7726522dbad08a9ee3874c2dcac6bfa32
+  data.tar.gz: cfe894eeadc1ce0aea59fc2811c9ca49e0edf66221d0f62e69abd5386e2bd335
 SHA512:
-  metadata.gz: 4e5a3d0fc882440bf5588dad4b2c38fa8ec285f56963c410a4c9166c0fcc1f5cd7d320b65396a2f80cfacbcd4a3fdf7e7fef5dfa637e20c46d5ecc290d613fe6
-  data.tar.gz: e185302fb178ff2d60b8d1333426c460a74fbffa2b64c4d41c3150156c6de789a0c52ea6716df0816709331035fde846119f305b080ce06b75c64df3d7b5734f
+  metadata.gz: a7d4c9274bce0ae8f097763e5c73d145a24ff5539da62c71cdda9008edcbc5f3fc8f57053964c52c1a84669420fcf40735aa0ffb2864b6cec79a0e1401b45b1e
+  data.tar.gz: c6d71984278c657663659c4bcb14e1b6a0b741a6d865caa5b5366616372731d68efe90d36a9610d38d8c727071e8f11b0cc6d4572a42c9feb424d3be7f60703f

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+cities.txt

data/city_search.gemspec

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

data/lib/city_search.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: city_search
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Maksatbek Mansurov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-17 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dawg
@@ -36,9 +36,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - city_search.gemspec
-- data/dawg.bin
-- data/state-countries.bin
+- 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:
@@ -60,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: City Search