metar-parser 0.1.3 → 0.1.4

data/lib/metar/data.rb

@@ -41,9 +41,9 @@ module Metar
       case
       when s =~ /^(\d+)(KT|MPS|KMH)$/
         # Call the appropriate factory method for the supplied units
-        send(METAR_UNITS[$2], $1.to_i, { :units => METAR_UNITS[$2], :precision => 0 })
+        send(METAR_UNITS[$2], $1.to_i, { :units => :kilometers_per_hour, :precision => 0, :abbreviated => true })
       when s =~ /^(\d+)$/
-        kilometers_per_hour($1.to_i, { :units => :kilometers_per_hour, :precision => 0 })
+        kilometers_per_hour($1.to_i, { :units => :kilometers_per_hour, :precision => 0, :abbreviated => true })
       else
         nil
       end
@@ -88,9 +88,9 @@ module Metar
     def Wind.parse(s)
       case
       when s =~ /^(\d{3})(\d{2}(|MPS|KMH|KT))$/
-        new(M9t::Direction.new($1, { :abbreviated => true }), Speed.parse($2))
+        new(M9t::Direction.new($1, { :units => :compass, :abbreviated => true }), Speed.parse($2))
       when s =~ /^(\d{3})(\d{2})G(\d{2,3}(|MPS|KMH|KT))$/
-        new(M9t::Direction.new($1, { :abbreviated => true }), Speed.parse($2))
+        new(M9t::Direction.new($1, { :units => :compass, :abbreviated => true }), Speed.parse($2))
       when s =~ /^VRB(\d{2}(|MPS|KMH|KT))$/
         new(:variable_direction, Speed.parse($1))
       when s =~ /^\/{3}(\d{2}(|MPS|KMH|KT))$/
@@ -125,7 +125,7 @@ module Metar
         else
           @speed.to_s
         end  
-      "#{ direction }, #{ speed }"
+      "#{ speed } #{ direction }"
     end
 
   end
@@ -325,7 +325,7 @@ module Metar
     def to_s
       modifier = @modifier ? @modifier + ' ' : ''
       descriptor = @descriptor ? @descriptor + ' ' : ''
-      I18n.t("metar.weather.%s%s%s" % [modifier, descriptor, @phenomenon])
+      I18n.t("metar.present_weather.%s%s%s" % [modifier, descriptor, @phenomenon])
     end
 
   end
@@ -333,6 +333,7 @@ module Metar
   class SkyCondition
 
     QUANTITY = {'BKN' => 'broken', 'FEW' => 'few', 'OVC' => 'overcast', 'SCT' => 'scattered'}
+
     def SkyCondition.parse(sky_condition)
       case
       when (sky_condition == 'NSC' or sky_condition == 'NCD') # WMO
@@ -355,7 +356,7 @@ module Metar
           when '///'
             nil
           else
-            raise MetarParserError.new("Unexpected sky condition type: #$3")
+            raise ParseError.new("Unexpected sky condition type: #$3")
           end
         new(quantity, height, type)
       else
@@ -369,11 +370,17 @@ module Metar
     end
 
     def to_s
+      conditions = to_summary
+      conditions += ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s if not @height.nil?
+      conditions
+    end
+
+    def to_summary
       if @quantity == nil and @height == nil and @type == nil
         I18n.t('metar.sky_conditions.clear skies')
       else
         type = @type ? ' ' + @type : ''
-        I18n.t("metar.sky_conditions.#{ @quantity }#{ type }") + ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s
+        I18n.t("metar.sky_conditions.#{ @quantity }#{ type }")
       end
     end
 

data/lib/metar/parser.rb

@@ -4,9 +4,6 @@ require File.join(File.dirname(__FILE__), 'data')
 
 module Metar
 
-  class ParseError < StandardError
-  end
-
   class Parser
     include AASM
 
@@ -95,7 +92,7 @@ module Metar
       parser
     end
 
