metar-parser 1.1.5 → 1.1.6

data/lib/metar/data.rb

@@ -5,6 +5,7 @@ require 'm9t'
 module Metar
   locales_path = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'locales'))
   I18n.load_path += Dir.glob("#{locales_path}/*.yml")
+  I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
 
   class Distance < M9t::Distance
     attr_accessor :units

data/lib/metar/version.rb

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

data/locales/en.yml

@@ -52,14 +52,16 @@ en:
       clear skies: clear skies
       broken: broken cloud
       broken cumulonimbus: broken cumulonimbus
-      broken towering cumulus: broken towering cumulus clouds
+      broken towering cumulus: broken towering cumulus
       few: few clouds
       few cumulonimbus: few cumulonimbus
-      few towering cumulus: few towering cumulus clouds
+      few towering cumulus: few towering cumulus
       scattered: scattered cloud
       scattered cumulonimbus: scattered cumulonimbus
-      scattered towering cumulus: scattered towering cumulus clouds
+      scattered towering cumulus: scattered towering cumulus
       overcast: overcast
+      overcast cumulonimbus: overcast cumulonimbus
+      overcast towering cumulus: overcast towering cumulus
     runway_visible_range:
       title: runway visible range
       runway: runway
@@ -159,3 +161,11 @@ en:
     remarks:
       title: remarks
 
+en-US:
+  metar:
+    sky_conditions:
+      clear skies: clear skies
+      broken: broken clouds
+      broken cumulonimbus: broken cumulonimbus clouds
+      broken towering cumulus: broken towering cumulus clouds
+

data/spec/unit/{locales_spec.rb → i18n_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'locales' do
+describe I18n do
   it 'adds our locales to the load path' do
     project_root = File.expand_path('../..', File.dirname(__FILE__))
     english_path = File.join(project_root, 'locales', 'en.yml')
@@ -11,5 +11,12 @@ describe 'locales' do
     expect(I18n.load_path).to include(italian_path)
     expect(I18n.load_path).to include(german_path)
   end
+
+  it 'falls back do 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/sky_condition_spec.rb

@@ -1,8 +1,8 @@
 # encoding: utf-8
 load File.expand_path( '../spec_helper.rb', File.dirname(__FILE__) )
 
-RSpec::Matchers.define :be_sky_condition do | quantity, height, type |
-  match do | sk |
+RSpec::Matchers.define :be_sky_condition do |quantity, height, type|
+  match do |sk|
     if    sk.nil? && quantity == :expect_nil
       true
     elsif sk.nil? && quantity != :expect_nil
@@ -20,56 +20,52 @@ RSpec::Matchers.define :be_sky_condition do | quantity, height, type |
 end
 
 describe Metar::SkyCondition do
-
   context '.parse' do
-
     [
-      [ 'understands clear skies codes', 'NSC',      [ nil,            nil,            nil ] ],
-      [ 'quantity + height',             'BKN12',    [ 'broken',    365.76,            nil ] ],
-      [ 'quantity + height + type',      'BKN12CB',  [ 'broken',    365.76, 'cumulonimbus' ] ],
-      [ 'quantity + ///',                'BKN///',   [ 'broken',       nil,            nil ] ],
-      [ 'quantity + height + ///',       'FEW038///',[ 'few',      1158.24,            nil ] ],
-      [ 'cumulonimbus only',             'CB',       [ nil,            nil, 'cumulonimbus' ] ], # seems non-standard, but occurs
-      [ 'returns nil for unmatched',     'FUBAR',    [ :expect_nil,    nil,            nil ] ],
-    ].each do | docstring, raw, expected |
+      ['understands clear skies codes', 'NSC',      [nil,            nil,            nil]],
+      ['quantity + height',             'BKN12',    ['broken',    365.76,            nil]],
+      ['quantity + height + type',      'BKN12CB',  ['broken',    365.76, 'cumulonimbus']],
+      ['quantity + ///',                'BKN///',   ['broken',       nil,            nil]],
+      ['quantity + height + ///',       'FEW038///',['few',      1158.24,            nil]],
+      ['cumulonimbus only',             'CB',       [nil,            nil, 'cumulonimbus']], # seems non-standard, but occurs
+      ['returns nil for unmatched',     'FUBAR',    [:expect_nil,    nil,            nil]],
+    ].each do |docstring, raw, expected|
       example docstring do
