metar-parser 1.5.0 → 1.7.0

data/spec/raw_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 require 'net/ftp'
@@ -29,7 +30,8 @@ describe Metar::Raw::Data do
 
     context "when called without a time parameter" do
       it "warns that the usage is deprecated" do
-        expect { described_class.new(raw_metar) }.to output(/deprecated/).to_stderr
+        expect { described_class.new(raw_metar) }.
+          to output(/deprecated/).to_stderr
       end
     end
   end
@@ -51,9 +53,12 @@ describe Metar::Raw::Metar do
       expect(subject.time.day).to eq(31)
     end
 
-    context "when the current day of month is greater than the METAR's day of month" do
+    context "when the current day of month " \
+            "is greater than the METAR's day of month" do
       let(:call_time) { Time.parse("2016-04-11 16:35") }
-      let(:raw_metar) { "OPPS 092359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011" }
+      let(:raw_metar) do
+        "OPPS 092359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011"
+      end
 
       it "uses the date from the current month" do
         expect(subject.time.year).to eq(2016)
@@ -76,26 +81,27 @@ describe Metar::Raw::Metar do
       let(:raw_metar) { "OPPS 3123Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011" }
 
       it "throws an error" do
-        expect { subject.time }
-          .to raise_error(RuntimeError, /6 digit/)
+        expect { subject.time }.to raise_error(RuntimeError, /6 digit/)
       end
     end
 
     context "when the day of month in the datetime is > 31" do
-      let(:raw_metar) { "OPPS 332359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011" }
+      let(:raw_metar) do
+        "OPPS 332359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011"
+      end
 
       it "throws an error" do
-        expect { subject.time }
-          .to raise_error(RuntimeError, /at most 31/)
+        expect { subject.time }.to raise_error(RuntimeError, /at most 31/)
       end
     end
 
     context "when the day of month in the datetime is 0" do
-      let(:raw_metar) { "OPPS 002359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011" }
+      let(:raw_metar) do
+        "OPPS 002359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011"
+      end
 
       it "throws an error" do
-        expect { subject.time }
-          .to raise_error(RuntimeError, /greater than 0/)
+        expect { subject.time }.to raise_error(RuntimeError, /greater than 0/)
       end
     end
   end
@@ -106,80 +112,43 @@ describe Metar::Raw::Noaa do
 
   let(:cccc) { "ESSB" }
   let(:ftp) do
-    double(Net::FTP, login: nil, chdir: nil, :passive= => nil, retrbinary: nil)
+    double(
+      Net::FTP,
+      chdir: nil,
+      close: nil,
+      login: nil,
+      :passive= => nil,
+      retrbinary: nil
+    )
   end
 
   before do
     allow(Net::FTP).to receive(:new) { ftp }
   end
 
-  after do
-    Metar::Raw::Noaa.send(:class_variable_set, '@@connection', nil)
-  end
-
-  context '.connection' do
-    context 'uncached' do
-      it 'sets up the connection' do
-        Metar::Raw::Noaa.connect
-
-        expect(Net::FTP).to have_received(:new)
-      end
-    end
-
-    context 'cached' do
-      before :each do
-        Metar::Raw::Noaa.send(:class_variable_set, '@@connection', ftp)
-      end
-
-      it 'does not connect to FTP' do
-        Metar::Raw::Noaa.connection
-
-        expect(Net::FTP).to_not have_received(:new)
-      end
-
-      it 'returns the cached connection' do
-        connection = Metar::Raw::Noaa.connection
-
-        expect(connection).to eq(ftp)
-      end
-    end
-  end
-
-  context '.connect' do
-    it 'sets up the connection' do
-      Metar::Raw::Noaa.connect
-
-      expect(Net::FTP).to have_received(:new)
-      expect(ftp).to have_received(:login).with(no_args)
-      expect(ftp).to have_received(:chdir).with('data/observations/metar/stations')
-      expect(ftp).to have_received(:passive=).with(true)
-    end
-  end
-
   context '.fetch' do
     before do
