metar-parser 0.9.10 → 0.9.11

data/lib/metar.rb

@@ -1,8 +1,8 @@
-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')
+require 'metar/raw'
+require 'metar/station'
+require 'metar/parser'
+require 'metar/report'
+require 'metar/version'
 
 module Metar
 
@@ -15,3 +15,4 @@ module Metar
   end
 
 end
+

data/lib/metar/parser.rb

@@ -92,12 +92,14 @@ module Metar
       parser
     end
 
-    attr_reader :station_code, :observer, :time, :wind, :variable_wind, :visibility, :runway_visible_range,
+    attr_reader :raw, :metar, :time
+    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)
-      @metar                = raw.metar.clone
-      @time                 = raw.time.clone
+      @raw   = raw
+      @metar = raw.metar.clone
+      @time  = raw.time.clone
       analyze
     end
 

data/lib/metar/raw.rb

@@ -9,13 +9,16 @@ module Metar
 
     class << self
 
-
       def cache_connection
         @@connection = connection
       end
 
       def connection
         return @@connection if @@connection
+        connect
+      end
+
+      def connect
         @@connection = Net::FTP.new('tgftp.nws.noaa.gov')
         @@connection.login
         @@connection.chdir('data/observations/metar/stations')
@@ -24,11 +27,20 @@ module Metar
       end
 
       def fetch( cccc )
-        s = ''
-        connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do | chunk |
-          s << chunk
+        attempts = 0
+        while attempts < 2
+          begin
+            s = ''
+            connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do | chunk |
+              s << chunk
+            end
+            return s
+          rescue Net::FTPTempError, EOFError => e
+            connect
+            attempts += 1
+          end
         end
-        s
+        raise "Net::FTP.retrbinary failed #{attempts} times"
       end
 
     end
@@ -54,6 +66,11 @@ module Metar
       @time
     end
 
+    def raw_time
+      fetch
+      @raw_time
+    end
+
     def metar
       fetch
       @metar
@@ -68,9 +85,9 @@ module Metar
     end
 
     def parse( data )
-      @data        = data
-      time, @metar = @data.split( "\n" )
-      @time        = Time.parse( time )
+      @data             = data
+      @raw_time, @metar = @data.split( "\n" )
+      @time             = Time.parse( @raw_time )
     end
 
   end

data/lib/metar/report.rb

@@ -43,6 +43,8 @@ module Metar
       reset_options!
     end
 
+    attr_reader :parser, :station
+
     def initialize(parser)
       @parser = parser
       @station = Station.find_by_cccc(@parser.station_code)

data/lib/metar/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metar-parser
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 9
-  - 10
-  version: 0.9.10
+  - 11
+  version: 0.9.11
 platform: ruby
 authors: 
 - Joe Yates