r18n-core 2.2.0 → 3.0.0

data/spec/locales/cs_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Cs do
-  it "uses Czech pluralization" do
+  it 'uses Czech pluralization' do
     cs = R18n.locale('cs')
     expect(cs.pluralize(0)).to eq(0)
     expect(cs.pluralize(1)).to eq(1)

data/spec/locales/en-us_spec.rb

@@ -1,13 +1,13 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::EnUs do
-  it "formats American English date" do
-    enUS = R18n::I18n.new('en-US')
-    expect(enUS.l(Date.parse('2009-05-01'), :full)).to eq('May 1st, 2009')
-    expect(enUS.l(Date.parse('2009-05-02'), :full)).to eq('May 2nd, 2009')
-    expect(enUS.l(Date.parse('2009-05-03'), :full)).to eq('May 3rd, 2009')
-    expect(enUS.l(Date.parse('2009-05-04'), :full)).to eq('May 4th, 2009')
-    expect(enUS.l(Date.parse('2009-05-11'), :full)).to eq('May 11th, 2009')
-    expect(enUS.l(Date.parse('2009-05-21'), :full)).to eq('May 21st, 2009')
+  it 'formats American English date' do
+    en_us = R18n::I18n.new('en-US')
+    expect(en_us.l(Date.parse('2009-05-01'), :full)).to eq('May 1st, 2009')
+    expect(en_us.l(Date.parse('2009-05-02'), :full)).to eq('May 2nd, 2009')
+    expect(en_us.l(Date.parse('2009-05-03'), :full)).to eq('May 3rd, 2009')
+    expect(en_us.l(Date.parse('2009-05-04'), :full)).to eq('May 4th, 2009')
+    expect(en_us.l(Date.parse('2009-05-11'), :full)).to eq('May 11th, 2009')
+    expect(en_us.l(Date.parse('2009-05-21'), :full)).to eq('May 21st, 2009')
   end
 end

data/spec/locales/en_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::En do
-  it "formats English date" do
+  it 'formats English date' do
     en = R18n::I18n.new('en')
     expect(en.l(Date.parse('2009-05-01'), :full)).to eq('1st of May, 2009')
     expect(en.l(Date.parse('2009-05-02'), :full)).to eq('2nd of May, 2009')

data/spec/locales/fa_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Fa do
-  it "formats Persian numerals" do
+  it 'formats Persian numerals' do
     fa = R18n::I18n.new('fa')
-    expect(fa.l(1234567890)).to eq('۱٬۲۳۴٬۵۶۷٬۸۹۰')
+    expect(fa.l(1_234_567_890)).to eq('۱٬۲۳۴٬۵۶۷٬۸۹۰')
     expect(fa.l(10.123)).to eq('۱۰٫۱۲۳')
     expect(fa.l(Date.parse('2009-05-01'))).to eq('۲۰۰۹/۰۵/۰۱')
   end

data/spec/locales/fr_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Fr do
-  it "formats French date" do
+  it 'formats French date' do
     fr = R18n::I18n.new('fr')
     expect(fr.l(Date.parse('2009-07-01'), :full)).to eq('1er juillet 2009')
     expect(fr.l(Date.parse('2009-07-02'), :full)).to eq(' 2 juillet 2009')

data/spec/locales/hu_spec.rb

@@ -1,15 +1,15 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Hu do
-  it "uses Hungarian digits groups" do
+  it 'uses Hungarian digits groups' do
     hu = R18n::I18n.new('hu')
-    expect(hu.l(1000)).to   eq('1000')
-    expect(hu.l(10000)).to  eq('10 000')
-    expect(hu.l(-10000)).to eq('−10 000')
-    expect(hu.l(100000)).to eq('100 000')
+    expect(hu.l(1000)).to    eq('1000')
+    expect(hu.l(10_000)).to  eq('10 000')
+    expect(hu.l(-10_000)).to eq('−10 000')
+    expect(hu.l(100_000)).to eq('100 000')
   end
 
-  it "uses Hungarian time format" do
+  it 'uses Hungarian time format' do
     hu = R18n::I18n.new('hu')
     expect(hu.l(Time.at(0).utc)).to        eq('1970. 01. 01., 00:00')
     expect(hu.l(Time.at(0).utc, :full)).to eq('1970. január  1., 00:00')

data/spec/locales/it_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::It do
-  it "formats Italian date" do
+  it 'formats Italian date' do
     italian = R18n::I18n.new('it')
-    expect(italian.l(Date.parse('2009-07-01'), :full)).to eq("1º luglio 2009")
+    expect(italian.l(Date.parse('2009-07-01'), :full)).to eq('1º luglio 2009')
     expect(italian.l(Date.parse('2009-07-02'), :full)).to eq(' 2 luglio 2009')
     expect(italian.l(Date.parse('2009-07-12'), :full)).to eq('12 luglio 2009')
   end

data/spec/locales/no_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+describe R18n::Locales::No do
+  it 'deprecated' do
+    expect { R18n::I18n.new('no') }.to output(
+      /R18n::Locales::No.new is deprecated; use R18n::Locales::Nb.new instead./
+    ).to_stderr
+  end
+end

data/spec/locales/pl_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Pl do
-  it "uses Polish pluralization" do
+  it 'uses Polish pluralization' do
     pl = R18n.locale('pl')
     expect(pl.pluralize(0)).to eq(0)
     expect(pl.pluralize(1)).to eq(1)

data/spec/locales/ru_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Ru do
-  it "uses Russian pluralization" do
+  it 'uses Russian pluralization' do
     ru = R18n.locale('ru')
     expect(ru.pluralize(0)).to eq(0)
 

data/spec/locales/sk_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Sk do
-  it "uses Slovak pluralization" do
+  it 'uses Slovak pluralization' do
     sk = R18n.locale('Sk')
     expect(sk.pluralize(0)).to eq(0)
     expect(sk.pluralize(1)).to eq(1)

data/spec/locales/th_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Th do
-  it "uses Thai calendar" do
+  it 'uses Thai calendar' do
     th = R18n::I18n.new('th')
     expect(th.l(Time.at(0).utc, '%Y %y')).to eq('2513 13')
     expect(th.l(Time.at(0).utc)).to eq('01/01/2513 00:00')

data/spec/locales/vi_spec.rb

@@ -1,7 +1,7 @@
-require File.expand_path('../../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Locales::Vi do
-  it "change times position" do
+  it 'change times position' do
     th = R18n::I18n.new('vi')
     expect(th.l(Time.at(0).utc)).to eq('00:00, 01/01/1970')
   end

data/spec/r18n_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n do
   include R18n::Helpers
@@ -9,7 +9,7 @@ describe R18n do
     R18n.reset!
   end
 
-  it "stores I18n" do
+  it 'stores I18n' do
     i18n = R18n::I18n.new('en')
     R18n.set(i18n)
     expect(R18n.get).to eq(i18n)
@@ -18,7 +18,7 @@ describe R18n do
     expect(R18n.get).to be_nil
   end
 
-  it "sets setter to I18n" do
+  it 'sets setter to I18n' do
     i18n = R18n::I18n.new('en')
     R18n.set(i18n)
 
@@ -28,25 +28,25 @@ describe R18n do
     expect(R18n.get).to eq(i18n)
   end
 
-  it "creates I18n object by shortcut" do
+  it 'creates I18n object by shortcut' do
     R18n.set('en', DIR)
     expect(R18n.get).to be_kind_of(R18n::I18n)
     expect(R18n.get.locales).to eq([R18n.locale('en')])
     expect(R18n.get.translation_places).to eq([R18n::Loader::YAML.new(DIR)])
   end
 
-  it "allows to return I18n arguments in setter block" do
+  it 'allows to return I18n arguments in setter block' do
     R18n.set { 'en' }
     expect(R18n.get.locales).to eq([R18n.locale('en')])
   end
 
-  it "clears cache" do
+  it 'clears cache' do
     R18n.cache[:a] = 1
     R18n.clear_cache!
     expect(R18n.cache).to be_empty
   end
 
-  it "resets I18n objects and cache" do
+  it 'resets I18n objects and cache' do
     R18n.cache[:a] = 1
     R18n.set('en')
     R18n.thread_set('en')
@@ -56,7 +56,7 @@ describe R18n do
     expect(R18n.cache).to be_empty
   end
 
-  it "stores I18n via thread_set" do
+  it 'stores I18n via thread_set' do
     i18n = R18n::I18n.new('en')
     R18n.thread_set(i18n)
     expect(R18n.get).to eq(i18n)
@@ -66,69 +66,71 @@ describe R18n do
     expect(R18n.get).to eq(i18n)
   end
 
-  it "allows to temporary change locale" do
+  it 'allows to temporary change locale' do
     R18n.default_places = DIR
     expect(R18n.change('en').locales).to eq([R18n.locale('en')])
     expect(R18n.change('en').translation_places.size).to eq(1)
     expect(R18n.change('en').translation_places.first.dir).to eq(DIR.to_s)
   end
 
-  it "allows to temporary change current locales" do
+  it 'allows to temporary change current locales' do
     R18n.set('ru')
     expect(R18n.change('en').locales).to eq(
-      [R18n.locale('en'), R18n.locale('ru')])
+      [R18n.locale('en'), R18n.locale('ru')]
+    )
     expect(R18n.change('en').translation_places).to eq(
-      R18n.get.translation_places)
+      R18n.get.translation_places
+    )
     expect(R18n.get.locale.code).to eq('ru')
   end
 
-  it "allows to get Locale to temporary change" do
+  it 'allows to get Locale to temporary change' do
     R18n.set('ru')
     expect(R18n.change(R18n.locale('en')).locale.code).to eq('en')
   end
 
-  it "has shortcut to load locale" do
+  it 'has shortcut to load locale' do
     expect(R18n.locale('ru')).to eq(R18n::Locale.load('ru'))
   end
 
-  it "stores default loader class" do
+  it 'stores default loader class' do
     expect(R18n.default_loader).to eq(R18n::Loader::YAML)
     R18n.default_loader = Class
     expect(R18n.default_loader).to be_kind_of(Class)
   end
 
-  it "stores cache" do
+  it 'stores cache' do
     expect(R18n.cache).to be_kind_of(Hash)
 
     R18n.cache = { 1 => 2 }
-    expect(R18n.cache).to eq({ 1 => 2 })
+    expect(R18n.cache).to eq(1 => 2)
 
     R18n.clear_cache!
-    expect(R18n.cache).to eq({ })
+    expect(R18n.cache).to eq({})
   end
 
-  it "maps hash" do
-    hash = R18n::Utils.hash_map({ 'a' => 1, 'b' => 2 }) { |k, v|
+  it 'maps hash' do
+    hash = R18n::Utils.hash_map('a' => 1, 'b' => 2) do |k, v|
       [k + 'a', v + 1]
-    }
-    expect(hash).to eq({ 'aa' => 2, 'ba' => 3 })
+    end
+    expect(hash).to eq('aa' => 2, 'ba' => 3)
   end
 
-  it "merges hash recursively" do
-    a = { a: 1, b: { ba: 1, bb: 1}, c: 1 }
-    b = {       b: { bb: 2, bc: 2}, c: 2 }
+  it 'merges hash recursively' do
+    a = { a: 1, b: { ba: 1, bb: 1 }, c: 1 }
+    b = {       b: { bb: 2, bc: 2 }, c: 2 }
 
     R18n::Utils.deep_merge!(a, b)
-    expect(a).to eq({ a: 1, b: { ba: 1, bb: 2, bc: 2 }, c: 2 })
+    expect(a).to eq(a: 1, b: { ba: 1, bb: 2, bc: 2 }, c: 2)
   end
 
-  it "has l and t methods" do
+  it 'has l and t methods' do
     R18n.set('en')
     expect(t.yes).to eq('Yes')
     expect(l(Time.at(0).utc)).to eq('1970-01-01 00:00')
   end
 
-  it "has helpers mixin" do
+  it 'has helpers mixin' do
     obj = R18n::I18n.new('en')
     R18n.set(obj)
 
@@ -138,27 +140,31 @@ describe R18n do
     expect(l(Time.at(0).utc)).to eq('1970-01-01 00:00')
   end
 
-  it "returns available translations" do
-    expect(R18n.available_locales(DIR)).to match_array([R18n.locale('nolocale'),
-                                           R18n.locale('ru'),
-                                           R18n.locale('en')])
+  it 'returns available translations' do
+    expect(R18n.available_locales(DIR)).to match_array([
+      R18n.locale('nolocale'),
+      R18n.locale('ru'),
+      R18n.locale('en')
+    ])
   end
 
-  it "uses default places" do
+  it 'uses default places' do
     R18n.default_places = DIR
     R18n.set('en')
     expect(t.one).to eq('One')
-    expect(R18n.available_locales).to match_array([R18n.locale('ru'),
-                                      R18n.locale('en'),
-                                      R18n.locale('nolocale')])
+    expect(R18n.available_locales).to match_array([
+      R18n.locale('ru'),
+      R18n.locale('en'),
+      R18n.locale('nolocale')
+    ])
   end
 
-  it "sets default places by block" do
+  it 'sets default places by block' do
     R18n.default_places { DIR }
     expect(R18n.default_places).to eq(DIR)
   end
 
-  it "allows to ignore default places" do
+  it 'allows to ignore default places' do
     R18n.default_places = DIR
     i18n = R18n::I18n.new('en', nil)
     expect(i18n.one).not_to be_translated

data/spec/spec_helper.rb

@@ -1,14 +1,18 @@
-require 'pp'
+# frozen_string_literal: true
 
-dir = Pathname(__FILE__).dirname
+require 'pp'
 
-require dir.join('../lib/r18n-core').to_s
-Dir.glob(dir.join('../locales/*.rb').to_s) { |locale| require locale }
+require_relative '../lib/r18n-core'
+Dir.glob(File.join(__dir__, '..', 'locales', '*.rb')) do |locale_file|
+  require locale_file
+end
 
-TRANSLATIONS = dir + 'translations' unless defined? TRANSLATIONS
-DIR = TRANSLATIONS + 'general' unless defined? DIR
-TWO = TRANSLATIONS + 'two'     unless defined? TWO
-EXT = R18n::Loader::YAML.new(TRANSLATIONS + 'extension') unless defined? EXT
+TRANSLATIONS = File.join(__dir__, 'translations') unless defined? TRANSLATIONS
+DIR = File.join(TRANSLATIONS, 'general') unless defined? DIR
+TWO = File.join(TRANSLATIONS, 'two')     unless defined? TWO
+unless defined? EXT
+  EXT = R18n::Loader::YAML.new(File.join(TRANSLATIONS, 'extension'))
+end
 
 RSpec.configure do |config|
   config.before { R18n.clear_cache! }
@@ -26,7 +30,7 @@ class CounterLoader
     @loaded = 0
   end
 
-  def load(locale)
+  def load(_locale)
     @loaded += 1
     {}
   end

data/spec/translated_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Translated do
   before do
@@ -7,26 +7,29 @@ describe R18n::Translated do
       attr_accessor :name_ru, :name_en
 
       def name_ru?; end
+
       def name_ru!; end
     end
     R18n.set('en')
   end
 
-  it "saves methods map" do
+  it 'saves methods map' do
     @user_class.translation :name, methods: { ru: :name_ru }
-    expect(@user_class.unlocalized_getters(:name)).to eq({ 'ru' => 'name_ru' })
-    expect(@user_class.unlocalized_setters(:name)).to eq({ 'ru' => 'name_ru=' })
+    expect(@user_class.unlocalized_getters(:name)).to eq('ru' => 'name_ru')
+    expect(@user_class.unlocalized_setters(:name)).to eq('ru' => 'name_ru=')
   end
 
-  it "autodetects methods map" do
+  it 'autodetects methods map' do
     @user_class.translation :name
-    expect(@user_class.unlocalized_getters(:name)).to eq({
-        'en' => 'name_en', 'ru' => 'name_ru' })
-    expect(@user_class.unlocalized_setters(:name)).to eq({
-        'en' => 'name_en=', 'ru' => 'name_ru=' })
+    expect(@user_class.unlocalized_getters(:name)).to eq(
+      'en' => 'name_en', 'ru' => 'name_ru'
+    )
+    expect(@user_class.unlocalized_setters(:name)).to eq(
+      'en' => 'name_en=', 'ru' => 'name_ru='
+    )
   end
 
-  it "translates methods" do
+  it 'translates methods' do
     @user_class.translation :name
     user = @user_class.new
 
@@ -39,10 +42,14 @@ describe R18n::Translated do
     expect(user.name).to eq('Джон')
   end
 
-  it "returns TranslatedString" do
-    class ::SomeTranslatedClass
+  it 'returns TranslatedString' do
+    class SomeTranslatedClass
       include R18n::Translated
-      def name_en; 'John'; end
+
+      def name_en
+        'John'
+      end
+
       translation :name
     end
     obj = ::SomeTranslatedClass.new
@@ -52,16 +59,16 @@ describe R18n::Translated do
     expect(obj.name.path).to eq('SomeTranslatedClass#name')
   end
 
-  it "searchs translation by locales priority" do
+  it 'searchs translation by locales priority' do
     @user_class.translation :name
     user = @user_class.new
 
-    R18n.set(['nolocale', 'ru', 'en'])
+    R18n.set(%w[nolocale ru en])
     user.name_ru = 'Иван'
     expect(user.name.locale).to eq(R18n.locale('ru'))
   end
 
-  it "uses default locale" do
+  it 'uses default locale' do
     @user_class.translation :name
     user = @user_class.new
 
@@ -70,9 +77,11 @@ describe R18n::Translated do
     expect(user.name.locale).to eq(R18n.locale('en'))
   end
 
-  it "uses filters" do
-    @user_class.class_eval do
-      def age_en; {1 => '%1 year', 'n' => '%1 years'} end
+  it 'uses filters' do
+    @user_class.class_exec do
+      def age_en
+        { 1 => '%1 year', 'n' => '%1 years' }
+      end
       translation :age, type: 'pl', no_params: true
     end
     user = @user_class.new
@@ -80,10 +89,16 @@ describe R18n::Translated do
     expect(user.age(20)).to eq('20 years')
   end
 
-  it "sends params to method if user want it" do
-    @user_class.class_eval do
-      def no_params_en(*params) params.join(' '); end
-      def params_en(*params)    params.join(' '); end
+  it 'sends params to method if user want it' do
+    @user_class.class_exec do
+      def no_params_en(*params)
+        params.join(' ')
+      end
+
+      def params_en(*params)
+        params.join(' ')
+      end
+
       translations [:no_params, { no_params: true }], :params
     end
     user = @user_class.new
@@ -92,11 +107,13 @@ describe R18n::Translated do
     expect(user.params(1, 2)).to eq('1 2')
   end
 
-  it "translates virtual methods" do
+  it 'translates virtual methods' do
     @virtual_class = Class.new do
       include R18n::Translated
+
       translation :no_method, methods: { en: :no_method_en }
-      def method_missing(name, *params)
+
+      def method_missing(name, *_params)
         name.to_s
       end
     end
@@ -105,8 +122,8 @@ describe R18n::Translated do
     expect(virtual.no_method).to eq('no_method_en')
   end
 
-  it "returns original type of result" do
-    @user_class.class_eval do
+  it 'returns original type of result' do
+    @user_class.class_exec do
       translation :name
       def name_en
         :ivan
@@ -117,8 +134,8 @@ describe R18n::Translated do
     expect(user.name).to eq(:ivan)
   end
 
-  it "returns nil" do
-    @user_class.class_eval do
+  it 'returns nil' do
+    @user_class.class_exec do
       translation :name
       def name_en
         nil
@@ -129,8 +146,8 @@ describe R18n::Translated do
     expect(user.name).to be_nil
   end
 
-  it "allows to change I18n object" do
-    @user_class.class_eval do
+  it 'allows to change I18n object' do
+    @user_class.class_exec do
       translation :name
       attr_accessor :r18n
     end