r18n-rails-api 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5deefc933007b37a5ba454c480ab0afc23fc9314
-  data.tar.gz: 52d1e20a21ac85503dbb03e977368cbd1cbcfafe
+SHA256:
+  metadata.gz: 4e6b0328797e38e0c254f9cb16d766dba6e25cfec33f159b047962a0d8964b7f
+  data.tar.gz: f28b4872106cf2ac7df1fd1af0f8a528154be49fb8f1730fd2d900718df094b1
 SHA512:
-  metadata.gz: ff65e2142af36b8acb39a60a20f0096a6fd86c447251d66db261c0c5c8e4bc0b90cf1e6d081ac346c744bcb2c95b232e60e746b7639ee0ca538aa5a6caa69670
-  data.tar.gz: d9c96fa2bf3d9ec94a91fcf30493a5eeae4b18cdbc2d3a69466e0a3fe9ac9d6ff0d6e131b76b648391fbeb26080b7540e86b411fdb57bb1c78757faa4db61ae9
+  metadata.gz: 1c18011d243cde29d90eace25a276c5d2de4a41c3849614c9759921c7c36b9ccf6f3f4b9b0b05b8c70acaa98b9e06ce15fd6d3361e78a3b5662c4c2a98f47e70
+  data.tar.gz: 915a2058918ec20875a6aa32fb763afd16cb08353eaa00f0639568d4062668f8f6ddee42f98dca1f68401f6b288251d0d646771b584411ae582d106383ee9d0b

data/.rspec

@@ -1 +1 @@
---format documentation --colour
+--format documentation --colour --warnings --require spec_helper

data/Rakefile

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
-task :default => :spec
+task default: :spec
 
 task :clobber_package do
-  rm_r 'pkg' rescue nil
+  rm_rf 'pkg'
 end
-task :clobber => [:clobber_package]
+task clobber: [:clobber_package]

data/lib/r18n-rails-api.rb

@@ -1,27 +1,25 @@
-=begin
-Rails I18n compatibility for R18n.
+# frozen_string_literal: true
 
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+# Rails I18n compatibility for R18n.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
-
-require 'pathname'
 require 'r18n-core'
 
-dir = Pathname(__FILE__).dirname.expand_path + 'r18n-rails-api'
-require dir + 'rails_plural'
-require dir + 'filters'
-require dir + 'loader'
-require dir + 'backend'
+require_relative 'r18n-rails-api/rails_plural'
+require_relative 'r18n-rails-api/filters'
+require_relative 'r18n-rails-api/loader'
+require_relative 'r18n-rails-api/backend'

data/lib/r18n-rails-api/backend.rb

@@ -1,21 +1,21 @@
-=begin
-R18n backend for Rails I18n.
-
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# frozen_string_literal: true
+
+# R18n backend for Rails I18n.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'i18n/backend/transliterator'
 
@@ -29,7 +29,7 @@ module R18n
   class Backend
     include ::I18n::Backend::Transliterator
 
-    RESERVED_KEYS = [:scope, :default, :separator]
+    RESERVED_KEYS = %i[scope default separator].freeze
 
     # Find translation in R18n. It didn’t use +locale+ argument, only current
     # R18n I18n object. Also it doesn’t support Proc and variables in +default+
@@ -38,12 +38,12 @@ module R18n
       return key.map { |k| translate(locale, k, options) } if key.is_a?(Array)
 
       scope, default, separator = options.values_at(*RESERVED_KEYS)
-      params = options.reject { |name, value| RESERVED_KEYS.include?(name) }
+      params = options.reject { |name, _value| RESERVED_KEYS.include?(name) }
 
       result = lookup(locale, scope, key, separator, params)
 
       if result.is_a? Untranslated
-        options = options.reject { |key, value| key == :default }
+        options = options.reject { |opts_key, _value| opts_key == :default }
 
         default = []        if default.nil?
         default = [default] unless default.is_a? Array
@@ -73,7 +73,7 @@ module R18n
     # Support Rails I18n (+:default+, +:short+, +:long+, +:long_ordinal+,
     # +:only_day+ and +:only_second+) and R18n (+:full+, +:human+, +:standard+
     # and +:month+) time formatters.
-    def localize(locale, object, format = :default, options = {})
+    def localize(locale, object, format = :default, _options = {})
       i18n = get_i18n(locale)
       if format.is_a? Symbol
         key  = format
@@ -117,11 +117,12 @@ module R18n
 
     def translation_to_hash(translation)
       Utils.hash_map(translation.to_hash) do |key, value|
-        value = if value.is_a? Hash
-          translation_to_hash(value)
-        else
-          format_value(value)
-        end
+        value =
+          if value.is_a? Hash
+            translation_to_hash(value)
+          else
+            format_value(value)
+          end
         [key.to_sym, value]
       end
     end
@@ -129,23 +130,25 @@ module R18n
     # Find translation by <tt>scope.key(params)</tt> in current R18n I18n
     # object.
     def lookup(locale, scope, key, separator, params)
-      keys = (Array(scope) + Array(key)).map { |k|
-        k.to_s.split(separator || ::I18n.default_separator) }.flatten
+      keys = (Array(scope) + Array(key))
+        .map { |k| k.to_s.split(separator || ::I18n.default_separator) }
+        .flatten
       last = keys.pop.to_sym
 
-      result = keys.inject(get_i18n(locale).t) do |node, key|
+      result = keys.inject(get_i18n(locale).t) do |node, iterated_key|
         if node.is_a? TranslatedString
-          node.get_untranslated(key)
+          node.get_untranslated(iterated_key)
         else
-          node[key]
+          node[iterated_key]
         end
       end
 
-      result = if result.is_a? TranslatedString
-        result.get_untranslated(key)
-      else
-        result[last, params]
-      end
+      result =
+        if result.is_a? TranslatedString
+          result.get_untranslated(key)
+        else
+          result[last, params]
+        end
 
       format_value(result)
     end

data/lib/r18n-rails-api/filters.rb

@@ -1,21 +1,21 @@
-=begin
-Filters for Rails I18n compatibility for R18n.
+# frozen_string_literal: true
 
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# Filters for Rails I18n compatibility for R18n.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Filter to use Rails named variables:
 #
@@ -53,14 +53,16 @@ end
 
 # Pluralization by named variable <tt>%{count}</tt>.
 R18n::Filters.add('pl', :named_pluralization) do |content, config, param|
-  if param.is_a? Hash and param.has_key? :count
+  if param.is_a?(Hash) && param.key?(:count)
     hash = content.to_hash
     type = config[:locale].pluralize(param[:count])
-    type = 'n' if not hash.has_key? type
+    type = 'n' unless hash.key?(type)
     hash[type]
   elsif content.is_a? R18n::UnpluralizetedTranslation
-    R18n::RailsUnpluralizetedTranslation.new(config[:locale], config[:path],
-        locale: config[:locale], translations: content.to_hash)
+    R18n::RailsUnpluralizetedTranslation.new(
+      config[:locale], config[:path],
+      locale: config[:locale], translations: content.to_hash
+    )
   else
     content
   end

data/lib/r18n-rails-api/loader.rb

@@ -1,21 +1,21 @@
-=begin
-Loader for Rails translations.
+# frozen_string_literal: true
 
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# Loader for Rails translations.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'i18n'
 
@@ -56,7 +56,7 @@ module R18n
 
       # Reload backend if <tt>I18n.load_path</tt> is changed.
       def reload!
-        return if @last_path == ::I18n.load_path
+        return if defined?(@last_path) && @last_path == ::I18n.load_path
         @last_path = ::I18n.load_path.clone
         @backend.reload!
         @backend.send(:init_translations)
@@ -69,8 +69,8 @@ module R18n
       end
 
       # Is another +loader+ is also load Rails translations.
-      def ==(loader)
-        self.class == loader.class
+      def ==(other)
+        self.class == other.class
       end
 
       protected
@@ -80,14 +80,17 @@ module R18n
         if value.is_a? Hash
           if value.empty?
             value
-          elsif value.keys.inject(true) { |a, i| a and RailsPlural.is_rails? i }
-            Typed.new('pl', R18n::Utils.hash_map(value) { |k, v|
-              [RailsPlural.to_r18n(k), transform(v)]
-            })
+          elsif value.keys.inject(true) { |a, i| a && RailsPlural.is_rails?(i) }
+            Typed.new(
+              'pl',
+              R18n::Utils.hash_map(value) do |k, v|
+                [RailsPlural.to_r18n(k), transform(v)]
+              end
+            )
           else
             Utils.hash_map(value) { |k, v| [k.to_s, transform(v)] }
           end
