metar-parser 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2c3aa5a4cae4d28cfa2ac65827416eae8ea706
-  data.tar.gz: 2edc10a772b9142531f3e3a942b5c913d043c98b
+  metadata.gz: b47782dda9aa78314cf6244e1d395acff88cd025
+  data.tar.gz: 097ed5364bdf7ded700dd77b5722a863655ae2b9
 SHA512:
-  metadata.gz: aa27381ba8e8bca2a90df135f4d1d3d9558d8c063f119e575a51e76577b4bb97164412204d0cffd49d4557e6ea99654ddd44b48c3781dfd4826bb3a4e18c93dd
-  data.tar.gz: 18eb8ba4319e3864b129dce58fffc9231623e63da8f8c737445c53693e5eaef669c9d4da3c87377d2b3dffcdaac00787a848c51fcd679cecd31d47396a2e08e5
+  metadata.gz: ebf5217c8b8edbe61045f48f7293ed479864208021c16792b0d436292ac4513c74688fa0d09e05a23140cafb3b0dc93b97a6165b661b4e5f5d77e6ab42b4e4f5
+  data.tar.gz: 84a588b82027c09eab3856a0dacafad06b2638a8ab34e1f75c5047f81af5018b7964e6a0319d8849a9918322060ea71bb4058f7affe7fb1f81d7892ce5ec016b

data/Rakefile

@@ -3,8 +3,8 @@ require "bundler/gem_tasks"
 require 'rcov/rcovtask' if RUBY_VERSION < '1.9'
 require 'rspec/core/rake_task'
 
-task :default => :spec
+task default: :spec
 
-RSpec::Core::RakeTask.new do | t |
+RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end

data/lib/metar/data.rb

@@ -23,9 +23,9 @@ module Metar
     # Handles nil case differently to M9t::Distance
     def to_s(options = {})
       options = {
-        :units       => @units,
-        :precision   => 0,
-        :abbreviated => true
+        units:       @units,
+        precision:   0,
+        abbreviated: true,
       }.merge(options)
       return I18n.t('metar.distance.unknown') if @value.nil?
       super(options)
@@ -66,7 +66,7 @@ module Metar
     end
 
     def to_s(options = {})
-      options = {:abbreviated => true, :precision => 0}.merge(options)
+      options = {abbreviated: true, precision: 0}.merge(options)
       super(options)
     end
   end
@@ -124,8 +124,8 @@ module Metar
 
     def to_s(options = {})
       options = {
-        :direction_units => :compass,
-        :speed_units     => :kilometers_per_hour
+        direction_units: :compass,
+        speed_units:     :kilometers_per_hour,
       }.merge(options)
       speed =
         case @speed
@@ -133,9 +133,9 @@ module Metar
           I18n.t('metar.wind.unknown_speed')
         else
           @speed.to_s(
-            :abbreviated => true,
-            :precision   => 0,
-            :units       => options[:speed_units]
+            abbreviated: true,
+            precision:   0,
+            units:       options[:speed_units]
           )
         end
       direction =
@@ -145,14 +145,14 @@ module Metar
         when :unknown_direction
           I18n.t('metar.wind.unknown_direction')
         else
-          @direction.to_s(:units => options[:direction_units])
+          @direction.to_s(units: options[:direction_units])
         end
       s = "#{speed} #{direction}"
       if not @gusts.nil?
         g = @gusts.to_s(
-          :abbreviated => true,
-          :precision   => 0,
-          :units       => options[:speed_units]
+          abbreviated: true,
+          precision:   0,
+          units:       options[:speed_units]
         )
         s += " #{I18n.t('metar.wind.gusts')} #{g}"
       end
@@ -176,7 +176,7 @@ module Metar
     end
 
     def to_s
-      "#{@direction1.to_s(:units => :compass)} - #{@direction2.to_s(:units => :compass)}"
+      "#{@direction1.to_s(units: :compass)} - #{@direction2.to_s(units: :compass)}"
     end
   end
 
@@ -219,29 +219,29 @@ module Metar
 
     def to_s(options = {})
       distance_options = {
-        :abbreviated => true,
-        :precision   => 0,
-        :units       => :kilometers
+        abbreviated: true,
+        precision:   0,
+        units:       :kilometers,
       }.merge(options)
