metar-parser 1.1.3 → 1.1.4

data/README.md

@@ -32,7 +32,7 @@ Hello World
 This prints the latest weather report for Portland International Airport:
 
 ```ruby
-station = Metar::Station.find_by_cccc( 'KPDX' )
+station = Metar::Station.find_by_cccc('KPDX')
 puts station.report.to_s
 ```
 
@@ -48,13 +48,13 @@ puts Metar::Station.countries
 Find a country's weather stations:
 
 ```ruby
-spanish = Metar::Station.find_all_by_country( 'Spain' )
+spanish = Metar::Station.find_all_by_country('Spain')
 ```
 
 Get The Data
 ------------
 ```ruby
-station = Metar::Station.find_by_cccc( 'KPDX' )
+station = Metar::Station.find_by_cccc('KPDX')
 parser  = station.parser
 puts parser.temperature.value
 ```
@@ -63,8 +63,8 @@ Use Your Own Raw Data
 ---------------------
 ```ruby
 metar_string = "KHWD 280554Z AUTO 29007KT 10SM OVC008 14/12 A3002 RMK AO2 SLP176 T01390117 10211\n"
-raw    = Metar::Raw::Data.new( metar_string )
-parser = Metar::Parser.new( raw )
+raw    = Metar::Raw::Data.new(metar_string)
+parser = Metar::Parser.new(raw)
 ```
 
 Compliance
@@ -96,6 +96,7 @@ Contributors
 
 * [Joe Yates](https://github.com/joeyates)
 * [Derek Johnson](https://github.com/EpicDraws)
+* [Florian Egermann and Mathias Wollin](https://github.com/math)
 
 Alternative Software
 ====================

data/lib/metar/data.rb

@@ -110,6 +110,12 @@ module Metar
         new( Direction.new( $1 ),
              Speed.parse( $2 + $4 ),
              Speed.parse( $3 ) )
+      when s =~ /^VRB(\d{2})G(\d{2,3})(|MPS|KMH|KT)$/
+        speed = $1 + $3
+        gusts = $2 + $3
+        new( :variable_direction,
+             Speed.parse(speed),
+             Speed.parse(gusts))
       when s =~ /^VRB(\d{2}(|MPS|KMH|KT))$/
         new( :variable_direction,
              Speed.parse($1))

data/lib/metar/version.rb

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

data/spec/unit/wind_spec.rb

@@ -34,25 +34,36 @@ describe Metar::Wind do
   context '.parse' do
 
     [
+      # Direction and speed
       [ 'treats 5 digits as degrees and kilometers per hour', '12345',       [ 123.0, 12.50, nil   ] ],
       [ 'understands 5 digits + KMH',                         '12345KMH',    [ 123.0, 12.50, nil   ] ],
       [ 'understands 5 digits + MPS',                         '12345MPS',    [ 123.0, 45.00, nil   ] ],
       [ 'understands 5 digits + KT',                          '12345KT',     [ 123.0, 23.15, nil   ] ],
       [ 'rounds 360 down to 0',                               '36045KT',     [   0.0, 23.15, nil   ] ],
       [ 'returns nil for directions outside 0 to 360',        '88845KT',     [ nil,   nil,   nil   ] ],
+      # +gusts
       [ 'understands 5 digits + G + 2 digits',                '12345G67',    [ 123.0, 12.50, 18.61 ] ],
-      [ 'understands 5 digits + G + 2 digits + MPS',          '12345G67MPS', [ 123.0, 45.00, 67.00 ] ],
       [ 'understands 5 digits + G + 2 digits + KMH',          '12345G67KMH', [ 123.0, 12.50, 18.61 ] ],
+      [ 'understands 5 digits + G + 2 digits + MPS',          '12345G67MPS', [ 123.0, 45.00, 67.00 ] ],
       [ 'understands 5 digits + G + 2 digits + KT',           '12345G67KT',  [ 123.0, 23.15, 34.47 ] ],
+      # Variable direction
       [ 'understands VRB + 2 digits'                          'VRB12',       [ :variable_direction,  3.33, nil ] ],
       [ 'understands VRB + 2 digits + KMH',                   'VRB12KMH',    [ :variable_direction,  3.33, nil ] ],
       [ 'understands VRB + 2 digits + MPS',                   'VRB12MPS',    [ :variable_direction, 12.00, nil ] ],
       [ 'understands VRB + 2 digits + KT',                    'VRB12KT',     [ :variable_direction,  6.17, nil ] ],
+      # + gusts
+      [ 'understands VRB + 2 digits + G + 2 digits',          'VRB45G67',    [ :variable_direction, 12.50, 18.61 ] ],
+      [ 'understands VRB + 2 digits + G + 2 digits + KMH',    'VRB45G67KMH', [ :variable_direction, 12.50, 18.61 ] ],
+      [ 'understands VRB + 2 digits + G + 2 digits + MPS',    'VRB45G67MPS', [ :variable_direction, 45.00, 67.00 ] ],
+      [ 'understands VRB + 2 digits + G + 2 digits + KT',     'VRB45G67KT',  [ :variable_direction, 23.15, 34.47 ] ],
+      # Unknown direction
       [ 'understands /// + 2 digits',                         '///12',       [ :unknown_direction,   3.33, nil ] ],
       [ 'understands /// + 2 digits + KMH',                   '///12KMH',    [ :unknown_direction,   3.33, nil ] ],
       [ 'understands /// + 2 digits + MPS',                   '///12MPS',    [ :unknown_direction,  12.00, nil ] ],
       [ 'understands /// + 2 digits + KT',                    '///12KT',     [ :unknown_direction,   6.17, nil ] ],
+      # Unknown direction and speed
       [ 'understands /////',                                  '/////',       [ :unknown_direction, :unknown_speed, nil ] ],
+      # Bad data
       [ 'returns nil for badly formatted values',             'XYZ12KT',     [ nil, nil, nil ] ],
       [ 'returns nil for nil',                                nil,           [ nil, nil, nil ] ],
     ].each do | docstring, raw, expected |

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3372405611005068870
+      hash: 256504047505018704
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -203,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3372405611005068870
+      hash: 256504047505018704
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.23