-        elsif @private_type_class and value.is_a? @private_type_class
+        elsif defined?(@private_type_class) && value.is_a?(@private_type_class)
           Typed.new(value.type_id, value.value)
         else
           value

data/lib/r18n-rails-api/rails_plural.rb

@@ -1,28 +1,28 @@
-=begin
-Converter between R18n and Rails I18n plural keys.
+# frozen_string_literal: true
 
-Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-=end
+# Converter between R18n and Rails I18n plural keys.
+#
+# Copyright (C) 2009 Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module R18n
   # Converter between R18n and Rails I18n plural keys.
   class RailsPlural
     # Check, that +key+ is Rails plural key.
     def self.is_rails?(k)
-      [:zero, :one, :few, :many, :other].include? k
+      %i[zero one few many other].include? k
     end
 
     # Convert Rails I18n plural key to R18n.

data/r18n-rails-api.gemspec

@@ -1,4 +1,6 @@
-require File.expand_path('../../r18n-core/lib/r18n-core/version', __FILE__)
+# frozen_string_literal: true
+
+require_relative '../r18n-core/lib/r18n-core/version'
 
 Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
@@ -7,14 +9,14 @@ Gem::Specification.new do |s|
   s.date     = Time.now.strftime('%Y-%m-%d')
 
   s.summary     = 'Rails I18n compatibility for R18n'
-  s.description = <<-EOF
+  s.description = <<-DESC
     R18n backend for Rails I18n and R18n filters and loader to support Rails
     translation format.
     R18n has nice Ruby-style syntax, filters, flexible locales, custom loaders,
     translation support for any classes, time and number localization, several
     user language support, agnostic core package with out-of-box support for
     Rails, Sinatra and desktop applications.
-  EOF
+  DESC
 
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -26,6 +28,6 @@ Gem::Specification.new do |s|
   s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-rails-api'
   s.license  = 'LGPL-3'
 
-  s.add_dependency 'r18n-core', "= #{R18n::VERSION}"
   s.add_dependency 'i18n'
+  s.add_dependency 'r18n-core', "= #{R18n::VERSION}"
 end

data/spec/backend_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Backend do
   before do
@@ -8,11 +8,11 @@ describe R18n::Backend do
     R18n.set('en')
   end
 
-  it "returns available locales" do
-    expect(I18n.available_locales).to match_array([:en, :ru])
+  it 'returns available locales' do
+    expect(I18n.available_locales).to match_array(%i[en ru])
   end
 
-  it "localizes objects" do
+  it 'localizes objects' do
     time = Time.at(0).utc
     date = Date.parse('1970-01-01')
 
@@ -25,66 +25,67 @@ describe R18n::Backend do
     expect(I18n.l(-5000.5)).to eq '−5,000.5'
   end
 
-  it "translates by key and scope" do
+  it 'translates by key and scope' do
     expect(I18n.t('in.another.level')).to            eq 'Hierarchical'
     expect(I18n.t(:level, scope: 'in.another')).to   eq 'Hierarchical'
     expect(I18n.t(:'another.level', scope: 'in')).to eq 'Hierarchical'
   end
 
-  it "uses pluralization and variables" do
+  it 'uses pluralization and variables' do
     expect(I18n.t('users', count: 0)).to eq '0 users'
     expect(I18n.t('users', count: 1)).to eq '1 user'
     expect(I18n.t('users', count: 5)).to eq '5 users'
   end
 
-  it "uses another separator" do
+  it 'uses another separator' do
     expect(I18n.t('in/another/level', separator: '/')).to eq 'Hierarchical'
   end
 
-  it "translates array" do
+  it 'translates array' do
     expect(I18n.t(['in.another.level', 'in.default'])).to eq(
-      ['Hierarchical', 'Default'])
+      %w[Hierarchical Default]
+    )
   end
 
-  it "uses default value" do
+  it 'uses default value' do
     expect(I18n.t(:missed, default: 'Default')).to                 eq 'Default'
     expect(I18n.t(:missed, default: :default, scope: :in)).to      eq 'Default'
-    expect(I18n.t(:missed, default: [:also_no, :'in.default'])).to eq 'Default'
+    expect(I18n.t(:missed, default: %i[also_no in.default])).to    eq 'Default'
     expect(I18n.t(:missed, default: proc { |key| key.to_s })).to   eq 'missed'
   end
 