-      direction_options = {:units => :compass}
+      direction_options = {units: :compass}
       case
       when (@direction.nil? and @comparator.nil?)
         @distance.to_s(distance_options)
       when @comparator.nil?
         [
           @distance.to_s(distance_options),
-          @direction.to_s(direction_options)
+          @direction.to_s(direction_options),
         ].join(' ')
       when @direction.nil?
         [
           I18n.t('comparison.' + @comparator.to_s),
-          @distance.to_s(distance_options)
+          @distance.to_s(distance_options),
         ].join(' ')
       else
         [
           I18n.t('comparison.' + @comparator.to_s),
           @distance.to_s(distance_options),
-          @direction.to_s(direction_options)
+          @direction.to_s(direction_options),
         ].join(' ')
       end
     end
@@ -288,9 +288,9 @@ module Metar
 
     def to_s
       distance_options = {
-        :abbreviated => true,
-        :precision   => 0,
-        :units       => @units
+        abbreviated: true,
+        precision:   0,
+        units:       @units,
       }
       s =
         if @visibility2.nil?
@@ -395,7 +395,7 @@ module Metar
       'CB'  => 'cumulonimbus',
       'TCU' => 'towering cumulus',
       '///' => nil, # cloud type unknown as observed by automatic system (15.9.1.7)
-      ''    => nil
+      ''    => nil,
     }
     CLEAR_SKIES = [
       'NSC', # WMO
@@ -492,7 +492,7 @@ module Metar
       when /^4([01])(\d{3})([01])(\d{3})$/
         [
           TemperatureExtreme.new(:maximum, sign($1) * tenths($2)),
-          TemperatureExtreme.new(:minimum, sign($3) * tenths($4))
+          TemperatureExtreme.new(:minimum, sign($3) * tenths($4)),
         ]
       when /^5([0-8])(\d{3})$/
         character = PRESSURE_CHANGE_CHARACTER[$1.to_i]
@@ -615,17 +615,17 @@ module Metar
 
   class VisibilityRemark < Visibility
     def self.parse(chunk)
-      chunk =~ /^(\d{4})([NESW]?)$/
-      distance = Distance.new($1)
+      metres, direction = chunk.scan(/^(\d{4})([NESW]?)$/)[0]
+      distance = Distance.new(metres)
 
-      new(distance, $2, :more_than)
+      new(distance, direction, :more_than)
     end
   end
 
   class DensityAltitude
     def self.parse(chunk)
-      chunk =~ /^(\d+)(FT)$/
-      height = Distance.feet($1)
+      feet = chunk[/^(\d+)(FT)/, 1]
+      height = Distance.feet(feet)
 
       new(height)
     end
@@ -637,4 +637,3 @@ module Metar
     end
   end
 end
-

data/lib/metar/parser.rb

@@ -1,9 +1,11 @@
 require File.join(File.dirname(__FILE__), 'data')
 
-module Metar
+# References:
+# WMO = World Meteorological Organization Manual on Codes Volume I.1
+#   Section FM 15
 
+module Metar
   class Parser
-
     def self.for_cccc(cccc)
       raw = Metar::Raw::Noaa.new(cccc)
       new(raw)
@@ -103,7 +105,7 @@ module Metar
         @day, @hour, @minute = $1.to_i, $2.to_i, $3.to_i
         found = true
       else
-        if not strict?  
+        if not strict?
           if @chunks[0] =~ /^(\d{1,2})(\d{2})Z$/
             # The day is missing, use today's date
             @day           = Time.now.day
@@ -267,7 +269,7 @@ module Metar
         @sea_level_pressure = sea_level_pressure
       end
     end
- 
+
     def seek_recent_weather
       loop do
         return if @chunks.size == 0
@@ -292,6 +294,7 @@ module Metar
       end
     end
 
+    # WMO: 15.15
     def seek_remarks
       return if @chunks.size == 0
       raise 'seek_remarks calls without remark' if @chunks[0] != 'RMK'
@@ -308,16 +311,16 @@ module Metar
             @remarks << r
           end
           @chunks.shift
-          next 
+          next
         end
         if @chunks[0] == 'VIS' and @chunks.size >= 3 and @chunks[1] == 'MIN'
-          @chunks.shift(3)
-          r = Metar::VisibilityRemark.parse(@chunks[2])
+          @chunks.shift(2)
+          r = Metar::VisibilityRemark.parse(@chunks[0])
           @remarks << r
         end
         if @chunks[0] == 'DENSITY' and @chunks.size >= 3 and @chunks[1] == 'ALT'
-          @chunks.shift(3)
-          r = Metar::DensityAltitude.parse(@chunks[2])
+          @chunks.shift(2)
+          r = Metar::DensityAltitude.parse(@chunks[0])
           @remarks << r
         end
         case
@@ -333,7 +336,5 @@ module Metar
     def strict?
       self.class.compliance == :strict
     end
-
   end
-
 end

data/lib/metar/raw.rb

@@ -98,7 +98,7 @@ module Metar
           while attempts < 2
             begin
               s = ''
-              connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do |chunk|
+              connection.retrbinary("RETR #{ cccc }.TXT", 1024) do |chunk|
                 s << chunk
               end
               return s

data/lib/metar/report.rb

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
 module Metar
-
   class Report
-
     ATTRIBUTES = [
       :station_name,
       :station_country,
@@ -13,7 +11,7 @@ module Metar
       :minimum_visibility,
       :present_weather,
       :sky_summary,
-      :temperature
+      :temperature,
     ]
 
     attr_reader :parser, :station
@@ -68,7 +66,7 @@ module Metar
     end
 
     def present_weather
-      @parser.present_weather.join( ', ' )
+      @parser.present_weather.join(', ')
     end
 
     def sky_summary
@@ -109,13 +107,11 @@ module Metar
     private
 
     def attributes
-      a = Metar::Report::ATTRIBUTES.map do | key |
+      a = Metar::Report::ATTRIBUTES.map do |key|
         value = self.send(key).to_s
         {:attribute => key, :value => value} if not value.empty?
       end
       a.compact
     end
-
   end
-
 end

data/lib/metar/station.rb

@@ -6,16 +6,14 @@ require 'set'
 # 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://weather.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
@@ -35,8 +33,8 @@ module Metar
         not find_data_by_cccc(cccc).nil?
       end
 
-      def find_all_by_country( country )
-        all.select { | s | s.country == country }
+      def find_all_by_country(country)
+        all.select { |s| s.country == country }
       end
 
       def to_longitude(s)
@@ -54,7 +52,7 @@ module Metar
     alias :code :cccc
 
     # No check is made on the existence of the station
-    def initialize( cccc, noaa_data )
+    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
@@ -62,18 +60,17 @@ module Metar
     end
 
     def parser
-      raw = Metar::Raw::Noaa.new( @cccc )
-      Metar::Parser.new( raw )
+      raw = Metar::Raw::Noaa.new(@cccc)
+      Metar::Parser.new(raw)
     end
 
     def report
-      Metar::Report.new( parser )
+      Metar::Report.new(parser)
     end
 
     private
 
     class << self
-
       @structures = nil
 
       def download_stations
@@ -89,13 +86,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],
-            :longitude => fields[8],
-            :raw       => station.clone
+            cccc:      fields[0],
+            name:      fields[3],
+            state:     fields[4],
+            country:   fields[5],
+            latitude:  fields[7],
+            longitude: fields[8],
+            raw:       station.clone,
           }
         end
 
