metar-parser 0.1.8 → 0.2.1

data/README.rdoc

@@ -6,13 +6,12 @@ The information comes from the National Oceanic and Atmospheric Association's ra
 
 * Parses METAR strings using a state machine.
 
-= Data format description
+= Data format descrition
 
 * WMO
   * http://www.wmo.int/pages/prog/www/WMOCodes/Manual/Volume-I-selection/Sel2.pdf (pages 27-38)
   * http://dcaa.slv.dk:8000/icaodocs/Annex%203%20-%20Meteorological%20Service%20for%20International%20Air%20Navigation/Cover%20sheet%20to%20AMDT%2074.pdf (Table A3-2. Template for METAR and SPECI)
   * http://booty.org.uk/booty.weather/metinfo/codes/METAR_decode.htm
-  * http://www.flyingineurope.be/metar_taf_decode.htm
 
 * United states:
   * http://www.nws.noaa.gov/oso/oso1/oso12/fmh1/fmh1ch12.htm
@@ -20,15 +19,6 @@ The information comes from the National Oceanic and Atmospheric Association's ra
   * http://weather.cod.edu/notes/metar.html
   * http://www.met.tamu.edu/class/METAR/metar-pg3.html - incomplete
 
-= Sources
-
-* Single Files 
-** ftp://tgftp.nws.noaa.gov/data/observations/metar/stations/[CCCC].TXT - plain text, time 3.1s
-** http://weather.noaa.gov/cgi-bin/mgetmetar.pl?cccc=LIRQ - embedded in HTML, time 0.3s
-* Cycle Files
-** http://weather.noaa.gov/weather/metar.shtml
-** ftp://tgftp.nws.noaa.gov/data/observations/metar/cycles/[NN]Z.TXT
-
 = Other software
 
 Other Ruby libraries offering METAR parsing:

data/Rakefile

@@ -12,32 +12,9 @@ RDOC_PATH = 'doc/rdoc'
 
 task :default => :test
 
-spec = Gem::Specification.new do |s|
-  s.name        = 'metar-parser'
-  s.summary     = 'A Ruby library for METAR weather reports'
-  s.description = 'A Ruby library which handle METAR weather reports. Provides weather station listings and info. Downloads and parses reports. Presents localized full text reports'
-  s.version     = Metar::VERSION::STRING
-
-  s.homepage = 'http://github.com/joeyates/metar-parser'
-  s.author   = 'Joe Yates'
-  s.email    = 'joe.g.yates@gmail.com'
-
-  s.files         = ['README.rdoc', 'COPYING', 'Rakefile'] + FileList['{bin,lib,test}/**/*.rb'] + FileList['locales/**/*.{rb,yml}']
-  s.require_paths = ['lib']
-  s.add_dependency('aasm', '>= 2.1.5')
-  s.add_dependency('i18n', '>= 0.3.5')
-  s.add_dependency('m9t', '>= 0.1.12')
-
-  s.has_rdoc = true
-  s.rdoc_options += RDOC_OPTS
-  s.extra_rdoc_files = ['README.rdoc', 'COPYING']
-
-  s.test_file = 'test/all_tests.rb'
-end
-
 Rake::TestTask.new do |t|
   t.libs << 'test'
-  t.test_files = FileList['test/unit/*_test.rb']
+  t.test_files = FileList['test/**/*.rb']
   t.verbose = true
 end
 
@@ -48,5 +25,12 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.add ['README.rdoc', 'COPYING', 'lib/**/*.rb']
 end
 
-Rake::GemPackageTask.new(spec) do |pkg|
+desc "Build the gem"
+task :build do
+  system "gem build metar-parser.gemspec"
+end
+
+desc "Publish a new version of the gem"
+task :release => :build do
+  system "gem push metar-parser-#{Metar::VERSION}"
 end

data/bin/download_raw.rb

@@ -16,6 +16,8 @@ Metar::Station.load_local
 
   stations = {}
 
+  Metar::Raw.cache_connection
+
   Metar::Station.all.each do |station|
 
     next if station.cccc[0, 1] < initial

data/lib/metar/data.rb

@@ -6,25 +6,30 @@ require 'm9t'
 module Metar
   locales_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'locales'))
   I18n.load_path += Dir.glob("#{ locales_path }/*.yml")
-  I18n.reload!
 
   # Subclasses M9t::Distance
   # Uses kilometers as desired default output unit
   class Distance < M9t::Distance
 
+    attr_accessor :units
+
     # nil is taken to mean 'data unavailable'
-    def initialize(meters = nil, options = {})
+    def initialize( meters = nil )
+      @units = units || :meters
       if meters
-        super(meters, { :units => :kilometers, :precision => 0, :abbreviated => true }.merge(options))
+        super
       else
         @value = nil
       end
     end
 
     # Handles nil case differently to M9t::Distance
-    def to_s
+    def to_s( options = {} )
+      options = { :units     => @units, 
+                  :precision => 0,
+                  :abbreviated => true }.merge( options )
       return I18n.t('metar.distance.unknown') if @value.nil?
-      super
+      super( options )
     end
 
   end
@@ -42,9 +47,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 => :kilometers_per_hour, :precision => 0, :abbreviated => true })
+        send( METAR_UNITS[$2], $1.to_i )
       when s =~ /^(\d+)$/
-        kilometers_per_hour($1.to_i, { :units => :kilometers_per_hour, :precision => 0, :abbreviated => true })
+        kilometers_per_hour( $1.to_i )
       else
         nil
       end
@@ -60,12 +65,17 @@ module Metar
         sign = $1
         value = $2.to_i
         value *= -1 if sign == 'M'
-        new(value, { :units => :degrees, :precision => 0, :abbreviated => true })
+        new( value )
       else
         nil
       end
     end
 
+    def to_s( options = {} )
+      options = { :abbreviated => true, :precision => 0 }.merge( options )
+      super( options )
+    end
+
   end
 
   # Adds a parse method to the M9t base class
@@ -89,9 +99,13 @@ module Metar
     def Wind.parse(s)
       case
       when s =~ /^(\d{3})(\d{2}(|MPS|KMH|KT))$/
-        new(M9t::Direction.new($1, { :units => :compass, :abbreviated => true }), Speed.parse($2))
+        new( M9t::Direction.new( $1 ),
+             Speed.parse( $2 ),
+             :direction_units => :compass )
       when s =~ /^(\d{3})(\d{2})G(\d{2,3}(|MPS|KMH|KT))$/
-        new(M9t::Direction.new($1, { :units => :compass, :abbreviated => true }), Speed.parse($2))
+        new( M9t::Direction.new( $1 ),
+             Speed.parse( $2 ),
+             :direction_units => :compass )
       when s =~ /^VRB(\d{2}(|MPS|KMH|KT))$/
         new(:variable_direction, Speed.parse($1))
       when s =~ /^\/{3}(\d{2}(|MPS|KMH|KT))$/
@@ -103,9 +117,11 @@ module Metar
       end
     end
 
-    attr_reader :direction, :speed, :units
+    attr_reader :direction, :speed, :options
 
-    def initialize(direction, speed, units = :kilometers_per_hour)
+    def initialize( direction, speed, options = {} )
+      @options = { :direction_units => :compass,
+                   :speed_units     => :kilometers_per_hour }.merge( options )
       @direction, @speed = direction, speed
     end
 
@@ -117,14 +133,16 @@ module Metar
         when :unknown_direction
           I18n.t('metar.wind.unknown_direction')
         else
-          @direction.to_s
+          @direction.to_s( :units => @options[ :direction_units ] )
         end
       speed =
         case @speed
         when :unknown
           I18n.t('metar.wind.unknown_speed')
         else
-          @speed.to_s
+          @speed.to_s( :abbreviated => true,
+                       :precision   => 0,
+                       :units       => @options[ :speed_units ] )
         end  
       "#{ speed } #{ direction }"
     end
@@ -158,22 +176,28 @@ module Metar
     def Visibility.parse(s)
       case
       when s == '9999'
-        new(Distance.new(10000), nil, :more_than)
+        new( Distance.new( 10000 ), nil, :more_than )
       when s =~ /(\d{4})NDV/ # WMO
-        new(Distance.new($1.to_f)) # Assuming meters
+        new( Distance.new( $1.to_f ) ) # Assuming meters
       when (s =~ /^((1|2)\s|)([13])\/([248])SM$/) # US
-        miles = $1.to_f + $3.to_f / $4.to_f
-        new(Distance.miles(miles, {:units => :miles}))
+        miles          = $1.to_f + $3.to_f / $4.to_f
+        distance       = Distance.miles( miles )
+        distance.units = :miles
+        new( distance )
       when s =~ /^(\d+)SM$/ # US
-        new(Distance.miles($1.to_f, {:units => :miles}))
+        distance       = Distance.miles( $1.to_f )
+        distance.units = :miles
+        new( distance )
       when s == 'M1/4SM' # US
-        new(Distance.miles(0.25, {:units => :miles}), nil, :less_than)
+        distance       = Distance.miles( 0.25 )
+        distance.units = :miles
+        new( distance, nil, :less_than )
       when s =~ /^(\d+)KM$/
-        new(Distance.kilometers($1))
+        new( Distance.kilometers( $1 ) )
       when s =~ /^(\d+)$/ # Units?
-        new(Distance.kilometers($1))
+        new( Distance.kilometers( $1 ) )
       when s =~ /^(\d+)(N|NE|E|SE|S|SW|W|NW)$/
-        new(Distance.kilometers($1), M9t::Direction.compass($2))
+        new( Distance.kilometers( $1 ), M9t::Direction.compass( $2 ) )
       else
         nil
       end
@@ -185,18 +209,27 @@ module Metar
       @distance, @direction, @comparator = distance, direction, comparator
     end
 
-    def to_s
+    def to_s( options = {} )
+      distance_options = { :abbreviated => true,
+                           :precision   => 0,
+                           :units       => :kilometers }.merge( options )
+      direction_options = { :units => :compass }
       case
-      when (@direction.nil? and @comparator.nil?)
-        @distance.to_s
+      when ( @direction.nil? and @comparator.nil? )
+        @distance.to_s( distance_options )
       when @comparator.nil?
-        "%s %s" % [@distance.to_s, @direction.to_s]
+        "%s %s" % [ @distance.to_s( distance_options ),
+                    @direction.to_s( direction_options ) ]
       when @direction.nil?
-        "%s %s" % [I18n.t('comparison.' + @comparator.to_s), @distance.to_s]
+        "%s %s" % [ I18n.t( 'comparison.' + @comparator.to_s ),
+                    @distance.to_s( distance_options ) ]
       else
-        "%s %s %s" % [I18n.t('comparison.' + @comparator.to_s), @distance.to_s, direction]
+        "%s %s %s" % [ I18n.t( 'comparison.' + @comparator.to_s ),
+                       @distance.to_s( distance_options ),
+                       @direction.to_s( direction_options ) ]
       end
     end
+
   end
 
   class RunwayVisibleRange
@@ -213,7 +246,7 @@ module Metar
         count      = $3.to_f
         tendency   = TENDENCY[$4]
         units      = UNITS[$5]
-        distance   = Distance.send(units, count, { :units => units })
+        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)?$/
@@ -224,26 +257,36 @@ module Metar
         count2      = $5.to_f
         tendency    = TENDENCY[$6]
         units       = UNITS[$7]
-        distance1   = Distance.send(units, count1, { :units => units })
-        distance2   = Distance.send(units, count2, { :units => units })
-        visibility1 = Visibility.new(distance1, nil, comparator1)
-        visibility2 = Visibility.new(distance2, nil, comparator2)
-        new(designator, visibility1, visibility2, tendency)
+        distance1   = Distance.send( units, count1 )
+        distance2   = Distance.send( units, count2 )
+        visibility1 = Visibility.new( distance1, nil, comparator1 )
+        visibility2 = Visibility.new( distance2, nil, comparator2 )
+        new( designator, visibility1, visibility2, tendency, units )
       else
         nil
       end
     end
 
     attr_reader :designator, :visibility1, :visibility2, :tendency
-    def initialize(designator, visibility1, visibility2 = nil, tendency = nil)
-      @designator, @visibility1, @visibility2, @tendency = designator, visibility1, visibility2, tendency
+    def initialize( designator, visibility1, visibility2 = nil, tendency = nil, units = :meters )
+      @designator, @visibility1, @visibility2, @tendency, @units = designator, visibility1, visibility2, tendency, units
     end
 
     def to_s
+      distance_options = { :abbreviated => true,
+                           :precision   => 0,
+                           :units       => @units }
       if @visibility2.nil?
-        I18n.t('metar.runway_visible_range.runway') + ' ' + @designator + ': ' + @visibility1.to_s
+        I18n.t('metar.runway_visible_range.runway') +
+          ' ' + @designator +
+          ': ' + @visibility1.to_s( distance_options )
       else
-        I18n.t('metar.runway_visible_range.runway') + ' ' + @designator + ': ' + I18n.t('metar.runway_visible_range.from') + ' ' + @visibility1.to_s + ' ' + I18n.t('metar.runway_visible_range.to') + ' ' + @visibility2.to_s
+        I18n.t('metar.runway_visible_range.runway') +
+          ' ' + @designator +
+          ': ' + I18n.t('metar.runway_visible_range.from') +
+          ' ' + @visibility1.to_s( distance_options ) +
+          ' ' + I18n.t('metar.runway_visible_range.to') +
+          ' ' + @visibility2.to_s( distance_options )
       end
     end
 
@@ -345,7 +388,7 @@ module Metar
         new
       when sky_condition =~ /^(BKN|FEW|OVC|SCT)(\d+)(CB|TCU|\/{3})?$/
         quantity = QUANTITY[$1]
-        height = Distance.new($2.to_i * 30.0, { :units => :meters })
+        height = Distance.new( $2.to_i * 30.0 )
         type =
           case $3
           when 'CB'
@@ -389,10 +432,10 @@ module Metar
 
   class VerticalVisibility
 
-    def VerticalVisibility.parse(vertical_visibility)
+    def VerticalVisibility.parse( vertical_visibility )
       case
       when vertical_visibility =~ /^VV(\d{3})$/
-        Distance.new($1.to_f * 30.0, { :units => :meters })
+        Distance.new( $1.to_f * 30.0 )
       when vertical_visibility == '///'
         Distance.new
       else

data/lib/metar/parser.rb

@@ -88,6 +88,7 @@ module Metar
       station = Metar::Station.new(cccc)
       raw = Metar::Raw.new(station)
       parser = new(raw)
+      parser.analyze
       parser
     end
 
@@ -180,7 +181,8 @@ module Metar
       if @chunks[0] == 'CAVOK'
         @chunks.shift
         @visibility = Visibility.new(M9t::Distance.kilometers(10), nil, :more_than)
-        @sky_conditions << SkyCondition.new
+        @present_weather << Metar::WeatherPhenomenon.new('No significant weather')
+        @sky_conditions << SkyCondition.new # = 'clear skies'
         cavok!
         return
       end

data/lib/metar/raw.rb

@@ -9,46 +9,22 @@ module Metar
 
       @connection = nil
 
+      def cache_connection
+        @connection = connection
+      end
+
       def connection
         return @connection if @connection
-        @connection = Net::FTP.new('tgftp.nws.noaa.gov')
-        @connection.login
-        @connection.passive = true
-        @connection
+        connection = Net::FTP.new('tgftp.nws.noaa.gov')
+        connection.login
+        connection.chdir('data/observations/metar/stations')
+        connection.passive = true
+        connection
       end
 
       def fetch(cccc)
-        fetch_file("#{ cccc }.TXT", '/data/observations/metar/stations')
-      end
-
-      # Downloads the latest cycle file (http://weather.noaa.gov/weather/metar.shtml#files)
-      # The files contain a lot (circa 80%) of duplicates
-      # Returns a hash { '[CCCC code]' => 2 line METAR report }
-      # This function takes 10s of seconds to download
-      # N.B.: There is a 10m period each day when each file is not present (the 10m before data is collected)
-      def hourly(hour = current_cycle_hour)
-        cycle_file_name = "%02uZ.TXT" % hour
-        cycle_file = fetch_file(cycle_file_name, '/data/observations/metar/cycles')
-        cycle_file.each_line("\n\n").reduce({}) do |memo, metar|
-          metar =~ /\n([A-Z]...)\s/
-          cccc = $1
-          memo[cccc] = metar
-          memo
-        end
-      end
-
-      # For logic, see http://weather.noaa.gov/weather/metar.shtml - A Discussion of METAR Cycles
-      def current_cycle_hour
-        time = Time.now.gmtime
-        time.min > 44 ? time.hour : time.hour - 1
-      end
-
-      private
-
-      def fetch_file(file, directory = nil)
-        connection.chdir(directory) if directory
         s = ''
-        connection.retrbinary("RETR #{ file }", 1024) do |chunk|
+        connection.retrbinary("RETR #{ cccc }.TXT", 1024) do |chunk|
           s << chunk
         end
         s

data/lib/metar/report.rb

@@ -39,11 +39,6 @@ module Metar
       def attributes=(attributes)
         @attributes = attributes.clone
       end
-      
-      def for_cccc(cccc)
-        parser = Parser.for_cccc(cccc)
-        new(parser)
-      end
 
       reset_options!
     end

data/lib/metar/station.rb

@@ -49,15 +49,13 @@ module Metar
       end
 
       def to_longitude(s)
-        s =~ /^(\d+)-(\d+)(-(\d+))?([EW])/ or return nil
-        seconds = $4 ? $4.to_f / 3600.0 : 0.0
-        ($5 == 'E' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0 + seconds)
+        s =~ /^(\d+)-(\d+)([EW])/ or return nil
+        ($3 == 'E' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0)
       end
 
       def to_latitude(s)
-        s =~ /^(\d+)-(\d+)(-(\d+))?([SN])/ or return nil
-        seconds = $4 ? $4.to_f / 3600.0 : 0.0
-        ($5 == 'N' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0 + seconds)
+        s =~ /^(\d+)-(\d+)([SN])/ or return nil
+        ($3 == 'N' ? 1.0 : -1.0) * ($1.to_f + $2.to_f / 60.0)
       end
     end
 
@@ -161,7 +159,6 @@ module Metar
 
     # Get data from the NOAA data file (very slow on first call!)
     def load!
-      return if @loaded
       noaa_data  = Station.find_data_by_cccc(@cccc)
       raise "Station identifier '#{ @cccc }' not found" if noaa_data.nil?
       @name      = noaa_data[:name]

data/lib/metar/version.rb

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

data/lib/metar.rb

@@ -2,17 +2,10 @@ require File.join(File.dirname(__FILE__), 'metar', 'raw')
 require File.join(File.dirname(__FILE__), 'metar', 'station')
 require File.join(File.dirname(__FILE__), 'metar', 'parser')
 require File.join(File.dirname(__FILE__), 'metar', 'report')
+require File.join(File.dirname(__FILE__), 'metar', 'version')
 
 module Metar
 
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 1
-    TINY = 8
- 
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-
   # Base class for all Metar exceptions
   class MetarError < StandardError
   end

data/test/unit/data_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../metar_test_helper'
+require 'metar_test_helper'
 
 class TestMetarData < Test::Unit::TestCase
   
@@ -10,7 +10,10 @@ class TestMetarData < Test::Unit::TestCase
   end
 
   def test_m9t_translations_available
-    assert_equal('10 kilometers', M9t::Distance.new(10000, {:units => :kilometers, :precision => 0}).to_s)
+    distance = M9t::Distance.new( 10000 )
+
+    assert_equal( '10 kilometers', distance.to_s( :units     => :kilometers,
+                                                  :precision => 0 ) )
   end
 
   # Distance
@@ -25,12 +28,12 @@ class TestMetarData < Test::Unit::TestCase
   def test_distance_with_default_options
     distance = Metar::Distance.new(123)
     assert_equal(123, distance.value)
-    assert_equal(:kilometers, distance.options[:units])
   end
 
   def test_distance_setting_options
-    distance = Metar::Distance.new(123, { :units => :feet })
-    assert_equal('404ft', distance.to_s)
+    distance = Metar::Distance.new( 123 )
+
+    assert_equal('404ft', distance.to_s( :units => :feet ) )
   end
 
   # Speed
@@ -55,19 +58,22 @@ class TestMetarData < Test::Unit::TestCase
 
   def test_speed_parse_knots
     speed = Metar::Speed.parse('12KT')
+
     assert_equal(12.0, speed.to_knots)
-    assert_equal(:kilometers_per_hour, speed.options[:units])
   end
 
   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(: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])
+    speed = Metar::Speed.parse( '12' )
+    assert_in_delta( M9t::Speed.kilometers_per_hour( 12 ), speed.value, 0.000001 )
+
+    speed = Metar::Speed.parse( '12MPS' )
+    assert_in_delta( 12, speed.value, 0.000001 )
+
+    speed = Metar::Speed.parse( '12KMH' )
+    assert_in_delta( M9t::Speed.kilometers_per_hour( 12 ), speed.value, 0.000001 )
+
+    speed = Metar::Speed.parse( '12KT' )
+    assert_in_delta( M9t::Speed.knots( 12 ), speed.value, 0.000001 )
   end
 
   # Temperature
@@ -84,7 +90,6 @@ class TestMetarData < Test::Unit::TestCase
   def test_temperature_parse_positive
     temperature = Metar::Temperature.parse('12')
     assert_equal(12, temperature.value)
-    assert_equal(:degrees, temperature.options[:units])
   end
 
   def test_temperature_parse_negative
@@ -110,7 +115,8 @@ class TestMetarData < Test::Unit::TestCase
 
   # Wind
   def test_wind_parse_without_units
-    wind = Metar::Wind.parse('18012')
+    wind = Metar::Wind.parse( '18012' )
+
     assert_equal(180, wind.direction.value)
     assert_equal(12.0, wind.speed.to_kilometers_per_hour)
   end
@@ -129,16 +135,18 @@ class TestMetarData < Test::Unit::TestCase
 
   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(:kilometers_per_hour, wind.speed.options[:units])
+
+    assert_equal( 240, wind.direction.value )
+    assert_equal( 6, wind.speed.to_knots )
+    assert_equal( :kilometers_per_hour, wind.options[ :speed_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('37km/h variable direction', wind.to_s)
+    wind = Metar::Wind.parse( 'VRB20KT' )
+
+    assert_equal( :variable_direction, wind.direction )
+    assert_equal( 20, wind.speed.to_knots )
+    assert_equal( '37km/h variable direction', wind.to_s )
   end
 
   def test_wind_parse_unknown_direction
@@ -157,17 +165,17 @@ class TestMetarData < Test::Unit::TestCase
 
   def test_wind_parse_default_output_units_kilometers_per_hour
     wind = Metar::Wind.parse('18012')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
     wind = Metar::Wind.parse('18012MPS')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
     wind = Metar::Wind.parse('27012KMH')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
     wind = Metar::Wind.parse('24006KT')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
     wind = Metar::Wind.parse('VRB20KT')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
     wind = Metar::Wind.parse('///20KT')
-    assert_equal(:kilometers_per_hour, wind.speed.options[:units])
+    assert_equal(:kilometers_per_hour, wind.options[:speed_units])
   end
 
   # VariableWind
@@ -204,31 +212,23 @@ class TestMetarData < Test::Unit::TestCase
   def test_visibility_parse_us_fractions_1_4
     visibility = Metar::Visibility.parse('1/4SM')
     assert_equal(M9t::Distance.miles(0.25).value, visibility.distance.value)
-    assert_equal(:miles, visibility.distance.options[:units])
   end
 
   def test_visibility_parse_us_fractions_2_1_2
     visibility = Metar::Visibility.parse('2 1/2SM')
     assert_equal(M9t::Distance.miles(2.5).value, visibility.distance.value)
-    assert_equal(:miles, visibility.distance.options[:units])
   end
 
   def test_visibility_parse_kilometers
     visibility = Metar::Visibility.parse('5KM')
     assert_equal(5000.0, visibility.distance.value)
-    assert_equal(:kilometers, visibility.distance.options[:units])
   end
 
   def test_visibility_parse_compass
     visibility = Metar::Visibility.parse('5NE')
     assert_equal(5000.0, visibility.distance.value)
-    assert_equal(:kilometers, visibility.distance.options[:units])
     assert_equal(45.0, visibility.direction.value)
-    visibility.distance.options[:units] = :kilometers
-    visibility.distance.options[:abbreviated] = true
-    visibility.distance.options[:precision] = 0
-    visibility.direction.options[:units] = :compass
-    assert_equal('5km NE', visibility.to_s)
+    assert_equal( '5km NE', visibility.to_s )
   end
 
   # RunwayVisibleRange
@@ -328,7 +328,7 @@ class TestMetarData < Test::Unit::TestCase
   end
 
   def test_sky_condition_sct
-    sky_condition = Metar::SkyCondition.parse('SCT016')
+    sky_condition = Metar::SkyCondition.parse( 'SCT016' )
     assert_equal('scattered', sky_condition.quantity)
     assert_equal(480, sky_condition.height.value)
     assert_equal('scattered cloud at 480m', sky_condition.to_s)

data/test/unit/parser_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../metar_test_helper'
+require 'metar_test_helper'
 
 class TestMetarParser < Test::Unit::TestCase
 
@@ -45,8 +45,7 @@ class TestMetarParser < Test::Unit::TestCase
 
   def test_visibility_miles_and_fractions
     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(1.75, parser.visibility.distance.to_miles, 0.01)
-    assert_equal(:miles, parser.visibility.distance.options[:units])
+    assert_in_delta( 1.75, parser.visibility.distance.to_miles, 0.01 )
   end
 
   def test_runway_visible_range
@@ -64,10 +63,9 @@ class TestMetarParser < Test::Unit::TestCase
 
   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)
-    assert_equal(:feet, parser.runway_visible_range[0].visibility1.distance.options[:units])
     assert_equal(6000.0, parser.runway_visible_range[0].visibility2.distance.to_feet)
-    assert_equal(:feet, parser.runway_visible_range[0].visibility2.distance.options[:units])
   end
 
   def test_present_weather
@@ -120,7 +118,6 @@ class TestMetarParser < Test::Unit::TestCase
   def test_sea_level_pressure
     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(29.10, parser.sea_level_pressure.to_inches_of_mercury)
-    assert_equal(:bar, parser.sea_level_pressure.options[:units])
   end
 
   def test_remarks

data/test/unit/raw_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../metar_test_helper'
+require 'metar_test_helper'
 
 class TestMetarRaw < Test::Unit::TestCase
   

data/test/unit/report_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require File.dirname(__FILE__) + '/../metar_test_helper'
+require 'metar_test_helper'
 
 class TestMetarReport < Test::Unit::TestCase
   def setup
@@ -53,7 +53,7 @@ class TestMetarReport < Test::Unit::TestCase
   end
 
   def test_present_weather
-    report = setup_report('DAAS', "2010/02/15 10:00\nDAAS 151000Z 16012KT 9999 -RA FEW010 BKN026 06/05 Q1006")
+    report = setup_report('DAAS', "2010/02/15 10:00\nDAAS 151000Z 16012KT 9999 -RA FEW010 BKN026 06/05 Q1006")    
     assert_equal('light rain', report.present_weather)
     I18n.locale = :it
     assert_equal('pioggia leggera', report.present_weather)
@@ -79,7 +79,7 @@ class TestMetarReport < Test::Unit::TestCase
 
   def test_dew_point
     report = setup_report('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
-    assert_equal('2°C', report.dew_point)
+    assert_equal( '2°C', report.dew_point )
   end
 
   def test_sea_level_pressure
@@ -91,7 +91,7 @@ class TestMetarReport < Test::Unit::TestCase
     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)
+    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

data/test/unit/station_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../metar_test_helper'
+require 'metar_test_helper'
 
 class TestStation < Test::Unit::TestCase
   

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metar-parser
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
+  - 2
   - 1
-  - 8
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors: 
 - Joe Yates
@@ -14,113 +15,71 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 +01:00
+date: 2011-04-04 00:00:00 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: aasm
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 5
-        version: 2.1.5
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 3
-        - 5
-        version: 0.3.5
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: m9t
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 1
-        - 12
-        version: 0.1.12
-  type: :runtime
-  version_requirements: *id003
+dependencies: []
+
 description: A Ruby library which handle METAR weather reports. Provides weather station listings and info. Downloads and parses reports. Presents localized full text reports
 email: joe.g.yates@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
-- COPYING
+extra_rdoc_files: []
+
 files: 
 - README.rdoc
 - COPYING
 - Rakefile
-- bin/parse_raw.rb
 - bin/download_raw.rb
-- lib/metar.rb
-- lib/metar/station.rb
-- lib/metar/raw.rb
-- lib/metar/parser.rb
+- bin/parse_raw.rb
 - lib/metar/data.rb
+- lib/metar/parser.rb
+- lib/metar/raw.rb
 - lib/metar/report.rb
+- lib/metar/station.rb
+- lib/metar/version.rb
+- lib/metar.rb
 - test/all_tests.rb
 - test/metar_test_helper.rb
 - test/unit/data_test.rb
+- test/unit/parser_test.rb
+- test/unit/raw_test.rb
 - test/unit/report_test.rb
 - test/unit/station_test.rb
-- test/unit/raw_test.rb
-- test/unit/parser_test.rb
-- locales/it.yml
 - locales/en.yml
+- locales/it.yml
 has_rdoc: true
 homepage: http://github.com/joeyates/metar-parser
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --quiet
-- --title
-- METAR Weather Report Parser
-- --main
-- README.rdoc
-- --inline-source
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: nowarning
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby library for METAR weather reports