metar-parser 1.5.0 → 1.6.0

data/lib/metar/raw.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 require 'net/ftp'
 require 'time'
@@ -7,21 +9,23 @@ module Metar
     class Base
       attr_reader :metar
       attr_reader :time
-      alias :to_s :metar
+      alias to_s metar
     end
 
     ##
     # Use this class when you have a METAR string and the date of reading
     class Data < Base
       def initialize(metar, time = nil)
-        if time == nil
-          warn <<-EOT
+        if time.nil?
+          warn <<-WARNING
           Using Metar::Raw::Data without a time parameter is deprecated.
           Please supply the reading time as the second parameter.
-          EOT
+          WARNING
           time = Time.now
         end
-        @metar, @time = metar, time
+
+        @metar = metar
+        @time = time
       end
     end
 
@@ -39,6 +43,7 @@ module Metar
 
       def time
         return @time if @time
+
         dom = day_of_month
         date = Date.today
         loop do
@@ -57,60 +62,42 @@ module Metar
       def datetime
         datetime = metar[/^\w{4} (\d{6})Z/, 1]
         raise "The METAR string must have a 6 digit datetime" if datetime.nil?
+
         datetime
       end
 
       def day_of_month
         dom = datetime[0..1].to_i
         raise "Day of month must be at most 31" if dom > 31
-        raise "Day of month must be greater than 0" if dom == 0
+        raise "Day of month must be greater than 0" if dom.zero?
+
         dom
       end
     end
 
     # Collects METAR data from the NOAA site via FTP
     class Noaa < Base
-      @@connection = nil
-
-      class << self
-
-        def connection
-          return @@connection if @@connection
-          connect
-          @@connection
-        end
-
-        def connect
-          @@connection = Net::FTP.new('tgftp.nws.noaa.gov')
-          @@connection.login
-          @@connection.chdir('data/observations/metar/stations')
-          @@connection.passive = true
-        end
-
-        def disconnect
-          return if @@connection.nil?
-          @@connection.close
-          @@connection = nil
-        end
-
-        def fetch(cccc)
-          attempts = 0
-          while attempts < 2
-            begin
-              s = ''
-              connection.retrbinary("RETR #{ cccc }.TXT", 1024) do |chunk|
-                s << chunk
-              end
-              disconnect
-              return s
-            rescue Net::FTPPermError, Net::FTPTempError, EOFError => e
-              connect
-              attempts += 1
+      def self.fetch(cccc)
+        connection = Net::FTP.new('tgftp.nws.noaa.gov')
+        connection.login
+        connection.chdir('data/observations/metar/stations')
+        connection.passive = true
+
+        attempts = 0
+        while attempts < 2
+          begin
+            s = ''
+            connection.retrbinary("RETR #{cccc}.TXT", 1024) do |chunk|
+              s += chunk
             end
+            connection.close
+            return s
+          rescue Net::FTPPermError, Net::FTPTempError, EOFError
+            attempts += 1
           end
-          raise "Net::FTP.retrbinary failed #{attempts} times"
         end
 
+        raise "Net::FTP.retrbinary failed #{attempts} times"
       end
 
       # Station is a string containing the CCCC code, or
@@ -124,7 +111,7 @@ module Metar
         @data
       end
       # #raw is deprecated, use #data
-      alias :raw :data
+      alias raw data
 
       def time
         fetch
@@ -140,6 +127,7 @@ module Metar
 
       def fetch
         return if @data
+
         @data = Noaa.fetch(@cccc)
         parse
       end

data/lib/metar/report.rb

@@ -1,24 +1,27 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
+require "metar/data/remark"
 
 module Metar
   class Report
-    ATTRIBUTES = [
-      :station_name,
-      :station_country,
-      :time,
-      :wind,
-      :visibility,
-      :minimum_visibility,
-      :present_weather,
-      :sky_summary,
-      :temperature,
-    ]
+    ATTRIBUTES = %i(
+      station_name
+      station_country
+      time
+      wind
+      visibility
+      minimum_visibility
+      present_weather
+      sky_summary
+      temperature
+    ).freeze
 
     attr_reader :parser, :station
 
     def initialize(parser)
       @parser = parser
