metar-parser 0.9.14 → 0.9.15

data/README.md

@@ -59,6 +59,14 @@ parser  = station.parser
 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 )
+parser = Metar::Parser.new( raw )
+```
+
 Implementation
 ==============
 

data/Rakefile

@@ -1,16 +1,8 @@
-require 'rubygems' if RUBY_VERSION < '1.9'
-require 'rubygems/package_task'
-require 'rdoc/task'
-require 'rake/clean'
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 require 'rcov/rcovtask' if RUBY_VERSION < '1.9'
 require 'rspec/core/rake_task'
 
-$:.unshift(File.dirname(__FILE__) + '/lib')
-require 'metar'
-
-RDOC_OPTS = ['--quiet', '--title', 'METAR Weather Report Parser', '--main', 'README.rdoc', '--inline-source']
-RDOC_PATH = 'doc/rdoc'
-
 task :default => :spec
 
 RSpec::Core::RakeTask.new do | t |
@@ -19,13 +11,6 @@ end
 
 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
@@ -34,13 +19,3 @@ if RUBY_VERSION < '1.9'
 
 end
 
-desc "Build the gem"
-task :build do
-  `gem build metar-parser.gemspec`
-end
-
-desc "Publish a new version of the gem"
-task :release => :build do
-  `gem push metar-parser-#{Metar::VERSION::STRING}.gem`
-end
-

data/lib/metar/data.rb

@@ -90,17 +90,24 @@ module Metar
 
   end
 
+  class Direction < M9t::Direction
+    def initialize( direction )
+      direction = M9t::Direction::normalize( direction.to_f )
+      super( direction )
+    end
+  end
+
   class Wind
     
     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 ),
+        return nil if $1.to_i > 360
+        new( Direction.new( $1 ),
              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 ),
+        return nil if $1.to_i > 360
+        new( Direction.new( $1 ),
              Speed.parse( $2 + $4 ),
              Speed.parse( $3 ) )
       when s =~ /^VRB(\d{2}(|MPS|KMH|KT))$/
@@ -160,7 +167,7 @@ module Metar
 
     def VariableWind.parse(variable_wind)
       if variable_wind =~ /^(\d+)V(\d+)$/
-        new(M9t::Direction.new($1), M9t::Direction.new($2))
+        new(Direction.new($1), Direction.new($2))
       else
         nil
       end

data/lib/metar/raw.rb

@@ -11,6 +11,7 @@ module Metar
       def connection
         return @@connection if @@connection
         connect
+        @@connection
       end
 
       def connect
@@ -18,7 +19,6 @@ module Metar
         @@connection.login
         @@connection.chdir('data/observations/metar/stations')
         @@connection.passive = true
-        @@connection
       end
 
       def fetch( cccc )
@@ -30,7 +30,7 @@ module Metar
               s << chunk
             end
             return s
-          rescue Net::FTPTempError, EOFError => e
+          rescue Net::FTPPermError, Net::FTPTempError, EOFError => e
             connect
             attempts += 1
           end

data/lib/metar/version.rb

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

data/spec/unit/variable_wind_spec.rb

@@ -12,6 +12,21 @@ describe Metar::VariableWind do
       vw.direction2.value.        should     == 180.0
     end
 
+    it 'accepts 360, rounding to 0 - 1' do
+      vw = Metar::VariableWind.parse( '360V090' )
+
+      vw.direction1.value.        should     ==   0.0
+      vw.direction2.value.        should     ==  90.0
+    end
+
+
+    it 'accepts 360, rounding to 0 - 2' do
+      vw = Metar::VariableWind.parse( '090V360' )
+
+      vw.direction1.value.        should     ==  90.0
+      vw.direction2.value.        should     ==   0.0
+    end
+
     it 'returns nil for other' do
       vw = Metar::VariableWind.parse( 'XXX' )
 
@@ -22,7 +37,7 @@ describe Metar::VariableWind do
 
   context '#to_s' do
 
-    it 'renders the ' do
+    it 'renders compatible values as compass directions' do
       vw = Metar::VariableWind.parse( '090V180' )
 
       vw.to_s.                    should     == 'E - S'

data/spec/unit/wind_spec.rb

@@ -5,6 +5,8 @@ RSpec::Matchers.define :be_wind do | direction, speed, gusts |
   match do | wind |
     if wind.nil?              && [ direction, speed, gusts ].all?( &:nil? )
       true
+    elsif wind.nil?
+      false
     elsif wind.direction.nil? != direction.nil?
       false
     elsif wind.speed.nil?     != speed.nil?
@@ -36,6 +38,7 @@ describe Metar::Wind do
       [ '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   ] ],
       [ '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 ] ],

metadata

@@ -1,137 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: metar-parser
-version: !ruby/object:Gem::Version 
-  hash: 39
+version: !ruby/object:Gem::Version
+  version: 0.9.15
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 14
-  version: 0.9.14
 platform: ruby
-authors: 
+authors:
 - Joe Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2012-07-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: i18n
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.5
-  requirement: *id003
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.5
+- !ruby/object:Gem::Dependency
   name: aasm
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.5
-  requirement: *id004
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.5
+- !ruby/object:Gem::Dependency
   name: m9t
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.3.1
-  requirement: *id005
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  requirement: *id006
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-description: "    metar-parser is a ruby gem that downloads weather reports, parses them and formats reports.\n\n    It also provides weather station listings and info (e.g. country, latitude and longitude).\n\n    Reports can be fully localized (currently English and Italian are available).\n"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "    metar-parser is a ruby gem that downloads weather reports, parses
+  them and formats reports.\n\n    It also provides weather station listings and info
+  (e.g. country, latitude and longitude).\n\n    Reports can be fully localized (currently
+  English and Italian are available).\n"
 email: joe.g.yates@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - COPYING
 - Rakefile
@@ -164,38 +164,35 @@ files:
 - locales/en.yml
 homepage: http://github.com/joeyates/metar-parser
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2658375331668671320
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2658375331668671320
 requirements: []
-
 rubyforge_project: nowarning
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Ruby gem for worldwide weather reports
-test_files: 
+test_files:
 - spec/unit/runway_visible_range_spec.rb
 - spec/unit/vertical_visibility_spec.rb
 - spec/unit/report_spec.rb