@@ -108,7 +105,7 @@ module Metar
 
     end
 
-    def load!( noaa_data )
+    def load!(noaa_data)
       @name      = noaa_data[:name]
       @state     = noaa_data[:state]
       @country   = noaa_data[:country]
@@ -116,8 +113,5 @@ module Metar
       @latitude  = Station.to_latitude(noaa_data[:latitude])
       @raw       = noaa_data[:raw]
     end
-
   end
-
 end
-

data/lib/metar/version.rb

@@ -2,9 +2,8 @@ module Metar
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end
-

data/spec/data_spec.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+require "spec_helper"
+
+RSpec.describe Metar::VisibilityRemark do
+  describe ".parse" do
+    subject { described_class.parse("2000W") }
+
+    it "interprets distance in metres" do
+      expect(subject.distance.value).to eq(2000)
+    end
+
+    it "interprets compass direction" do
+      expect(subject.direction).to eq("W")
+    end
+  end
+end
+
+RSpec.describe Metar::DensityAltitude do
+  describe ".parse" do
+    subject { described_class.parse("50FT") }
+
+    it "interprets the value as feet" do
+      expect(subject.height.to_feet).to eq(50)
+    end
+  end
+end

data/spec/{unit/distance_spec.rb → distance_spec.rb}

@@ -2,20 +2,20 @@
 require "spec_helper"
 
 describe Metar::Distance do
-  let(:value) { 12345.6789 }
+  let(:value) { 12_345.6789 }
 
   subject { described_class.new(value) }
 
   context '#value' do
     it 'treats the parameter as meters' do
       expect(subject.units).to eq(:meters)