-    attr_reader :station_code, :time, :observer, :wind, :variable_wind, :visibility, :runway_visible_range,
+    attr_reader :station_code, :observer, :time, :wind, :variable_wind, :visibility, :runway_visible_range,
        :present_weather, :sky_conditions, :vertical_visibility, :temperature, :dew_point, :sea_level_pressure, :remarks
 
     def initialize(raw)
@@ -104,26 +101,6 @@ module Metar
       analyze
     end
 
-    def attributes
-      h = {
-        :station_code => @location.clone,
-        :time         => @time.to_s,
-        :observer     => Report.symbol_to_s(@observer)
-      }
-      h[:wind]                 = @wind                 if @wind
-      h[:variable_wind]        = @variable_wind.clone  if @variable_wind
-      h[:visibility]           = @visibility           if @visibility
-      h[:runway_visible_range] = @runway_visible_range if @runway_visible_range
-      h[:present_weather]      = @present_weather      if @present_weather
-      h[:sky_conditions]       = @sky_conditions       if @sky_conditions
-      h[:vertical_visibility]  = @vertical_visibility  if @vertical_visibility
-      h[:temperature]          = @temperature
-      h[:dew_point]            = @dew_point
-      h[:sea_level_pressure]   = @sea_level_pressure
-      h[:remarks]              = @remarks.clone        if @remarks
-      h
-    end
-
     def date
       Date.new(@time.year, @time.month, @time.day)
     end
@@ -133,26 +110,26 @@ module Metar
     def analyze
       @chunks = @metar.split(' ')
 
-      @location             = nil
+      @station_code         = nil
       @observer             = :real
       @wind                 = nil
       @variable_wind        = nil
       @visibility           = nil
-      @runway_visible_range = nil
-      @present_weather      = nil
-      @sky_conditions       = nil
+      @runway_visible_range = []
+      @present_weather      = []
+      @sky_conditions       = []
       @vertical_visibility  = nil
       @temperature          = nil
       @dew_point            = nil
       @sea_level_pressure   = nil
-      @remarks              = nil
+      @remarks              = []
 
       aasm_enter_initial_state
     end
 
     def seek_location
       if @chunks[0] =~ /^[A-Z][A-Z0-9]{3}$/
-        @location = @chunks.shift
+        @station_code = @chunks.shift
       else
         raise ParseError.new("Expecting location, found '#{ @chunks[0] }'")
       end
@@ -204,18 +181,15 @@ module Metar
       if @chunks[0] == 'CAVOK'
         @chunks.shift
         @visibility = Visibility.new(M9t::Distance.kilometers(10), nil, :more_than)
-        @present_weather ||= []
         @present_weather << Metar::WeatherPhenomenon.new('No significant weather')
-        @sky_conditions ||= []
-        @sky_conditions << 'No significant cloud' # TODO: What does NSC stand for?
+        @sky_conditions << SkyCondition.new # = 'clear skies'
         cavok!
         return
       end
 
       if @observer == :auto # WMO 15.4
         if @chunks[0] == '////'
-          @chunks.shift
-          @visibility = Visibility.new('Not observed')
+          @chunks.shift # Simply dispose of it
           visibility!
           return
         end
@@ -242,7 +216,6 @@ module Metar
       runway_visible_range = RunwayVisibleRange.parse(@chunks[0])
       if runway_visible_range
         @chunks.shift
-        @runway_visible_range ||= []
         @runway_visible_range << runway_visible_range
         collect_runway_visible_range
       end
@@ -257,7 +230,6 @@ module Metar
       wtp = WeatherPhenomenon.parse(@chunks[0])
       if wtp
         @chunks.shift
-        @present_weather ||= []
         @present_weather << wtp
         collect_present_weather
       end
@@ -266,7 +238,7 @@ module Metar
     def seek_present_weather
       if @observer == :auto
         if @chunks[0] == '//' # WMO 15.4
-          @present_weather ||= []
+          @chunks.shift # Simply dispose of it
           @present_weather << Metar::WeatherPhenomenon.new('not observed')
           present_weather!
           return
@@ -281,7 +253,6 @@ module Metar
       sky_condition = SkyCondition.parse(@chunks[0])
       if sky_condition
         @chunks.shift
-        @sky_conditions ||= []
         @sky_conditions << sky_condition
         collect_sky_conditions
       end
@@ -290,9 +261,7 @@ module Metar
     def seek_sky_conditions
       if @observer == :auto # WMO 15.4
         if @chunks[0] == '///' or @chunks[0] == '//////'
-          @chunks.shift
-          @sky_conditions ||= []
-          @sky_conditions << 'Not observed'
+          @chunks.shift # Simply dispose of it
           sky_conditions!
           return
         end
@@ -336,7 +305,6 @@ module Metar
       if @chunks[0] == 'RMK'
         @chunks.shift
       end
-      @remarks ||= []
       @remarks += @chunks.clone
       @chunks = []
       remarks!

data/lib/metar/report.rb

@@ -1,10 +1,63 @@
 # encoding: utf-8
 
 module Metar
+
   class Report
 
+    KNOWN_ATTRIBUTES =
+      [
+       :station_code, :station_name, :station_country,
+       :date, :time, :observer,
+       :wind, :variable_wind,
+       :visibility, :runway_visible_range,
+       :present_weather,
+       :sky_summary, :sky_conditions,
+       :temperature, :dew_point, :remarks
+      ]
+
+    DEFAULT_ATTRIBUTES =
+      [
+       :station_name, :station_country,
+       :time,
+       :wind,
+       :visibility,
+       :present_weather,
+       :sky_summary,
+       :temperature
+      ]
+
+    instance_eval do
+
+      def reset_options!
+        @attributes = DEFAULT_ATTRIBUTES.clone
+      end
+
+      def attributes
+        @attributes
+      end
+
+      def attributes=(attributes)
+        @attributes = attributes.clone
+      end
+
+      reset_options!
+    end
+
     def initialize(parser)
       @parser = parser
+      @station = Station.find_by_cccc(@parser.station_code)
+    end
+
+    def station_name
+      @station.name
+    end
+
+    def station_country
+      @station.country
+    end
+
+    def station_code
+      @parser.station_code
     end
 
     def date
@@ -15,6 +68,10 @@ module Metar
       "%u:%u" % [@parser.time.hour, @parser.time.min]
     end
 
+    def observer
+      I18n.t('metar.observer.' + @parser.observer.to_s)
+    end
+
     def wind
       @parser.wind.to_s
     end
@@ -35,6 +92,11 @@ module Metar
       @parser.present_weather.to_s
     end
 
+    def sky_summary
+      return I18n.t('metar.sky_conditions.clear skies') if @parser.sky_conditions.length == 0
+      @parser.sky_conditions[-1].to_summary
+    end
+
     def sky_conditions
       @parser.sky_conditions.collect { |sky| sky.to_s }.join(', ')
     end
@@ -55,41 +117,24 @@ module Metar
       @parser.sea_level_pressure.to_s
     end
 
-  end
-end
-
-__END__
-
-
-    def attributes_to_s
-      attrib = attributes
-      texts = {}
-      texts[:wind]                 = attrib[:wind]                            if attrib[:wind]
-      texts[:variable_wind]        = attrib[:variable_wind]                   if attrib[:variable_wind]
-      texts[:visibility]           = "%u meters" % attrib[:visibility].value  if attrib[:visibility]
-      texts[:runway_visible_range] = attrib[:runway_visible_range].join(', ') if attrib[:runway_visible_range]
-      texts[:present_weather]      = attrib[:present_weather].join(', ')      if attrib[:present_weather]
-      texts[:sky_conditions]       = attrib[:sky_conditions].join(', ')       if attrib[:sky_conditions]
-      texts[:temperature]          = "%u celcius" % attrib[:temperature]      if attrib[:temperature]
-      texts[:dew_point]            = "%u celcius" % attrib[:dew_point]        if attrib[:dew_point]
-      texts[:remarks]              = attrib[:remarks].join(', ')              if attrib[:remarks]
-
-      texts
+    def remarks
+      @parser.remarks.join(', ')
+    end
+    
+    def attributes
+      Metar::Report.attributes.reduce([]) do |memo, key|
+        value = self.send(key).to_s
+        memo << {:attribute => key, :value => value} if not value.empty?
+        memo
+      end
     end
 
     def to_s
-      # If attributes supplied an ordered hash, the hoop-jumping below
-      # wouldn't be necessary
-      attr = attributes_to_s
-      [:station_code, :time, :observer, :wind, :variable_wind, :visibility, :runway_visible_range,
-       :present_weather, :sky_conditions, :temperature, :dew_point, :remarks].collect do |key|
-        attr[key] ? self.symbol_to_s(key) + ": " + attr[key] : nil
-      end.compact.join("\n")
+      attributes.collect do |attribute|
+        I18n.t('metar.' + attribute[:attribute].to_s + '.title') + ': ' + attribute[:value]
+      end.join("\n")
     end
 
-    private
+  end
 
-    # :symbol_etc => 'Symbol etc'
-    def self.symbol_to_s(sym)
-      sym.to_s.gsub(/^([a-z])/) {$1.upcase}.gsub(/_([a-z])/) {" #$1"}
-    end
+end

data/lib/metar/station.rb

@@ -23,7 +23,7 @@ module Metar
       end
 
       # Load local copy of the station list
-      # and download it first if  missing
+      # 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|
@@ -39,15 +39,15 @@ module Metar
         end
       end
 
-      def find_by_cccc(cccc)
-        all.find { |station| station.cccc == cccc }
-      end
-      
       # Does the given CCCC code exist?
       def exist?(cccc)
         not find_data_by_cccc(cccc).nil?
       end
 
+      def find_by_cccc(cccc)
+        all.find { |station| station.cccc == cccc }
+      end
+
       def to_longitude(s)
         s =~ /^(\d+)-(\d+)([EW])/ or return nil
         ($3 == 'E' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0)

data/lib/metar.rb

@@ -8,7 +8,7 @@ module Metar
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY = 3
+    TINY = 4
  
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
@@ -18,7 +18,7 @@ module Metar
   end
 
   # Raised when an unrecognized value is found
-  class MetarParserError < MetarError
+  class ParseError < MetarError
   end
 
 end

data/locales/en.yml

@@ -11,15 +11,37 @@ en:
       bar:
         full: bar
   metar:
+    station_code:
+      title: station code
+    station_name:
+      title: name
+    station_country:
+      title: country
+    time:
+      title: time
+    observer:
+      title: observer
+      real: real
+      auto: automatic
+      corrected: corrected
     altitude:
       at: at
     distance:
+      title: distance
       unknown: unknown
     wind:
+      title: wind
       variable_direction: variable direction
       unknown_direction: unknown direction
       unknown_speed: unknown speed
+    variable_wind:
+      title: wind variation
+    visibility:
+      title: visibility
+    sky_summary:
+      title: sky
     sky_conditions:
+      title: sky conditions
       clear skies: clear skies
       broken: broken cloud
       broken cumulonimbus: broken cumulonimbus
@@ -32,10 +54,13 @@ en:
       scattered towering cumulus: scattered towering cumulus clouds
       overcast: overcast
     runway_visible_range:
+      title: runway visible range
       runway: runway
       from: from
       to: to
-    weather:
+    present_weather:
+      title: weather
+      not observed: not observed
       mist: mist
       dust: dust
       blowing dust: blowing dust
@@ -119,3 +144,9 @@ en:
       light thunderstorm and unknown phenomenon: light thunderstorm and unknown phenomenon
       heavy unknown phenomenon: heavy unknown phenomenon
       light unknown phenomenon: light unknown phenomenon
+    temperature:
+      title: temperature
+    dew_point:
+      title: punto di rugiada
+    remarks:
+      title: annotazioni

data/locales/it.yml

@@ -11,15 +11,37 @@ it:
       bar:
         full: bar
   metar:
+    station_code:
+      title: codice stazione
+    station_name:
+      title: nome
+    station_country:
+      title: nazione
+    time:
+      title: ora
+    observer:
+      title: osservatore
+      real: reale
+      auto: automazzato
+      corrected: corretto
     altitude:
       at: a
     distance:
+      title: distanza
       unknown: sconosciuto
     wind:
+      title: vento
       variable_direction: direzione variabile
       unknown_direction: direzione sconosciuta
       unknown_speed: velocità sconosciuta
+    variable_wind:
+      title: variazione del vento
+    visibility:
+      title: visibilità
+    sky_summary:
+      title: cielo
     sky_conditions:
+      title: condizioni del cielo
       clear skies: cielo sereno
       broken: nuvolosità parziale
       broken cumulonimbus: copertura parziale di cumulonembi
@@ -32,10 +54,13 @@ it:
       scattered towering cumulus: cumulonembi sparsi
       overcast: chiuso
     runway_visible_range:
+      title: visibilità sulle piste
       runway: pista
       from: da
       to: a
-    weather:
+    present_weather:
+      title: tempo
+      not observed: non osservato
       mist: foschia
       dust: polvere
       blowing dust: polviscolo
@@ -119,3 +144,9 @@ it:
       light thunderstorm and unknown phenomenon: temporale con fenomeno sconosciuto leggero
       heavy unknown phenomenon: fenomeno sconosciuto intenso
       light unknown phenomenon: fenomeno sconosciuto leggero
+    temperature:
+      title: temperatura
+    dew_point:
+      title: punto di rugiada
+    remarks:
+      title: annotazioni

data/test/metar_test_helper.rb

@@ -11,4 +11,23 @@ Metar::Raw.instance_eval do
   end
 end
 
+# Don't load station data from files
+module Metar
+  class Station
+
+    class << self
+
+      def all_structures
+        [
+          { :cccc => 'LIRQ', :country => 'Italy', :latitude => '43-48N', :longitude => '011-12E', :name => 'Firenze / Peretola', :state => '' },
+          { :cccc => 'DAAS', :country => 'Algeria', :latitude => '36-11N',  :longitude => '005-25E', :name => 'Setif', :state => '' },
+          { :cccc => 'ESSB', :country => 'Sweden', :latitude => '59-21N', :longitude => '017-57E',:name => 'Stockholm / Bromma', :state => '' },
+          { :cccc => 'KPDX', :country => 'United States', :latitude => '45-35N', :longitude => '122-36W', :name => 'PORTLAND INTERNATIONAL  AIRPORT', :state => '' },
+          { :cccc => 'CYXS', :country => 'Canada', :latitude => '53-53N', :longitude => '122-41W', :name => 'Prince George, B. C.', :state => '' },
+        ]
+      end
+    end
+  end
+end
+
 require 'test/unit'

data/test/unit/data_test.rb

@@ -43,26 +43,31 @@ class TestMetarData < Test::Unit::TestCase
     assert_not_nil(Metar::Speed.options)
   end
 
-  def test_speed_parse_default_unit
+  def test_speed_parse_without_units
     speed = Metar::Speed.parse('12')
     assert_equal(12, speed.to_kilometers_per_hour)
-    assert_equal(:kilometers_per_hour, speed.options[:units])
   end
 
   def test_speed_parse_kilometers_per_hour
     speed = Metar::Speed.parse('12KMH')
     assert_equal(12, speed.to_kilometers_per_hour)
-    assert_equal(:kilometers_per_hour, speed.options[:units])
   end
 
   def test_speed_parse_knots
     speed = Metar::Speed.parse('12KT')
-    assert_equal(:knots, speed.options[:units])
+    assert_equal(12.0, speed.to_knots)
+    assert_equal(:kilometers_per_hour, speed.options[:units])
   end
 
-  def test_speed_parse_meters_per_second
+  def test_speed_parse_kilometers_per_hour_is_default
+    speed = Metar::Speed.parse('12')
+    assert_equal(:kilometers_per_hour, speed.options[:units])
     speed = Metar::Speed.parse('12MPS')
-    assert_equal(:meters_per_second, speed.options[:units])
+    assert_equal(:kilometers_per_hour, speed.options[:units])
+    speed = Metar::Speed.parse('12KMH')
+    assert_equal(:kilometers_per_hour, speed.options[:units])
+    speed = Metar::Speed.parse('12KT')
+    assert_equal(:kilometers_per_hour, speed.options[:units])
   end
 
   # Temperature
@@ -104,55 +109,65 @@ class TestMetarData < Test::Unit::TestCase
   end
 
   # Wind
-  def test_wind_parse_default_units
+  def test_wind_parse_without_units
     wind = Metar::Wind.parse('18012')
     assert_equal(180, wind.direction.value)
     assert_equal(12.0, wind.speed.to_kilometers_per_hour)
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
   end
 
   def test_wind_parse_mps
     wind = Metar::Wind.parse('18012MPS')
     assert_equal(180, wind.direction.value)
     assert_equal(12.0, wind.speed.value)
-    assert_equal(:meters_per_second, wind.speed.options[:units])
   end
 
   def test_wind_parse_kmh
     wind = Metar::Wind.parse('27012KMH')
     assert_equal(270, wind.direction.value)
     assert_equal(12.0, wind.speed.to_kilometers_per_hour)
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
   end
 
   def test_wind_parse_knots
     wind = Metar::Wind.parse('24006KT')
     assert_equal(240, wind.direction.value)
     assert_equal(6, wind.speed.to_knots)
-    assert_equal(:knots, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
   end
 
   def test_wind_parse_variable_direction
     wind = Metar::Wind.parse('VRB20KT')
     assert_equal(:variable_direction, wind.direction)
     assert_equal(20, wind.speed.to_knots)
-    assert_equal(:knots, wind.speed.options[:units])
-    assert_equal('variable direction, 20 knots', wind.to_s)
+    assert_equal('37km/h variable direction', wind.to_s)
   end
 
   def test_wind_parse_unknown_direction
     wind = Metar::Wind.parse('///20KT')
     assert_equal(:unknown_direction, wind.direction)
     assert_equal(20, wind.speed.to_knots)
-    assert_equal(:knots, wind.speed.options[:units])
-    assert_equal('unknown direction, 20 knots', wind.to_s)
+    assert_equal('37km/h unknown direction', wind.to_s)
   end
 
   def test_wind_parse_unknown_direction_and_speed
     wind = Metar::Wind.parse('/////')
     assert_equal(:unknown_direction, wind.direction)
     assert_equal(:unknown, wind.speed)
-    assert_equal('unknown direction, unknown speed', wind.to_s)
+    assert_equal('unknown speed unknown direction', wind.to_s)
+  end
+
+  def test_wind_parse_default_output_units_kilometers_per_hour
+    wind = Metar::Wind.parse('18012')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    wind = Metar::Wind.parse('18012MPS')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    wind = Metar::Wind.parse('27012KMH')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    wind = Metar::Wind.parse('24006KT')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    wind = Metar::Wind.parse('VRB20KT')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    wind = Metar::Wind.parse('///20KT')
+    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
   end
 
   # VariableWind

data/test/unit/parser_test.rb

@@ -15,11 +15,22 @@ class TestMetarParser < Test::Unit::TestCase
     end
   end
 
+  def test_time_obligatory
+    assert_raise(Metar::ParseError) {
+      setup_parser('PAIL', "2010/02/06 16:10\nPAIL 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
+    }
+  end
+
   def test_date
     parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
     assert_equal(Date.new(2010, 2, 6), parser.date)
   end
 
+  def test_observer_real
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+    assert_equal(:real, parser.observer)
+  end
+
   def test_wind
     parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
     assert_in_delta(240, parser.wind.direction.value, 0.0001)
@@ -46,6 +57,11 @@ class TestMetarParser < Test::Unit::TestCase
     assert_equal(:no_change, parser.runway_visible_range[0].tendency)
   end
 
+  def test_runway_visible_range_defaults_to_empty_array
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+    assert_equal(0, parser.runway_visible_range.length)
+  end
+
   def test_runway_visible_range_variable
     parser = setup_parser('KPDX', "2010/02/15 11:08\nKPDX 151108Z 11006KT 1/4SM R10R/1600VP6000FT FG OVC002 05/05 A3022 RMK AO2")
     assert_equal(1600.0, parser.runway_visible_range[0].visibility1.distance.to_feet)
@@ -61,6 +77,11 @@ class TestMetarParser < Test::Unit::TestCase
     assert_equal('snow', parser.present_weather[0].phenomenon)
   end
 
+  def test_present_weather_defaults_to_empty_array
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+    assert_equal(0, parser.present_weather.length)
+  end
+
   def test_sky_conditions
     parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
     assert_equal(2, parser.sky_conditions.length)
@@ -70,11 +91,22 @@ class TestMetarParser < Test::Unit::TestCase
     assert_equal(900, parser.sky_conditions[1].height.value)
   end
 
+  def test_sky_conditions_defaults_to_empty_array
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN M17/M20 A2910 RMK AO2 P0000")
+    assert_equal(0, parser.sky_conditions.length)
+  end
+
   def test_vertical_visibility
     parser = setup_parser('CYXS', "2010/02/15 10:34\nCYXS 151034Z AUTO 09003KT 1/8SM FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
     assert_equal(30, parser.vertical_visibility.value)
   end
 
+  def test_temperature_obligatory
+    assert_raise(Metar::ParseError) {
+      setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 A2910 RMK AO2 P0000")
+    }
+  end
+
   def test_temperature
     parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
     assert_equal(-17, parser.temperature.value)
@@ -91,6 +123,20 @@ class TestMetarParser < Test::Unit::TestCase
     assert_equal(:bar, parser.sea_level_pressure.options[:units])
   end
 
+  def test_remarks
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+    assert_instance_of(Array, parser.remarks)
+    assert_equal(2, parser.remarks.length)
+    assert_equal('AO2', parser.remarks[0])
+    assert_equal('P0000', parser.remarks[1])
+  end
+
+  def test_remarks_defaults_to_empty_array
+    parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910")
+    assert_instance_of(Array, parser.remarks)
+    assert_equal(0, parser.remarks.length)
+  end
+
   private
 
   def setup_parser(cccc, metar)

data/test/unit/raw_test.rb

@@ -18,10 +18,19 @@ class TestMetarRaw < Test::Unit::TestCase
     end
   end
 
-  def test_attributes
+  def test_cccc
     raw = Metar::Raw.new('LIRQ')
     assert_equal('LIRQ', raw.cccc)
+  end
+
+  def test_time
+    raw = Metar::Raw.new('LIRQ')
     assert_instance_of(Time, raw.time)
+    assert_equal(2010, raw.time.year)
+  end
+
+  def test_metar
+    raw = Metar::Raw.new('LIRQ')
     assert_instance_of(String, raw.metar)
   end
 

data/test/unit/report_test.rb

@@ -5,7 +5,11 @@ require File.dirname(__FILE__) + '/../metar_test_helper'
 
 class TestMetarReport < Test::Unit::TestCase
   def setup
-    I18n.locale = :en
+  end
+
+  def test_name
+    report = setup_report('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
+    assert_equal('Firenze / Peretola', report.station_name)
   end
 
   def test_date
@@ -20,13 +24,12 @@ class TestMetarReport < Test::Unit::TestCase
 
   def test_wind_knots
     report = setup_report('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
-    assert_equal('10°, 7 knots', report.wind)
-    I18n.locale = :it
-    assert_equal('10°, 7 nodi', report.wind)
+    assert_equal('13km/h N', report.wind)
   end
 
   def test_variable_wind
     report = setup_report('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
+    I18n.locale = :en
     assert_equal('350 degrees - 50 degrees', report.variable_wind)
   end
 
@@ -37,11 +40,15 @@ class TestMetarReport < Test::Unit::TestCase
 
   def test_runway_visible_range
     report = setup_report('ESSB', "2010/02/15 10:20\nESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55")
+    I18n.locale = :en
     assert_equal('runway 12: 1000m, runway 30: 1500m', report.runway_visible_range)
+    I18n.locale = :it
+    assert_equal('pista 12: 1000m, pista 30: 1500m', report.runway_visible_range)
   end
 
   def test_runway_visible_range_variable
     report = setup_report('KPDX', "2010/02/15 11:08\nKPDX 151108Z 11006KT 1/4SM R10R/1600VP6000FT FG OVC002 05/05 A3022 RMK AO2")
+    I18n.locale = :en
     assert_equal('runway 10R: from 1600ft to more than 6000ft', report.runway_visible_range)
   end
 
@@ -80,6 +87,13 @@ class TestMetarReport < Test::Unit::TestCase
     assert_equal('1.00500 bar', report.sea_level_pressure)
   end
 
+  def test_to_s
+    report = setup_report('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
+    Metar::Report.attributes -= [:station_code, :variable_wind, :observer, :remarks]
+    I18n.locale = :en
+    assert_equal("name: Firenze / Peretola\ncountry: Italy\ntime: 15:20\nwind: 13km/h N\nvisibility: more than 10km\nsky: broken cloud\ntemperature: 8°C", report.to_s)
+  end
+
   private
 
   def setup_report(cccc, metar)

data/test/unit/station_test.rb

@@ -24,6 +24,26 @@ class TestStation < Test::Unit::TestCase
     assert_not_nil Metar::Station.find_by_cccc('LIRQ')
   end
 
+  def test_to_latitude_incorrect_gives_nil
+    assert_nil Metar::Station.to_latitude('23-15')
+  end
+
+  def test_to_latitude_n
+    assert_equal 43.8, Metar::Station.to_latitude('43-48N')
+  end
+
+  def test_to_latitude_s
+    assert_equal -23.25, Metar::Station.to_latitude('23-15S')
+  end
+
+  def test_to_longitude_e
+    assert_equal 11.2, Metar::Station.to_longitude('11-12E')
+  end
+
+  def test_to_longitude_w
+    assert_equal -11.2, Metar::Station.to_longitude('11-12W')
+  end
+
   def test_instantiation_sets_cccc
     station = Metar::Station.new('LIRQ')
     assert_equal 'LIRQ', station.cccc
@@ -40,29 +60,29 @@ class TestStation < Test::Unit::TestCase
     assert station.loaded?
   end
 
-  def test_latitude_is_a_decimal_number
+  def test_name
     station = Metar::Station.new('LIRQ')
-    assert station.latitude.to_s == station.latitude.to_f.to_s
+    assert_equal 'Firenze / Peretola', station.name
   end
 
-  def test_longitude_is_a_decimal_number
+  def test_state
     station = Metar::Station.new('LIRQ')
-    assert station.longitude.to_s == station.longitude.to_f.to_s
+    assert_equal '', station.state
   end
 
-  def test_to_latitude_north
-    assert(Metar::Station.to_latitude('43-48N') == 43.8)
+  def test_country
+    station = Metar::Station.new('LIRQ')
+    assert_equal 'Italy', station.country
   end
 
-  def test_to_latitude_south
-    assert(Metar::Station.to_latitude('43-48S') == -43.8)
+  def test_latitude_is_a_decimal_number
+    station = Metar::Station.new('LIRQ')
+    assert_equal station.latitude.to_s, station.latitude.to_f.to_s
   end
 
-  def test_to_longitude_east
-    assert(Metar::Station.to_longitude('011-12E') == 11.2)
+  def test_longitude_is_a_decimal_number
+    station = Metar::Station.new('LIRQ')
+    assert_equal station.longitude.to_s, station.longitude.to_f.to_s
   end
 
-  def test_to_longitude_west
-    assert(Metar::Station.to_longitude('011-12W') == -11.2)
-  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Joe Yates