city-state 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22dc3ee5f09c971103d3a93e13efacb3b61ed1fe02cb604a7f5eeef49a9205ee
-  data.tar.gz: 6dc75d6663b0c8c3e0b59248e1de379c9c1598cfeaf5999795570d0b47e1b250
+  metadata.gz: 0dd92ab946196352480ea026ea14b427f321749dfabaabd347656577ffd4bbd8
+  data.tar.gz: 240d426e2b920fdedd2e478d5bf32ea227bb01b015ab3c9a23df34dd852c5199
 SHA512:
-  metadata.gz: 82e920dcef289a72b7ef163e6cf7461438ffdca4907958dbbb5d5f6cd1b794f20a4482f1d49adef0d6c0b1ec88e2567faf7c4c3ca53395e603402600dedab1bf
-  data.tar.gz: 2be31983767dabe77a888d351d1c84bb1db65d8c80a688f344677ba5c7ae116b645f11f382126742c5068b42cc8d9654095927dfea59005154fc7e31ad4d5417
+  metadata.gz: 28320ed1e61dd13379ff99456d1fe417ff2e54320c2ad5dbad4735bce01f6a2c19ef99013e2bfb973f1a5cd2b6831b81ebc7721ba5bf73ee3a28fcfb6a33deb7
+  data.tar.gz: 23679a1b7de164805ebbd9f09b7b2d8c6f9640dec5a43dae8c047752a357dd8a8b3cd0b1e8a74701a6f6c3ef71c753e43d73568c21d899ec1e09ad46b21ae5b2

data/CHANGELOG.md