-      expect(subject.value).to eq(12345.6789)
+      expect(subject.value).to eq(12_345.6789)
     end
   end
 
   context '#to_s' do
     it 'should default to meters' do
-      expect(subject.to_s).to match(%r(^\d+m))
+      expect(subject.to_s).to match(/^\d+m/)
     end
 
     context 'when <= 0.5' do

data/spec/{unit/i18n_spec.rb → i18n_spec.rb}

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe I18n do
   it 'adds our locales to the load path' do
-    project_root = File.expand_path('../..', File.dirname(__FILE__))
+    project_root = File.expand_path('..', File.dirname(__FILE__))
     english_path = File.join(project_root, 'locales', 'en.yml')
     italian_path = File.join(project_root, 'locales', 'it.yml')
     german_path  = File.join(project_root, 'locales', 'de.yml')

data/spec/{unit/parser_spec.rb → parser_spec.rb}

@@ -35,7 +35,7 @@ describe Metar::Parser do
 
     it '.location missing' do
       expect do
-        setup_parser("FUBAR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
+        setup_parser("FUBAR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
       end.to raise_error(Metar::ParseError, /Expecting location/)
     end
 
@@ -48,7 +48,7 @@ describe Metar::Parser do
 
       it 'throws an error is missing' do
         expect do
-          setup_parser("PAIL 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
+          setup_parser("PAIL 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
         end.to raise_error(Metar::ParseError, /Expecting datetime/)
       end
 
@@ -168,7 +168,7 @@ describe Metar::Parser do
         parser = setup_parser('VABB 282210Z 22005KT 4000 HZ SCT018 FEW025TCU BKN100 28/25 Q1003 NOSIG')
 
         expect(parser.visibility.distance.value).to be_within(0.01).of(4000)
-       end
+      end
 
       it '//// with automatic observer' do
         parser = setup_parser("CYXS 151034Z AUTO 09003KT //// FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
@@ -286,11 +286,25 @@ describe Metar::Parser do
         expect(parser.remarks.size).to eq(0)
       end
 
-      it 'parses known remarks' do
-        parser = setup_parser('CYZT 052200Z 31010KT 20SM SKC 17/12 A3005 RMK SLP174 20046')
+      context 'known remarks' do
+        it 'parses sea level pressure' do
+          parser = setup_parser('CYZT 052200Z 31010KT 20SM SKC 17/12 A3005 RMK SLP174 20046')
+
+          expect(parser.remarks[0]).to be_a(Metar::SeaLevelPressure)
+        end
 
-        expect(parser.remarks[0]).to be_a(Metar::SeaLevelPressure)
-        expect(parser.remarks[1]).to be_temperature_extreme(:minimum, 4.6)
+        it 'parses extreme temperature' do
+          parser = setup_parser('CYZT 052200Z 31010KT 20SM SKC 17/12 A3005 RMK SLP174 20046')
+
+          expect(parser.remarks[1]).to be_temperature_extreme(:minimum, 4.6)
+        end
+
+        it 'parses density altitude' do
+          parser = setup_parser('CYBW 010000Z AUTO VRB04KT 9SM SCT070 13/M01 A3028 RMK DENSITY ALT 4100FT=')
+
+          expect(parser.remarks[0]).to be_a(Metar::DensityAltitude)
+          expect(parser.remarks[0].height.value).to be_within(0.001).of(1249.68)
+        end
       end
 
       context 'in strict mode' do
@@ -314,7 +328,7 @@ describe Metar::Parser do
         end
       end
     end
-  
+
     def setup_parser(metar)
       raw = Metar::Raw::Data.new(metar, Time.now)
       Metar::Parser.new(raw)

data/spec/pressure_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Metar::Pressure do
+  context '.parse' do
+    it 'interprets the Q prefix as hectopascals' do
+      expect(Metar::Pressure.parse('Q1300').value).to be_within(0.01).of(1.3)
+    end
+
+    it 'interprets the A prefix as inches of mercury' do
+      expect(Metar::Pressure.parse('A1234').value).to be_within(0.01).of(0.42)
+    end
+
+    it 'require 4 digits' do
+      expect(Metar::Pressure.parse('Q12345')).to be_nil
+      expect(Metar::Pressure.parse('A123')).to be_nil
+    end
+
+    it 'returns nil for nil' do
+      expect(Metar::Pressure.parse(nil)).to be_nil
+    end
+  end
+end