turkish_cities 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14e3cb00362c30c66924e86fb009a79dd9ef16b086166ec0eb1be136653e7cc7
-  data.tar.gz: a1b61fbd9f3319d5973acf35b029bb315460b83d0d8ebcfb15d30405eab0e6cb
+  metadata.gz: bae35e49b4b510ec357661984e1fe58147fb814c0d3fa05884b267d1dc73c3e8
+  data.tar.gz: e0107fac60f4c94f319a3a7abe9dc0a3d2dcde7be97636ae289755d64a017efa
 SHA512:
-  metadata.gz: 4a0d5834616ddfe7cf080efd3182d599f7901a1d139f831aa85a7ff81d66498bb2ad8a2e118e9c935fadf679cb86f249ae6210f986a38408a1d21c8e5e313b17
-  data.tar.gz: ea17bd392eb05c6bfa1413cc0754d749a2dc53874d5944bc37603c98cf2f65c9de9c9c9a68d208bcbde738c73f59e9b09740f23d5899526ff7a8080e15732197
+  metadata.gz: dcbef3333549bcf28f20597ae6b43948fc6555c1e407baaa358bc2da1f13b0a60afbd86e1211b2dfccbe9fd1ca7690bbedd1499db47d553b3d59a44d26b8d995
+  data.tar.gz: bd4196417c877097d240d7d44005debf81d0171c20b1b290cbdbe5b81053dc154dbacf092a20413cda142cecfb83d6eaa8c0f52391d3311961b6b83e0f20b6e3

data/.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "09:00"
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop
+    versions:
+    - 1.8.1
+    - 1.9.1
+  - dependency-name: bundler
+    versions:
+    - 2.2.6
+    - 2.2.7
+  - dependency-name: i18n
+    versions:
+    - 1.8.7

data/.hound.yml

@@ -1,3 +1,3 @@
 rubocop:
-  version: 0.83.0
+  version: 1.5.2
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -4,12 +4,13 @@ AllCops:
     - 'Gemfile'
     - 'turkish_cities.gemspec'
   NewCops: enable
+  SuggestExtensions: false
 Layout/LineLength:
   Max: 120
 Metrics/AbcSize:
   Max: 20
 Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
+  IgnoredMethods: ['describe', 'context']
 Metrics/MethodLength:
   Max: 15
 Style/Documentation:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.0 (2021-06-06)
