r18n-core 3.2.0 → 4.0.0

data/spec/locales/en-us_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe R18n::Locales::EnUs do
+describe R18n::Locales::EnUS do
   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')
@@ -10,4 +10,19 @@ describe R18n::Locales::EnUs do
     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
+
+  it 'formats American English time' do
+    en_us = R18n::I18n.new('en-US')
+    expect(
+      en_us.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true)
+    )
+      .to eq('05/01/2009 06:07:08 AM')
+  end
+
+  it 'takes locaize from `en` locale when loaded from dir with only regions' do
+    en_us = R18n::I18n.new(
+      'en-US', File.join(__dir__, '..', 'translations', 'with_regions')
+    )
+    expect(en_us.l(Time.now - 61, :human)).to eq '1 minute ago'
+  end
 end

data/spec/locales/es-us_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+describe R18n::Locales::EnUS do
+  it 'formats American Spanish time' do
+    es_us = R18n::I18n.new('es-US')
+    expect(
+      es_us.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true)
+    )
+      .to eq('05/01/2009 06:07:08 AM')
+  end
+end

data/spec/locales/fi_spec.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+describe R18n::Locales::Fi do
+  it 'formats Finnish time' do
+    fi = R18n::I18n.new('fi')
+    expect(fi.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true))
+      .to eq('01.05.2009 06.07.08')
+  end
+end

data/spec/locales/hu_spec.rb

@@ -13,5 +13,7 @@ describe R18n::Locales::Hu 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')
+    expect(hu.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true))
+      .to eq('2009. 05. 01., 06:07:08')
   end
 end

data/spec/locales/id_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+describe R18n::Locales::Id do
+  it 'formats Indonesian date' do
+    id = R18n::I18n.new('id')
+
+    expect(id.l(Date.parse('2009-11-01'), :full)).to eq('1 November 2009')
+    expect(id.l(Date.parse('2009-11-02'), :standard)).to eq('02/11/2009')
+    expect(id.l(Date.parse('2009-11-21'), '%d/%b/%y')).to eq('21/Nov/09')
+  end
+
+  it 'formats Indonesian time' do
+    id = R18n::I18n.new('id')
+    time = id.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard)
+    expect(time).to eq('01/05/2009 pukul 06.07')
+  end
+
+  it 'formats Indonesian time with seconds' do
+    id = R18n::I18n.new('id')
+    time = id.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true)
+    expect(time).to eq('01/05/2009 pukul 06.07.08')
+  end
+end

data/spec/locales/vi_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 describe R18n::Locales::Vi 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')
+  it 'formats Vietnamese time' do
+    vi = R18n::I18n.new('vi')
+    expect(vi.l(Time.utc(2009, 5, 1, 6, 7, 8), :standard, with_seconds: true))
+      .to eq('06:07:08, 01/05/2009')
   end
 end

data/spec/r18n_spec.rb

@@ -89,6 +89,14 @@ describe R18n do
     expect(R18n.change(R18n.locale('en')).locale.code).to eq('en')
   end
 
+  it 'allows to temporary change locale inside block' do
+    R18n.set('ru')
+    code_inside_block = nil
+    R18n.change(R18n.locale('en')) { code_inside_block = R18n.get.locale.code }
+    expect(code_inside_block).to eq('en')
+    expect(R18n.get.locale.code).to eq('ru')
+  end
+
   it 'has shortcut to load locale' do
     expect(R18n.locale('ru')).to eq(R18n::Locale.load('ru'))
   end
@@ -109,13 +117,6 @@ describe R18n do
     expect(R18n.cache).to eq({})
   end
 
-  it 'maps hash' do
-    hash = R18n::Utils.hash_map('a' => 1, 'b' => 2) do |k, v|
-      [k + 'a', v + 1]
-    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 }
@@ -175,4 +176,17 @@ describe R18n do
     R18n.set('en')
     expect(t.one).to eq('One')
   end
