airports 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8815f8b4415b254f726bb075910b58c5110cc4fd
-  data.tar.gz: 55c2474dc7966cff0f68a7d82fbf68639c9a0267
+SHA256:
+  metadata.gz: 001bb2bb68b337b4cd6a84bf91a460e3e00042df2b27acffde368d233b0f155b
+  data.tar.gz: 94d9b31f843346e005daa60df0b24468af5bcfb80a000017419b38a204414ec4
 SHA512:
-  metadata.gz: 64e0197e308c2f232ad49b566a13d19007bcf9224969e90135dc160431b36fffb0ee8be589727ae2fec670be4028d74c77aaf6dbbfeb49725d09856e1cfbce3f
-  data.tar.gz: 4f6d93a9bf1d3740ec5dc6ae32f02cf103b07f060c4c593cfb25c443c024c6f00707091f002aaa0342d7e0fc2b3e1c035a25a2a6bd36facfae52075493beb270
+  metadata.gz: 5dd63de8956bff030f825dfddd281d69a0ae7acd30897e8bb3173e17700e5ce470b1c7e4d1767f31fd333b7f3e255b875320839239459a40c30a058a3ddd8f59
+  data.tar.gz: db3a13c87145a9b9534f8d68bfffd057c7ecf804ae6ba79b569b5675125c62c7815361e4bb4af96a391ffa41744d763c725d81298d482b4fe0426f7781ebb31b

data/.circleci/config.yml

@@ -0,0 +1,56 @@
+version: 2
+
+references:
+  steps: &steps
+    - checkout
+
+    - type: cache-restore
+      key: airports-bundler-{{ checksum "airports.gemspec" }}
+
+    - run: gem install bundler
+
+    - run: bundle install --path vendor/bundle
+
+    - type: cache-save
+      key: airports-bundler-{{ checksum "airports.gemspec" }}
+      paths:
+        - vendor/bundle
+
+    - type: shell
+      command: |
+        bundle exec rspec --profile 10 \
+                          --format RspecJunitFormatter \
+                          --out /tmp/test-results/rspec.xml \
+                          --format progress \
+                          spec
+
+    - type: store_test_results
+      path: /tmp/test-results
+
+    - run: bundle exec rubocop
+jobs:
+  build-ruby22:
+    docker:
+      - image: ruby:2.2
+    steps: *steps
+  build-ruby23:
+    docker:
+      - image: ruby:2.3
+    steps: *steps
+  build-ruby24:
+    docker:
+      - image: ruby:2.4
+    steps: *steps
+  build-ruby25:
+    docker:
+      - image: ruby:2.5
+    steps: *steps
+
+workflows:
+  version: 2
+  tests:
+    jobs:
+      - build-ruby22
+      - build-ruby23
+      - build-ruby24
+      - build-ruby25

data/.rubocop.yml

@@ -0,0 +1,5 @@
+inherit_gem:
+  gc_ruboconfig: rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.2

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+# v1.2.0 (11 March 2018)
+
+* Drop support for Ruby 2.2, which has reached end-of-life and no longer receives security updates (@timrogers)
+* Enforce code style using Rubocop (@timrogers)
+
+# v1.1.0 (11 March 2018)
+
+* Add new `.find_by_icao_code` for finding airports by their ICAO code (@ryanburnett)

data/README.md

@@ -11,7 +11,7 @@ It's based on data from [OpenFlights](http://openflights.org), with a bit of mas
 Install the gem by adding it to your Gemfile:
 
 ```ruby
-gem 'airports', '~> 1.0.0'
+gem 'airports', '~> 1.2.0'
 ```
 
 You can then look up an airport by its IATA code (e.g. `LHR` for London Heathrow) using `Airports.find_by_iata_code`, which returns an object with a bunch of accessors like `name` and `city`:
