airports 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71054d19224dc546e049cfefd387542e8a085efeb1c4634add3a68394e9fe080
-  data.tar.gz: 357a2beb36a3db8cb1508c1414dfdf327731d438b9ecf76eb0d47efdc7cfbb8d
+  metadata.gz: cd6eb797344db6298be1e177fe7a24372708f3656965a549a2bc363ecc8028f9
+  data.tar.gz: bb94c1025b93602d478a2babadcc38f6f03b28578428ea3d2bfd1246adb7fd66
 SHA512:
-  metadata.gz: eccd4f723bd12442dc87d1815998727e3ae341df58d44574b712493c9335bc499fb328190a995f9aa2cc738e8b5a61215a28fc963b57354f4c423c9448758d01
-  data.tar.gz: b6e8553d78442487173da7de7027cdbe59028de8245cb36578ba34ad201e471dcb0751cb313a707e7a8ddd10d5a99217e0c4340fa3be7888ef6f7c0f51a8aa5d
+  metadata.gz: e27d0d368ade101807f015ac7271f3b556d66d9e67aa96c2f325697c1fcd75e6bfb1b03e58a51996326fab224aa99d4c57169b0801534d5ed2df4eaee08eaac8
+  data.tar.gz: d28ea2d9e45464493eb7bdbfeb75a9ee1d4426bdc737160a7e430dc3da69a67ec76af30830a49b0d5faa13697eb7eda12782a6a954cff0bbaf8f0025bb83b013

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# v1.5.0 (5 December 2019)
+
+* Support looking up airports by the name of the city they
+are located in with `Airports.find_all_by_city_name` (@viral810, @timrogers)
+* Refactor `Airports` so `Airport` objects are only generated once
+and the code is cleaner (@timrogers)
+
 # v1.4.1 (14 November 2019)
 
 * Correct the time zone of Istanbul Airport (`IST`) (@aliismayilov)

data/airports.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.4"
 
-  spec.add_development_dependency "gc_ruboconfig", "~> 2.7.1"
+  spec.add_development_dependency "gc_ruboconfig", "~> 2.8.0"
   spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.9.0"
   spec.add_development_dependency "rspec-its", "~> 1.3.0"
   spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.0"

data/lib/airports.rb

@@ -8,25 +8,17 @@ module Airports
   def self.find_by_iata_code(iata_code)
     return unless iata_code.length == 3
 
-    airport_data = parsed_data.fetch(iata_code, nil)
-
-    return unless airport_data
-
-    Airport.
-      new(airport_data.each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
+    all.find { |airport| airport.iata == iata_code }
   end
 
   def self.find_by_icao_code(icao_code)
     return unless icao_code.length == 4
 
-    airport_data = parsed_data.values.find do |data|
-      data["icao"] == icao_code
-    end
-
-    return unless airport_data
+    all.find { |airport| airport.icao == icao_code }
+  end
 
-    Airport.
-      new(airport_data.each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
+  def self.find_all_by_city_name(city_name)
+    all.select { |airport| airport.city.casecmp(city_name).zero? }
   end
 
   def self.iata_codes
@@ -34,9 +26,8 @@ module Airports
   end
 
   def self.all
-    @all ||= parsed_data.map do |_iata_code, airport_data|
-      Airport.
-        new(airport_data.each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
+    @all ||= parsed_data.values.map do |airport_data|
+      airport_from_parsed_data_element(airport_data)
     end
   end
 
@@ -44,6 +35,16 @@ module Airports
     @parsed_data ||= JSON.parse(data)
   end
 
+  def self.airport_from_parsed_data_element(parsed_data_element)
+    # TODO: Once we're using Ruby 2.5+, use Hash#transform_keys here to symbolize the keys
+    transformed_hash = parsed_data_element.each_with_object({}) do |(k, v), hash|
+      hash[k.to_sym] = v
+    end
+
+    Airport.new(transformed_hash)
+  end
+  private_class_method :airport_from_parsed_data_element
+
   def self.data
     @data ||= File.read(data_path)
   end

data/lib/airports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Airports
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airports
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Tim Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gc_ruboconfig
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement