metar-parser 1.1.0 → 1.1.1

data/README.md

@@ -67,6 +67,18 @@ raw    = Metar::Raw::Data.new( metar_string )
 parser = Metar::Parser.new( raw )
 ```
 
+Compliance
+==========
+
+By default, the parser runs in 'loose' compliance mode. That means that it tries to
+accept non-standard input.
+
+If you only want to accept standards-compliant METAR strings, do this:
+
+```ruby
+Metar::Parse.compliance = :strict
+```
+
 Changelog
 =========
 

data/lib/metar/data.rb

@@ -467,5 +467,264 @@ module Metar
 
   end
 
+  class Remark
+
+    PRESSURE_CHANGE_CHARACTER = [
+      :increasing_then_decreasing, # 0
+      :increasing_then_steady,     # 1
+      :increasing,                 # 2
+      :decreasing_or_steady_then_increasing, # 3
+      :steady,                     # 4
+      :decreasing_then_increasing, # 5
+      :decreasing_then_steady,     # 6
+      :decreasing,                 # 7
+      :steady_then_decreasing,     # 8
+    ]
+
+    INDICATOR_TYPE = {
+      'TS' => :thunderstorm_information,
+      'PWI' => :precipitation_identifier,
+      'P'   => :precipitation_amount,
+    }
+
+    COLOR_CODE = ['RED', 'AMB', 'YLO', 'GRN', 'WHT', 'BLU']
+
+    def self.parse(s)
+      case s
+      when /^([12])([01])(\d{3})$/
+        extreme = {'1' => :maximum, '2' => :minimum}[$1]
+        value   = sign($2) * tenths($3)
+        TemperatureExtreme.new(extreme, value)
+      when /^4([01])(\d{3})([01])(\d{3})$/
+        [
+          TemperatureExtreme.new(:maximum, sign($1) * tenths($2)),
+          TemperatureExtreme.new(:minimum, sign($3) * tenths($4))
+        ]
+      when /^5([0-8])(\d{3})$/
+        character = PRESSURE_CHANGE_CHARACTER[$1.to_i]
+        PressureTendency.new(character, tenths($2))
+      when /^6(\d{4})$/
+        Precipitation.new(3, Distance.new(inches_to_meters($1))) # actually 3 or 6 depending on reporting time
+      when /^7(\d{4})$/
+        Precipitation.new(24, Distance.new(inches_to_meters($1)))
+      when /^A[0O]([12])$/
+        type = [:with_precipitation_discriminator, :without_precipitation_discriminator][$1.to_i - 1]
+        AutomatedStationType.new(type)
+      when /^P(\d{4})$/
+        Precipitation.new(1, Distance.new(inches_to_meters($1)))
+      when /^T([01])(\d{3})([01])(\d{3})$/
+        temperature = Temperature.new(sign($1) * tenths($2))
+        dew_point   = Temperature.new(sign($3) * tenths($4))
+        HourlyTemperaturAndDewPoint.new(temperature, dew_point)
+      when /^SLP(\d{3})$/
+        SeaLevelPressure.new(Pressure.hectopascals(tenths($1)))
+      when /^(#{INDICATOR_TYPE.keys.join('|')})NO$/
+        type = INDICATOR_TYPE[$1]
+        SensorStatusIndicator.new(:type, :not_available)
+      when /^(#{COLOR_CODE.join('|')})$/
+        ColorCode.new($1)
+      when 'SKC'
+        SkyCondition.new
+      when '$'
+        MaintenanceNeeded.new
+      else
+        nil
+      end
+    end
+
+    def self.sign(digit)
+      case digit
+      when '0'
+        1.0
+      when '1'
+        -1.0
+      else
+        raise "Unexpected sign: #{digit}"
+      end
+    end
+
+    def self.tenths(digits)
+      digits.to_f / 10.0
+    end
+
+    def self.inches_to_meters(digits)
+      digits.to_f * 0.000254
+    end
+
+  end
+
+  class TemperatureExtreme
+
+    attr_accessor :value
+    attr_accessor :extreme
+
+    def initialize(extreme, value)
+      @extreme, @value = extreme, value
+    end
+
+  end
+
+  class PressureTendency
+
+    attr_accessor :value
+    attr_accessor :character
+
+    def initialize(character, value)
+      @character, @value = character, value
+    end
+
+  end
+
+  class Precipitation
+
+    attr_accessor :period
+    attr_accessor :amount
+
+    def initialize(period, amount)
+      @period, @amount = period, amount
+    end
+
+  end
+
+  class AutomatedStationType
+
+    attr_accessor :type
+
+    def initialize(type)
+      @type = type
+    end
+
+  end
+
+  class HourlyTemperaturAndDewPoint
+
+    attr_accessor :temperature
+    attr_accessor :dew_point
+
+    def initialize(temperature, dew_point)
+      @temperature, @dew_point = temperature, dew_point
+    end
+
+  end
+
+  class SeaLevelPressure
+
+    attr_accessor :pressure
+
+    def initialize(pressure)
+      @pressure = pressure
+    end
+
+  end
+
+  class SensorStatusIndicator
+
+    attr_accessor :type
+    attr_accessor :state
+
+    def initialize(type, state)
+      @type, @state = type, state
+    end
+
+  end
+
+  class MaintenanceNeeded
+  end
+
+  class Lightning
+
+    TYPE = {'' => :default}
+
+    def self.parse_chunks(chunks)
+      ltg = chunks.shift
+      m = ltg.match(/^LTG(|CG|IC|CC|CA)$/)
+      raise 'first chunk is not lightning' if m.nil?
+      type = TYPE[m[1]]
+
+      frequency = nil
+      distance = nil
+      directions = []
+
+      if chunks[0] == 'DSNT'
+        distance = Distance.miles(10) # Should be >10SM, not 10SM
+        chunks.shift
+      end
+
+      loop do
+        if is_compass?(chunks[0])
+          directions << chunks.shift
+        elsif chunks[0] == 'ALQDS'
+          directions += ['N', 'E', 'S', 'W']
+          chunks.shift
+        elsif chunks[0] =~ /^([NESW]{1,2})-([NESW]{1,2})$/
+          if is_compass?($1) and is_compass?($2)
+            directions += [$1, $2]
+            chunks.shift
+          else
+            break
+          end
+        elsif chunks[0] == 'AND'
+          chunks.shift
+        else
+          break
+        end
+      end
+
+      new(frequency, type, distance, directions)
+    end
+
+    def self.is_compass?(s)
+      s =~ /^([NESW]|NE|SE|SW|NW)$/
+    end
+
+    attr_accessor :frequency
+    attr_accessor :type
+    attr_accessor :distance
+    attr_accessor :directions
+
+    def initialize(frequency, type, distance, directions)
+      @frequency, @type, @distance, @directions = frequency, type, distance, directions
+    end
+
+  end
+
+  class VisibilityRemark < Visibility
+
+    def self.parse(chunk)
+      chunk =~ /^(\d{4})([NESW]?)$/
+      distance = Distance.new($1)
+
+      new(distance, $2, :more_than)
+    end
+
+  end
+
+  class DensityAltitude
+
+    def self.parse(chunk)
+      chunk =~ /^(\d+)(FT)$/
+      height = Distance.feet($1)
+
+      new(height)
+    end
+
+    attr_accessor :height
+
+    def initialize(height)
+      @height = height
+    end
+
+  end
+
+  class ColorCode
+
+    attr_accessor :code
+
+    def initialize(code)
+      @code = code
+    end
+
+  end
+
 end
 

data/lib/metar/parser.rb

@@ -9,11 +9,26 @@ module Metar
       new(raw)
     end
 
+    COMPLIANCE = [:strict, :loose]
+
+    def self.thread_attributes
+      Thread.current[:metar_parser] ||= {}
+    end
+
+    def self.compliance
+      thread_attributes[:compliance] ||= :loose
+    end
+
+    def self.compliance=(compliance)
+      raise 'Unknown compliance' unless COMPLIANCE.find(compliance)
+      thread_attributes[:compliance] = compliance
+    end
+
     attr_reader :raw, :metar
     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
+      :recent_weather, :unparsed, :remarks
 
     def initialize(raw)
       @raw   = raw
@@ -44,6 +59,7 @@ module Metar
       @dew_point            = nil
       @sea_level_pressure   = nil
       @recent_weather       = []
+      @unparsed             = []
       @remarks              = []
 
       seek_location
@@ -63,6 +79,7 @@ module Metar
       seek_temperature_dew_point
       seek_sea_level_pressure
       seek_recent_weather
+      seek_to_remarks
       seek_remarks
     end
 
@@ -75,12 +92,30 @@ module Metar
     end
 
     def seek_datetime
-      case
-      when @chunks[0] =~ /^(\d{2})(\d{2})(\d{2})Z$/
-        @chunks.shift
+      found = false
+      date_matcher =
+        if strict?
+          /^(\d{2})(\d{2})(\d{2})Z$/
+        else
+          /^(\d{1,2})(\d{2})(\d{2})Z$/
+        end
+      if @chunks[0] =~ date_matcher
         @day, @hour, @minute = $1.to_i, $2.to_i, $3.to_i
+        found = true
+      else
+        if not strict?  
+          if @chunks[0] =~ /^(\d{1,2})(\d{2})Z$/
+            # The day is missing, use today's date
+            @day           = Time.now.day
+            @hour, @minute = $1.to_i, $2.to_i, $3.to_i
+            found = true
+          end
+        end
+      end
+      if found
+        @chunks.shift
       else
-        raise ParseError.new("Expecting datetime, found '#{ @chunks[0] }' in #{@metar}")
+        raise ParseError.new("Expecting datetime, found '#{@chunks[0]}' in #{@metar}")
       end
     end
 
@@ -238,19 +273,60 @@ module Metar
         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
+        break if recent_weather.nil?
+        @chunks.shift
+        @recent_weather << recent_weather
+      end
+    end
+
+    def seek_to_remarks
+      if strict?
+        if @chunks.size > 0 and @chunks[0] != 'RMK'
+          raise ParseError.new("Unparsable text found: '#{@chunks.join(' ')}'")
+        end
+      else
+        while @chunks.size > 0 and @chunks[0] != 'RMK' do
+          @unparsed << @chunks.shift
         end
       end
     end
 
     def seek_remarks
-      if @chunks[0] == 'RMK'
-        @chunks.shift
+      return if @chunks.size == 0
+      raise 'seek_remarks calls without remark' if @chunks[0] != 'RMK'
+
+      @chunks.shift # Drop 'RMK'
+      @remarks = []
+      loop do
+        break if @chunks.size == 0
+        r = Metar::Remark.parse(@chunks[0])
+        if r
+          @remarks += [*r]
+          @chunks.shift
+          next 
+        end
+        if @chunks[0] == 'VIS' and @chunks.size >= 3 and @chunks[1] == 'MIN'
+          @chunks.shift(3)
+          r = Metar::VisibilityRemark.parse(@chunks[2])
+          @remarks << r
+        end
+        if @chunks[0] == 'DENSITY' and @chunks.size >= 3 and @chunks[1] == 'ALT'
+          @chunks.shift(3)
+          r = Metar::DensityAltitude.parse(@chunks[2])
+          @remarks << r
+        end
+        case
+        when @chunks[0] =~ /^LTG(|CG|IC|CC|CA)$/
+          r = Metar::Lightning.parse_chunks(@chunks)
+          @remarks << r
+        else
+          @remarks << @chunks.shift
+        end
       end
-      @remarks += @chunks.clone
-      @chunks = []
+    end
+
+    def strict?
+      self.class.compliance == :strict
     end
 
   end

data/lib/metar/station.rb

@@ -14,22 +14,6 @@ module Metar
 
       @nsd_cccc = nil # Contains the text of the station list
 
-      def download_local
-        nsd_cccc = Metar::Station.download_stations
-        File.open(Metar::Station.local_nsd_path, 'w') do |fil|
-          fil.write nsd_cccc
-        end
-      end
-
-      # Load local copy of the station list
-      # and download it first if missing
-      def load_local
-        download_local if not File.exist?(Metar::Station.local_nsd_path)
-        @nsd_cccc = File.open(Metar::Station.local_nsd_path) do |fil|
-          fil.read
-        end
-      end
-
       def countries
         all_structures.reduce( Set.new ) { |a, s| a.add( s[ :country ] ) }.to_a.sort
       end
@@ -96,11 +80,6 @@ module Metar
         open(NOAA_STATION_LIST_URL) { |fil| fil.read }
       end
 
-      # Path for saving a local copy of the nsc_cccc station list
-      def local_nsd_path
-        File.join(File.expand_path(File.dirname(__FILE__) + '/../../'), 'data', 'nsd_cccc.txt')
-      end
-
       def all_structures
         return @structures if @structures
 

data/lib/metar/version.rb

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

data/locales/en.yml

@@ -138,6 +138,7 @@ en:
       light dust storm: light dust storm
       nearby dust storm: nearby dust storm
       thunderstorm: thunderstorm
+      thunderstorm and rain: thunderstorm and rain
       nearby thunderstorm: nearby thunderstorm
       heavy thunderstorm and hail: heavy thunderstorm and hail
       light thunderstorm and hail: light thunderstorm and hail

data/locales/it.yml

@@ -138,6 +138,7 @@ it:
       light dust storm: tempesta di polvere leggera
       nearby dust storm: tempesta di polvere vicina
       thunderstorm: temporale
+      thunderstorm and rain: temporale con pioggia
       nearby thunderstorm: temporale vicino
       heavy thunderstorm and hail: temporale con grandine intenso
       light thunderstorm and hail: temporale con grandine leggero

data/spec/spec_helper.rb

@@ -12,3 +12,17 @@ end
 
 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::TemperatureExtreme)
+      false
+    elsif remark.extreme != extreme
+      false
+    elsif remark.value   != value
+      false
+    else
+      true
+    end
+  end
+end
+

data/spec/unit/parser_spec.rb

@@ -3,6 +3,10 @@ load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
 
 describe Metar::Parser do
 
+  after :each do
+    Metar::Parser.compliance = :loose
+  end
+
   context '.for_cccc' do
 
     it 'returns a loaded parser' do
@@ -33,16 +37,50 @@ describe Metar::Parser do
       end.                        to         raise_error( Metar::ParseError, /Expecting location/ )
     end
 
-    it '.time missing' do
-      expect do
-        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
+    context 'datetime' do
 
-    it 'time' do
-      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+      it 'is parsed' do
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
+        parser.time.              should     == Time.gm(2011, 05, 06, 16, 10)
+      end
+
+      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") 
+        end.                      to         raise_error( Metar::ParseError, /Expecting datetime/ )
+      end
+
+      context 'in strict mode' do
+
+        before :each do
+          Metar::Parser.compliance = :strict
+        end
+
+        it 'less than 6 numerals fails' do
+          expect do
+            parser = setup_parser('MMCE 21645Z 12010KT 8SM SKC 29/26 A2992 RMK')
+          end.                    to         raise_error(Metar::ParseError, /Expecting datetime/)
+        end
+
+      end
+
+      context 'in loose mode' do
+
+        it '5 numerals parses' do
+          parser = setup_parser('MMCE 21645Z 12010KT 8SM SKC 29/26 A2992 RMK')
+
+          parser.time.              should     == Time.gm(2011, 05, 02, 16, 45)
+        end
+
+        it "with 4 numerals parses, takes today's day" do
+          parser = setup_parser('HKML 1600Z 19010KT 9999 FEW022 25/22 Q1015')
+
+          parser.time.              should     == Time.gm(2011, 05, 06, 16, 00)
+        end
+
+      end
 
-      parser.time.                should     == Time.gm(2011, 05, 06, 16, 10)
     end
 
     context '.observer' do
@@ -249,20 +287,54 @@ describe Metar::Parser do
                                   should    == 'thunderstorm'
     end
 
-    it 'remarks' do
-      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+    context 'remarks' do
 
-      parser.remarks.             should     be_a Array
-      parser.remarks.length.      should     == 2
-      parser.remarks[0].          should     == 'AO2'
-      parser.remarks[1].          should     == 'P0000'
-    end
+      it 'are collected' do
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
+        parser.remarks.             should     be_a Array
+        parser.remarks.size.        should     == 2
+      end
 
-    it 'remarks_defaults_to_empty_array' do
-      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910")
+      it 'remarks defaults to empty array' do
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910")
+
+        parser.remarks.             should     be_a Array
+        parser.remarks.length.      should     == 0
+      end
+
+      it 'parses known remarks' do
+        parser = setup_parser('CYZT 052200Z 31010KT 20SM SKC 17/12 A3005 RMK SLP174 20046')
+
+        parser.remarks[0].        should    be_a(Metar::SeaLevelPressure)
+        parser.remarks[1].        should    be_temperature_extreme(:minimum, 4.6)
+      end
+
+      context 'in strict mode' do
+
+        before :each do
+          Metar::Parser.compliance = :strict
+        end
+
+        it 'unparsed data causes an error' do
+          expect do
+            setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 FOO RMK AO2 P0000")
+          end.                    to        raise_error(Metar::ParseError, /Unparsable text found/)
+        end
+
+      end
+
+      context 'in loose mode' do
+
+        it 'unparsed data is collected' do
+          parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 FOO RMK AO2 P0000")
+
+          parser.unparsed.        should    == ['FOO']
+          parser.remarks.size.    should    == 2
+        end
+
+      end
 
-      parser.remarks.             should     be_a Array
-      parser.remarks.length.      should     == 0
     end
   
     def setup_parser(metar)

data/spec/unit/remark_spec.rb

@@ -0,0 +1,173 @@
+# encoding: utf-8
+load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
+ 
+describe Metar::Remark do
+
+  context '.parse' do
+
+    it 'should delegate to subclasses' do
+      Metar::Remark.parse('21012').  should    be_a(Metar::TemperatureExtreme)
+    end
+
+    it 'should return nil for unrecognised' do
+      Metar::Remark.parse('FOO').    should    be_nil
+    end
+
+    context '6-hour maximum or minimum' do
+
+      [
+        ['positive maximum', '10046', [:maximum,  4.6]],
+        ['negative maximum', '11012', [:maximum, -1.2]],
+        ['positive minimum', '20046', [:minimum,  4.6]],
+        ['negative minimum', '21012', [:minimum, -1.2]],
+      ].each do |docstring, raw, expected|
+        example docstring do
+          Metar::Remark.parse(raw).
+                                should    be_temperature_extreme(*expected)
+        end
+      end
+
+    end
+
+    context '24-hour maximum and minimum' do
+
+      it 'returns minimum and maximum' do
+        max, min = Metar::Remark.parse('400461006')
+
+        max.                      should    be_temperature_extreme(:maximum,  4.6)
+        min.                      should    be_temperature_extreme(:minimum, -0.6)
+      end
+
+    end
+
+    context 'pressure tendency' do
+
+      it 'steady_then_decreasing' do
+        pt = Metar::Remark.parse('58033')
+
+        pt.                       should    be_a(Metar::PressureTendency)
+        pt.character.             should    == :steady_then_decreasing
+        pt.value.                 should    == 3.3
+      end
+
+    end
+
+    context '3-hour and 6-hour precipitation' do
+
+      it '60009' do
+        pr = Metar::Remark.parse('60009')
+        
+        pr.                       should    be_a(Metar::Precipitation)
+        pr.period.                should    == 3
+        pr.amount.value.          should    == 0.002286
+      end
+
+    end
+
+    context '24-hour precipitation' do
+
+      it '70015' do
+        pr = Metar::Remark.parse('70015')
+        
+        pr.                       should    be_a(Metar::Precipitation)
+        pr.period.                should    == 24
+        pr.amount.value.          should    == 0.003810
+      end
+
+    end
+
+    context 'automated station' do
+
+      [
+        ['with precipitation dicriminator', 'AO1', [Metar::AutomatedStationType, :with_precipitation_discriminator]],
+        ['without precipitation dicriminator', 'AO2', [Metar::AutomatedStationType, :without_precipitation_discriminator]],
+      ].each do |docstring, raw, expected|
+        example docstring do
+          aut = Metar::Remark.parse(raw)
+
+          aut.                      should    be_a(expected[0])
+          aut.type.                 should    == expected[1]
+        end
+      end
+
+    end
+
+    context 'sea-level pressure' do
+
+      it 'SLP125' do
+        slp = Metar::Remark.parse('SLP125')
+
+        slp.                      should    be_a(Metar::SeaLevelPressure)
+        slp.pressure.value.       should    == 0.0125
+      end
+
+    end
+
+    context 'hourly temperature and dew point' do
+
+      it 'T00640036' do
+        htm = Metar::Remark.parse('T00641036')
+
+        htm.                      should    be_a(Metar::HourlyTemperaturAndDewPoint)
+        htm.temperature.value.    should    ==  6.4
+        htm.dew_point.value.      should    == -3.6
+      end
+
+    end
+
+  end
+
+end
+
+describe Metar::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']]],
+    ].each do |docstring, section, expected|
+      example docstring do
+        chunks = section.split(' ')
+        r = Metar::Lightning.parse_chunks(chunks)
+
+        r.                        should    be_a(Metar::Lightning)
+        r.type.                   should    == expected[0]
+        if expected[1]
+          r.distance.value.       should    == expected[1]
+        else
+          r.distance.             should    be_nil
+        end
+        r.directions.             should    == expected[2]
+      end
+    end
+
+    it 'should remove parsed chunks' do
+      chunks = ['LTG', 'DSNT', 'SE', 'FOO']
+
+      r = Metar::Lightning.parse_chunks(chunks)
+
+      chunks.                     should    == ['FOO']
+    end
+
+    it 'should fail if the first chunk is not LTGnnn' do
+      expect do
+        Metar::Lightning.parse_chunks(['FOO'])
+      end.                        to        raise_error(RuntimeError, /not lightning/)
+    end
+
+    it 'should not fail if all chunks are parsed' do
+      chunks = ['LTG', 'DSNT', 'SE']
+
+      r = Metar::Lightning.parse_chunks(chunks)
+
+      chunks.                     should    == []
+    end
+
+  end
+
+end
+

data/spec/unit/station_spec.rb

@@ -21,74 +21,10 @@ describe Metar::Station do
     @file = stub( 'file' )
   end
 
-  context '.download_local' do
-
-    it 'downloads the station list' do
-      File.stub!( :open => @file )
-
-      Metar::Station.             should_receive( :open ).
-                                  with( /^http/ )
-
-      Metar::Station.download_local
-    end
-
-    it 'saves the list to disk' do
-      Metar::Station.stub!( :open ).and_return( 'aaa' )
-
-      File.                       should_receive( :open ) do | path, mode, &block |
-        path.                     should     =~ %r(data/nsd_cccc.txt$)
-        mode.                     should     == 'w'
-        block.call @file
-      end
-      @file.                      should_receive( :write ).
-                                  with( 'aaa' )
-
-      Metar::Station.download_local
-    end
-
-  end
-
-  context '.load_local' do
-
-    it 'downloads the station list, if missing, then loads it' do
-      File.                       should_receive( :exist? ).
-                                  and_return( false )
-      # open-uri call
-      Metar::Station.             should_receive( :open ).
-                                  and_return( 'aaa' )
-
-      outfile = stub( 'outfile' )
-      File.                       should_receive( :open ).once.with( %r(nsd_cccc.txt), 'w' ) do | *args, &block |
-        block.call outfile
-      end
-      outfile.                    should_receive( :write ).
-                                  with( 'aaa' )
-
-      infile = stub( 'infile' )
-      File.                       should_receive( :open ).once.with( %r(nsd_cccc.txt) ) do | *args, &block |
-        block.call infile
-      end
-      infile.                     should_receive( :read ).
-                                  and_return( 'bbb' )
-
-      Metar::Station.load_local.  should     == 'bbb'
-    end
-
-    it 'loads the file, if already present' do
-      File.                       should_receive( :exist? ).
-                                  and_return( true )
-
-      File.                       should_receive( :open ).once.with( %r(nsd_cccc.txt) )
-
-      Metar::Station.load_local
-    end
-
-  end
-
   context 'using structures' do
 
     before :each do
-      preload_data
+      Metar::Station.stub!(:open).with(Metar::Station::NOAA_STATION_LIST_URL).and_return(nsd_file)
     end
 
     context '.countries' do
@@ -143,12 +79,6 @@ EOT
       StringIO.new( nsd_text )
     end
 
-    def preload_data
-      File.stub!( :exist? ).and_return( true )
-      File.stub!( :open ).with( %r(nsd_cccc.txt) ).and_return( nsd_file )
-      Metar::Station.load_local
-    end
-
   end
 
   context '.to_longitude' do

data/spec/unit/weather_phenomenon_spec.rb

@@ -20,12 +20,11 @@ RSpec::Matchers.define :be_weather_phenomenon do | modifier, descriptor, phenome
 end
 
 describe Metar::WeatherPhenomenon do
-
   context '.parse' do
-
     [
       [ 'simple phenomenon',                  'BR',     [ nil,      nil,            'mist' ] ],
       [ 'descriptor + phenomenon',            'BCFG',   [ nil,      'patches of',   'fog'  ] ],
+      [ 'thunderstorm and rain',              'TSRA',   [ nil,      'thunderstorm and', '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' ] ],
@@ -37,11 +36,9 @@ describe Metar::WeatherPhenomenon do
         Metar::WeatherPhenomenon.parse( raw ).should be_weather_phenomenon( *expected )
       end
     end
-
   end
 
   context '#to_s' do
-
     before :all do
       @locale = I18n.locale
       I18n.locale = :it
@@ -52,10 +49,11 @@ describe Metar::WeatherPhenomenon do
     end
 
     [
-      [ 'simple phenomenon', :en, [ nil, nil, 'mist' ], 'mist' ],
-      [ 'simple phenomenon', :it, [ nil, nil, 'mist' ], 'foschia' ],
-      [ 'descriptor + phenomenon', :en, [ nil, 'patches of', 'fog' ], 'patches of fog' ],
-      [ 'modifier + phenomenon', :en, ['heavy', nil, 'drizzle' ], 'heavy drizzle' ],
+      [ 'simple phenomenon',       :en, [ nil,    nil,          'mist' ],    'mist' ],
+      [ 'simple phenomenon',       :it, [ nil,    nil,          'mist' ],    'foschia' ],
+      [ 'descriptor + phenomenon', :en, [ nil,    'patches of', 'fog' ],     'patches of fog' ],
+      [ 'thunderstorm and rain',   :en, [ nil,    'thunderstorm and', 'rain' ],  'thunderstorm and rain' ],
+      [ 'modifier + phenomenon',   :en, ['heavy', nil,          'drizzle' ], 'heavy drizzle' ],
       [ 'modifier + descriptor + phenomenon', :en, ['heavy', 'freezing', 'drizzle' ], 'heavy freezing drizzle' ],
     ].each do | docstring, locale, ( modifier, descriptor, phenomenon ), expected |
       example docstring + " (#{locale})" do
@@ -64,8 +62,6 @@ describe Metar::WeatherPhenomenon do
                                   should     == expected
       end
     end
-
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -151,33 +151,33 @@ files:
 - README.md
 - COPYING
 - Rakefile
-- bin/download_raw.rb
 - bin/parse_raw.rb
-- lib/metar.rb
-- lib/metar/data.rb
-- lib/metar/station.rb
 - lib/metar/parser.rb
 - lib/metar/report.rb
-- lib/metar/version.rb
 - lib/metar/raw.rb
-- spec/unit/runway_visible_range_spec.rb
-- spec/unit/vertical_visibility_spec.rb
+- lib/metar/station.rb
+- lib/metar/data.rb
+- lib/metar/version.rb
+- lib/metar.rb
+- spec/spec_helper.rb
 - spec/unit/report_spec.rb
-- spec/unit/temperature_spec.rb
-- spec/unit/sky_condition_spec.rb
+- spec/unit/pressure_spec.rb
+- spec/unit/station_spec.rb
 - spec/unit/visibility_spec.rb
+- spec/unit/sky_condition_spec.rb
+- spec/unit/speed_spec.rb
+- spec/unit/wind_spec.rb
+- spec/unit/distance_spec.rb
+- spec/unit/temperature_spec.rb
+- spec/unit/vertical_visibility_spec.rb
+- spec/unit/remark_spec.rb
+- spec/unit/runway_visible_range_spec.rb
 - spec/unit/weather_phenomenon_spec.rb
-- spec/unit/station_spec.rb
+- spec/unit/raw_spec.rb
 - spec/unit/parser_spec.rb
-- spec/unit/pressure_spec.rb
 - spec/unit/variable_wind_spec.rb
-- spec/unit/wind_spec.rb
-- spec/unit/raw_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/distance_spec.rb
-- spec/spec_helper.rb
-- locales/it.yml
 - locales/en.yml
+- locales/it.yml
 homepage: http://github.com/joeyates/metar-parser
 licenses: []
 post_install_message: 
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -116852050728515412
+      hash: -171469053592145990
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -116852050728515412
+      hash: -171469053592145990
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.23
@@ -209,19 +209,20 @@ signing_key:
 specification_version: 3
 summary: A Ruby gem for worldwide weather reports
 test_files:
-- spec/unit/runway_visible_range_spec.rb
-- spec/unit/vertical_visibility_spec.rb
 - spec/unit/report_spec.rb
-- spec/unit/temperature_spec.rb
-- spec/unit/sky_condition_spec.rb
+- spec/unit/pressure_spec.rb
+- spec/unit/station_spec.rb
 - spec/unit/visibility_spec.rb
+- spec/unit/sky_condition_spec.rb
+- spec/unit/speed_spec.rb
+- spec/unit/wind_spec.rb
+- spec/unit/distance_spec.rb
+- spec/unit/temperature_spec.rb
+- spec/unit/vertical_visibility_spec.rb
+- spec/unit/remark_spec.rb
+- spec/unit/runway_visible_range_spec.rb
 - spec/unit/weather_phenomenon_spec.rb
-- spec/unit/station_spec.rb
+- spec/unit/raw_spec.rb
 - spec/unit/parser_spec.rb
-- spec/unit/pressure_spec.rb
 - spec/unit/variable_wind_spec.rb
-- spec/unit/wind_spec.rb
-- spec/unit/raw_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/distance_spec.rb
 has_rdoc: 

data/bin/download_raw.rb

@@ -1,55 +0,0 @@
-#!/usr/bin/env ruby
-
-=begin
-
-This script downloads the current weather report for each station.
-
-=end
-
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'yaml'
-require File.join(File.expand_path(File.dirname(__FILE__) + '/../lib'), 'metar')
-
-Metar::Station.load_local
-
-('A'..'Z').each do |initial|
-
-  stations = {}
-
-  Metar::Station.all.each do |station|
-
-    next if station.cccc[0, 1] < initial
-    break if station.cccc[0, 1] > initial
-
-    print station.cccc
-    raw = nil
-    begin
-      raw = Metar::Raw.new(station.cccc)
-    rescue Net::FTPPermError => e
-      puts ": Not available - #{ e }"
-      next
-    rescue
-      puts ": Other error - #{ e }"
-      next
-    end
-
-    stations[station.cccc] = raw.raw.clone
-    puts ': OK'
-  end
-
-  filename = File.join(File.expand_path(File.dirname(__FILE__) + '/../data'), "stations.#{ initial }.yml")
-  File.open(filename, 'w') { |fil| fil.write stations.to_yaml }
-
-end
-
-# Merge into one file
-stations = {}
-('A'..'Z').each do |initial|
-  filename = File.join(File.expand_path(File.dirname(__FILE__) + '/../data'), "stations.#{ initial }.yml")
-  next if not File.exist?(filename)
-  h = YAML.load_file(filename)
-  stations.merge!(h)
-end
-
-filename = File.join(File.expand_path(File.dirname(__FILE__) + '/../data'), "stations.yml")
-File.open(filename, 'w') { |fil| fil.write stations.to_yaml }