metar-parser 0.2.1 → 0.9.7

data/Rakefile

@@ -32,5 +32,5 @@ end
 
 desc "Publish a new version of the gem"
 task :release => :build do
-  system "gem push metar-parser-#{Metar::VERSION}"
+  system "gem push metar-parser-#{Metar::VERSION::STRING}.gem"
 end

data/lib/metar/raw.rb

@@ -5,26 +5,27 @@ module Metar
 
   class Raw
 
+    @@connection = nil
+
     class << self
 
-      @connection = nil
 
       def cache_connection
-        @connection = connection
+        @@connection = connection
       end
 
       def connection
-        return @connection if @connection
-        connection = Net::FTP.new('tgftp.nws.noaa.gov')
-        connection.login
-        connection.chdir('data/observations/metar/stations')
-        connection.passive = true
-        connection
+        return @@connection if @@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)
+      def fetch( cccc )
         s = ''
-        connection.retrbinary("RETR #{ cccc }.TXT", 1024) do |chunk|
+        connection.retrbinary( "RETR #{ cccc }.TXT", 1024 ) do | chunk |
           s << chunk
         end
         s
@@ -32,16 +33,44 @@ module Metar
 
     end
 
-    attr_reader :cccc, :raw, :metar, :time
-    alias :to_s :metar
+    attr_reader :cccc
 
     # Station is a string containing the CCCC code, or
     # an object with a 'cccc' method which returns the code
-    def initialize(station, raw = nil)
+    def initialize( station, data = nil )
       @cccc = station.respond_to?(:cccc) ? station.cccc : station
-      @raw = raw || Raw.fetch(@cccc)
-      time, @metar = @raw.split("\n")
-      @time = Time.parse(time)
+      parse data if data
+    end
+
+    def data
+      fetch
+      @data
+    end
+    # #raw is deprecated, use #data
+    alias :raw :data
+
+    def time
+      fetch
+      @time
+    end
+
+    def metar
+      fetch
+      @metar
+    end
+    alias :to_s :metar
+
+    private
+
+    def fetch
+      return if @data
+      parse Raw.fetch( @cccc )
+    end
+
+    def parse( data )
+      @data        = data
+      time, @metar = @data.split( "\n" )
+      @time        = Time.parse( time )
     end
 
   end

data/lib/metar/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metar-parser
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 53
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 9
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Joe Yates
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +01:00
+date: 2011-07-01 00:00:00 +01:00
 default_executable: 
 dependencies: []