@@ -0,0 +1,46 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [0.1.1] - 2023-08-19
+
+### Changed
+- Updated `required_ruby_version` to restrict compatibility to Ruby 2.x. This version of the gem is now explicitly compatible only with Ruby 2. [@9f97d06](https://github.com/thecodecrate/city-state/commit/9f97d060c9774778497e624d05c45309fdaf5d68)
+
+### Notes
+- Users running Ruby 3 or newer should refer to version `1.1.0` or later for compatibility.
+
+## [1.1.0] - 2023-08-14
+
+### Added
+- Ruby 3 support.
+- Development dependencies: `rspec 3.10`.
+- Unit tests with RSpec.
+
+### Removed
+- Ruby 2.5 support. Minimum Ruby version is now 2.6.0.
+- `Gemfile.lock` from version control.
+
+### Changed
+- Update bundled MaxMind database.
+- Upgrade runtime dependencies: minimum Rake is 11.0, minimum Rubyzip is 2.3.
+
+## [0.1.0] - 2020-03-25
+
+### Added
+- Methods `set_license_key(license_key)` and `set_maxmind_zip_url(url)`.
+
+### Removed
+- Rails-specific code for broader Ruby compatibility.
+
+### Changed
+- Improve methods for renaming and adding missing cities.
+- Update bundled MaxMind database.
+- Upgrade dependencies for security and compatibility.
+
+### Fixed
+- Duplicated city entries. `CS.cities(:CA, :US)` multiple `Burbank` entries.
+- Calling `CS.cities(nil)` returns random values.

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2020 Daniel Loureiro
+Copyright (c) 2023 Daniel Loureiro
 
 MIT License
 

data/README.md

@@ -1,68 +1,76 @@
-# city-state ruby gem
+# City-State Ruby Gem
 
-**city-state** is a very simple ruby gem to get a list of states in a country. Also, you can get a list of cities in a state, and a list of all countries of the world.
+The `city-state` gem offers a straightforward way to retrieve lists of states for any given country and cities for any state. It's built on the MaxMind database, making it a reliable source for such data.
+
+## Installation
+
+Add the gem to your Gemfile:
 
-## Put this gem at your Gemfile:
 ```ruby
 gem 'city-state'
 ```
 
-## List of states:
-```ruby
-CS.states(:us)
-# => {:AK=>"Alaska", :AL=>"Alabama", :AR=>"Arkansas", :AZ=>"Arizona", :CA=>"California", :CO=>"Colorado", :CT=>"Connecticut", :DC=>"District of Columbia", :DE=>"Delaware", :FL=>"Florida", :GA=>"Georgia", :HI=>"Hawaii", :IA=>"Iowa", :ID=>"Idaho", :IL=>"Illinois", :IN=>"Indiana", :KS=>"Kansas", :KY=>"Kentucky", :LA=>"Louisiana", :MA=>"Massachusetts", :MD=>"Maryland", :ME=>"Maine", :MI=>"Michigan", :MN=>"Minnesota", :MO=>"Missouri", :MS=>"Mississippi", :MT=>"Montana", :NC=>"North Carolina", :ND=>"North Dakota", :NE=>"Nebraska", :NH=>"New Hampshire", :NJ=>"New Jersey", :NM=>"New Mexico", :NV=>"Nevada", :NY=>"New York", :OH=>"Ohio", :OK=>"Oklahoma", :OR=>"Oregon", :PA=>"Pennsylvania", :RI=>"Rhode Island", :SC=>"South Carolina", :SD=>"South Dakota", :TN=>"Tennessee", :TX=>"Texas", :UT=>"Utah", :VA=>"Virginia", :VT=>"Vermont", :WA=>"Washington", :WI=>"Wisconsin", :WV=>"West Virginia", :WY=>"Wyoming"}
-```
-**PS:** *city-state is case insensitive. You can use :US, :us, :Us, "us", "US", ...*
+Then, run:
 
-## List of cities:
-```ruby
-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"]
+```bash
+$ bundle install
 ```
 
-## All countries of the world:
+## Listing States:
+
+Retrieve a list of states for a specified country:
+
 ```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"}
+CS.states(:US)
 ```
+**Note:** The gem is case-insensitive. You can use variations like `:US`, `:us`, `:Us`, `"us"`, and `"US"`.
 
-## Simplified syntax with *get* method:
-* _CS.get_: list of countries (equivalent to `CS.countries`)
-* _CS.get(country)_: list of states (equivalent to `CS.states(country)`)
-* _CS.get(country, state)_: list of cities (equivalent to `CS.cities(state, country)`)
+## Listing Cities:
+
+Retrieve a list of cities for a specified state and country:
 
-Example:
 ```ruby
-CS.get
-# => {: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"}
+CS.cities(:AK, :US)
 ```
+
+You can also specify the country, though it's optional. The gem remembers the last country you used:
+
 ```ruby
-CS.get :us
-# => {:AK=>"Alaska", :AL=>"Alabama", :AR=>"Arkansas", :AZ=>"Arizona", :CA=>"California", :CO=>"Colorado", :CT=>"Connecticut", :DC=>"District of Columbia", :DE=>"Delaware", :FL=>"Florida", :GA=>"Georgia", :HI=>"Hawaii", :IA=>"Iowa", :ID=>"Idaho", :IL=>"Illinois", :IN=>"Indiana", :KS=>"Kansas", :KY=>"Kentucky", :LA=>"Louisiana", :MA=>"Massachusetts", :MD=>"Maryland", :ME=>"Maine", :MI=>"Michigan", :MN=>"Minnesota", :MO=>"Missouri", :MS=>"Mississippi", :MT=>"Montana", :NC=>"North Carolina", :ND=>"North Dakota", :NE=>"Nebraska", :NH=>"New Hampshire", :NJ=>"New Jersey", :NM=>"New Mexico", :NV=>"Nevada", :NY=>"New York", :OH=>"Ohio", :OK=>"Oklahoma", :OR=>"Oregon", :PA=>"Pennsylvania", :RI=>"Rhode Island", :SC=>"South Carolina", :SD=>"South Dakota", :TN=>"Tennessee", :TX=>"Texas", :UT=>"Utah", :VA=>"Virginia", :VT=>"Vermont", :WA=>"Washington", :WI=>"Wisconsin", :WV=>"West Virginia", :WY=>"Wyoming"}
+CS.states(:BR)
+
+CS.cities(:TO)  # This will use Brazil (BR) as the country
 ```
+
+Miscellaneous Notes:
+- The country is an optional argument. The gem always uses the last country that you used.
+
+## Listing Countries:
+
 ```ruby
-CS.get :us, :ak
-# => ["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"]
+CS.countries
 ```
 
-# Missing cities and wrong names
+## Missing cities and wrong names
 To add missing cities or to rename wrong ones, create these files in your project folder:
 `db/cities-lookup.yml` and `db/states-lookup.yml` and `db/countries-lookup.yml`:
 
-1) Renaming a country - `US` to `America`:
+### Renaming a country - `US` to `America`:
+
 ```yaml
 # db/countries-lookup.yml
 US: "America"
 ```
 
-2) Renaming a state - `California` to `Something Else`:
+### Renaming a state - `California` to `Something Else`:
+
 ```yaml
 # db/states-lookup.yml
 US:
   CA: Something Else
 ```
 
-3) Renaming a city:
+### Renaming a city:
+
 ```yaml
 # db/cities-lookup.yml
 US:
@@ -70,7 +78,8 @@ US:
     "Burbank": "Bur Bank"
 ```
 
-4) Adding a missing city:
+### Adding a missing city:
+
 ```yaml
 # db/cities-lookup.yml
 US:
@@ -78,7 +87,7 @@ US:
     "My Town": "My Town"
 ```
 
-5) Suppressing a city (set it as a blank line):
+### Suppressing a city (set it as a blank line):
 ```yaml
 # db/cities-lookup.yml
 US:
@@ -86,14 +95,17 @@ US:
     "Burbank": ""
 ```
 
-To use a different file instead of `db\cities-lookup.yml`:
+### To use a different file instead of `db\cities-lookup.yml`:
+
 ```ruby
 CS.set_cities_lookup_file('new-city-names.yml')
+
 CS.set_states_lookup_file('new-state-names.yml')
+
 CS.set_countries_lookup_file('new-country-names.yml')
 ```
 
-# Update the database from MaxMind
+## Updating MaxMind database
 MaxMind update their databases weekly on Tuesdays.
 
 Since Dec 30, 2019, MaxMind requires a license key (for free) to get download updates.
@@ -101,59 +113,46 @@ Since Dec 30, 2019, MaxMind requires a license key (for free) to get download up
 To get the license key:
 1. Sign up for a MaxMind account: https://www.maxmind.com/en/geolite2/signup
 2. Create a license key: https://www.maxmind.com/en/accounts/current/license-key
+3. There's no need to download anything.
 
 To update:
+
 ```ruby
 CS.set_license_key('MY_KEY')
+
 CS.update
 ```
-_*PS:* Replace "_MY_KEY_" with your actual key._
+**Note:** Replace `MY_KEY` with your actual license key.
 
 ## Manually setting a database file:
+
 You can use an alternative database file instead of downloading from MaxMind servers:
+
 ```ruby
 CS.set_maxmind_zip_url('/home/daniel/GeoLite2-City-CSV_20200324.zip')
+
 CS.update
 ```
+
 or
+
 ```ruby
 CS.set_maxmind_zip_url('https://example.com/GeoLite2-City-CSV_20200324.zip')
+
 CS.update
 ```
 
-The file has to be a ZIP file. And it has contains a CVS file named `GeoLite2-City-Locations-en.csv`. This file must be in the MaxMind's GeoLite2 City's format.
+The file has to be a ZIP file. And it has to contain a CVS file named `GeoLite2-City-Locations-en.csv`. This file must be in MaxMind's GeoLite2 City's format.
 
-# Other countries:
-
-When getting a city list, you can also specifies the country:
-```ruby
-CS.cities(:sp, :br)
-```
-
-The country is an optional argument. **city-state** always uses the last country that you used.
-```ruby
-CS.states(:br)
-# => {:AC=>"Acre", :AL=>"Alagoas", :AM=>"Amazonas", :AP=>"Amapa", :BA=>"Bahia", :CE=>"Ceara", :DF=>"Federal District", :ES=>"Espirito Santo", :GO=>"Goias", :MA=>"Maranhao", :MG=>"Minas Gerais", :MS=>"Mato Grosso do Sul", :MT=>"Mato Grosso", :PA=>"Para", :PB=>"Paraiba", :PE=>"Pernambuco", :PI=>"Piaui", :PR=>"Parana", :RJ=>"Rio de Janeiro", :RN=>"Rio Grande do Norte", :RO=>"Rondonia", :RR=>"Roraima", :RS=>"Rio Grande do Sul", :SC=>"Santa Catarina", :SE=>"Sergipe", :SP=>"Sao Paulo", :TO=>"Tocantins"}
-CS.cities(:to)
-# => ["Aparecida do Rio Negro", "Araguaína", "Brejinho de Nazare", "Gurupi", "Itaguatins", "Miracema do Tocantins", "Monte Alegre", "Palmas", "Paraiso do Tocantins", "Parana", "Pedro Afonso", "Porto Nacional", "Presidente Kennedy", "Salvador", "Santo Antonio", "Sao Domingos", "Taguatinga", "Tucum"]
-```
+## Changelog
+See [CHANGELOG.md](CHANGELOG.md)
 
-# Changelog
-* 0.1.0:
-  - [Minor] Added `set_license_key(license_key)` and `set_maxmind_zip_url(url)` methods;
-  - [Minor] Removed Rails code, so it can be used on pure Ruby;
-  - [Minor] Allow to rename and to add missing cities;
-  - [Minor] Updated default MaxMind database;
-  - [Fix] Filter duplicated elements (ex. `CS.cities(:ca, :us)` was returning `Burbank` twice);
-  - [Fix] Upgraded dependencies (some had security issues);
-  - [Fix] Calling `CS.cities(nil)` was returning random values;
-
-# More details about this gem
+## How this gem was created
 https://learnwithdaniel.com/2015/02/citystate-list-of-countries-cities-and-states-ruby/
 
-# CityState License
+## CityState License
 **city-state** is a open source project by Daniel Loureiro with a MIT license. Also, it uses MaxMind open source database.
 
-# MaxMind License
+## MaxMind License
 Database and Contents Copyright (c) 2020 MaxMind, Inc.
 This work is licensed under the Creative Commons Attribution 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by/3.0/.

data/city-state.gemspec

@@ -10,15 +10,22 @@ Gem::Specification.new do |spec|
   spec.email         = ["loureirorg@gmail.com"]
   spec.summary       = %q{Simple list of cities and states of the world}
   spec.description   = %q{Useful to make forms and validations. It uses MaxMind database.}
-  spec.homepage      = "https://github.com/loureirorg/city-state"
+  spec.homepage      = "https://github.com/thecodecrate/city-state"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = [
+    'Rakefile',
+    'README.md',
+    'LICENSE.txt',
+    'CHANGELOG.md',
+    'city-state.gemspec'
+  ] + Dir["lib/**/*"] + Dir["spec/**/*"]
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.0.0', '< 3.0.0'
+
   spec.add_development_dependency "bundler", ">= 1.7"
-  spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_runtime_dependency "rubyzip", ">= 1.1"
+  spec.add_development_dependency "rake", ">= 11.0"
+  spec.add_runtime_dependency "rubyzip", ">= 2.3"
+  spec.add_development_dependency 'rspec', '~> 3.10'
 end

data/lib/city-state/version.rb

@@ -1,3 +1,3 @@
 module CS
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/city-state.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require "city-state/version"
 require 'yaml'
 
@@ -39,7 +40,7 @@ module CS
 
     # get zipped file
     return false if !@maxmind_zip_url
-    f_zipped = open(@maxmind_zip_url)
+    f_zipped = URI.open(@maxmind_zip_url)
 
     # unzip file:
     # recursively searches for "GeoLite2-City-Locations-en"
@@ -75,7 +76,7 @@ module CS
 
   def self.install(country)
     # get CSV if doesn't exists
-    update_maxmind unless File.exists? MAXMIND_DB_FN
+    update_maxmind unless File.exist? MAXMIND_DB_FN
 
     # normalize "country"
     country = country.to_s.upcase
@@ -163,7 +164,7 @@ module CS
     # load the country file
     if self.blank?(@cities[country])
       cities_fn = File.join(FILES_FOLDER, "cities.#{country.to_s.downcase}")
-      self.install(country) if ! File.exists? cities_fn
+      self.install(country) if ! File.exist? cities_fn
       @cities[country] = self.symbolize_keys(YAML::load_file(cities_fn))
 
       # Remove duplicated cities
@@ -214,7 +215,7 @@ module CS
     if @cities_lookup.nil?
       @cities_lookup_fn  = DEFAULT_CITIES_LOOKUP_FN if @cities_lookup_fn.nil?
       @cities_lookup_fn  = File.expand_path(@cities_lookup_fn)
-      return nil if ! File.exists?(@cities_lookup_fn)
+      return nil if ! File.exist?(@cities_lookup_fn)
       @cities_lookup = self.symbolize_keys(YAML::load_file(@cities_lookup_fn)) # force countries to be symbols
       @cities_lookup.each { |key, value| @cities_lookup[key] = self.symbolize_keys(value) } # force states to be symbols
     end
@@ -228,7 +229,7 @@ module CS
     if @states_lookup.nil?
       @states_lookup_fn  = DEFAULT_STATES_LOOKUP_FN if @states_lookup_fn.nil?
       @states_lookup_fn  = File.expand_path(@states_lookup_fn)
-      return nil if ! File.exists?(@states_lookup_fn)
+      return nil if ! File.exist?(@states_lookup_fn)
       @states_lookup = self.symbolize_keys(YAML::load_file(@states_lookup_fn)) # force countries to be symbols
       @states_lookup.each { |key, value| @states_lookup[key] = self.symbolize_keys(value) } # force states to be symbols
     end
@@ -242,7 +243,7 @@ module CS
     if @countries_lookup.nil?
       @countries_lookup_fn  = DEFAULT_COUNTRIES_LOOKUP_FN if @countries_lookup_fn.nil?
       @countries_lookup_fn  = File.expand_path(@countries_lookup_fn)
-      return nil if ! File.exists?(@countries_lookup_fn)
+      return nil if ! File.exist?(@countries_lookup_fn)
       @countries_lookup = self.symbolize_keys(YAML::load_file(@countries_lookup_fn)) # force countries to be symbols
     end
 
@@ -260,7 +261,7 @@ module CS
     # Load the country file
     if self.blank?(@states[country])
       states_fn = File.join(FILES_FOLDER, "states.#{country.to_s.downcase}")
-      self.install(country) if ! File.exists? states_fn
+      self.install(country) if ! File.exist? states_fn
       @states[country] = self.symbolize_keys(YAML::load_file(states_fn))
 
       # Process lookup table
@@ -283,9 +284,9 @@ module CS
 
   # list of all countries of the world (countries.yml)
   def self.countries
-    if ! File.exists? COUNTRIES_FN
+    if ! File.exist? COUNTRIES_FN
       # countries.yml doesn't exists, extract from MAXMIND_DB
-      update_maxmind unless File.exists? MAXMIND_DB_FN
+      update_maxmind unless File.exist? MAXMIND_DB_FN
 
       # reads CSV line by line
       File.foreach(MAXMIND_DB_FN) do |line|