+
+  it 'allows to load files with downcased region in name' do
+    R18n.default_places = File.join(TRANSLATIONS, 'yaml')
+    R18n.set('en-us')
+    expect(t.one).to eq('American One')
+  end
+
+  it 'allows to load files with upcased region in name' do
+    R18n.default_places = File.join(TRANSLATIONS, 'yaml')
+    R18n.set('en-gb')
+    expect(R18n.get.locale.code).to eq('en-GB')
+    expect(t.one).to eq('British One')
+  end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,8 @@
 # frozen_string_literal: true
 
-## https://github.com/stevekinney/pizza/issues/103#issuecomment-136052789
-## https://github.com/docker-library/ruby/issues/45
-Encoding.default_external = 'UTF-8'
-
 require 'pp'
 
 require_relative '../lib/r18n-core'
-Dir.glob(File.join(__dir__, '..', 'locales', '*.rb')) do |locale_file|
-  require locale_file
-end
 
 TRANSLATIONS = File.join(__dir__, 'translations') unless defined? TRANSLATIONS
 DIR = File.join(TRANSLATIONS, 'general') unless defined? DIR

data/spec/translated_spec.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 describe R18n::Translated do
-  before do
-    @user_class = Class.new do
+  let(:user_class) do
+    Class.new do
       include R18n::Translated
       attr_accessor :name_ru, :name_en
 
@@ -10,28 +10,32 @@ describe R18n::Translated do
 
       def name_ru!; end
     end
+  end
+
+  let(:user) { user_class.new }
+
+  before do
     R18n.set('en')
   end
 
   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=')
+    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=')
   end
 
   it 'autodetects methods map' do
