metar-parser 0.9.15 → 1.0.0

data/README.md

@@ -62,8 +62,8 @@ puts parser.temperature.value
 Use Your Own Raw Data
 ---------------------
 ```ruby
-metar_string = "2012/07/28 08:54\nKHWD 280554Z AUTO 29007KT 10SM OVC008 14/12 A3002 RMK AO2 SLP176 T01390117 10211\n"
-raw    = Metar::Raw.new( 'KHWD', metar_string )
+metar_string = "KHWD 280554Z AUTO 29007KT 10SM OVC008 14/12 A3002 RMK AO2 SLP176 T01390117 10211\n"
+raw    = Metar::Raw.new( metar_string )
 parser = Metar::Parser.new( raw )
 ```
 
@@ -72,6 +72,18 @@ Implementation
 
 * Parses METAR strings using a state machine.
 
+Changelog
+=========
+
+1.0.0
+-----
+This version introduces a major change to the Metar::Raw class.
+
+Previously, this class downloaded METAR data from the NOAA FTP site.
+The old functionality has been moved to Metar::Raw::Noaa. The new class,
+Metar::Raw::Data accepts a METAR string as a parameter - allowing the user to
+parse METAR strings without necessarily contacting the NOAA.
+
 Alternative Software
 ====================
 

data/lib/metar/data.rb

@@ -415,7 +415,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 )
+        height   = Distance.new( $2.to_i * 30.48 )
         type     = CONDITION[ $3 ]
         new(quantity, height, type)
       else
@@ -452,7 +452,7 @@ module Metar
     def VerticalVisibility.parse( vertical_visibility )
       case
       when vertical_visibility =~ /^VV(\d{3})$/
-        Distance.new( $1.to_f * 30.0 )
+        Distance.new( $1.to_f * 30.48 )
       when vertical_visibility == '///'
         Distance.new
       else

data/lib/metar/parser.rb

@@ -84,24 +84,22 @@ module Metar
     end
 
     def self.for_cccc(cccc)
-      station = Metar::Station.new(cccc)
-      raw = Metar::Raw.new(station)
+      raw = Metar::Raw::Noaa.new(cccc)
       new(raw)
     end
 
-    attr_reader :raw, :metar, :time
+    attr_reader :raw, :metar
     attr_reader :station_code, :observer, :wind, :variable_wind, :visibility, :runway_visible_range,
        :present_weather, :sky_conditions, :vertical_visibility, :temperature, :dew_point, :sea_level_pressure, :remarks
 
     def initialize(raw)
       @raw   = raw
       @metar = raw.metar.clone
-      @time  = raw.time.clone
       analyze
     end
 
-    def date
-      Date.new(@time.year, @time.month, @time.day)
+    def time
+      Time.gm(@raw.time.year, @raw.time.month, @day, @hour, @minute)
     end
 
     private
@@ -137,8 +135,9 @@ module Metar
 
     def seek_datetime
       case
-      when @chunks[0] =~ /^\d{6}Z$/
-        @datetime = @chunks.shift
+      when @chunks[0] =~ /^(\d{2})(\d{2})(\d{2})Z$/
+        @chunks.shift
+        @day, @hour, @minute = $1.to_i, $2.to_i, $3.to_i
       else
         raise ParseError.new("Expecting datetime, found '#{ @chunks[0] }'")
       end

data/lib/metar/raw.rb

@@ -1,88 +1,104 @@
 require 'net/ftp'
+require 'time'
 
 module Metar
 
-  class Raw
+  module Raw
 
-    @@connection = nil
+    class Base
+      attr_reader :cccc
+      attr_reader :metar
+      attr_reader :time
+      alias :to_s :metar
 
-    class << self
-
-      def connection
-        return @@connection if @@connection
-        connect
-        @@connection
+      def parse
+        @cccc = @metar[/\w+/]
       end
+    end
 
-      def connect
-        @@connection = Net::FTP.new('tgftp.nws.noaa.gov')
-        @@connection.login
-        @@connection.chdir('data/observations/metar/stations')
-        @@connection.passive = true
+    class Data < Base
+      def initialize(metar, time = Time.now)
+        @metar, @time = metar, time
+
+        parse
       end
+    end
 
