city-state 0.0.9.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab62516b059dbebf162e8c890338147da4e96cba
-  data.tar.gz: fbe03dc8cd47eaeecaaae204a5afb2bfb90c3f2f
+  metadata.gz: dfe91c13079d671f4da2fcd328c848c3dd20ab49
+  data.tar.gz: 0f541c9110cc637fa777f73cd29c5015cc0cf223
 SHA512:
-  metadata.gz: 20f2e155d5fcb949995ab5f71507ca302f073a065f5aacf24f430ef7c3f395aa2beb102beb9dcbcb60257818b2f1cbbf83de4797774d5b2fbe1984c768467c95
-  data.tar.gz: 06738a97ec3f12c0b04b17e887f5e498baa5dbe854accb105eea15709ae86f084ddcf242c5c8575009b1a2d596ef42ed44e417226698d668e654ea6b35ce0296
+  metadata.gz: 4543724c8dc5699064f98073307c643e214851bb74694102b3422567e115a3edfc7c3d3c6c5d208abb4f6a57fcbad669fc9ddabd0d010b63bd63c334f46af560
+  data.tar.gz: 708a0a204e8236fdd5a048b1c1f924900f8ca8802b94075ef952c0e60957a696cead803c68ea2c687f4a350e60079585af07bb695049e252bb4c0d2cbebc56ae

data/README.md

@@ -20,6 +20,12 @@ CS.cities(:ak, :us)
 # => ["Adak", "Akhiok", "Akiachak", "Akiak", "Akutan", "Alakanuk", "Ambler", "Anchor Point", "Anchorage", "Angoon", "Atqasuk", "Barrow", "Bell Island Hot Springs", "Bethel", "Big Lake", "Buckland", "Chefornak", "Chevak", "Chicken", "Chugiak", "Coffman Cove", "Cooper Landing", "Copper Center", "Cordova", "Craig", "Deltana", "Dillingham", "Douglas", "Dutch Harbor", "Eagle River", "Eielson Air Force Base", "Fairbanks", "Fairbanks North Star Borough", "Fort Greely", "Fort Richardson", "Galena", "Girdwood", "Goodnews Bay", "Haines", "Homer", "Hooper Bay", "Juneau", "Kake", "Kaktovik", "Kalskag", "Kenai", "Ketchikan", "Kiana", "King Cove", "King Salmon", "Kipnuk", "Klawock", "Kodiak", "Kongiganak", "Kotlik", "Koyuk", "Kwethluk", "Levelock", "Manokotak", "May Creek", "Mekoryuk", "Metlakatla", "Mountain Village", "Nabesna", "Naknek", "Nazan Village", "Nenana", "New Stuyahok", "Nikiski", "Ninilchik", "Noatak", "Nome", "Nondalton", "Noorvik", "North Pole", "Northway", "Old Kotzebue", "Palmer", "Pedro Bay", "Petersburg", "Pilot Station", "Point Hope", "Point Lay", "Prudhoe Bay", "Russian Mission", "Sand Point", "Scammon Bay", "Selawik", "Seward", "Shungnak", "Sitka", "Skaguay", "Soldotna", "Stebbins", "Sterling", "Sutton", "Talkeetna", "Teller", "Thorne Bay", "Togiak", "Tok", "Toksook Bay", "Tuntutuliak", "Two Rivers", "Unalakleet", "Unalaska", "Valdez", "Wainwright", "Wasilla"]
 ```
 
+## Get a list of all countries of the world:
+```ruby
+CS.countries
+# => {:AD=>"Andorra", :AE=>"United Arab Emirates", :AF=>"Afghanistan", :AG=>"Antigua and Barbuda", :AI=>"Anguilla", :AL=>"Albania", :AM=>"Armenia", :AO=>"Angola", :AQ=>"Antarctica", :AR=>"Argentina", :AS=>"American Samoa", :AT=>"Austria", :AU=>"Australia", :AW=>"Aruba", :AX=>"Åland", :AZ=>"Azerbaijan", :BA=>"Bosnia and Herzegovina", :BB=>"Barbados", :BD=>"Bangladesh", :BE=>"Belgium", :BF=>"Burkina Faso", :BG=>"Bulgaria", :BH=>"Bahrain", :BI=>"Burundi", :BJ=>"Benin", :BL=>"Saint-Barthélemy", :BM=>"Bermuda", :BN=>"Brunei", :BO=>"Bolivia", :BQ=>"Bonaire", :BR=>"Brazil", :BS=>"Bahamas", :BT=>"Bhutan", :BW=>"Botswana", :BY=>"Belarus", :BZ=>"Belize", :CA=>"Canada", :CC=>"Cocos [Keeling] Islands", :CD=>"Congo", :CF=>"Central African Republic", :CG=>"Republic of the Congo"}
+```
+
 ## Update the database from MaxMind:
 MaxMind update their databases weekly on tuesdays. To get a new and updated version, you can update with:
 ```ruby