-    @user_class.translation :name
-    expect(@user_class.unlocalized_getters(:name)).to eq(
+    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(
+    expect(user_class.unlocalized_setters(:name)).to eq(
       'en' => 'name_en=', 'ru' => 'name_ru='
     )
   end
 
   it 'translates methods' do
-    @user_class.translation :name
-    user = @user_class.new
+    user_class.translation :name
 
     user.name = 'John'
     expect(user.name).to eq('John')
@@ -42,8 +46,24 @@ describe R18n::Translated do
     expect(user.name).to eq('Джон')
   end
 
-  it 'returns TranslatedString' do
-    class SomeTranslatedClass
+  it 'translates locales with regions' do
+    some_translated_class = Class.new do
+      include R18n::Translated
+
+      def name_en_us
+        'John'
+      end
+
+      translation :name
+    end
+    obj = some_translated_class.new
+
+    R18n.set('en-US')
+    expect(obj.name).to eq('John')
+  end
+
+  it 'returns `TranslatedString`' do
+    some_translated_class = Class.new do
       include R18n::Translated
 
       def name_en
@@ -52,7 +72,9 @@ describe R18n::Translated do
 
       translation :name
     end
-    obj = ::SomeTranslatedClass.new
+    allow(some_translated_class).to receive(:name)
+      .and_return 'SomeTranslatedClass'
+    obj = some_translated_class.new
 
     expect(obj.name).to be_kind_of(R18n::TranslatedString)
     expect(obj.name.locale).to eq(R18n.locale('en'))
@@ -60,8 +82,7 @@ describe R18n::Translated do
   end
 
   it 'searchs translation by locales priority' do
-    @user_class.translation :name
-    user = @user_class.new
+    user_class.translation :name
 
     R18n.set(%w[nolocale ru en])
     user.name_ru = 'Иван'
@@ -69,101 +90,136 @@ describe R18n::Translated do
   end
 
   it 'uses default locale' do
-    @user_class.translation :name
-    user = @user_class.new
+    user_class.translation :name
 
     R18n.set('nolocale')
     user.name_en = 'John'
     expect(user.name.locale).to eq(R18n.locale('en'))
   end
 
-  it 'uses filters' do
-    @user_class.class_exec do
-      def age_en
-        { 1 => '%1 year', 'n' => '%1 years' }
+  describe 'filters' do
+    let(:user_class) do
+      Class.new do
+        include R18n::Translated
+
+        def age_en
+          { 1 => '%1 year', 'n' => '%1 years' }
+        end
+
+        translation :age, type: 'pl', no_params: true
       end
-      translation :age, type: 'pl', no_params: true
     end
-    user = @user_class.new
 
-    expect(user.age(20)).to eq('20 years')
+    it 'uses them' do
+      expect(user.age(20)).to eq('20 years')
+    end
   end
 
-  it 'sends params to method if user want it' do
-    @user_class.class_exec do
-      def no_params_en(*params)
-        params.join(' ')
-      end
+  describe 'passing params to method' do
+    let(:user_class) do
+      Class.new do
+        include R18n::Translated
 
-      def params_en(*params)
-        params.join(' ')
-      end
+        def no_params_en(*params)
+          params.join(' ')
+        end
+
+        def params_en(*params)
+          params.join(' ')
+        end
 
-      translations [:no_params, { no_params: true }], :params
+        translations [:no_params, { no_params: true }], :params
+      end
     end
-    user = @user_class.new
 
-    expect(user.no_params(1, 2)).to eq('')
-    expect(user.params(1, 2)).to eq('1 2')
+    it 'works' do
+      expect(user.no_params(1, 2)).to eq('')
+      expect(user.params(1, 2)).to eq('1 2')
+    end
   end
 
   it 'translates virtual methods' do
-    @virtual_class = Class.new do
+    virtual_class = Class.new do
       include R18n::Translated
 
       translation :no_method, methods: { en: :no_method_en }
 
       def method_missing(name, *_params)
         return name.to_s if name.to_s =~ /^no_method*/
+
         super
       end
 
       def respond_to_missing?(name, *_params)
         return true if name.to_s =~ /^no_method*/
+
         super
       end
     end
-    virtual = @virtual_class.new
+    virtual = virtual_class.new
 
     expect(virtual.no_method).to eq('no_method_en')
   end
 
-  it 'returns original type of result' do
-    @user_class.class_exec do
-      translation :name
-      def name_en
-        :ivan
+  describe 'returning original type of result' do
+    let(:user_class) do
+      Class.new do
+        include R18n::Translated
+
+        translation :name
+
+        def name_en
+          :ivan
+        end
       end
     end
-    user = @user_class.new
 
-    expect(user.name).to eq(:ivan)
-  end
+    it 'works' do
+      expect(user.name).to eq(:ivan)
+    end
 
-  it 'returns nil' do
-    @user_class.class_exec do
-      translation :name
-      def name_en
-        nil
+    context 'is nil' do
+      let(:user_class) do
+        Class.new do
+          include R18n::Translated
+
+          translation :name
+
+          def name_en
+            nil
+          end
+        end
       end
-    end
-    user = @user_class.new
 
-    expect(user.name).to be_nil
+      it 'works' do
+        expect(user.name).to be_nil
+      end
+    end
   end
 
-  it 'allows to change I18n object' do
-    @user_class.class_exec do
-      translation :name
-      attr_accessor :r18n
+  describe 'allowing to change I18n object' do
+    let(:user_class) do
+      Class.new do
+        include R18n::Translated
+
+        attr_accessor :name_ru, :name_en
+
+        translation :name
+
+        attr_accessor :r18n
+      end
     end
-    user = @user_class.new
-    user.name_ru = 'Иван'
-    user.name_en = 'John'
 
-    user.r18n = R18n::I18n.new('ru')
-    expect(user.name).to eq('Иван')
-    user.r18n = R18n::I18n.new('en')
-    expect(user.name).to eq('John')
+    before do
+      user.name_ru = 'Иван'
+      user.name_en = 'John'
+    end
+
+    it 'works' do
+      user.r18n = R18n::I18n.new('ru')
+      expect(user.name).to eq('Иван')
+      user.r18n = R18n::I18n.new('en')
+      expect(user.name).to eq('John')
+    end
   end
 end

data/spec/translation_spec.rb

@@ -104,8 +104,11 @@ describe R18n::Translation do
 
   it 'filters typed data' do
     en = R18n.locale('en')
-    translation = R18n::Translation.new(en, '', locale: en, translations:
-      { 'count' => R18n::Typed.new('pl', 1 => 'one', 'n' => 'many') })
+    translation = R18n::Translation.new(
+      en, '', locale: en, translations: {
+        'count' => R18n::Typed.new('pl', 1 => 'one', 'n' => 'many')
+      }
+    )
 
     expect(translation.count(1)).to eq('one')
     expect(translation.count(5)).to eq('many')