metar-parser 0.9.11 → 0.9.12

data/README.md

@@ -32,14 +32,27 @@ puts station.report.to_s
 Countries
 ---------
 
+List countries:
+
 ```ruby
-# List countries:
 puts Metar::Station.countries
+```
+
+Find a country's weather stations:
 
-# Find a country's weather stations:
+```ruby
 spanish = Metar::Station.find_all_by_country( 'Spain' )
 ```
 
+Get The Data
+------------
+```ruby
+station = Metar::Station.find_by_cccc( 'KPDX' )
+parser  = station.parser
+puts parser.temperature.value
+```
+
+
 The METAR Data Format
 =====================
 
@@ -72,10 +85,3 @@ There are two gems which read the National Oceanic and Atmospheric Association's
 Interactive map:
 * http://www.spatiality.at/metarr/frontend/
 
-Testing
-=======
-
-The tests use a local copy of the weather stations list: data/nsd_cccc.txt
-
-If missing, the file gets downloaded before running tests.
-

data/Rakefile

@@ -1,8 +1,9 @@
-require 'rubygems'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/testtask'
+require 'rubygems' if RUBY_VERSION < '1.9'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/clean'
+require 'rcov/rcovtask' if RUBY_VERSION < '1.9'
+require 'rspec/core/rake_task'
 
 $:.unshift(File.dirname(__FILE__) + '/lib')
 require 'metar'
@@ -10,19 +11,26 @@ require 'metar'
 RDOC_OPTS = ['--quiet', '--title', 'METAR Weather Report Parser', '--main', 'README.rdoc', '--inline-source']
 RDOC_PATH = 'doc/rdoc'
 
-task :default => :test
+task :default => :spec
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/*.rb']
-  t.verbose = true
+RSpec::Core::RakeTask.new do | t |
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = RDOC_PATH
-  rdoc.options += RDOC_OPTS
-  rdoc.main = 'README.rdoc'
-  rdoc.rdoc_files.add ['README.rdoc', 'COPYING', 'lib/**/*.rb']
+if RUBY_VERSION < '1.9'
+  Rake::RDocTask.new do |rdoc|
+    rdoc.rdoc_dir = RDOC_PATH
+    rdoc.options  += RDOC_OPTS
+    rdoc.main     = 'README.rdoc'
+    rdoc.rdoc_files.add ['README.rdoc', 'COPYING', 'lib/**/*.rb']
+  end
+
+  RSpec::Core::RakeTask.new( 'spec:rcov' ) do |t|
+    t.pattern   = 'spec/**/*_spec.rb'
+    t.rcov      = true
+    t.rcov_opts = [ '--exclude', 'spec/,/gems/' ]
+  end
+
 end
 
 desc "Build the gem"
@@ -34,3 +42,4 @@ desc "Publish a new version of the gem"
 task :release => :build do
   `gem push metar-parser-#{Metar::VERSION::STRING}.gem`
 end
+

data/bin/download_raw.rb

@@ -16,8 +16,6 @@ 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

@@ -1,5 +1,4 @@
 # encoding: utf-8
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'i18n'
 require 'm9t'
 
@@ -7,15 +6,13 @@ module Metar
   locales_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'locales'))
   I18n.load_path += Dir.glob("#{ locales_path }/*.yml")
 
-  # 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 )
-      @units = units || :meters
+      @units = :meters
       if meters
         super
       else
@@ -25,8 +22,8 @@ module Metar
 
     # Handles nil case differently to M9t::Distance
     def to_s( options = {} )
-      options = { :units     => @units, 
-                  :precision => 0,
+      options = { :units       => @units,
+                  :precision   => 0,
                   :abbreviated => true }.merge( options )
       return I18n.t('metar.distance.unknown') if @value.nil?
       super( options )
@@ -38,6 +35,7 @@ module Metar
   class Speed < M9t::Speed
 
     METAR_UNITS = {
+      ''    => :kilometers_per_hour,
       'KMH' => :kilometers_per_hour,
       'MPS' => :meters_per_second,
       'KT'  => :knots,
@@ -45,11 +43,9 @@ module Metar
 
     def Speed.parse(s)
       case
-      when s =~ /^(\d+)(KT|MPS|KMH)$/
+      when s =~ /^(\d+)(|KT|MPS|KMH)$/
         # Call the appropriate factory method for the supplied units
         send( METAR_UNITS[$2], $1.to_i )
-      when s =~ /^(\d+)$/
-        kilometers_per_hour( $1.to_i )
       else
         nil
       end
@@ -99,33 +95,46 @@ module Metar
     def Wind.parse(s)
       case
       when s =~ /^(\d{3})(\d{2}(|MPS|KMH|KT))$/
+        return nil if $1.to_i > 359
         new( M9t::Direction.new( $1 ),
-             Speed.parse( $2 ),
-             :direction_units => :compass )
+             Speed.parse( $2 ) )
       when s =~ /^(\d{3})(\d{2})G(\d{2,3}(|MPS|KMH|KT))$/
+        return nil if $1.to_i > 359
         new( M9t::Direction.new( $1 ),
-             Speed.parse( $2 ),
-             :direction_units => :compass )
+             Speed.parse( $2 + $4 ),
+             Speed.parse( $3 ) )
       when s =~ /^VRB(\d{2}(|MPS|KMH|KT))$/