-      @station = Station.find_by_cccc(@parser.station_code) # TODO: parser should return the station
+      # TODO: parser should return the station
+      @station = Station.find_by_cccc(@parser.station_code)
     end
 
     def station_name
@@ -38,7 +41,10 @@ module Metar
     end
 
     def time
-      "%u:%02u" % [@parser.time.hour, @parser.time.min]
+      format(
+        "%<hour>u:%02<min>u",
+        hour: @parser.time.hour, min: @parser.time.min
+      )
     end
 
     def observer
@@ -62,7 +68,7 @@ module Metar
     end
 
     def runway_visible_range
-      @parser.runway_visible_range.collect { |rvr| rvr.to_s }.join(', ')
+      @parser.runway_visible_range.map(&:to_s).join(', ')
     end
 
     def present_weather
@@ -70,12 +76,15 @@ module Metar
     end
 
     def sky_summary
-      return I18n.t('metar.sky_conditions.clear skies') if @parser.sky_conditions.length == 0
+      if @parser.sky_conditions.empty?
+        return I18n.t('metar.sky_conditions.clear skies')
+      end
+
       @parser.sky_conditions[-1].to_summary
     end
 
     def sky_conditions
-      @parser.sky_conditions.collect { |sky| sky.to_s }.join(', ')
+      @parser.sky_conditions.map(&:to_s).join(', ')
     end
 
     def vertical_visibility
@@ -100,7 +109,9 @@ module Metar
 
     def to_s
       attributes.collect do |attribute|
-        I18n.t('metar.' + attribute[:attribute].to_s + '.title') + ': ' + attribute[:value]
+        I18n.t('metar.' + attribute[:attribute].to_s + '.title') +
+          ': ' +
+          attribute[:value]
       end.join("\n") + "\n"
     end
 
@@ -108,8 +119,8 @@ module Metar
 
     def attributes
       a = Metar::Report::ATTRIBUTES.map do |key|
-        value = self.send(key).to_s
-        {:attribute => key, :value => value} if not value.empty?
+        value = send(key).to_s
+        {attribute: key, value: value} if !value.empty?
       end
       a.compact
     end

data/lib/metar/station.rb

@@ -1,19 +1,24 @@
-require 'open-uri'
+# frozen_string_literal: true
+
+require 'net/http'
+require 'uri'
 require 'set'
 
 # A Station can be created without downloading data from the Internet.
-# The class downloads and caches the NOAA station list when it is first requested.
-# As soon of any of the attributes are read, the data is downloaded (if necessary), and attributes are set.
+# The class downloads and caches the NOAA station list
+# when it is first requested.
+# As soon of any of the attributes are read, the data is downloaded
+# (if necessary), and attributes are set.
 
 module Metar
   class Station
-    NOAA_STATION_LIST_URL = 'http://tgftp.nws.noaa.gov/data/nsd_cccc.txt'
+    NOAA_STATION_LIST_URL = 'https://tgftp.nws.noaa.gov/data/nsd_cccc.txt'
 
     class << self
       @nsd_cccc = nil # Contains the text of the station list
 
       def countries
-        all_structures.reduce(Set.new) { |a, s| a.add(s[ :country ]) }.to_a.sort
+        all_structures.reduce(Set.new) { |a, s| a.add(s[:country]) }.to_a.sort
       end
 
       def all
@@ -30,33 +35,36 @@ module Metar
 
       # Does the given CCCC code exist?
       def exist?(cccc)
-        not find_data_by_cccc(cccc).nil?
+        !find_data_by_cccc(cccc).nil?
       end
 
       def find_all_by_country(country)
         all.select { |s| s.country == country }
       end
 
-      def to_longitude(s)
-        m = s.match(/^(\d+)-(\d+)([EW])/)
+      def to_longitude(longitude)
+        m = longitude.match(/^(\d+)-(\d+)([EW])/)
         return nil if !m
+
         (m[3] == 'E' ? 1.0 : -1.0) * (m[1].to_f + m[2].to_f / 60.0)
       end
 
-      def to_latitude(s)
-        m = s.match(/^(\d+)-(\d+)([SN])/)
+      def to_latitude(latitude)
+        m = latitude.match(/^(\d+)-(\d+)([SN])/)
         return nil if !m
+
         (m[3] == 'E' ? 1.0 : -1.0) * (m[1].to_f + m[2].to_f / 60.0)
       end
     end
 
     attr_reader :cccc, :name, :state, :country, :longitude, :latitude, :raw
-    alias :code :cccc
+    alias code cccc
 
     # No check is made on the existence of the station
     def initialize(cccc, noaa_data)
       raise "Station identifier must not be nil"   if cccc.nil?
       raise "Station identifier must not be empty" if cccc.to_s == ''
+
       @cccc = cccc
       load! noaa_data
     end
@@ -76,7 +84,9 @@ module Metar
       @structures = nil
 
       def download_stations
-        open(NOAA_STATION_LIST_URL) { |fil| fil.read }
+        uri = URI.parse(NOAA_STATION_LIST_URL)
+        response = Net::HTTP.get_response(uri)
+        response.body
       end
 
       def all_structures
@@ -88,13 +98,13 @@ module Metar
         @nsd_cccc.each_line do |station|
           fields = station.split(';')
           @structures << {
-            cccc:      fields[0],
-            name:      fields[3],
-            state:     fields[4],
-            country:   fields[5],
-            latitude:  fields[7],
+            cccc: fields[0],
+            name: fields[3],
+            state: fields[4],
+            country: fields[5],
+            latitude: fields[7],
             longitude: fields[8],
-            raw:       station.clone,
+            raw: station.clone
           }
         end
 
@@ -104,7 +114,6 @@ module Metar
       def find_data_by_cccc(cccc)
         all_structures.find { |station| station[:cccc] == cccc }
       end
-
     end
 
     def load!(noaa_data)

data/lib/metar/version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Metar
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/metar.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "metar/i18n"
 require "metar/raw"
 require "metar/station"
@@ -16,4 +18,3 @@ module Metar
 
   autoload :Data, "metar/data"
 end
-

data/locales/de.yml

@@ -69,6 +69,7 @@ de:
     present_weather:
       title: Wetter
       not observed: nicht beobachtet
+      no significant weather: kein signifikantes Wetter
       mist: Nebel
       dust: Staub
       blowing dust: aufgewirbelter Staub

data/locales/en.yml

@@ -71,6 +71,7 @@ en:
     present_weather:
       title: weather
       not observed: not observed
+      no significant weather: no significant weather
       mist: mist
       dust: dust
       blowing dust: blowing dust

data/locales/it.yml

@@ -69,6 +69,7 @@ it:
     present_weather:
       title: tempo
       not observed: non osservato
+      no significant weather: nessun tempo significativo
       mist: foschia
       dust: polvere
       blowing dust: polviscolo

data/locales/pt-BR.yml

@@ -90,6 +90,7 @@ pt-BR:
     present_weather:
       title: clima
       not observed: não observado
+      no significant weather: sem clima significativo
       mist: misto
       dust: poeira
       blowing dust: sopro com poeira

data/spec/data/density_altitude_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "spec_helper"
 
 RSpec.describe Metar::Data::DensityAltitude do

data/spec/data/distance_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Metar::Data::Distance do

data/spec/data/lightning_spec.rb

@@ -1,13 +1,30 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Metar::Data::Lightning do
   context '.parse_chunks' do
     [
-      ['direction',                        'LTG SE',            [:default,      nil, ['SE']]],
-      ['distance direction',               'LTG DSNT SE',       [:default, 16093.44, ['SE']]],
-      ['distance direction and direction', 'LTG DSNT NE AND W', [:default, 16093.44, ['NE', 'W']]],
-      ['distance direction-direction',     'LTG DSNT SE-SW',    [:default, 16093.44, ['SE', 'SW']]],
-      ['distance all quandrants',          'LTG DSNT ALQDS',    [:default, 16093.44, ['N', 'E', 'S', 'W']]],
+      [
+        'direction', 'LTG SE',
+        [:default, nil, ['SE']]
+      ],
+      [
+        'distance direction', 'LTG DSNT SE',
+        [:default, 16_093.44, ['SE']]
+      ],
+      [
+        'distance direction and direction', 'LTG DSNT NE AND W',
+        [:default, 16_093.44, %w(NE W)]
+      ],
+      [
+        'distance direction-direction', 'LTG DSNT SE-SW',
+        [:default, 16_093.44, %w(SE SW)]
+      ],
+      [
+        'distance all quandrants', 'LTG DSNT ALQDS',
+        [:default, 16_093.44, %w(N E S W)]
+      ]
     ].each do |docstring, section, expected|
       example docstring do
         chunks = section.split(' ')
