metar-parser 1.0.0 → 1.1.0

data/README.md

@@ -63,15 +63,10 @@ Use Your Own Raw Data
 ---------------------
 ```ruby
 metar_string = "KHWD 280554Z AUTO 29007KT 10SM OVC008 14/12 A3002 RMK AO2 SLP176 T01390117 10211\n"
-raw    = Metar::Raw.new( metar_string )
+raw    = Metar::Raw::Data.new( metar_string )
 parser = Metar::Parser.new( raw )
 ```
 
-Implementation
-==============
-
-* Parses METAR strings using a state machine.
-
 Changelog
 =========
 
@@ -84,6 +79,12 @@ The old functionality has been moved to Metar::Raw::Noaa. The new class,
 Metar::Raw::Data accepts a METAR string as a parameter - allowing the user to
 parse METAR strings without necessarily contacting the NOAA.
 
+Contributors
+============
+
+* [Joe Yates](https://github.com/joeyates)
+* [Derek Johnson](https://github.com/EpicDraws)
+
 Alternative Software
 ====================
 

data/lib/metar/data.rb

@@ -193,7 +193,7 @@ module Metar
         new( Distance.new( 10000 ), nil, :more_than )
       when s =~ /(\d{4})NDV/ # WMO
         new( Distance.new( $1.to_f ) ) # Assuming meters
-      when (s =~ /^((1|2)\s|)([13])\/([248])SM$/) # US
+      when (s =~ /^((1|2)\s|)([1357])\/([248]|16)SM$/) # US
         miles          = $1.to_f + $3.to_f / $4.to_f
         distance       = Distance.miles( miles )
         distance.units = :miles
@@ -208,10 +208,10 @@ module Metar
         new( distance, nil, :less_than )
       when s =~ /^(\d+)KM$/
         new( Distance.kilometers( $1 ) )
-      when s =~ /^(\d+)$/ # Units?
-        new( Distance.kilometers( $1 ) )
+      when s =~ /^(\d+)$/ # We assume meters
+        new( Distance.new( $1 ) )
       when s =~ /^(\d+)(N|NE|E|SE|S|SW|W|NW)$/
-        new( Distance.kilometers( $1 ), M9t::Direction.compass( $2 ) )
+        new( Distance.meters( $1 ), M9t::Direction.compass( $2 ) )
       else
         nil
       end
@@ -263,7 +263,7 @@ module Metar
         distance   = Distance.send( units, count )
         visibility = Visibility.new(distance, nil, comparator)
         new(designator, visibility, nil, tendency)
-      when runway_visible_range =~ /^R(\d+[RLC]?)\/(P|M|)(\d{4})V(P|M|)(\d{4})(N|U|D)?(FT)?$/
+      when runway_visible_range =~ /^R(\d+[RLC]?)\/(P|M|)(\d{4})V(P|M|)(\d{4})(N|U|D)?(FT|)$/
         designator  = $1
         comparator1 = COMPARATOR[$2]
         count1      = $3.to_f
@@ -316,9 +316,11 @@ module Metar
   class WeatherPhenomenon
 
     Modifiers = {
-      '+' => 'heavy',
-      '-'  => 'light',
-      'VC' => 'nearby'
+      '+'   => 'heavy',
+      '-'   => 'light',
+      'VC'  => 'nearby',
+      '-VC' => 'nearby light',
+      '+VC' => 'nearby heavy',
     }
 
     Descriptors = {
@@ -350,7 +352,6 @@ module Metar
       'SH'   => 'shower',
       'SN'   => 'snow',
       'SG'   => 'snow grains',
-      'SNRA' => 'snow and rain',
       'SQ'   => 'squall',
       'UP'   => 'unknown phenomenon', # => AUTO
       'VA'   => 'volcanic ash',
@@ -358,28 +359,24 @@ module Metar
       'SS'   => 'sand storm',
       'DS'   => 'dust storm',
       'TS'   => 'thunderstorm',
-      'TSGR' => 'thunderstorm and hail',
-      'TSGS' => 'thunderstorm and small hail',
-      'TSRA' => 'thunderstorm and rain',
-      'TSRA' => 'thunderstorm and snow',
-      'TSRA' => 'thunderstorm and unknown phenomenon', # => AUTO
     }
 
     # Accepts all standard (and some non-standard) present weather codes
     def WeatherPhenomenon.parse(s)
-      codes = Phenomena.keys.join('|')
+      phenomena   = Phenomena.keys.join('|')
       descriptors = Descriptors.keys.join('|')
-      modifiers = Modifiers.keys.join('|')
+      modifiers   = Modifiers.keys.join('|')
       modifiers.gsub!(/([\+\-])/) { "\\#$1" }
-      rxp = Regexp.new("^(#{ modifiers })?(#{ descriptors })?(#{ codes })$")
-      if rxp.match(s)
-        modifier_code = $1
-        descriptor_code = $2
-        phenomenon_code = $3
-        Metar::WeatherPhenomenon.new(Phenomena[phenomenon_code], Modifiers[modifier_code], Descriptors[descriptor_code])
-      else
-        nil
-      end
+      rxp = Regexp.new("^(#{ modifiers })?(#{ descriptors })?((?:#{ phenomena }){1,2})$")
+      m   = rxp.match(s)
+      return nil if m.nil?
+
+      modifier_code    = m[1]
+      descriptor_code  = m[2]
+      phenomena_codes  = m[3].scan(/../)
+      phenomena_phrase = phenomena_codes.map{ |c| Phenomena[c] }.join(' and ')
+
+      Metar::WeatherPhenomenon.new(phenomena_phrase, Modifiers[modifier_code], Descriptors[descriptor_code])
     end
 
     attr_reader :phenomenon, :modifier, :descriptor
@@ -399,7 +396,7 @@ module Metar
     CONDITION = {
       'CB'  => 'cumulonimbus',
       'TCU' => 'towering cumulus',
-      '///' => nil,
+      '///' => nil, # cloud type unknown as observed by automatic system (15.9.1.7)
       ''    => nil
     }
     CLEAR_SKIES = [
@@ -413,11 +410,19 @@ module Metar
       case
       when CLEAR_SKIES.include?( sky_condition )
         new
-      when sky_condition =~ /^(BKN|FEW|OVC|SCT)(\d+)(CB|TCU|\/{3}|)?$/
+      when sky_condition =~ /^(BKN|FEW|OVC|SCT)(\d+|\/{3})(CB|TCU|\/{3}|)?$/
         quantity = QUANTITY[ $1 ]
-        height   = Distance.new( $2.to_i * 30.48 )
-        type     = CONDITION[ $3 ]
+        height   =
+          if $2 == '///'
+            nil
+          else
+            Distance.new( $2.to_i * 30.48 )
+          end
+        type = CONDITION[ $3 ]
         new(quantity, height, type)
+      when sky_condition =~ /^(CB|TCU)$/
+        type = CONDITION[ $1 ]
+        new(nil, nil, type)
       else
         nil
       end

data/lib/metar/parser.rb

@@ -1,87 +1,8 @@
-require 'aasm'
 require File.join(File.dirname(__FILE__), 'data')
 
 module Metar
 
   class Parser
-    include AASM
-
-    aasm_initial_state :start
-
-    aasm_state :start,                                       :after_enter => :seek_location
-    aasm_state :location,                                    :after_enter => :seek_datetime
-    aasm_state :datetime,                                    :after_enter => [:seek_cor_auto, :seek_wind]
-    aasm_state :wind,                                        :after_enter => :seek_variable_wind
-    aasm_state :variable_wind,                               :after_enter => :seek_visibility
-    aasm_state :visibility,                                  :after_enter => :seek_runway_visible_range
-    aasm_state :runway_visible_range,                        :after_enter => :seek_present_weather
-    aasm_state :present_weather,                             :after_enter => :seek_sky_conditions
-    aasm_state :sky_conditions,                              :after_enter => :seek_vertical_visibility
-    aasm_state :vertical_visibility,                         :after_enter => :seek_temperature_dew_point
-    aasm_state :temperature_dew_point,                       :after_enter => :seek_sea_level_pressure
-    aasm_state :sea_level_pressure,                          :after_enter => :seek_remarks
-    aasm_state :remarks,                                     :after_enter => :seek_end
-    aasm_state :end
-
-    aasm_event :location do
-      transitions :from => :start,              :to => :location
-    end
-
-    aasm_event :datetime do
-      transitions :from => :location,           :to => :datetime
-    end
-
-    aasm_event :wind do
-      transitions :from => :datetime,           :to => :wind
-    end
-
-    aasm_event :cavok do
-      transitions :from => :variable_wind,      :to => :sky_conditions
-    end
-
-    aasm_event :variable_wind do
-      transitions :from => :wind,               :to => :variable_wind
-    end
-
-    aasm_event :visibility do
-      transitions :from => [:wind, :variable_wind],  :to => :visibility
-    end
-
-    aasm_event :runway_visible_range do
-      transitions :from => [:visibility],         :to => :runway_visible_range
-    end
-
-    aasm_event :present_weather do
-      transitions :from => [:runway_visible_range],
-                                              :to => :present_weather
-    end
-
-    aasm_event :sky_conditions do
-      transitions :from => [:present_weather, :visibility, :sky_conditions],
-                                                :to => :sky_conditions
-    end
-
-    aasm_event :vertical_visibility do
-      transitions :from => [:present_weather, :visibility, :sky_conditions],
-                                                :to => :vertical_visibility
-    end
-
-    aasm_event :temperature_dew_point do
-      transitions :from => [:wind, :sky_conditions, :vertical_visibility],   :to => :temperature_dew_point
-    end
-
-    aasm_event :sea_level_pressure do
-      transitions :from => :temperature_dew_point,   :to => :sea_level_pressure
-    end
-
-    aasm_event :remarks do
-      transitions :from => [:temperature_dew_point, :sea_level_pressure],
-                                                :to => :remarks
-    end
-
-    aasm_event :done do
-      transitions :from => [:remarks],          :to => :end
-    end
 
     def self.for_cccc(cccc)
       raw = Metar::Raw::Noaa.new(cccc)
@@ -89,8 +10,10 @@ module Metar
     end
 
     attr_reader :raw, :metar
-    attr_reader :station_code, :observer, :wind, :variable_wind, :visibility, :runway_visible_range,
-       :present_weather, :sky_conditions, :vertical_visibility, :temperature, :dew_point, :sea_level_pressure, :remarks
+    attr_reader :station_code, :observer, :wind, :variable_wind, :visibility,
+      :minimum_visibility, :runway_visible_range, :present_weather, :sky_conditions,
+      :vertical_visibility, :temperature, :dew_point, :sea_level_pressure,
+      :recent_weather, :remarks
 
     def initialize(raw)
       @raw   = raw
@@ -112,6 +35,7 @@ module Metar
       @wind                 = nil
       @variable_wind        = nil
       @visibility           = nil
+      @minimum_visibility   = nil
       @runway_visible_range = []
       @present_weather      = []
       @sky_conditions       = []
@@ -119,18 +43,35 @@ module Metar
       @temperature          = nil
       @dew_point            = nil
       @sea_level_pressure   = nil
+      @recent_weather       = []
       @remarks              = []
 
-      aasm_enter_initial_state
+      seek_location
+      seek_datetime
+      seek_cor_auto
+      seek_wind
+      seek_variable_wind
+      cavok = seek_cavok
+      if not cavok
+        seek_visibility
+        seek_minimum_visibility
+        seek_runway_visible_range
+        seek_present_weather
+        seek_sky_conditions
+      end
+      seek_vertical_visibility
+      seek_temperature_dew_point
+      seek_sea_level_pressure
+      seek_recent_weather
+      seek_remarks
     end
 
     def seek_location
       if @chunks[0] =~ /^[A-Z][A-Z0-9]{3}$/
         @station_code = @chunks.shift
       else
-        raise ParseError.new("Expecting location, found '#{ @chunks[0] }'")
+        raise ParseError.new("Expecting location, found '#{ @chunks[0] }' in #{@metar}")
       end
-      location!
     end
 
     def seek_datetime
@@ -139,9 +80,8 @@ module Metar
         @chunks.shift
         @day, @hour, @minute = $1.to_i, $2.to_i, $3.to_i
       else
-        raise ParseError.new("Expecting datetime, found '#{ @chunks[0] }'")
+        raise ParseError.new("Expecting datetime, found '#{ @chunks[0] }' in #{@metar}")
       end
-      datetime!
     end
 
     def seek_cor_auto
@@ -152,6 +92,11 @@ module Metar
       when @chunks[0] == 'COR'
         @chunks.shift
         @observer = :corrected
+      when @chunks[0] == 'CCA'
+        @chunks.shift
+        @observer = :corrected
+      when @chunks[0] == 'RTD'   #  Delayed observation, no comments on observer
+        @chunks.shift
       else
         nil
       end
@@ -163,7 +108,6 @@ module Metar
         @chunks.shift
         @wind = wind
       end
-      wind!
     end
 
     def seek_variable_wind
@@ -172,23 +116,25 @@ module Metar
         @chunks.shift
         @variable_wind = variable_wind
       end
-      variable_wind!
     end
 
-    def seek_visibility
+    def seek_cavok
       if @chunks[0] == 'CAVOK'
         @chunks.shift
-        @visibility = Visibility.new(M9t::Distance.kilometers(10), nil, :more_than)
+        @visibility      = Visibility.new(M9t::Distance.kilometers(10), nil, :more_than)
         @present_weather << Metar::WeatherPhenomenon.new('No significant weather')
-        @sky_conditions << SkyCondition.new # = 'clear skies'
-        cavok!
-        return
+        @sky_conditions  << SkyCondition.new # = 'clear skies'
+        return true
+      else
+        return false
       end
+    end
 
+    # 15.10, 15.6.1
+    def seek_visibility
       if @observer == :auto # WMO 15.4
         if @chunks[0] == '////'
           @chunks.shift # Simply dispose of it
-          visibility!
           return
         end
       end
@@ -207,29 +153,23 @@ module Metar
           @visibility = visibility
         end
       end
-      visibility!
     end
 
-    def collect_runway_visible_range
-      runway_visible_range = RunwayVisibleRange.parse(@chunks[0])
-      if runway_visible_range
+    # Optional after visibility: 15.6.2
+    def seek_minimum_visibility
+      minimum_visibility = Visibility.parse(@chunks[0])
+      if minimum_visibility
         @chunks.shift
-        @runway_visible_range << runway_visible_range
-        collect_runway_visible_range
+        @minimum_visibility = minimum_visibility
       end
     end
 
     def seek_runway_visible_range
-      collect_runway_visible_range
-      runway_visible_range!
-    end
-
-    def collect_present_weather
-      wtp = WeatherPhenomenon.parse(@chunks[0])
-      if wtp
+      loop do
+        runway_visible_range = RunwayVisibleRange.parse(@chunks[0])
+        break if runway_visible_range.nil?
         @chunks.shift
-        @present_weather << wtp
-        collect_present_weather
+        @runway_visible_range << runway_visible_range
       end
     end
 
@@ -238,35 +178,33 @@ module Metar
         if @chunks[0] == '//' # WMO 15.4
           @chunks.shift # Simply dispose of it
           @present_weather << Metar::WeatherPhenomenon.new('not observed')
-          present_weather!
           return
         end
       end
 
-      collect_present_weather
-      present_weather!
-    end
-
-    def collect_sky_conditions
-      sky_condition = SkyCondition.parse(@chunks[0])
-      if sky_condition
+      loop do
+        wtp = WeatherPhenomenon.parse(@chunks[0])
+        break if wtp.nil?
         @chunks.shift
-        @sky_conditions << sky_condition
-        collect_sky_conditions
+        @present_weather << wtp
       end
     end
 
+    # Repeatable: 15.9.1.3
     def seek_sky_conditions
       if @observer == :auto # WMO 15.4
         if @chunks[0] == '///' or @chunks[0] == '//////'
           @chunks.shift # Simply dispose of it
-          sky_conditions!
           return
         end
       end
 
-      collect_sky_conditions
-      sky_conditions!
+      loop do
+        sky_condition = SkyCondition.parse(@chunks[0])
+        break if sky_condition.nil?
+        @chunks.shift
+        @sky_conditions << sky_condition
+      end
     end
 
     def seek_vertical_visibility
@@ -275,7 +213,6 @@ module Metar
         @chunks.shift
         @vertical_visibility = vertical_visibility
       end
-      vertical_visibility!
     end
 
     def seek_temperature_dew_point
@@ -284,10 +221,7 @@ module Metar
         @chunks.shift
         @temperature = Metar::Temperature.parse($1)
         @dew_point = Metar::Temperature.parse($2)
-      else
-        raise ParseError.new("Expecting temperature/dew point, found '#{ @chunks[0] }'")
       end
-      temperature_dew_point!
     end
 
     def seek_sea_level_pressure
@@ -296,7 +230,19 @@ module Metar
         @chunks.shift
         @sea_level_pressure = sea_level_pressure
       end
-      sea_level_pressure!
+    end
+ 
+    def seek_recent_weather
+      loop do
+        return if @chunks.size == 0
+        m = /^RE/.match(@chunks[0])
+        break if m.nil?
+        recent_weather = Metar::WeatherPhenomenon.parse(m.post_match)
+        if recent_weather
+          @chunks.shift
+          @recent_weather << recent_weather
+        end
+      end
     end
 
     def seek_remarks
@@ -305,11 +251,6 @@ module Metar
       end
       @remarks += @chunks.clone
       @chunks = []
-      remarks!
-    end
-
-    def seek_end
-      done!
     end
 
   end

data/lib/metar/raw.rb

@@ -43,6 +43,12 @@ module Metar
           @@connection.passive = true
         end
 
+        def disconnect
+          return if @connection.nil
+          @connection.close
+          @cconnection = nil
+        end
+
         def fetch(cccc)
           attempts = 0
           while attempts < 2

data/lib/metar/report.rb

@@ -10,6 +10,7 @@ module Metar
       :time,
       :wind,
       :visibility,
+      :minimum_visibility,
       :present_weather,
       :sky_summary,
       :temperature
@@ -58,6 +59,10 @@ module Metar
       @parser.visibility.to_s
     end
 
+    def minimum_visibility
+      @parser.minimum_visibility.to_s
+    end
+
     def runway_visible_range
       @parser.runway_visible_range.collect { |rvr| rvr.to_s }.join(', ')
     end

data/lib/metar/version.rb

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

data/locales/en.yml

@@ -43,6 +43,8 @@ en:
       title: wind variation
     visibility:
       title: visibility
+    minimum_visibility:
+      title: minimum visibility
     sky_summary:
       title: sky
     sky_conditions:

data/locales/it.yml

@@ -43,6 +43,8 @@ it:
       title: variazione del vento
     visibility:
       title: visibilità
+    minimum_visibility:
+      title: visibilità minima
     sky_summary:
       title: cielo
     sky_conditions:

data/spec/unit/parser_spec.rb

@@ -64,6 +64,12 @@ describe Metar::Parser do
 
         parser.observer.          should     == :corrected
       end
+
+      it 'corrected (Canadian)' do
+        parser = setup_parser('CYZU 310100Z CCA 26004KT 15SM FEW009 BKN040TCU BKN100 OVC210 15/12 A2996 RETS RMK SF1TCU4AC2CI1 SLP149')
+
+        parser.observer.          should     == :corrected
+      end
       
     end
 
@@ -108,6 +114,13 @@ describe Metar::Parser do
                                   should     be_within( 0.01 ).of( 1.75 )
       end
 
+      it 'in meters' do
+        parser = setup_parser('VABB 282210Z 22005KT 4000 HZ SCT018 FEW025TCU BKN100 28/25 Q1003 NOSIG')
+
+        parser.visibility.distance.value.
+                                  should     be_within(0.01).of(4000)
+       end
+
       it '//// with automatic observer' do
         parser = setup_parser("CYXS 151034Z AUTO 09003KT //// FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
 
@@ -211,12 +224,6 @@ describe Metar::Parser do
                                   should     == 30.48
     end
 
-    it 'temperature_obligatory' do
-      expect do
-        setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 A2910 RMK AO2 P0000")
-      end.                        to         raise_error( Metar::ParseError )
-    end
-
     it 'temperature' do
       parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
       parser.temperature.value.   should     == -17
@@ -233,6 +240,15 @@ describe Metar::Parser do
                                   should     == 29.10
     end
 
+    it 'recent weather' do
+      parser = setup_parser("CYQH 310110Z 00000KT 20SM SCT035CB BKN050 RETS RMK CB4SC1")
+
+      parser.recent_weather.      should    be_a Array
+      parser.recent_weather.size. should    == 1
+      parser.recent_weather[0].phenomenon.
+                                  should    == 'thunderstorm'
+    end
+
     it 'remarks' do
       parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
 

data/spec/unit/report_spec.rb

@@ -79,6 +79,7 @@ describe Metar::Report do
           :wind,
           :variable_wind,
           :visibility,
+          :minimum_visibility,
           :vertical_visibility,
           :temperature,
           :dew_point,
@@ -161,10 +162,11 @@ describe Metar::Report do
     end
 
     it '#to_s' do
-          sky1 = stub( 'sky1', :to_summary => 'sky1' )
-          sky2 = stub( 'sky2', :to_summary => 'sky2' )
+      sky1 = stub( 'sky1', :to_summary => 'sky1' )
+      sky2 = stub( 'sky2', :to_summary => 'sky2' )
       @parser.stub!( :wind            => 'wind',
                      :visibility      => 'visibility',
+                     :minimum_visibility => 'min visibility',
                      :present_weather => ['pw'],
                      :sky_conditions  => [ sky1, sky2 ],
                      :temperature     => 'temp' )
@@ -174,6 +176,7 @@ country: Wwwwww
 time: #{@metar_time}
 wind: wind
 visibility: visibility
+minimum visibility: min visibility
 weather: pw
 sky: sky2
 temperature: temp

data/spec/unit/runway_visible_range_spec.rb

@@ -39,7 +39,8 @@ describe Metar::RunwayVisibleRange do
       [ 'understands comparators: PM',       'R12/P3400',       [ '12',  [3400.00, nil, :more_than], nil,                nil ] ],
       [ 'understands tendencies: NUD',       'R12/3400U',       [ '12',  [3400.00, nil, nil],        nil,                :improving ] ],
       [ 'understands feet',                  'R12/3400FT',      [ '12',  [1036.32, nil, nil],        nil,                nil ] ],
-      [ 'understands second visibilties',    'R12/3400V1800FT', [ '12',  [1036.32, nil, nil],        [548.64, nil, nil], nil ] ],
+      [ 'understands second visibilities (m)',  'R26/0750V1200U',  [ '12', [ 750.0,  nil, nil],     [1200.0, nil, nil], :improving ] ],
+      [ 'understands second visibilities (ft)', 'R12/3400V1800FT', [ '12', [1036.32, nil, nil],     [548.64, nil, nil], nil ] ],
       [ 'returns nil for nil',               nil,               [ nil,   nil,                        nil,                nil ] ],
     ].each do | docstring, raw, expected |
       example docstring do

data/spec/unit/sky_condition_spec.rb

@@ -24,11 +24,13 @@ describe Metar::SkyCondition do
   context '.parse' do
 
     [
-      [ 'understands clear skies codes', 'NSC',      [ nil,         nil, nil               ] ],
-      [ 'quantity + height',             'BKN12',    [ 'broken',    365.76, nil            ] ],
+      [ 'understands clear skies codes', 'NSC',      [ nil,            nil,            nil ] ],
+      [ 'quantity + height',             'BKN12',    [ 'broken',    365.76,            nil ] ],
       [ 'quantity + height + type',      'BKN12CB',  [ 'broken',    365.76, 'cumulonimbus' ] ],
-      [ 'quantity + height + ///',       'BKN12///', [ 'broken',    365.76, nil            ] ],
-      [ 'returns nil for unmatched',     'FUBAR',    [ :expect_nil, nil, nil               ] ],
+      [ 'quantity + ///',                'BKN///',   [ 'broken',       nil,            nil ] ],
+      [ 'quantity + height + ///',       'FEW038///',[ 'few',      1158.24,            nil ] ],
+      [ 'cumulonimbus only',             'CB',       [ nil,            nil, 'cumulonimbus' ] ], # seems non-standard, but occurs
+      [ 'returns nil for unmatched',     'FUBAR',    [ :expect_nil,    nil,            nil ] ],
     ].each do | docstring, raw, expected |
       example docstring do
         Metar::SkyCondition.parse( raw ).should be_sky_condition( *expected )

data/spec/unit/visibility_spec.rb

@@ -33,13 +33,14 @@ describe Metar::Visibility do
       [ 'understands 9999',          '9999',    [ 10000.00, nil,   :more_than ] ],
       [ 'understands nnnn + NDV',    '0123NDV', [   123.00, nil,   nil ] ],
       [ 'understands n/nSM',         '3/4SM',   [  1207.01, nil,   nil ] ],
+      [ 'understands 3/16SM',        '3/16SM',  [  301.752, nil,   nil ] ],
       [ 'understands n n/nSM',       '1 1/4SM', [  2011.68, nil,   nil ] ],
       [ 'understands nSM',           '5SM',     [  8046.72, nil,   nil ] ],
       [ 'understands M1/4SM',        'M1/4SM',  [   402.34, nil,   :less_than ] ],
       [ 'understands n + KM',        '5KM',     [  5000.00, nil,   nil ] ],
-      [ 'understands n',             '5',       [  5000.00, nil,   nil ] ],
-      [ 'understands n + compass',   '5NW',     [  5000.00, 315.0, nil ] ],
-      [ 'returns nil for unmatched', 'FUBAR',   [  nil,     nil,   nil ] ],
+      [ 'understands n',             '500',     [   500.00, nil,   nil ] ],
+      [ 'understands n + compass',   '500NW',   [   500.00, 315.0,        nil ] ],
+      [ 'returns nil for unmatched', 'FUBAR',   [      nil,   nil,        nil ] ],
     ].each do | docstring, raw, expected |
       example docstring do
         Metar::Visibility.parse( raw ).should be_visibility( *expected )

data/spec/unit/weather_phenomenon_spec.rb

@@ -26,7 +26,10 @@ describe Metar::WeatherPhenomenon do
     [
       [ 'simple phenomenon',                  'BR',     [ nil,      nil,            'mist' ] ],
       [ 'descriptor + phenomenon',            'BCFG',   [ nil,      'patches of',   'fog'  ] ],
-      [ 'modifier + phenomenon',              '+RA',    [ 'heavy',  nil,            'rain' ] ],
+      [ 'intensity + phenomenon',             '+RA',    [ 'heavy',  nil,            'rain' ] ],
+      [ 'intensity + proximity + phenomenon', '-VCTSRA', [ 'nearby light', 'thunderstorm and', 'rain' ] ],
+      [ '2 phenomena: SN RA',                 'SNRA',   [ nil,      nil,            'snow and rain' ] ],
+      [ '2 phenomena: RA DZ',                 'RADZ',   [ nil,      nil,            'rain and drizzle' ] ],
       [ 'modifier + descriptor + phenomenon', 'VCDRFG', [ 'nearby', 'low drifting', 'fog'  ] ],
       [ 'returns nil for unmatched',          'FUBAR',  [ nil,      nil,            nil  ] ],
     ].each do | docstring, raw, expected |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -60,45 +60,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.5
 - !ruby/object:Gem::Dependency
-  name: aasm
+  name: m9t
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 0.3.1
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.1.5
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: m9t
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,9 +122,9 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -176,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2800563498014087456
+      hash: -116852050728515412
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2800563498014087456
+      hash: -116852050728515412
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.23
@@ -208,3 +224,4 @@ test_files:
 - spec/unit/raw_spec.rb
 - spec/unit/speed_spec.rb
 - spec/unit/distance_spec.rb
+has_rdoc: