metar-parser 1.1.7 → 1.1.8

data/lib/metar/parser.rb

@@ -124,10 +124,11 @@ module Metar
       when @chunks[0] == 'AUTO' # WMO 15.4
         @chunks.shift
         @observer = :auto
-      when @chunks[0] == 'COR'
+      when @chunks[0] == 'COR'  # WMO specified code word for correction
         @chunks.shift
         @observer = :corrected
-      when @chunks[0] == 'CCA'
+      when @chunks[0] =~ /CC[A-Z]/  # Canadian correction
+        # Canada uses CCA for first correction, CCB for second, etc...
         @chunks.shift
         @observer = :corrected
       when @chunks[0] == 'RTD'   #  Delayed observation, no comments on observer

data/lib/metar/version.rb

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

data/spec/unit/i18n_spec.rb

@@ -11,12 +11,4 @@ describe I18n do
     expect(I18n.load_path).to include(italian_path)
     expect(I18n.load_path).to include(german_path)
   end
-
-  it 'falls back to the language translation when a region-specific translation is not available' do
-    old_locale = I18n.locale
-    I18n.locale = :'en-FOO'
-    expect(I18n.t('metar.altitude.at')).to eq('at')
-    I18n.locale = old_locale
-  end
 end
-

data/spec/unit/parser_spec.rb

@@ -92,11 +92,23 @@ describe Metar::Parser do
         expect(parser.observer).to eq(:corrected)
       end
 
-      it 'corrected (Canadian)' do
+      it 'corrected (Canadian, first correction)' do
         parser = setup_parser('CYZU 310100Z CCA 26004KT 15SM FEW009 BKN040TCU BKN100 OVC210 15/12 A2996 RETS RMK SF1TCU4AC2CI1 SLP149')
 
         expect(parser.observer).to eq(:corrected)
       end
+
+      it 'corrected (Canadian, second correction)' do
+        parser = setup_parser('CYCX 052000Z CCB 30014G27KT 15SM DRSN SCT035 M02/M09 A2992 RMK SC4 SLP133')
+
+        expect(parser.observer).to eq(:corrected)
+      end
+
+      it 'corrected (Canadian, rare third correction)' do
+        parser = setup_parser('CYEG 120000Z CCC 12005KT 15SM FEW110 BKN190 03/M01 A2980 RMK AC2AC3 SLP122')
+
+        expect(parser.observer).to eq(:corrected)
+      end
     end
 
     it 'wind' do

data/spec/unit/raw_spec.rb

@@ -1,144 +1,110 @@
 # encoding: utf-8
-load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
+require 'spec_helper'
 
 require 'net/ftp'
 require 'time'
 
 module MetarRawTestHelper
-
-  def noaa_metar
-    raw_time  = "2010/02/15 10:20"
-    "#{ raw_time }\n#{ raw_metar }"
-  end
-
   def raw_metar
     "ESSB 151020Z 26003KT 2000 R12/1000N R30/1500N VV002 M07/M07 Q1013 1271//55"
   end
-
 end
 
 describe Metar::Raw::Data do
-
   include MetarRawTestHelper
 
   context 'initialization' do
+    let(:call_time) { Time.parse('2012-07-29 16:35') }
 
     it 'should parse data, if supplied' do
-      @call_time = Time.parse('2012-07-29 16:35')
-      Time.stub!(:now).and_return(@call_time)
+      now = call_time
+      Time.stub(:now) { now }
 
       raw = Metar::Raw::Data.new(raw_metar)
      
-      raw.metar.                  should     == raw_metar 
-      raw.cccc.                   should     == 'ESSB'
-      raw.time.                   should     == @call_time
+      expect(raw.metar).to eq(raw_metar)
+      expect(raw.cccc).to eq('ESSB')
+      expect(raw.time).to eq(call_time)
     end
-
   end
-
 end
 
 describe Metar::Raw::Noaa do
-
   include MetarRawTestHelper
 
+  let(:ftp) { double('ftp', :login => nil, :chdir => nil, :passive= => nil, :retrbinary => nil) }
+
+  before do
+    Net::FTP.stub(:new).and_return(ftp)
+  end
+
   after :each do
-    Metar::Raw::Noaa.send( :class_variable_set, '@@connection', nil )
+    Metar::Raw::Noaa.send(:class_variable_set, '@@connection', nil)
   end
 
   context '.connection' do
-
     context 'uncached' do
-
       it 'sets up the connection' do
-        ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil )
-
-        Net::FTP.                   should_receive( :new ).
-                                    and_return( ftp )
-
         Metar::Raw::Noaa.connect
-      end
 
+        expect(Net::FTP).to have_received(:new)
+      end
     end
 
     context 'cached' do
-
       before :each do
-        @ftp = stub( 'ftp' )
-        Metar::Raw::Noaa.send( :class_variable_set, '@@connection', @ftp )
+        Metar::Raw::Noaa.send(:class_variable_set, '@@connection', ftp)
       end
 
       it 'does not connect to FTP' do
-        Net::FTP.                   should_not_receive( :new )
-
         Metar::Raw::Noaa.connection
+
+        expect(Net::FTP).to_not have_received(:new)
       end
 
       it 'returns the cached connection' do
         connection = Metar::Raw::Noaa.connection
 
-        connection.               should     == @ftp
+        expect(connection).to eq(ftp)
       end
-
     end
-    
   end
 
   context '.connect' do
-
     it 'sets up the connection' do
-      ftp = stub( 'ftp' )
-
-      Net::FTP.                   should_receive( :new ).
-                                  and_return( ftp )
-      ftp.                        should_receive( :login )
-      ftp.                        should_receive( :chdir )
-      ftp.                        should_receive( :passive= ).
-                                  with( true )
-
       Metar::Raw::Noaa.connect
-    end
 
+      expect(Net::FTP).to have_received(:new)
+      expect(ftp).to have_received(:login).with()
+      expect(ftp).to have_received(:chdir).with('data/observations/metar/stations')
+      expect(ftp).to have_received(:passive=).with(true)
+    end
   end
 
   context '.fetch' do
-
     it 'uses the connection' do
-      ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil, :retrbinary => nil )
-
-      Net::FTP.                   should_receive( :new ).
-                                  and_return( ftp )
+      Metar::Raw::Noaa.fetch('the_cccc')
 
-      Metar::Raw::Noaa.fetch( 'the_cccc' )
+      expect(Net::FTP).to have_received(:new)
     end
 
     it 'downloads the raw report' do
-      ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil )
-      Net::FTP.stub!( :new ).and_return( ftp )
-
-      ftp.                        should_receive( :retrbinary ) do | *args, &block |
-        args[ 0 ].                should     == 'RETR the_cccc.TXT'
-        args[ 1 ].                should     be_a Fixnum
-      end
+      Metar::Raw::Noaa.fetch('the_cccc')
 
-      Metar::Raw::Noaa.fetch( 'the_cccc' )
+      expect(ftp).to have_received(:retrbinary).with('RETR the_cccc.TXT', kind_of(Fixnum))
     end
 
     it 'returns the data' do
-      ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil )
-      def ftp.retrbinary( *args, &block )
+      def ftp.retrbinary(*args, &block)
         block.call "chunk 1\n"
         block.call "chunk 2\n"
       end
-      Net::FTP.stub!( :new ).and_return( ftp )
- 
-      raw = Metar::Raw::Noaa.fetch( 'the_cccc' )
+      raw = Metar::Raw::Noaa.fetch('the_cccc')
 
-      raw.                        should     == "chunk 1\nchunk 2\n"
+      expect(raw).to eq("chunk 1\nchunk 2\n")
     end
 
     it 'retries retrieval once' do
-      ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil )
       def ftp.attempt
         @attempt
       end
@@ -146,21 +112,19 @@ describe Metar::Raw::Noaa do
         @attempt = a
       end
       ftp.attempt = 0
-      def ftp.retrbinary( *args, &block )
+      def ftp.retrbinary(*args, &block)
         self.attempt = self.attempt + 1
         raise Net::FTPTempError if self.attempt == 1
         block.call "chunk 1\n"
         block.call "chunk 2\n"
       end
-      Net::FTP.stub!( :new ).and_return( ftp )
  
-      raw = Metar::Raw::Noaa.fetch( 'the_cccc' )
+      raw = Metar::Raw::Noaa.fetch('the_cccc')
 
-      raw.                        should     == "chunk 1\nchunk 2\n"
+      expect(raw).to eq("chunk 1\nchunk 2\n")
     end
 
     it 'fails with an error, if retrieval fails twice' do
-      ftp = stub( 'ftp', :login => nil, :chdir => nil, :passive= => nil )
       def ftp.attempt
         @attempt
       end
@@ -168,51 +132,55 @@ describe Metar::Raw::Noaa do
         @attempt = a
       end
       ftp.attempt = 0
-      def ftp.retrbinary( *args, &block )
+      def ftp.retrbinary(*args, &block)
         self.attempt = self.attempt + 1
         raise Net::FTPTempError
       end
-      Net::FTP.stub!( :new ).and_return( ftp )
 
       expect do
-        Metar::Raw::Noaa.fetch( 'the_cccc' )
-      end.                        to         raise_error( RuntimeError, /failed 2 times/)
+        Metar::Raw::Noaa.fetch('the_cccc')
+      end.to raise_error(RuntimeError, /failed 2 times/)
     end
-
   end
 
   context 'initialization' do
-  
     it 'should accept CCCC codes' do
-      raw = Metar::Raw::Noaa.new( 'XXXX' )
+      raw = Metar::Raw::Noaa.new('XXXX')
 
-      raw.cccc.                   should     == 'XXXX'
+      expect(raw.cccc).to eq('XXXX')
     end
       
     it 'should accept Stations' do
-      station = stub( 'Metar::Station', :cccc => 'YYYY' )
-      raw = Metar::Raw::Noaa.new( station )
+      station = double('Metar::Station', :cccc => 'YYYY')
+      raw = Metar::Raw::Noaa.new(station)
 
-      raw.cccc.                   should     == 'YYYY'
+      expect(raw.cccc).to eq('YYYY')
     end
-    
   end
 
   context 'lazy loading' do
-    
-    it 'should fetch data on demand' do
-      raw = Metar::Raw::Noaa.new( 'ESSB' )
+    let(:noaa_metar) do
+      raw_time  = "2010/02/15 10:20"
+      "#{raw_time}\n#{raw_metar}"
+    end
+
+    before do
+      Metar::Raw::Noaa.stub(:fetch => noaa_metar)
+    end
 
-      Metar::Raw::Noaa.           should_receive(:fetch).
-                                  with( 'ESSB' ).
-                                  and_return(noaa_metar)
+    subject { Metar::Raw::Noaa.new('ESSB') }
 
-      raw.metar
+    it 'should fetch data on demand' do
+      subject.metar
 
-      raw.data.                   should     == noaa_metar 
+      expect(Metar::Raw::Noaa).to have_received(:fetch).with('ESSB')
     end
 
-  end
+    it 'sets data to the returned value' do
+      subject.metar
 
+      expect(subject.data).to eq(noaa_metar)
+    end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: metar-parser
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 1
-  - 7
-  version: 1.1.7
+  - 8
+  version: 1.1.8
 platform: ruby
 authors: 
 - Joe Yates
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-03 00:00:00 +02:00
+date: 2015-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -28,12 +28,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  name: rake
   prerelease: false
+  requirement: *id001
+  name: rake
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -42,12 +42,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id002
-  name: rdoc
   prerelease: false
+  requirement: *id002
+  name: rdoc
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +58,20 @@ dependencies:
         - 3
         - 5
         version: 0.3.5
-  version_requirements: *id003
-  name: i18n
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   prerelease: false
+  requirement: *id003
+  name: i18n
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,28 +82,28 @@ dependencies:
         - 3
         - 1
         version: 0.3.1
-  version_requirements: *id004
-  name: m9t
   prerelease: false
+  requirement: *id004
+  name: m9t
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 53
         segments: 
         - 2
-        - 11
-        - 0
-        version: 2.11.0
-  version_requirements: *id005
-  name: rspec
+        - 14
+        - 1
+        version: 2.14.1
   prerelease: false
+  requirement: *id005
+  name: rspec
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -104,12 +112,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
-  name: rcov
   prerelease: false
+  requirement: *id006
+  name: rcov
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,12 +126,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
-  name: pry
   prerelease: false
+  requirement: *id007
+  name: pry
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -132,11 +140,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
-  name: pry-doc
   prerelease: false
+  requirement: *id008
+  name: pry-doc
   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"
+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 Brazilian Portuguese, English, German and Italian are available).\n"
 email: joe.g.yates@gmail.com
 executables: []
 
@@ -149,34 +157,34 @@ files:
 - COPYING
 - Rakefile
 - bin/parse_raw.rb
+- lib/metar.rb
 - lib/metar/parser.rb
-- lib/metar/report.rb
 - lib/metar/raw.rb
 - lib/metar/station.rb
 - lib/metar/data.rb
+- lib/metar/report.rb
 - lib/metar/version.rb
-- lib/metar.rb
 - spec/spec_helper.rb
-- spec/unit/report_spec.rb
-- spec/unit/pressure_spec.rb
-- spec/unit/station_spec.rb
-- spec/unit/visibility_spec.rb
-- spec/unit/sky_condition_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/wind_spec.rb
-- spec/unit/distance_spec.rb
+- spec/unit/runway_visible_range_spec.rb
+- spec/unit/weather_phenomenon_spec.rb
 - spec/unit/temperature_spec.rb
 - spec/unit/i18n_spec.rb
-- spec/unit/vertical_visibility_spec.rb
+- spec/unit/pressure_spec.rb
 - spec/unit/remark_spec.rb
-- spec/unit/runway_visible_range_spec.rb
-- spec/unit/weather_phenomenon_spec.rb
-- spec/unit/raw_spec.rb
+- spec/unit/speed_spec.rb
+- spec/unit/vertical_visibility_spec.rb
 - spec/unit/parser_spec.rb
+- spec/unit/visibility_spec.rb
+- spec/unit/report_spec.rb
+- spec/unit/raw_spec.rb
+- spec/unit/distance_spec.rb
+- spec/unit/wind_spec.rb
+- spec/unit/sky_condition_spec.rb
+- spec/unit/station_spec.rb
 - spec/unit/variable_wind_spec.rb
-- locales/en.yml
 - locales/it.yml
 - locales/pt-BR.yml
+- locales/en.yml
 - locales/de.yml
 has_rdoc: true
 homepage: http://github.com/joeyates/metar-parser
@@ -213,20 +221,20 @@ signing_key:
 specification_version: 3
 summary: A Ruby gem for worldwide weather reports
 test_files: 
-- spec/unit/report_spec.rb
-- spec/unit/pressure_spec.rb
-- spec/unit/station_spec.rb
-- spec/unit/visibility_spec.rb
-- spec/unit/sky_condition_spec.rb
-- spec/unit/speed_spec.rb
-- spec/unit/wind_spec.rb
-- spec/unit/distance_spec.rb
+- spec/unit/runway_visible_range_spec.rb
+- spec/unit/weather_phenomenon_spec.rb
 - spec/unit/temperature_spec.rb
 - spec/unit/i18n_spec.rb
-- spec/unit/vertical_visibility_spec.rb
+- spec/unit/pressure_spec.rb
 - spec/unit/remark_spec.rb
-- spec/unit/runway_visible_range_spec.rb
-- spec/unit/weather_phenomenon_spec.rb
-- spec/unit/raw_spec.rb
+- spec/unit/speed_spec.rb
+- spec/unit/vertical_visibility_spec.rb
 - spec/unit/parser_spec.rb
+- spec/unit/visibility_spec.rb
+- spec/unit/report_spec.rb
+- spec/unit/raw_spec.rb
+- spec/unit/distance_spec.rb
+- spec/unit/wind_spec.rb
+- spec/unit/sky_condition_spec.rb
+- spec/unit/station_spec.rb
 - spec/unit/variable_wind_spec.rb