@@ -25,9 +42,9 @@ describe Metar::Data::Lightning do
     end
 
     it 'removes parsed chunks' do
-      chunks = ['LTG', 'DSNT', 'SE', 'FOO']
+      chunks = %w(LTG DSNT SE FOO)
 
-      r = described_class.parse_chunks(chunks)
+      described_class.parse_chunks(chunks)
 
       expect(chunks).to eq(['FOO'])
     end
@@ -39,9 +56,9 @@ describe Metar::Data::Lightning do
     end
 
     it "doesn't not fail if all chunks are parsed" do
-      chunks = ['LTG', 'DSNT', 'SE']
+      chunks = %w(LTG DSNT SE)
 
-      r = described_class.parse_chunks(chunks)
+      described_class.parse_chunks(chunks)
 
       expect(chunks).to eq([])
     end

data/spec/data/pressure_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Metar::Data::Pressure do

data/spec/data/remark_spec.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Metar::Data::Remark do
   context '.parse' do
     it 'delegate to subclasses' do
-      expect(described_class.parse('21012')).to be_a(Metar::Data::TemperatureExtreme)
+      expect(described_class.parse('21012')).
+        to be_a(Metar::Data::TemperatureExtreme)
     end
 
     it 'returns nil for unrecognised' do
@@ -12,13 +15,14 @@ describe Metar::Data::Remark do
 
     context '6-hour maximum or minimum' do
       [
-        ['positive maximum', '10046', [:maximum,  4.6]],
+        ['positive maximum', '10046', [:maximum, 4.6]],
         ['negative maximum', '11012', [:maximum, -1.2]],
-        ['positive minimum', '20046', [:minimum,  4.6]],
-        ['negative minimum', '21012', [:minimum, -1.2]],
+        ['positive minimum', '20046', [:minimum, 4.6]],
+        ['negative minimum', '21012', [:minimum, -1.2]]
       ].each do |docstring, raw, expected|
         example docstring do
-          expect(described_class.parse(raw)).to be_temperature_extreme(*expected)
+          expect(described_class.parse(raw)).
+            to be_temperature_extreme(*expected)
         end
       end
     end
@@ -27,7 +31,7 @@ describe Metar::Data::Remark do
       it 'returns minimum and maximum' do
         max, min = described_class.parse('400461006')
 
-        expect(max).to be_temperature_extreme(:maximum,  4.6)
+        expect(max).to be_temperature_extreme(:maximum, 4.6)
         expect(min).to be_temperature_extreme(:minimum, -0.6)
       end
     end
@@ -63,10 +67,23 @@ describe Metar::Data::Remark do
     end
 
     context 'automated station' do
-
       [
-        ['with precipitation dicriminator', 'AO1', [Metar::Data::AutomatedStationType, :with_precipitation_discriminator]],
-        ['without precipitation dicriminator', 'AO2', [Metar::Data::AutomatedStationType, :without_precipitation_discriminator]],
+        [
+          'with precipitation dicriminator',
+          'AO1',
+          [
+            Metar::Data::AutomatedStationType,
+            :with_precipitation_discriminator
+          ]
+        ],
+        [
+          'without precipitation dicriminator',
+          'AO2',
+          [
+            Metar::Data::AutomatedStationType,
+            :without_precipitation_discriminator
+          ]
+        ]
       ].each do |docstring, raw, expected|
         example docstring do
           aut = described_class.parse(raw)