-        Metar::SkyCondition.parse( raw ).should be_sky_condition( *expected )
+        Metar::SkyCondition.parse(raw).should be_sky_condition(*expected)
       end
     end
-
   end
 
   context '.to_summary' do
-
     [
-      [ 'all values nil',  [ nil,      nil, nil ],           'clear skies'         ],
-      [ 'quantity',        [ 'broken', nil, nil ],           'broken cloud'        ],
-      [ 'quantity + type', [ 'broken', nil, 'cumulonimbus'], 'broken cumulonimbus' ],
-    ].each do | docstring, ( quantity, height, type ), expected |
-      example docstring do
-        sk = Metar::SkyCondition.new( quantity, height, type )
-      
-        sk.to_summary.            should     == expected
+      ['all values nil',  [nil,      nil, nil           ], :en,      'clear skies'        ],
+      ['quantity',        ['broken', nil, nil           ], :en,      'broken cloud'       ],
+      ['quantity',        ['broken', nil, nil           ], :'en-US', 'broken clouds'      ],
+      ['quantity + type', ['broken', nil, 'cumulonimbus'], :en,      'broken cumulonimbus'],
+      ['quantity + type', ['broken', nil, 'cumulonimbus'], :'en-US', 'broken cumulonimbus clouds'],
+    ].each do |docstring, (quantity, height, type), locale, expected|
+      before { @old_locale = I18n.locale }
+      after  { I18n.locale = @old_locale }
+
+      example "#{docstring} - #{locale}" do
+        condition = Metar::SkyCondition.new(quantity, height, type)
+        I18n.locale = locale
+        expect(condition.to_summary).to eq(expected)
       end
     end
-
   end
 
   context '.to_s' do
-
     [
-      [ 'all values nil',  [ nil,      nil, nil ],           'clear skies'                ],
-      [ 'quantity',        [ 'broken', 360, nil ],           'broken cloud at 360'        ],
-      [ 'quantity + type', [ 'broken', 360, 'cumulonimbus'], 'broken cumulonimbus at 360' ],
-    ].each do | docstring, ( quantity, height, type ), expected |
+      ['all values nil',  [nil,      nil, nil],            'clear skies'               ],
+      ['quantity',        ['broken', 360, nil],            'broken cloud at 360'       ],
+      ['quantity + type', ['broken', 360, 'cumulonimbus'], 'broken cumulonimbus at 360'],
+    ].each do |docstring, (quantity, height, type), expected|
       example docstring do
-        sk = Metar::SkyCondition.new( quantity, height, type )
-      
-        sk.to_s.                  should     == expected
+        condition = Metar::SkyCondition.new(quantity, height, type)
+        expect(condition.to_s).to eq(expected)
       end
     end
-
   end
-
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metar-parser
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -169,10 +169,10 @@ files:
 - spec/unit/wind_spec.rb
 - spec/unit/distance_spec.rb
 - spec/unit/temperature_spec.rb
+- spec/unit/i18n_spec.rb
 - spec/unit/vertical_visibility_spec.rb
 - spec/unit/remark_spec.rb
 - spec/unit/runway_visible_range_spec.rb
-- spec/unit/locales_spec.rb
 - spec/unit/weather_phenomenon_spec.rb
 - spec/unit/raw_spec.rb
 - spec/unit/parser_spec.rb
@@ -194,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2864761200794302878
+      hash: 4569733942927237109
 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: 2864761200794302878
+      hash: 4569733942927237109
 requirements: []
 rubyforge_project: nowarning
 rubygems_version: 1.8.23
@@ -220,10 +220,10 @@ test_files:
 - spec/unit/wind_spec.rb
 - spec/unit/distance_spec.rb
 - spec/unit/temperature_spec.rb
+- spec/unit/i18n_spec.rb
 - spec/unit/vertical_visibility_spec.rb
 - spec/unit/remark_spec.rb
 - spec/unit/runway_visible_range_spec.rb
-- spec/unit/locales_spec.rb
 - spec/unit/weather_phenomenon_spec.rb
 - spec/unit/raw_spec.rb
 - spec/unit/parser_spec.rb