-        new(:variable_direction, Speed.parse($1))
+        new( :variable_direction,
+             Speed.parse($1))
       when s =~ /^\/{3}(\d{2}(|MPS|KMH|KT))$/
-        new(:unknown_direction, Speed.parse($1))
-      when s =~ /^\/{3}(\/{2}(|MPS|KMH|KT))$/
-        new(:unknown_direction, :unknown)
+        new( :unknown_direction,
+             Speed.parse($1))
+      when s =~ %r(^/////(|MPS|KMH|KT)$)
+        new( :unknown_direction,
+             :unknown_speed)
       else
         nil
       end
     end
 
-    attr_reader :direction, :speed, :options
+    attr_reader :direction, :speed, :gusts
 
-    def initialize( direction, speed, options = {} )
-      @options = { :direction_units => :compass,
-                   :speed_units     => :kilometers_per_hour }.merge( options )
-      @direction, @speed = direction, speed
+    def initialize( direction, speed, gusts = nil )
+      @direction, @speed, @gusts = direction, speed, gusts
     end
 
-    def to_s
+    def to_s( options = {} )
+      options = { :direction_units => :compass,
+                  :speed_units     => :kilometers_per_hour }.merge( options )
+      speed =
+        case @speed
+        when :unknown_speed
+          I18n.t('metar.wind.unknown_speed')
+        else
+          @speed.to_s( :abbreviated => true,
+                       :precision   => 0,
+                       :units       => options[ :speed_units ] )
+        end
       direction =
         case @direction
         when :variable_direction
@@ -133,18 +142,16 @@ module Metar
         when :unknown_direction
           I18n.t('metar.wind.unknown_direction')
         else
-          @direction.to_s( :units => @options[ :direction_units ] )
+          @direction.to_s( :units => options[ :direction_units ] )
         end
-      speed =
-        case @speed
-        when :unknown
-          I18n.t('metar.wind.unknown_speed')
-        else
-          @speed.to_s( :abbreviated => true,
-                       :precision   => 0,
-                       :units       => @options[ :speed_units ] )
-        end  
-      "#{ speed } #{ direction }"
+      s = "#{ speed } #{ direction }"
+      if ! @gusts.nil?
+        g =  @gusts.to_s( :abbreviated => true,
+                          :precision   => 0,
+                          :units       => options[ :speed_units ] )
+        s += " #{ I18n.t('metar.wind.gusts') } #{ g }"
+      end
+      s
     end
 
   end
@@ -166,7 +173,7 @@ module Metar
     end
 
     def to_s
-      "#{ @direction1 } - #{ @direction2 }"
+      "#{ @direction1.to_s( :units => :compass ) } - #{ @direction2.to_s( :units => :compass ) }"
     end
 
   end
@@ -276,18 +283,25 @@ module Metar
       distance_options = { :abbreviated => true,
                            :precision   => 0,
                            :units       => @units }
-      if @visibility2.nil?
-        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( distance_options ) +
-          ' ' + I18n.t('metar.runway_visible_range.to') +
-          ' ' + @visibility2.to_s( distance_options )
+      s =
+        if @visibility2.nil?
+          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( distance_options ) +
+                  ' '  + I18n.t('metar.runway_visible_range.to') +
+                  ' '  + @visibility2.to_s( distance_options )
+        end
+
+      if ! tendency.nil?
+        s += ' ' + I18n.t( "tendency.#{ tendency }" )
       end
+
+      s
     end
 
   end
@@ -367,9 +381,7 @@ module Metar
     end
 
     def to_s
-      modifier = @modifier ? @modifier + ' ' : ''
-      descriptor = @descriptor ? @descriptor + ' ' : ''
-      I18n.t("metar.present_weather.%s%s%s" % [modifier, descriptor, @phenomenon])
+      I18n.t("metar.present_weather.%s" % [@modifier, @descriptor, @phenomenon].compact.join(' '))
     end
 
   end
@@ -377,31 +389,27 @@ module Metar
   class SkyCondition
 
     QUANTITY = {'BKN' => 'broken', 'FEW' => 'few', 'OVC' => 'overcast', 'SCT' => 'scattered'}
+    CONDITION = {
+      'CB'  => 'cumulonimbus',
+      'TCU' => 'towering cumulus',
+      '///' => nil,
+      ''    => nil
+    }
+    CLEAR_SKIES = [
+      'NSC', # WMO
+      'NCD', # WMO
+      'CLR',
+      'SKC',
+    ]
 
     def SkyCondition.parse(sky_condition)
       case
-      when (sky_condition == 'NSC' or sky_condition == 'NCD') # WMO
-        new
-      when sky_condition == 'CLR'
-        new
-      when sky_condition == 'SKC'
+      when CLEAR_SKIES.include?( sky_condition )
         new
-      when sky_condition =~ /^(BKN|FEW|OVC|SCT)(\d+)(CB|TCU|\/{3})?$/
-        quantity = QUANTITY[$1]
-        height = Distance.new( $2.to_i * 30.0 )
-        type =
-          case $3
-          when 'CB'
-            'cumulonimbus'
-          when 'TCU'
-            'towering cumulus'
-          when nil
-            nil
-          when '///'
-            nil
-          else
-            raise ParseError.new("Unexpected sky condition type: #$3")
-          end
+      when sky_condition =~ /^(BKN|FEW|OVC|SCT)(\d+)(CB|TCU|\/{3}|)?$/
+        quantity = QUANTITY[ $1 ]
+        height   = Distance.new( $2.to_i * 30.0 )
+        type     = CONDITION[ $3 ]
         new(quantity, height, type)
       else
         nil
@@ -414,9 +422,11 @@ module Metar
     end
 
     def to_s
-      conditions = to_summary
-      conditions += ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s if not @height.nil?
-      conditions
+      if @height.nil?
+        to_summary
+      else
+        to_summary + ' ' + I18n.t('metar.altitude.at') + ' ' + height.to_s
+      end
     end
 
     def to_summary
@@ -446,3 +456,4 @@ module Metar
   end
 
 end
+

data/lib/metar/parser.rb

@@ -1,4 +1,3 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'aasm'
 require File.join(File.dirname(__FILE__), 'data')
 
@@ -84,12 +83,10 @@ module Metar
       transitions :from => [:remarks],          :to => :end
     end
 
-    def Parser.for_cccc(cccc)
+    def self.for_cccc(cccc)
       station = Metar::Station.new(cccc)
       raw = Metar::Raw.new(station)
-      parser = new(raw)
-      parser.analyze
-      parser
+      new(raw)
     end
 
     attr_reader :raw, :metar, :time
@@ -313,9 +310,6 @@ module Metar
     end
 
     def seek_end
-      if @chunks.length > 0
-        raise ParseError.new("Unexpected tokens found at end of string: found '#{ @chunks.join(' ') }'")
-      end
       done!
     end
 

data/lib/metar/raw.rb

@@ -1,4 +1,3 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
 require 'net/ftp'
 
 module Metar
@@ -9,10 +8,6 @@ module Metar
 
     class << self
 
-      def cache_connection
-        @@connection = connection
-      end
-
       def connection
         return @@connection if @@connection
         connect
@@ -93,3 +88,4 @@ module Metar
   end
 
 end
+

data/lib/metar/report.rb

@@ -4,50 +4,22 @@ 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
+    ATTRIBUTES = [
+      :station_name,
+      :station_country,
+      :time,
+      :wind,
+      :visibility,
+      :present_weather,
+      :sky_summary,
+      :temperature
+    ]
 
     attr_reader :parser, :station
 
     def initialize(parser)
       @parser = parser
-      @station = Station.find_by_cccc(@parser.station_code)
+      @station = Station.find_by_cccc(@parser.station_code) # TODO: parser should return the station
     end
 
     def station_name
@@ -122,19 +94,21 @@ module Metar
     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
       attributes.collect do |attribute|
         I18n.t('metar.' + attribute[:attribute].to_s + '.title') + ': ' + attribute[:value]
-      end.join("\n")
+      end.join("\n") + "\n"
+    end
+
+    private
+
+    def attributes
+      a = Metar::Report::ATTRIBUTES.map do | key |
+        value = self.send(key).to_s
+        {:attribute => key, :value => value} if not value.empty?
+      end
+      a.compact
     end
 
   end