-  it "raises error on no translation" do
-    expect(-> {
+  it 'raises error on no translation' do
+    expect(lambda {
       I18n.backend.translate(:en, :missed)
     }).to raise_error(::I18n::MissingTranslationData)
 
-    expect(-> {
+    expect(lambda {
       I18n.t(:missed)
     }).to raise_error(::I18n::MissingTranslationData)
   end
 
-  it "reloads translations" do
+  it 'reloads translations' do
     expect(-> { I18n.t(:other) }).to raise_error(::I18n::MissingTranslationData)
     I18n.load_path << OTHER
     I18n.reload!
     expect(I18n.t(:other)).to eq 'Other'
   end
 
-  it "returns plain classes" do
+  it 'returns plain classes' do
     expect(I18n.t('in.another.level').class).to eq ActiveSupport::SafeBuffer
     expect(I18n.t('in.another').class).to eq Hash
   end
 
-  it "returns correct unpluralized hash" do
-    expect(I18n.t('users')).to eq ({ one: '1 user', other: '%{count} users' })
+  it 'returns correct unpluralized hash' do
+    expect(I18n.t('users')).to eq(one: '1 user', other: '%{count} users')
   end
 
-  it "corrects detect untranslated, whem path is deeper than string" do
-    expect(-> {
+  it 'corrects detect untranslated, whem path is deeper than string' do
+    expect(lambda {
       I18n.t('in.another.level.deeper')
     }).to raise_error(::I18n::MissingTranslationData)
 
-    expect(-> {
+    expect(lambda {
       I18n.t('in.another.level.go.deeper')
     }).to raise_error(::I18n::MissingTranslationData)
   end
@@ -94,23 +95,23 @@ describe R18n::Backend do
   end
 
   it "doesn't call object methods" do
-    expect(-> {
+    expect(lambda {
       I18n.t('in.another.level.to_sym')
     }).to raise_error(::I18n::MissingTranslationData)
   end
 
-  it "works deeper pluralization" do
+  it 'works deeper pluralization' do
     expect(I18n.t('users.other', count: 5)).to eq '5 users'
   end
 
-  it "returns hash with symbols keys" do
-    expect(I18n.t('in')).to eq({
+  it 'returns hash with symbols keys' do
+    expect(I18n.t('in')).to eq(
       another: { level: 'Hierarchical' },
       default: 'Default'
-    })
+    )
   end
 
-  it "changes locale in place" do
+  it 'changes locale in place' do
     I18n.load_path << PL
     expect(I18n.t('users', count: 5)).to eq '5 users'
     expect(I18n.t('users', count: 5, locale: :ru)).to eq 'Много'
@@ -118,7 +119,7 @@ describe R18n::Backend do
     expect(I18n.l(Date.parse('1970-01-01'), locale: :ru)).to eq '01.01.1970'
   end
 
-  it "has transliterate method" do
+  it 'has transliterate method' do
     expect(I18n.transliterate('café')).to eq 'cafe'
   end
 end

data/spec/data/simple/ru.rb

@@ -1 +1,3 @@
-{ ru: { two: "Два" } }
+# frozen_string_literal: true
+
+{ ru: { two: 'Два' } }

data/spec/filters_spec.rb

@@ -1,9 +1,10 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe 'Rails filters' do
-  it "uses named variables" do
-    i18n = R18n::Translation.new(EN, '', locale: EN,
-      translations: { 'echo' => 'Value is %{value}' })
+  it 'uses named variables' do
+    i18n = R18n::Translation.new(
+      EN, '', locale: EN, translations: { 'echo' => 'Value is %{value}' }
+    )
 
     expect(i18n.echo(value: 'R18n')).to eq 'Value is R18n'
     expect(i18n.echo(value: -5.5)).to   eq 'Value is −5.5'
@@ -12,21 +13,24 @@ describe 'Rails filters' do
     expect(i18n.echo).to eq 'Value is %{value}'
   end
 
-  it "uses old variables syntax" do
-    i18n = R18n::Translation.new(EN, '', locale: EN,
-      translations: { 'echo' => 'Value is {{value}}' })
+  it 'uses old variables syntax' do
+    i18n = R18n::Translation.new(
+      EN, '', locale: EN, translations: { 'echo' => 'Value is {{value}}' }
+    )
     expect(i18n.echo(value: 'Old')).to eq 'Value is Old'
   end
 
-  it "pluralizes by variable %{count}" do
-    i18n = R18n::Translation.new(EN, '', locale: EN,
-      translations: {
-        'users' => R18n::Typed.new('pl', {
+  it 'pluralizes by variable %{count}' do
+    i18n = R18n::Translation.new(
+      EN, '', locale: EN, translations: {
+        'users' => R18n::Typed.new(
+          'pl',
           0 => 'no users',
           1 => '1 user',
           'n' => '%{count} users'
-        })
-      })
+        )
+      }
+    )
 
     expect(i18n.users(count: 0)).to eq 'no users'
     expect(i18n.users(count: 1)).to eq '1 user'

data/spec/loader_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../spec_helper', __FILE__)
+# frozen_string_literal: true
 
 describe R18n::Loader::Rails do
   before do
@@ -6,51 +6,53 @@ describe R18n::Loader::Rails do
     @loader = R18n::Loader::Rails.new
   end
 
-  it "returns available locales" do
+  it 'returns available locales' do
     expect(@loader.available).to match_array([DECH, EN, RU])
   end
 
-  it "loads translation" do
-    expect(@loader.load(RU)).to eq({ 'one' => 'Один', 'two' => 'Два' })
+  it 'loads translation' do
+    expect(@loader.load(RU)).to eq('one' => 'Один', 'two' => 'Два')
   end
 
-  it "loads translation for dialects" do
-    expect(@loader.load(DECH)).to eq({ 'a' => 1 })
+  it 'loads translation for dialects' do
+    expect(@loader.load(DECH)).to eq('a' => 1)
   end
 
-  it "changes pluralization" do
-    expect(@loader.load(EN)).to eq({
-      'users' => R18n::Typed.new('pl', {
+  it 'changes pluralization' do
+    expect(@loader.load(EN)).to eq(
+      'users' => R18n::Typed.new(
+        'pl',
         0   => 'Zero',
         1   => 'One',
         2   => 'Few',
         'n' => 'Other'
-      })
-    })
+      )
+    )
   end
 
-  it "changes Russian pluralization" do
+  it 'changes Russian pluralization' do
     I18n.load_path = [PL]
-    expect(@loader.load(RU)).to eq({
-      'users' => R18n::Typed.new('pl', {\
+    expect(@loader.load(RU)).to eq(
+      'users' => R18n::Typed.new(
+        'pl',
         0   => 'Ноль',
         1   => 'Один',
         2   => 'Несколько',
         'n' => 'Много'
-      })
-    })
+      )
+    )
   end
 
-  it "reloads translations on load_path changes" do
+  it 'reloads translations on load_path changes' do
     I18n.load_path << OTHER
-    expect(@loader.load(RU)).to eq({
+    expect(@loader.load(RU)).to eq(
       'one'   => 'Один',
       'two'   => 'Два',
       'three' => 'Три'
-    })
+    )
   end
 
-  it "changes hash on load_path changes" do
+  it 'changes hash on load_path changes' do
     before = @loader.hash
     I18n.load_path << OTHER
     expect(@loader.hash).not_to eq before

data/spec/spec_helper.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 require 'pp'
 require 'i18n'
 require 'active_support'
 
 I18n.enforce_available_locales = true
 
-require File.join(File.dirname(__FILE__), '../lib/r18n-rails-api')
+require_relative '../lib/r18n-rails-api'
 
 EN   = R18n.locale(:en)
 RU   = R18n.locale(:ru)
 DECH = R18n.locale(:'de-CH')
 
-GENERAL = Dir.glob(File.join(File.dirname(__FILE__), 'data/general/*'))
-SIMPLE  = Dir.glob(File.join(File.dirname(__FILE__), 'data/simple/*'))
-OTHER   = Dir.glob(File.join(File.dirname(__FILE__), 'data/other/*'))
-PL      = Dir.glob(File.join(File.dirname(__FILE__), 'data/pl/*'))
+GENERAL = Dir.glob(File.join(__dir__, 'data', 'general', '*'))
+SIMPLE  = Dir.glob(File.join(__dir__, 'data', 'simple', '*'))
+OTHER   = Dir.glob(File.join(__dir__, 'data', 'other', '*'))
+PL      = Dir.glob(File.join(__dir__, 'data', 'pl', '*'))

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-22 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: r18n-core
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: r18n-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
 description: |2
       R18n backend for Rails I18n and R18n filters and loader to support Rails
       translation format.
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails I18n compatibility for R18n