@@ -21,6 +21,16 @@ Airports.find_by_iata_code("LHR")
 => #<Airports::Airport:0x007fd9a1bbd550 @name="Heathrow", @city="London", @country="United Kingdom", @iata="LHR", @icao="EGLL", @latitude="51.4775", @longitude="-0.461389", @altitude="83", @timezone="0", @dst="E">
 ```
 
+You can also look up an airport by its ICAO code.
+
+```ruby
+Airports.find_by_iata_code("KCRG")
+=> #<Airports::Airport:0x00007fb548bea898 @altitude="41", @city="Jacksonville",
+@country="United States", @dst="\\N", @iata="CRG", @icao="KCRG",
+@latitude="30.3362998962", @longitude="-81.51439666750001", @name="Jacksonville
+Executive at Craig Airport", @timezone="\\N">
+```
+
 A couple of other methods provide access to aggregate data.
 
 You can call `Airports.iata_codes` for a list of valid IATA codes, perfect for Rails validations:

data/Rakefile

@@ -7,10 +7,11 @@ require "open-uri"
 RSpec::Core::RakeTask.new(:spec)
 
 task :update do
-  raw_data = open("https://raw.githubusercontent.com/jpatokal/openflights/master/data/airports.dat").read
-  cleaned_data = raw_data.gsub(/\\"/,'""')
+  raw_data = open("https://raw.githubusercontent.com/jpatokal/openflights/master/data/" \
+                  "airports.dat").read
+  cleaned_data = raw_data.gsub(/\\"/, '""')
 
-  data = CSV.parse(cleaned_data).each_with_object({}) do |row, accumulator|
+  cleaned_data = CSV.parse(cleaned_data).each_with_object({}) do |row, accumulator|
     # Doha is missing its IATA code, for some reason 🙄
     iata_code = row[5] == "OTBD" ? "DOH" : row[4]
 
@@ -24,28 +25,27 @@ task :update do
       longitude: row[7],
       altitude: row[8],
       timezone: row[9],
-      dst: row[10]
+      dst: row[10],
     }
-  end.
-    tap do |data|
-      # Hyderabad (HYD) is missing, so add it in
-      data["HYD"] = {
-        name: "Rajiv Gandhi International Airport",
-        city: "Hyderabad",
-        country: "India",
-        iata: "HYD",
-        icao: "VOHS",
-        latitude: "17.2403",
-        longitude: "78.4294",
-        altitude: nil,
-        timezone: "N",
-        dst: "5.5",
-      }
-    end.
-    # We aren't interested in airports with no IATA code
-    reject { |code, _| code.nil? || code == "" }
-
-  File.open("data/airports.json", "w").puts JSON.generate(data)
+  end
+
+  # Hyderabad (HYD) is missing, so add it in
+  cleaned_data["HYD"] = {
+    name: "Rajiv Gandhi International Airport",
+    city: "Hyderabad",
+    country: "India",
+    iata: "HYD",
+    icao: "VOHS",
+    latitude: "17.2403",
+    longitude: "78.4294",
+    altitude: nil,
+    timezone: "N",
+    dst: "5.5",
+  }
+
+  cleaned_data = cleaned_data.reject { |code, _| code.nil? || code == "" }
+
+  File.open("data/airports.json", "w").puts JSON.generate(cleaned_data)
 end
 
-task :default => :spec
+task default: :spec

data/airports.gemspec

@@ -1,41 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'airports/version'
+require "airports/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "airports"
-  spec.version       = Airports::VERSION
-  spec.authors       = ["Tim Rogers"]
-  spec.email         = ["me@timrogers.co.uk"]
-
-  spec.summary       = %q{Access data on airports from around the world}
-  spec.description   = %q{Access data on airports from around the world}
-  spec.homepage      = "https://github.com/timrogers/airports"
-  spec.license       = "MIT"
+  spec.name = "airports"
+  spec.version = Airports::VERSION
+  spec.authors = ["Tim Rogers"]
+  spec.email = ["me@timrogers.co.uk"]
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.summary = "Access data on airports from around the world"
+  spec.description = "Access data on airports from around the world"
+  spec.homepage = "https://github.com/timrogers/airports"
+  spec.license = "MIT"
 
-  gem_dir = File.expand_path(File.dirname(__FILE__)) + "/"
-  `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|
-    Dir.chdir(submodule_path) do
-      submodule_relative_path = submodule_path.sub gem_dir, ""
-      # issue git ls-files in submodule's directory and
-      # prepend the submodule path to create absolute file paths
-      `git ls-files`.split($\).each do |filename|
-        spec.files << "#{submodule_relative_path}/#{filename}"
-      end
-    end
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
   end
 
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = ">= 2.2"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0", ">= 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3.0", ">= 3.3.0"
-  spec.add_development_dependency "rspec-its", "~> 1.2.0", ">= 1.2.0"
-  spec.add_development_dependency "pry", "~> 0.10.3", ">= 0.10.3"
+  spec.add_development_dependency "gc_ruboconfig", "~> 2.3.4"
+  spec.add_development_dependency "pry", "~> 0.10.3"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3.0"
+  spec.add_development_dependency "rspec-its", "~> 1.2.0"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.3.0"
 end

data/lib/airports.rb

@@ -1,14 +1,29 @@
-require 'json'
-require 'airports/version'
-require 'airports/airport'
+require "json"
+require "airports/version"
+require "airports/airport"
 
 module Airports
   def self.find_by_iata_code(iata_code)
     return unless iata_code.length == 3
-    return unless airport_data = parsed_data.fetch(iata_code, nil)
+    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 })
+  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
 
     Airport.
-      new(airport_data.each_with_object({}) { |(k,v), h| h[k.to_sym] = v })
+      new(airport_data.each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
   end
 
   def self.iata_codes
@@ -18,7 +33,7 @@ module Airports
   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 })
+        new(airport_data.each_with_object({}) { |(k, v), h| h[k.to_sym] = v })
     end
   end
 
@@ -32,7 +47,7 @@ module Airports
   private_class_method :data
 
   def self.data_path
-    File.expand_path("../../data/airports.json", __FILE__)
+    File.expand_path("../data/airports.json", __dir__)
   end
   private_class_method :data_path
 end

data/lib/airports/version.rb

@@ -1,3 +1,3 @@
 module Airports
-  VERSION = "1.0.0"
+  VERSION = "1.2.0".freeze
 end

metadata

@@ -1,47 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: airports
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Rogers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: gc_ruboconfig
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.3.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 2.3.4
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.10.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-    - - ">="
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -51,9 +59,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -61,9 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -71,9 +73,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,29 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.3
+        version: 0.3.0
 description: Access data on airports from around the world
 email:
 - me@timrogers.co.uk
@@ -111,9 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".rubocop.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -138,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -146,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Access data on airports from around the world

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.0
-  - 2.1.0
-before_install: gem install bundler -v 1.10.4