turkish_cities 0.4.0 → 0.6.1

data/lib/turkish_cities/helpers/decomposer_helper.rb

@@ -4,15 +4,23 @@ 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 check_population_range(input, min, max)
+    input.to_i.between?(min, 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 city_population_not_found_error
+    I18n.t('errors.city_population_not_found_error')
   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 +43,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 +72,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 +84,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
@@ -98,7 +108,11 @@ module DecomposerHelper
     result[:metropolitan_municipality_since] = city['metropolitan_municipality_since']
   end
 
+  def unsupported_population_type(input)
+    I18n.t('errors.unsupported_population_type', input: input)
+  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/population.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'i18n'
+require 'yaml'
+
+require_relative '../turkish_cities/helpers/decomposer_helper'
+
+class Population
+  include DecomposerHelper
+
+  file_path = File.join(File.dirname(__FILE__), 'data/cities.yaml')
+  CITY_LIST = YAML.load_file(file_path)
+
+  def find_by_population(type, population_one, population_two)
+    return [] unless check_population_range(population_one, 83_645, 15_840_900)
+
+    return [] if !population_two.nil? && !check_population_range(population_two, 83_645, 15_840_900)
+
+    result = find_population(type, population_one, population_two)
+
+    result.length.positive? ? result : city_population_not_found_error
+  end
+
+  private
+
+  def find_population(type, population_one, population_two)
+    city_list = CITY_LIST
+
+    case type
+    when 'exact'
+      exact_population(city_list, population_one)
+    when 'below'
+      below_population(city_list, population_one)
+    when 'above'
+      above_population(city_list, population_one)
+    when 'between'
+      between_population(city_list, population_one, population_two)
+    else
+      unsupported_population_type(type)
+    end
+  end
+
+  def exact_population(city_list, population)
+    city_list.map { |city| city['name'] if city['population'] == population }.compact
+  end
+
+  def below_population(city_list, population)
+    city_list.map { |city| city['name'] if city['population'] < population }.compact
+  end
+
+  def above_population(city_list, population)
+    city_list.map { |city| city['name'] if city['population'] > population }.compact
+  end
+
+  def between_population(city_list, population_one, population_two)
+    if population_one > population_two
+      bigger = population_one
+      smaller = population_two
+    else
+      smaller = population_one
+      bigger = population_two
+    end
+
+    city_list.map { |city| city['name'] if city['population'] > smaller && city['population'] < bigger }.compact
+  end
+end

data/lib/turkish_cities/version.rb

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

data/lib/turkish_cities.rb

@@ -3,10 +3,27 @@
 require_relative '../lib/turkish_cities/city'
 require_relative '../lib/turkish_cities/distance'
 require_relative '../lib/turkish_cities/district'
+require_relative '../lib/turkish_cities/population'
 require_relative '../lib/turkish_cities/postcode'
 require_relative '../lib/turkish_cities/version'
 
+require 'i18n'
+
+I18n.load_path << "#{File.expand_path('config/locales')}/en.yml"
+I18n.load_path << "#{File.expand_path('config/locales')}/tr.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 +33,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 = {})
@@ -43,6 +60,10 @@ class TurkishCities
     District.new(city_name, district_name).neighborhoods(subdistrict_name)
   end
 
+  def self.find_by_population(type, population_one, population_two = nil)
+    Population.new.find_by_population(type, population_one, population_two)
+  end
+
   def self.find_by_postcode(postcode)
     Postcode.new.find_by_postcode(postcode)
   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'
@@ -22,9 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n', ['>= 0.6.4', '<= 2']
 
   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 'codecov', '~> 0.6.0'
+  s.add_development_dependency 'rake', '~> 13.0.6'
+  s.add_development_dependency 'rspec', '~> 3.11.0'
+  s.add_development_dependency 'rubocop', '~> 1.27.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.6.1
 platform: ruby
 authors:
 - Semih Arslanoglu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -45,47 +45,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.16
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: codecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.23
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.27.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
@@ -94,15 +108,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".codeclimate.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
+- ".github/dependabot.yml"
 - ".github/pull_request_template.md"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
@@ -110,6 +126,9 @@ files:
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- Rakefile
+- config/locales/en.yml
+- config/locales/tr.yml
 - lib/turkish_cities.rb
 - lib/turkish_cities/city.rb
 - lib/turkish_cities/data/cities.yaml
@@ -198,6 +217,7 @@ files:
 - lib/turkish_cities/distance.rb
 - lib/turkish_cities/district.rb
 - lib/turkish_cities/helpers/decomposer_helper.rb
+- lib/turkish_cities/population.rb
 - lib/turkish_cities/postcode.rb
 - lib/turkish_cities/version.rb
 - public/assets/img/TurkishCities_darkblue-on-yellow_800X800@3x-8.png
@@ -214,7 +234,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 +249,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.3
+signing_key:
 specification_version: 4
 summary: List and find Turkish cities
 test_files: []

data/.travis.yml

@@ -1,21 +0,0 @@
-env:
-  global:
-    - CC_TEST_REPORTER_ID=23062197f289fd0ae7601ae06c2dd4a0af4e16c436f2428b99ab4b64a7e4a587
-language: ruby
-dist: trusty
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem install bundler
-before_script:
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
-script: bundle exec rspec spec
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-notifications:
-  email:
-    - arslanoglusemih93@gmail.com