-      def fetch( cccc )
-        attempts = 0
-        while attempts < 2
-          begin
-            s = ''
-            connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do | chunk |
-              s << chunk
+    # Collects METAR data from the NOAA site via FTP
+    class Noaa < Base
+      @@connection = nil
+
+      class << self
+
+        def connection
+          return @@connection if @@connection
+          connect
+          @@connection
+        end
+
+        def connect
+          @@connection = Net::FTP.new('tgftp.nws.noaa.gov')
+          @@connection.login
+          @@connection.chdir('data/observations/metar/stations')
+          @@connection.passive = true
+        end
+
+        def fetch(cccc)
+          attempts = 0
+          while attempts < 2
+            begin
+              s = ''
+              connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do |chunk|
+                s << chunk
+              end
+              return s
+            rescue Net::FTPPermError, Net::FTPTempError, EOFError => e
+              connect
+              attempts += 1
             end
-            return s
-          rescue Net::FTPPermError, Net::FTPTempError, EOFError => e
-            connect
-            attempts += 1
           end
+          raise "Net::FTP.retrbinary failed #{attempts} times"
         end
-        raise "Net::FTP.retrbinary failed #{attempts} times"
-      end
-
-    end
 
-    attr_reader :cccc
+      end
 
-    # Station is a string containing the CCCC code, or
-    # an object with a 'cccc' method which returns the code
-    def initialize( station, data = nil )
-      @cccc = station.respond_to?(:cccc) ? station.cccc : station
-      parse data if data
-    end
+      # Station is a string containing the CCCC code, or
+      # an object with a 'cccc' method which returns the code
+      def initialize(station)
+        @cccc = station.respond_to?(:cccc) ? station.cccc : station
+      end
 
-    def data
-      fetch
-      @data
-    end
-    # #raw is deprecated, use #data
-    alias :raw :data
+      def data
+        fetch
+        @data
+      end
+      # #raw is deprecated, use #data
+      alias :raw :data
 
-    def time
-      fetch
-      @time
-    end
+      def time
+        fetch
+        @time
+      end
 
-    def raw_time
-      fetch
-      @raw_time
-    end
+      def metar
+        fetch
+        @metar
+      end
 
-    def metar
-      fetch
-      @metar
-    end
-    alias :to_s :metar
+      private
 
-    private
+      def fetch
+        return if @data
+        @data = Noaa.fetch(@cccc)
+        parse
+      end
 
-    def fetch
-      return if @data
-      parse Raw.fetch( @cccc )
-    end
+      def parse
+        raw_time, @metar = @data.split("\n")
+        @time            = Time.parse(raw_time)
+        super
+      end
 
-    def parse( data )
-      @data             = data
-      @raw_time, @metar = @data.split( "\n" )
-      @time             = Time.parse( @raw_time )
     end
 
   end

data/lib/metar/station.rb

@@ -78,7 +78,7 @@ module Metar
     end
 
     def parser
-      raw = Metar::Raw.new( @cccc )
+      raw = Metar::Raw::Noaa.new( @cccc )
       Metar::Parser.new( raw )
     end
 

data/lib/metar/version.rb

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

data/spec/unit/parser_spec.rb

@@ -10,7 +10,7 @@ describe Metar::Parser do
       raw = stub( 'raw', :metar => "XXXX 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000",
                          :time  => '2010/02/06 16:10' )
       Metar::Station.stub!( :new => station )
-      Metar::Raw.stub!( :new => raw )
+      Metar::Raw::Noaa.stub!( :new => raw )
 
       parser = Metar::Parser.for_cccc( 'XXXX' )
 
@@ -22,58 +22,70 @@ describe Metar::Parser do
 
   context 'attributes' do
 
+    before :each do
+      @call_time = Time.parse('2011-05-06 16:35')
+      Time.stub!(:now).and_return(@call_time)
+    end
+
     it '.location missing' do
       expect do