-      allow(ftp).to receive(:retrbinary).and_yield("chunk 1\n").and_yield("chunk 2\n")
-      allow(ftp).to receive(:close)
-    end
-
-    it 'uses the connection' do
-      Metar::Raw::Noaa.fetch('the_cccc')
-
-      expect(Net::FTP).to have_received(:new)
-      expect(ftp).to have_received(:close)
+      allow(ftp).
+        to receive(:retrbinary).and_yield("chunk 1\n").and_yield("chunk 2\n")
     end
 
     it 'downloads the raw report' do
       Metar::Raw::Noaa.fetch('the_cccc')
 
-      expect(ftp).to have_received(:retrbinary).with('RETR the_cccc.TXT', kind_of(Fixnum))
-      expect(ftp).to have_received(:close)
+      expect(ftp).
+        to have_received(:retrbinary).
+        with('RETR the_cccc.TXT', kind_of(Integer))
     end
 
     it 'returns the data' do
       raw = Metar::Raw::Noaa.fetch('the_cccc')
 
       expect(raw).to eq("chunk 1\nchunk 2\n")
+    end
+
+    it 'closes the connection' do
+      Metar::Raw::Noaa.fetch('the_cccc')
+
       expect(ftp).to have_received(:close)
     end
 
@@ -190,6 +159,7 @@ describe Metar::Raw::Noaa do
         allow(ftp).to receive(:retrbinary) do |_args, &block|
           @attempt += 1
           raise Net::FTPTempError if @attempt == 1
+
           block.call "chunk 1\n"
           block.call "chunk 2\n"
         end
@@ -244,7 +214,9 @@ describe Metar::Raw::Noaa do
     context "times" do
       let(:cccc)      { "OPPS" }
       let(:raw_time)  { "2016/03/31 23:59" }
-      let(:raw_metar) { "OPPS 312359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011" }
+      let(:raw_metar) do
+        "OPPS 312359Z 23006KT 4000 HZ SCT040 SCT100 17/12 Q1011"
+      end
 
       specify "are parsed as UTC/GMT" do
         expect(subject.time.zone).to eq("UTC").or eq("GMT")

data/spec/report_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Metar::Report do
@@ -7,9 +8,9 @@ describe Metar::Report do
       double(
         Metar::Parser,
         station_code: station_code,
-        date:         Date.parse(metar_date),
-        time:         Time.parse(metar_datetime),
-        observer:     :real
+        date: Date.parse(metar_date),
+        time: Time.parse(metar_datetime),
+        observer: :real
       )
     end
     let(:station_code) { "SSSS" }
@@ -22,7 +23,8 @@ describe Metar::Report do
     end
 
     before do
-      allow(Metar::Station).to receive(:find_by_cccc).with(station_code) { station }
+      allow(Metar::Station).
+        to receive(:find_by_cccc).with(station_code) { station }
     end
 
     subject { described_class.new(parser) }
@@ -75,15 +77,15 @@ describe Metar::Report do
 
     context 'proxied from parser' do
       context 'singly' do
-        [
-          :wind,
-          :variable_wind,
-          :visibility,
-          :minimum_visibility,
-          :vertical_visibility,
-          :temperature,
-          :dew_point,
-        ].each do |attribute|
+        %i(
+          wind
+          variable_wind
+          visibility
+          minimum_visibility
+          vertical_visibility
+          temperature
+          dew_point
+        ).each do |attribute|
           example attribute do
             allow(parser).to receive(attribute) { attribute.to_s }
 
@@ -173,17 +175,17 @@ describe Metar::Report do
       end
 
       it "returns the full report" do
-        expected = <<EOT
-name: Airport 1
-country: Wwwwww
-time: #{metar_time}
-wind: wind
-visibility: visibility
-minimum visibility: min visibility
-weather: pw
-sky: sky2
-temperature: temp
-EOT
+        expected = <<-EXPECTED.gsub(/^\s{10}/, "")
+          name: Airport 1
+          country: Wwwwww
+          time: #{metar_time}
+          wind: wind
+          visibility: visibility
+          minimum visibility: min visibility
+          weather: pw
+          sky: sky2
+          temperature: temp
+        EXPECTED
         expect(subject.to_s).to eq(expected)
       end
     end

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'rspec'
 
 if RUBY_VERSION > '1.9'
   require 'simplecov'