data/lib/city-state.rb

@@ -7,7 +7,7 @@ module CS
   MAXMIND_DB_FN = File.join(FILES_FOLDER, "GeoLite2-City-Locations-en.csv")
   COUNTRIES_FN = File.join(FILES_FOLDER, "countries.yml")
 
-  @countries = @states = @cities = {}
+  @countries, @states, @cities = [{}, {}, {}]
   @current_country = nil # :US, :BR, :GB, :JP, ...
 
   def self.update_maxmind
@@ -56,13 +56,26 @@ module CS
     # normalize "country"
     country = country.to_s.upcase
 
+    # some state codes are empty: we'll use "states-replace" in these cases
+    states_replace_fn = File.join(FILES_FOLDER, "states-replace.yml")
+    states_replace = YAML::load_file(states_replace_fn).symbolize_keys
+    states_replace = states_replace[country.to_sym] || {} # we need just this country
+    states_replace_inv = states_replace.invert # invert key with value, to ease the search
+
     # read CSV line by line
     cities = {}
     states = {}
     File.foreach(MAXMIND_DB_FN) do |line|
       rec = line.split(",")
       next if rec[COUNTRY] != country
-      next if rec[STATE].blank? || rec[CITY].blank?
+      next if (rec[STATE].blank? && rec[STATE_LONG].blank?) || rec[CITY].blank?
+
+      # some state codes are empty: we'll use "states-replace" in these cases
+      rec[STATE] = states_replace_inv[rec[STATE_LONG]] if rec[STATE].blank?
+      rec[STATE] = rec[STATE_LONG] if rec[STATE].blank? # there's no correspondent in states-replace: we'll use the long name as code
+
+      # some long names are empty: we'll use "states-replace" to get the code
+      rec[STATE_LONG] = states_replace[rec[STATE]] if rec[STATE_LONG].blank?
 
       # normalize
       rec[STATE] = rec[STATE].to_sym
@@ -96,7 +109,7 @@ module CS
   def self.current_country
     return @current_country if @current_country.present?
 
-    # we don't have used this module yet: discover by the file extension
+    # we don't have used this method yet: discover by the file extension
     fn = Dir[File.join(FILES_FOLDER, "cities.*")].last
     @current_country = fn.blank? ? nil : fn.split(".").last
     
@@ -142,7 +155,7 @@ module CS
       @states[country] = YAML::load_file(states_fn).symbolize_keys
     end
 
-    @states[country] || []
+    @states[country] || {}
   end
 
   # list of all countries of the world (countries.yml)

data/lib/city-state/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.0.9.6"
+  VERSION = "0.0.10"
 end

data/lib/db/states-replace.yml

@@ -0,0 +1,3 @@
+---
+:IN:
+  :TG: Telangana

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: city-state
 version: !ruby/object:Gem::Version
-  version: 0.0.9.6
+  version: 0.0.10
 platform: ruby
 authors:
 - Daniel Loureiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,6 +68,7 @@ files:
 - lib/city-state.rb
 - lib/city-state/version.rb
 - lib/db/GeoLite2-City-Locations-en.csv
+- lib/db/states-replace.yml
 homepage: https://github.com/loureirorg/city-state
 licenses:
 - MIT