-        setup_parser('PAIL', "2010/02/06 16:10\nFUBAR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
-      end.       to         raise_error( Metar::ParseError, /Expecting location/ )
+        setup_parser("FUBAR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
+      end.                        to         raise_error( Metar::ParseError, /Expecting location/ )
     end
 
     it '.time missing' do
       expect do
-        setup_parser('PAIL', "2010/02/06 16:10\nPAIL 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000") 
-      end.       to         raise_error( Metar::ParseError, /Expecting datetime/ )
+        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
 
-    it 'date' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.date.    should     == Date.new(2010, 2, 6)
+    it 'time' 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
 
     context '.observer' do
 
       it 'real' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
         parser.observer.          should     == :real
       end
 
       it 'auto' do
-        parser = setup_parser('CYXS', "2010/02/15 10:34\nCYXS 151034Z AUTO 09003KT 1/8SM FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
+        parser = setup_parser("CYXS 151034Z AUTO 09003KT 1/8SM FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
 
         parser.observer.          should     == :auto
       end
 
       it 'corrected' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z COR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z COR 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
         parser.observer.          should     == :corrected
       end
       
     end
 
     it 'wind' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.wind.direction.value.   should  be_within( 0.0001 ).of( 240 )
-      parser.wind.speed.to_knots.   should  be_within( 0.0001 ).of( 6 )
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
+      parser.wind.direction.value.should     be_within( 0.0001 ).of( 240 )
+      parser.wind.speed.to_knots. should     be_within( 0.0001 ).of( 6 )
     end
 
     it 'variable_wind' do
-      parser = setup_parser('LIRQ', "2010/02/06 15:20\nLIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
-      parser.variable_wind.direction1.value.should be_within( 0.0001 ).of( 350 )
-      parser.variable_wind.direction2.value.should be_within( 0.0001 ).of( 50 )
+      parser = setup_parser("LIRQ 061520Z 01007KT 350V050 9999 SCT035 BKN080 08/02 Q1005")
+
+      parser.variable_wind.direction1.value.
+                                  should     be_within( 0.0001 ).of( 350 )
+      parser.variable_wind.direction2.value.
+                                  should     be_within( 0.0001 ).of( 50 )
     end
 
     context '.visibility' do
       it 'CAVOK' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT CAVOK M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z 24006KT CAVOK M17/M20 A2910 RMK AO2 P0000")
 
         parser.visibility.distance.value.
                                   should     be_within( 0.01 ).of( 10000.00 )
@@ -90,43 +102,51 @@ describe Metar::Parser do
       end
 
       it 'visibility_miles_and_fractions' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
 
         parser.visibility.distance.to_miles.
                                   should     be_within( 0.01 ).of( 1.75 )
       end
 
       it '//// with automatic observer' do
-        parser = setup_parser('CYXS', "2010/02/15 10:34\nCYXS 151034Z AUTO 09003KT //// FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
+        parser = setup_parser("CYXS 151034Z AUTO 09003KT //// FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
 
         parser.visibility.        should     be_nil
       end
     end
 
     it 'runway_visible_range' do
-      parser = setup_parser('ESSB', "2010/02/15 10:20\nESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55")
-      parser.runway_visible_range.length.    should     == 2
-      parser.runway_visible_range[0].designator.    should     == '12'
-      parser.runway_visible_range[0].visibility1.distance.value.    should     == 1000
-      parser.runway_visible_range[0].tendency.    should     == :no_change
+      parser = setup_parser("ESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55")
+      parser.runway_visible_range.length.
+                                  should     == 2
+      parser.runway_visible_range[0].designator.
+                                  should     == '12'
+      parser.runway_visible_range[0].visibility1.distance.value.
+                                  should     == 1000
+      parser.runway_visible_range[0].tendency.
+                                  should     == :no_change
     end
 
     it 'runway_visible_range_defaults_to_empty_array' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.runway_visible_range.length.    should     == 0
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+
+      parser.runway_visible_range.length.
+                                  should     == 0
     end
 
     it 'runway_visible_range_variable' do
-      parser = setup_parser('KPDX', "2010/02/15 11:08\nKPDX 151108Z 11006KT 1/4SM R10R/1600VP6000FT FG OVC002 05/05 A3022 RMK AO2")
+      parser = setup_parser("KPDX 151108Z 11006KT 1/4SM R10R/1600VP6000FT FG OVC002 05/05 A3022 RMK AO2")
 
-      parser.runway_visible_range[0].visibility1.distance.to_feet.    should     == 1600.0
-      parser.runway_visible_range[0].visibility2.distance.to_feet.    should     == 6000.0
+      parser.runway_visible_range[0].visibility1.distance.to_feet.
+                                  should     == 1600.0
+      parser.runway_visible_range[0].visibility2.distance.to_feet.
+                                  should     == 6000.0
     end
 
     context '.present_weather' do
 
       it 'normal' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
 
         parser.present_weather.size.
                                   should     == 1
@@ -137,7 +157,7 @@ describe Metar::Parser do
       end
 
       it 'auto + //' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z AUTO 24006KT 1 3/4SM // BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z AUTO 24006KT 1 3/4SM // BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
 
         parser.present_weather.size.
                                   should     == 1
@@ -148,29 +168,30 @@ describe Metar::Parser do
     end
 
     it 'present_weather_defaults_to_empty_array' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.present_weather.length.    should     == 0
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+      parser.present_weather.length.
+                                  should     == 0
     end
 
     context '.sky_conditions' do
 
       it 'normal' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
 
         parser.sky_conditions.size.
                                   should     == 2
         parser.sky_conditions[0].quantity.
                                   should     == 'broken'
         parser.sky_conditions[0].height.value.
-                                  should     == 480
+                                  should     == 487.68
         parser.sky_conditions[1].quantity.
                                   should     == 'overcast'
         parser.sky_conditions[1].height.value.
-                                  should     == 900
+                                  should     == 914.40
       end
 
       it 'auto + ///' do
-        parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z AUTO 24006KT 1 3/4SM /// M17/M20 A2910 RMK AO2 P0000")
+        parser = setup_parser("PAIL 061610Z AUTO 24006KT 1 3/4SM /// M17/M20 A2910 RMK AO2 P0000")
 
         parser.sky_conditions.size.
                                   should     == 0
@@ -179,53 +200,58 @@ describe Metar::Parser do
     end
 
     it 'sky_conditions_defaults_to_empty_array' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN M17/M20 A2910 RMK AO2 P0000")
-      parser.sky_conditions.length.    should     == 0
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN M17/M20 A2910 RMK AO2 P0000")
+      parser.sky_conditions.length.
+                                  should     == 0
     end
 
     it 'vertical_visibility' do
-      parser = setup_parser('CYXS', "2010/02/15 10:34\nCYXS 151034Z AUTO 09003KT 1/8SM FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
-      parser.vertical_visibility.value.    should     == 30
+      parser = setup_parser("CYXS 151034Z AUTO 09003KT 1/8SM FZFG VV001 M03/M03 A3019 RMK SLP263 ICG")
+      parser.vertical_visibility.value.
+                                  should     == 30.48
     end
 
     it 'temperature_obligatory' do
       expect do
-        setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 A2910 RMK AO2 P0000")
-      end.       to         raise_error( Metar::ParseError )
+        setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 A2910 RMK AO2 P0000")
+      end.                        to         raise_error( Metar::ParseError )
     end
 
     it 'temperature' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.temperature.value.    should     == -17
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+      parser.temperature.value.   should     == -17
     end
 
     it 'dew_point' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.dew_point.value.    should     == -20
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+      parser.dew_point.value.     should     == -20
     end
 
     it 'sea_level_pressure' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.sea_level_pressure.to_inches_of_mercury.    should     == 29.10
+      parser = setup_parser("PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
+      parser.sea_level_pressure.to_inches_of_mercury.
+                                  should     == 29.10
     end
 
     it 'remarks' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000")
-      parser.remarks.   should be_a Array
-      parser.remarks.length.    should     == 2
-      parser.remarks[0].    should     == 'AO2'
-      parser.remarks[1].    should     == 'P0000'
+      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.length.      should     == 2
+      parser.remarks[0].          should     == 'AO2'
+      parser.remarks[1].          should     == 'P0000'
     end
 
     it 'remarks_defaults_to_empty_array' do
-      parser = setup_parser('PAIL', "2010/02/06 16:10\nPAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910")
-      parser.remarks.   should be_a Array
-      parser.remarks.length.    should     == 0
+      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
   
-    def setup_parser( cccc, metar )
-      raw = Metar::Raw.new( cccc, metar )
-      Metar::Parser.new( raw )
+    def setup_parser(metar)
+      raw = Metar::Raw::Data.new(metar)
+      Metar::Parser.new(raw)
     end
 
   end

data/spec/unit/raw_spec.rb

@@ -1,12 +1,49 @@
-load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
 # encoding: utf-8
+load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
 
 require 'net/ftp'
+require 'time'
+
+module MetarRawTestHelper
+
+  def noaa_metar
+    raw_time  = "2010/02/15 10:20"
+    "#{ raw_time }\n#{ raw_metar }"
+  end
+
+  def raw_metar
+    "ESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55"
+  end
 
-describe Metar::Raw do
+end
+
+describe Metar::Raw::Data do
+
+  include MetarRawTestHelper
+
+  context 'initialization' do
+
+    it 'should parse data, if supplied' do
+      @call_time = Time.parse('2012-07-29 16:35')
+      Time.stub!(:now).and_return(@call_time)
+
+      raw = Metar::Raw::Data.new(raw_metar)
+     
+      raw.metar.                  should     == raw_metar 
+      raw.cccc.                   should     == 'ESSB'
+      raw.time.                   should     == @call_time
+    end
+
+  end
+
+end
+
+describe Metar::Raw::Noaa do
+
+  include MetarRawTestHelper
 
   after :each do
-    Metar::Raw.send( :class_variable_set, '@@connection', nil )
+    Metar::Raw::Noaa.send( :class_variable_set, '@@connection', nil )
   end
 
   context '.connection' do
@@ -19,7 +56,7 @@ describe Metar::Raw do
         Net::FTP.                   should_receive( :new ).
                                     and_return( ftp )
 
-        Metar::Raw.connect
+        Metar::Raw::Noaa.connect
       end
 
     end
@@ -28,17 +65,17 @@ describe Metar::Raw do
 
       before :each do
         @ftp = stub( 'ftp' )
-        Metar::Raw.send( :class_variable_set, '@@connection', @ftp )
+        Metar::Raw::Noaa.send( :class_variable_set, '@@connection', @ftp )
       end
 
       it 'does not connect to FTP' do
         Net::FTP.                   should_not_receive( :new )
 
-        Metar::Raw.connection
+        Metar::Raw::Noaa.connection
       end
 
       it 'returns the cached connection' do
-        connection = Metar::Raw.connection
+        connection = Metar::Raw::Noaa.connection
 
         connection.               should     == @ftp
       end
@@ -59,7 +96,7 @@ describe Metar::Raw do
       ftp.                        should_receive( :passive= ).
                                   with( true )
 
-      Metar::Raw.connect
+      Metar::Raw::Noaa.connect
     end
 
   end
@@ -72,7 +109,7 @@ describe Metar::Raw do
       Net::FTP.                   should_receive( :new ).
                                   and_return( ftp )
 
-      Metar::Raw.fetch( 'the_cccc' )
+      Metar::Raw::Noaa.fetch( 'the_cccc' )
     end
 
     it 'downloads the raw report' do
@@ -84,7 +121,7 @@ describe Metar::Raw do
         args[ 1 ].                should     be_a Fixnum
       end
 
-      Metar::Raw.fetch( 'the_cccc' )
+      Metar::Raw::Noaa.fetch( 'the_cccc' )
     end
 
     it 'returns the data' do
@@ -95,7 +132,7 @@ describe Metar::Raw do
       end
       Net::FTP.stub!( :new ).and_return( ftp )
  
-      raw = Metar::Raw.fetch( 'the_cccc' )
+      raw = Metar::Raw::Noaa.fetch( 'the_cccc' )
 
       raw.                        should     == "chunk 1\nchunk 2\n"
     end
@@ -117,7 +154,7 @@ describe Metar::Raw do
       end
       Net::FTP.stub!( :new ).and_return( ftp )
  
-      raw = Metar::Raw.fetch( 'the_cccc' )
+      raw = Metar::Raw::Noaa.fetch( 'the_cccc' )
 
       raw.                        should     == "chunk 1\nchunk 2\n"
     end
@@ -138,7 +175,7 @@ describe Metar::Raw do
       Net::FTP.stub!( :new ).and_return( ftp )
 
       expect do
-        Metar::Raw.fetch( 'the_cccc' )
+        Metar::Raw::Noaa.fetch( 'the_cccc' )
       end.                        to         raise_error( RuntimeError, /failed 2 times/)
     end
 
@@ -147,50 +184,35 @@ describe Metar::Raw do
   context 'initialization' do
   
     it 'should accept CCCC codes' do
-      raw = Metar::Raw.new( 'XXXX' )
+      raw = Metar::Raw::Noaa.new( 'XXXX' )
 
       raw.cccc.                   should     == 'XXXX'
     end
       
     it 'should accept Stations' do
       station = stub( 'Metar::Station', :cccc => 'YYYY' )
-      raw = Metar::Raw.new( station )
+      raw = Metar::Raw::Noaa.new( station )
 
       raw.cccc.                   should     == 'YYYY'
     end
-
-    it 'should parse data, if supplied' do
-      raw = Metar::Raw.new( 'XXXX', raw_metar )
-     
-      raw.data.                   should     == raw_metar 
-      raw.raw_time.               should     == @raw_time
-      raw.metar.                  should     == @metar 
-      raw.time.                   should     == Time.parse( @raw_time ) 
-    end
     
   end
 
   context 'lazy loading' do
     
     it 'should fetch data on demand' do
-      raw = Metar::Raw.new( 'ESSB' )
+      raw = Metar::Raw::Noaa.new( 'ESSB' )
 
-      Metar::Raw.                 should_receive( :fetch ).
+      Metar::Raw::Noaa.           should_receive(:fetch).
                                   with( 'ESSB' ).
-                                  and_return( raw_metar )
+                                  and_return(noaa_metar)
 
       raw.metar
 
-      raw.data.                   should     == raw_metar 
+      raw.data.                   should     == noaa_metar 
     end
 
   end
 
-  def raw_metar
-    @raw_time  = "2010/02/15 10:20"
-    @metar     = "ESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55"
-    "#{ @raw_time }\n#{ @metar }"
-  end
-
 end
 

data/spec/unit/sky_condition_spec.rb

@@ -24,11 +24,11 @@ describe Metar::SkyCondition do
   context '.parse' do
 
     [
-      [ 'understands clear skies codes', 'NSC',      [ nil,         nil, nil            ] ],
-      [ 'quantity + height',             'BKN12',    [ 'broken',    360, nil            ] ],
-      [ 'quantity + height + type',      'BKN12CB',  [ 'broken',    360, 'cumulonimbus' ] ],
-      [ 'quantity + height + ///',       'BKN12///', [ 'broken',    360, nil            ] ],
-      [ 'returns nil for unmatched',     'FUBAR',    [ :expect_nil, nil, nil            ] ],
+      [ 'understands clear skies codes', 'NSC',      [ nil,         nil, nil               ] ],
+      [ 'quantity + height',             'BKN12',    [ 'broken',    365.76, nil            ] ],
+      [ 'quantity + height + type',      'BKN12CB',  [ 'broken',    365.76, 'cumulonimbus' ] ],
+      [ 'quantity + height + ///',       'BKN12///', [ 'broken',    365.76, nil            ] ],
+      [ 'returns nil for unmatched',     'FUBAR',    [ :expect_nil, nil, nil               ] ],
     ].each do | docstring, raw, expected |
       example docstring do
         Metar::SkyCondition.parse( raw ).should be_sky_condition( *expected )

data/spec/unit/station_spec.rb

@@ -232,7 +232,7 @@ EOT
     before :each do
       @raw = stub('raw', :metar => 'PAIL 061610Z 24006KT 1 3/4SM -SN BKN016 OVC030 M17/M20 A2910 RMK AO2 P0000', :time => '2010/02/06 16:10' )
       # TODO: hack - once parser returns station this can be removed
-      Metar::Raw.                 should_receive( :new ).
+      Metar::Raw::Noaa.           should_receive( :new ).
                                   and_return( @raw )
     end
 

data/spec/unit/vertical_visibility_spec.rb

@@ -22,7 +22,7 @@ describe Metar::VerticalVisibility do
   context '.parse' do
 
     [
-      [ 'VV + nnn',                  'VV300',  9000 ],
+      [ 'VV + nnn',                  'VV300',  9144 ],
       [ '///',                       '///',    nil ],
       [ 'returns nil for unmatched', 'FUBAR',  :expect_nil ],
     ].each do | docstring, raw, expected |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -176,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2658375331668671320
+      hash: 2800563498014087456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2658375331668671320
+      hash: 2800563498014087456
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.23