-  if ENV[ 'COVERAGE' ]
+  if ENV['COVERAGE']
     SimpleCov.start do
       add_filter "/spec/"
     end
@@ -13,15 +15,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../lib/metar')
 
 RSpec::Matchers.define :be_temperature_extreme do |extreme, value|
   match do |remark|
-    if    not remark.is_a?(Metar::Data::TemperatureExtreme)
+    if !remark.is_a?(Metar::Data::TemperatureExtreme)
       false
     elsif remark.extreme != extreme
       false
-    elsif remark.value   != value
-      false
     else
-      true
+      remark.value == value
     end
   end
 end
-

data/spec/station_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require "spec_helper"
 
 require "stringio"
@@ -7,19 +8,48 @@ RSpec::Matchers.define :have_attribute do |attribute|
   match do |object|
     if !object.respond_to?(attribute)
       false
-    elsif object.method(attribute).arity != 0
-      false
     else
-      true
+      object.method(attribute).arity == 0
     end
   end
 end
 
 describe Metar::Station do
   context "using structures" do
+    let(:response) { double(body: nsd_file) }
+
+    ##
+    # NOAA Station list fields:
+    #
+    # 0    1  2   3          45     6 7      8       9      10      11  12  13
+    # PPPP;00;000;Airport P1;;Ppppp;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
+    #
+    # 0 - CCCC
+    # 1 - ?
+    # 2 - ?
+    # 3 - name of station
+    # 4 - state
+    # 5 - country
+    # 6 - ?
+    # 7 - latitude1
+    # 8 - longitude1
+    # 9 - latitude2
+    # 10 - longitude2
+    # 11 - ?
+    # 12 - ?
+    # 13 - ?
+    #
+    let(:nsd_file) do
+      <<-TEXT.gsub(/^\s{8}/, "")
+        PPPP;00;000;Airport P1;;Ppppp;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
+        AAAA;00;000;Airport A1;;Aaaaa;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
+        AAAB;00;000;Airport A2;;Aaaaa;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
+        BBBA;00;000;Airport B1;;Bbbbb;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
+      TEXT
+    end
+
     before do
-      allow(Metar::Station).to receive(:open)
-        .with(Metar::Station::NOAA_STATION_LIST_URL) { nsd_file }
+      allow(Net::HTTP).to receive(:get_response) { response }
     end
 
     context ".countries" do
@@ -67,37 +97,6 @@ describe Metar::Station do
         expect(aaaaa.map(&:cccc)).to eq(%w(AAAA AAAB))
       end
     end
-
-    ##
-    # NOAA Station list fields:
-    #
-    # 0    1  2   3          45     6 7      8       9      10      11  12  13
-    # PPPP;00;000;Airport P1;;Ppppp;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
-    #
-    # 0 - CCCC
-    # 1 - ?
-    # 2 - ?
-    # 3 - name of station
-    # 4 - state
-    # 5 - country
-    # 6 - ?
-    # 7 - latitude1
-    # 8 - longitude1
-    # 9 - latitude2
-    # 10 - longitude2
-    # 11 - ?
-    # 12 - ?
-    # 13 - ?
-    #
-    def nsd_file
-      nsd_text = <<-EOT.gsub(/^\s{8}/, "")
-        PPPP;00;000;Airport P1;;Ppppp;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
-        AAAA;00;000;Airport A1;;Aaaaa;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
-        AAAB;00;000;Airport A2;;Aaaaa;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
-        BBBA;00;000;Airport B1;;Bbbbb;1;11-03S;055-24E;11-03S;055-24E;000;000;P\r
-      EOT
-      StringIO.new(nsd_text)
-    end
   end
 
   context ".to_longitude" do
@@ -105,6 +104,12 @@ describe Metar::Station do
       expect(Metar::Station.to_longitude("055-24E")).to eq(55.4)
     end
 
+    context "with Western values" do
+      it "returns negative results" do
+        expect(Metar::Station.to_longitude("055-24W")).to eq(-55.4)
+      end
+    end
+
     it "returns nil for badly formed strings" do
       expect(Metar::Station.to_longitude("aaa")).to be_nil
     end
@@ -112,7 +117,13 @@ describe Metar::Station do
 
   context ".to_latitude" do
     it "converts strings to latitude" do