+
+### New features
+
+* [#68](https://github.com/sarslanoglu/turkish_cities/issues/68): Add localization for all method responses and errors
+
 ## 0.4.0 (2021-04-25)
 
 ### New features

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    turkish_cities (0.4.0)
+    turkish_cities (0.5.0)
       i18n (>= 0.6.4, <= 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    concurrent-ruby (1.1.6)
+    ast (2.4.2)
+    concurrent-ruby (1.1.8)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -17,15 +17,15 @@ GEM
       tins (~> 1.6)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    i18n (1.8.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
-    parallel (1.20.0)
-    parser (2.7.2.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -39,18 +39,18 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.3.1)
+    rubocop (1.16.0)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.1.1)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
-      parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -62,7 +62,7 @@ GEM
     thor (1.0.1)
     tins (1.25.0)
       sync
-    unicode-display_width (1.7.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -71,7 +71,7 @@ DEPENDENCIES
   bundler (~> 2.2.16)
   coveralls (~> 0.8.23)
   rspec (~> 3.10.0)
-  rubocop (~> 1.3.1)
+  rubocop (~> 1.16.0)
   turkish_cities!
 
 BUNDLED WITH

data/README.md

@@ -20,6 +20,7 @@ https://rubygems.org/gems/turkish_cities
 
 ## Table of Contents
 * [Installation](#installation)
+* [Localization](#localization)
 * [Documentation](#documentation)
   * [Finding city name by plate number](#finding-city-name-by-plate-number)
   * [Finding city name by phone code](#finding-city-name-by-phone-code)
@@ -63,6 +64,24 @@ and run
 $ bundle
 ```
 
+## Localization
+
+Currently gem supports two different languages, Turkish and English. English is default, if no action taken.
+
+Language can be easily changed by ```change_locale``` method. Valid parameters are 'tr' for Turkish and 'en' for English.
+
+```rb
+TurkishCities.change_locale('tr') # => "Dil Türkçe olarak ayarlandı."
+```
+
+After changing language all errors and result sets will be in desired language
+
+```rb
+TurkishCities.list_districts('Eskişehirrr') # => "'Eskişehirrr' ile bir şehir bulunamadı"
+TurkishCities.distance_between('kirsehir', 'Ordu', 'land')
+# => [533, "Kırşehir ile Ordu arasındaki karayolu mesafesi 533 km"]
+```
+
 ## Documentation
 
 With using irb just require gem and start using
@@ -319,9 +338,9 @@ https://www.kgm.gov.tr/SiteCollectionDocuments/KGMdocuments/Root/Uzakliklar/ilme
 
 | Ruby Version | Supported          |
 | ------------ | ------------------ |
-| 2.7.1        | :white_check_mark: |
-| 2.6.6        | :white_check_mark: |
-| 2.5.8        | :white_check_mark: |
+| 2.7.x        | :white_check_mark: |
+| 2.6.x        | :white_check_mark: |
+| 2.5.x        | :white_check_mark: |
 | < 2.5.1      | :x:                |
 
 - TurkishCities heavily depends on ```:turkic``` case mapping support of Ruby string downcase method. Below Ruby version 2.5.1 some functions will run buggy/false or even won't run at all.
@@ -329,7 +348,6 @@ https://www.kgm.gov.tr/SiteCollectionDocuments/KGMdocuments/Root/Uzakliklar/ilme
 ## Roadmap
 
 - Add missing sea travel method
-- Add localization to gem
 - Refactor tests (separate test suites with more edge case tests)
 
 ## Contributing

data/config/locales/en.yml

@@ -0,0 +1,17 @@
+en:
+  description_text:
+    air_travel: "Air travel distance between %{first_city} and %{second_city} is %{distance} km. Estimated air travel would take %{duration} minutes"
+    land_travel: "Land travel distance between %{first_city} and %{second_city} is %{distance} km"
+  errors:
+    cities_not_found_error: "Couldn't find cities combination with '%{first}/%{second}'"
+    city_not_found_error: "Couldn't find city name with '%{input}'"
+    district_not_found_error: "Couldn't find district name with '%{district_input}' of '%{city_input}'"
+    not_even_input: "Given value [%{input}] must be an even number"
+    outside_bounds: "Given value [%{input}] is outside bounds of %{min} to %{max}"
+    postcode_not_found_error: "Couldn't find any subdistrict with postcode '%{postcode_input}'"
+    subdistrict_not_found_error: "Couldn't find subdistrict with '%{subdistrict_input}' of '%{district_input}'/'%{city_input}'"
+    unsupported_travel_method: "Travel method '%{input}' is unsupported"
+  language:
+    errors:
+      unsupported_language_code: "Unsupported language code. Please use 'tr' for Turkish, 'en' for English"
+    success: "Language set to English"

data/config/locales/tr.yml

@@ -0,0 +1,17 @@
+tr:
+  description_text:
+    air_travel: "%{first_city} ile %{second_city} arasındaki havayolu mesafesi %{distance} km. Tahmini uçuş süresi %{duration} dakikadır"
+    land_travel: "%{first_city} ile %{second_city} arasındaki karayolu mesafesi %{distance} km"
+  errors:
+    cities_not_found_error: "'%{first}/%{second}' ile şehir kombinasyonu bulunamadı"
+    city_not_found_error: "'%{input}' ile bir şehir bulunamadı"
+    district_not_found_error: "'%{city_input}' şehrine ait '%{district_input}' ilçesi ile bir kayıt bulunamadı"
+    not_even_input: "Girilen değer [%{input}] çift sayı olmalı"
+    outside_bounds: "Girilen değer [%{input}] %{min} ile %{max} değerleri dışında"
+    postcode_not_found_error: "'%{postcode_input}' posta kodu ile kayıt bulunamadı"
+    subdistrict_not_found_error: "'%{subdistrict_input}' ile '%{district_input}'/'%{city_input}' ait bir kayıt bulunamdı"
+    unsupported_travel_method: "'%{input}' yolculuk methodu desteklenmiyor"
+  language:
+    errors:
+      unsupported_language_code: "Desteklenmeyen dil kodu. Lütfen Türkçe için 'tr', İngilizce için 'en' kullanınız"
+    success: "Dil Türkçe olarak ayarlandı"

data/lib/turkish_cities.rb

@@ -6,7 +6,22 @@ require_relative '../lib/turkish_cities/district'
 require_relative '../lib/turkish_cities/postcode'
 require_relative '../lib/turkish_cities/version'
 
+require 'i18n'
+
+I18n.load_path << Dir["#{File.expand_path('config/locales')}/*.yml"]
+
 class TurkishCities
+  PLATE_NUMBER = 'plate_number'
+  PHONE_CODE = 'phone_code'
+
+  def self.change_locale(language_code)
+    if %w[en tr].include?(language_code)
+      I18n.locale = language_code.to_sym
+      return I18n.t('language.success')
+    end
+    I18n.t('language.errors.unsupported_language_code')
+  end
+
   def self.find_name_by_plate_number(plate_number)
     City.new.find_by_id(plate_number)
   end
@@ -16,11 +31,11 @@ class TurkishCities
   end
 
   def self.find_plate_number_by_name(city_name)
-    City.new.find_by_name(city_name, 'plate_number')
+    City.new.find_by_name(city_name, self::PLATE_NUMBER)
   end
 
   def self.find_phone_code_by_name(city_name)
-    City.new.find_by_name(city_name, 'phone_code')
+    City.new.find_by_name(city_name, self::PHONE_CODE)
   end
 
   def self.list_cities(options = {})

data/lib/turkish_cities/city.rb

@@ -8,8 +8,6 @@ require_relative '../turkish_cities/helpers/decomposer_helper'
 class City
   include DecomposerHelper
 
-  I18n.enforce_available_locales = false
-
   file_path = File.join(File.dirname(__FILE__), 'data/cities.yaml')
   CITY_LIST = YAML.load_file(file_path)
 
@@ -67,7 +65,7 @@ class City
   def check_phone_code(input)
     return if input.to_i.even?
 
-    raise ArgumentError, "Given value [#{input}] must be an even number."
+    raise ArgumentError, I18n.t('errors.not_even_input', input: input)
   end
 
   def filter_metropolitan_municipalities(city_list)

data/lib/turkish_cities/data/neighborhoods_parser.rb

@@ -32,7 +32,7 @@ module NeighborhoodsParser
     end
 
     mahalle = []
-    data_array[3].downcase(:turkic).strip.split(' ').each do |word|
+    data_array[3].downcase(:turkic).strip.split.each do |word|
       if word[0] == '('
         word[1] = word[1].capitalize!(:turkic) unless word[1].to_i.to_s == word[1]
       else

data/lib/turkish_cities/distance.rb

@@ -121,11 +121,14 @@ class Distance
 
   def description_text(travel_method, city_array, result_set)
     if travel_method == 'Air'
-      return "#{travel_method} travel distance between #{city_array[0]['name']} and #{city_array[1]['name']} is " \
-        "#{result_set[0]} km. Estimated air travel would take #{result_set[1]} minutes."
+      return I18n.t('description_text.air_travel', first_city: city_array[0]['name'],
+                                                   second_city: city_array[1]['name'],
+                                                   distance: result_set[0],
+                                                   duration: result_set[1])
     end
 
-    "#{travel_method} travel distance between #{city_array[0]['name']} and #{city_array[1]['name']} is " \
-        "#{result_set[0]} km."
+    I18n.t('description_text.land_travel', first_city: city_array[0]['name'],
+                                           second_city: city_array[1]['name'],
+                                           distance: result_set[0])
   end
 end

data/lib/turkish_cities/helpers/decomposer_helper.rb

@@ -4,15 +4,15 @@ module DecomposerHelper
   def check_input_range(input, min, max)
     return if input.to_i.between?(min, max)
 
-    raise RangeError, "Given value [#{input}] is outside bounds of #{min} to #{max}."
+    raise RangeError, I18n.t('errors.outside_bounds', input: input, min: min, max: max)
   end
 
   def city_not_found_error(input)
-    "Couldn't find city name with '#{input}'"
+    I18n.t('errors.city_not_found_error', input: input)
   end
 
   def cities_not_found_error(first, second)
-    "Couldn't find cities combination with '#{first}/#{second}'"
+    I18n.t('errors.cities_not_found_error', first: first, second: second)
   end
 
   def convert_chars(string)
@@ -35,11 +35,11 @@ module DecomposerHelper
   end
 
   def district_not_found_error(district_input, city_input)
-    "Couldn't find district name with '#{district_input}' of '#{city_input}'"
+    I18n.t('errors.district_not_found_error', district_input: district_input, city_input: city_input)
   end
 
   def postcode_not_found_error(postcode_input)
-    "Couldn't find any subdistrict with postcode '#{postcode_input}'"
+    I18n.t('errors.postcode_not_found_error', postcode_input: postcode_input)
   end
 
   def prepare_city_list(city_list, options)
@@ -64,6 +64,7 @@ module DecomposerHelper
 
   def sort_alphabetically(list, options = nil)
     turkish_alphabet = ' -0123456789abcçdefgğhıijklmnoöprsştuüvyz'
+
     list.sort_by do |item|
       item_to_sort = if options.nil? || options[:with].nil?
                        item
@@ -75,7 +76,8 @@ module DecomposerHelper
   end
 
   def subdistrict_not_found_error(subdistrict_input, district_input, city_input)
-    "Couldn't find subdistrict with '#{subdistrict_input}' of '#{district_input}'/'#{city_input}'"
+    I18n.t('errors.subdistrict_not_found_error', subdistrict_input: subdistrict_input, district_input: district_input,
+                                                 city_input: city_input)
   end
 
   private
@@ -99,6 +101,6 @@ module DecomposerHelper
   end
 
   def unsupported_travel_method(input)
-    "Travel method '#{input}' is unsupported"
+    I18n.t('errors.unsupported_travel_method', input: input)
   end
 end

data/lib/turkish_cities/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TurkishCities
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/turkish_cities.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.authors               = ['Semih Arslanoglu']
   s.email                 = 'arslanoglusemih93@gmail.com'
 
-  s.date                  = '2020-04-13'
   s.summary               = 'List and find Turkish cities'
   s.description           = 'List and find Turkish cities via name, district name, post code, plate number. Calculate air travel distance between cities and get realistic estimates of travel time'
   s.homepage              = 'https://github.com/sarslanoglu/turkish_cities'
@@ -24,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'bundler', '~> 2.2.16'
   s.add_development_dependency 'coveralls', '~> 0.8.23'
   s.add_development_dependency 'rspec', '~> 3.10.0'
-  s.add_development_dependency 'rubocop', '~> 1.3.1'
+  s.add_development_dependency 'rubocop', '~> 1.16.0'
 
   if s.respond_to?(:metadata)
     s.metadata['changelog_uri'] = 'https://github.com/sarslanoglu/turkish_cities/blob/master/CHANGELOG.md'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turkish_cities
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Semih Arslanoglu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.16.0
 description: List and find Turkish cities via name, district name, post code, plate
   number. Calculate air travel distance between cities and get realistic estimates
   of travel time
@@ -97,6 +97,7 @@ files:
 - ".codeclimate.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/dependabot.yml"
 - ".github/pull_request_template.md"
 - ".gitignore"
 - ".hound.yml"
@@ -110,6 +111,8 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- config/locales/en.yml
+- config/locales/tr.yml
 - lib/turkish_cities.rb
 - lib/turkish_cities/city.rb
 - lib/turkish_cities/data/cities.yaml
@@ -214,7 +217,7 @@ metadata:
   changelog_uri: https://github.com/sarslanoglu/turkish_cities/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/sarslanoglu/turkish_cities
   bug_tracker_uri: https://github.com/sarslanoglu/turkish_cities/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -229,8 +232,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.17
+signing_key:
 specification_version: 4
 summary: List and find Turkish cities
 test_files: []