-      expect(Metar::Station.to_latitude("11-03S")).to eq(-11.05)
+      expect(Metar::Station.to_latitude("11-03N")).to eq(11.05)
+    end
+
+    context "with Southern values" do
+      it "returns negative results" do
+        expect(Metar::Station.to_latitude("11-03S")).to eq(-11.05)
+      end
     end
 
     it "returns nil for badly formed strings" do
@@ -124,22 +135,35 @@ describe Metar::Station do
   let(:name) { "Station name" }
   let(:state) { "State" }
   let(:country) { "Country" }
+  let(:longitude) { "055-24E" }
+  let(:latitude) { "11-03N" }
   let(:noaa_raw) do
-    cccc +
-      ";00;000;" +
-      name + ";" +
-      state + ";" +
-      country + ";1;11-03S;055-24E;11-03S;055-24E;000;000;P"
+    [
+      cccc,
+      "00",
+      "000",
+      name,
+      state,
+      country,
+      "1",
+      latitude,
+      longitude,
+      latitude,
+      longitude,
+      "000",
+      "000",
+      "P"
+    ].join(";")
   end
   let(:noaa_data) do
     {
-      cccc:      cccc,
-      name:      name,
-      state:     state,
-      country:   country,
-      longitude: "055-24E",
-      latitude:  "11-03S",
-      raw:       noaa_raw,
+      cccc: cccc,
+      name: name,
+      state: state,
+      country: country,
+      longitude: longitude,
+      latitude: latitude,
+      raw: noaa_raw
     }
   end
 
@@ -176,8 +200,24 @@ describe Metar::Station do
       specify { expect(subject.state).to eq(state) }
       specify { expect(subject.country).to eq(country) }
       specify { expect(subject.longitude).to eq(55.4) }
-      specify { expect(subject.latitude).to eq(-11.05) }
+      specify { expect(subject.latitude).to eq(11.05) }
       specify { expect(subject.raw).to eq(noaa_raw) }
+
+      context "when longitude is Western" do
+        let(:longitude) { "055-24W" }
+
+        it "is parsed as negative" do
+          expect(subject.longitude).to eq(-55.4)
+        end
+      end
+
+      context "When latitude is Southern" do
+        let(:latitude) { "11-03S" }
+
+        it "is parsed as negative" do
+          expect(subject.latitude).to eq(-11.05)
+        end
+      end
     end
   end
 
@@ -185,7 +225,7 @@ describe Metar::Station do
     let(:metar) do
       "PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910"
     end
-    let(:time) { Date.new(2010, 02, 06) }
+    let(:time) { Date.new(2010, 2, 6) }
     let(:raw) { double(Metar::Raw, metar: metar, time: time) }
 
     before do

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: m9t
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: net-ftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -229,35 +243,35 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A Ruby gem for worldwide weather reports
 test_files:
-- spec/parser_spec.rb
-- spec/station_spec.rb
-- spec/i18n_spec.rb
-- spec/raw_spec.rb
 - spec/report_spec.rb
+- spec/raw_spec.rb
+- spec/data/wind_spec.rb
 - spec/data/pressure_spec.rb
-- spec/data/density_altitude_spec.rb
-- spec/data/remark_spec.rb
 - spec/data/weather_phenomenon_spec.rb
+- spec/data/vertical_visibility_spec.rb
+- spec/data/temperature_spec.rb
 - spec/data/sky_condition_spec.rb
 - spec/data/visibility_remark_spec.rb
 - spec/data/runway_visible_range_spec.rb
-- spec/data/variable_wind_spec.rb
-- spec/data/wind_spec.rb
-- spec/data/lightning_spec.rb
-- spec/data/vertical_visibility_spec.rb
-- spec/data/visibility_spec.rb
-- spec/data/temperature_spec.rb
 - spec/data/speed_spec.rb
+- spec/data/visibility_spec.rb
+- spec/data/remark_spec.rb
+- spec/data/density_altitude_spec.rb
 - spec/data/distance_spec.rb
+- spec/data/variable_wind_spec.rb
+- spec/data/lightning_spec.rb
+- spec/parser_spec.rb
+- spec/station_spec.rb
+- spec/i18n_spec.rb