r18n-rails-api 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa895f7f002e9dcdff8ba5045941330e07e7ce1c9cdf7a48a16c2b4204a9007
-  data.tar.gz: 669562fc19838c73730d102b440b032c058e48bd6570c124f371fcb3609d0ea8
+  metadata.gz: '099a10ed8e4a7e10242249f77a27092dae05fad11e08c3ce9753e9c78c5cbf1c'
+  data.tar.gz: d46f35406a6f561b1c86fbca7248b8faaa5978133fd8afd33ee6371775f2eab9
 SHA512:
-  metadata.gz: 8729f0e5cc0f67756bad45f5d5b8ac9c338cd196df7f03b32a01671d7ad974c0e63ca60e3a5c10fc23960a312879d9af89747cd94fbd01afd00f0702a389f4f9
-  data.tar.gz: 60f983d9fadfdd661f64e42c4a4ae68a8397e67e1d32c684a820781dbb2e2f9508e20fb63c000bfd374ffb9408bba5c4ffd23339628a3c65d20b769c2a79a7b4
+  metadata.gz: e203f84f913425ee61448023acad3bed063bc36b3844a588b61d75ce2c7ad0cb8882f00b939da0ac2ec0d077346ed8f36a888617a47693d39cd660fc5b782dc7
+  data.tar.gz: 6f9dcc914c984f762b11beadec8dc220435299f5fad7254bfe2be216dc7be5eef5b2ef071c351304d13c4beb7067eb6fbeed5ea03a0a51378972c015cb0da07b

data/README.md

@@ -2,7 +2,7 @@
 
 Rails I18n compatibility for R18n:
 * R18n loader for Rails I18n translation format;
-* R18n backend.
+* R18n back-end.
 
 ## How To
 
@@ -30,9 +30,9 @@ i18n = R18n::I18n.new('en', R18n::Loader::Rails)
 i18n.posts(count: 5) #=> "5 posts"
 ```
 
-### Backend
+### Back-end
 
-You can use R18n as a backend for Rails I18n:
+You can use R18n as a back-end for Rails I18n:
 
 ```ruby
 require 'r18n-rails-api'
@@ -58,8 +58,8 @@ I18n.t :users, count: 5        #=> "5 users"
 ## License
 
 R18n is licensed under the GNU Lesser General Public License version 3.
-You can read it in LICENSE file or in http://www.gnu.org/licenses/lgpl.html.
+You can read it in LICENSE file or in [www.gnu.org/licenses/lgpl-3.0.html](https://www.gnu.org/licenses/lgpl-3.0.html).
 
 ## Author
 
-Andrey “A.I.” Sitnik <andrey@sitnik.ru>
+Andrey “A.I.” Sitnik [andrey@sitnik.ru](mailto:andrey@sitnik.ru)

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

@@ -31,9 +31,9 @@ module R18n
 
     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+
-    # String option.
+    # 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` String option.
     def translate(locale, key, options = {})
       return key.map { |k| translate(locale, k, options) } if key.is_a?(Array)
 
@@ -66,13 +66,13 @@ module R18n
       end
     end
 
-    # Convert +object+ to String, according to the rules of the current
-    # R18n locale. It didn’t use +locale+ argument, only current R18n I18n
-    # object. It support Integer, Float, Time, Date and DateTime.
+    # Convert `object` to `String`, according to the rules of the current
+    # R18n locale. It didn't use `locale` argument, only current R18n I18n
+    # object. It support `Integer`, `Float`, `Time`, `Date` and `DateTime`.
     #
-    # Support Rails I18n (+:default+, +:short+, +:long+, +:long_ordinal+,
-    # +:only_day+ and +:only_second+) and R18n (+:full+, +:human+, +:standard+
-    # and +:month+) time formatters.
+    # 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 = {})
       i18n = get_i18n(locale)
       if format.is_a? Symbol
@@ -105,9 +105,7 @@ module R18n
       if result.is_a? TranslatedString
         result.to_s
       elsif result.is_a? UnpluralizetedTranslation
-        Utils.hash_map(result.to_hash) do |key, value|
-          [RailsPlural.from_r18n(key), value]
-        end
+        result.to_hash.map { |k, v| [RailsPlural.from_r18n(k), v] }.to_h
       elsif result.is_a? Translation
         translation_to_hash(result)
       else
@@ -116,18 +114,15 @@ module R18n
     end
 
     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
-        [key.to_sym, value]
-      end
+      translation.to_hash.map do |key, value|
+        [
+          key.to_sym,
+          value.is_a?(Hash) ? translation_to_hash(value) : format_value(value)
+        ]
+      end.to_h
     end
 
-    # Find translation by <tt>scope.key(params)</tt> in current R18n I18n
+    # Find translation by `scope.key(params)` in current R18n I18n
     # object.
     def lookup(locale, scope, key, separator, params)
       keys = (Array(scope) + Array(key))

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

@@ -51,7 +51,7 @@ module R18n
   end
 end
 
-# Pluralization by named variable <tt>%{count}</tt>.
+# Pluralization by named variable `%{count}`.
 R18n::Filters.add('pl', :named_pluralization) do |content, config, param|
   if param.is_a?(Hash) && param.key?(:count)
     hash = content.to_hash

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

@@ -34,44 +34,45 @@ module R18n
     class Rails
       include ::R18n::YamlMethods
 
-      # Create new loader for some +backend+ from Rails I18n. Backend must have
-      # +reload!+, +init_translations+ and +translations+ methods.
+      # Create new loader for some `backend` from Rails I18n. Backend must have
+      # `reload!`, `init_translations` and `translations` methods.
       def initialize(backend = ::I18n::Backend::Simple.new)
         @backend = backend
         detect_yaml_private_type
       end
 
-      # Array of locales, which has translations in +I18n.load_path+.
+      # `Array` of locales, which has translations in `I18n.load_path`.
       def available
         reload!
         @translations.keys.map { |code| R18n.locale(code) }
       end
 
-      # Return Hash with translations for +locale+.
+      # Return `Hash` with translations for `locale`.
       def load(locale)
         initialize_types
         reload!
         @translations[locale.code]
       end
 
-      # Reload backend if <tt>I18n.load_path</tt> is changed.
+      # Reload backend if `I18n.load_path` is changed.
       def reload!
         return if defined?(@last_path) && @last_path == ::I18n.load_path
+
         @last_path = ::I18n.load_path.clone
         @backend.reload!
         @backend.send(:init_translations)
         @translations =
-          Utils.hash_map(@backend.send(:translations)) do |locale, values|
+          @backend.send(:translations).map do |locale, values|
             [R18n::Locale.sanitize_code(locale), transform(values)]
-          end
+          end.to_h
       end
 
-      # Return hash for object and <tt>I18n.load_path</tt>.
+      # Return hash for object and `I18n.load_path`.
       def hash
         ::I18n.load_path.hash
       end
 
-      # Is another +loader+ is also load Rails translations.
+      # Is another `loader` is also load Rails translations.
       def ==(other)
         self.class == other.class
       end
@@ -83,15 +84,13 @@ module R18n
         if value.is_a? Hash
           if value.empty?
             value
-          elsif value.keys.inject(true) { |a, i| a && RailsPlural.is_rails?(i) }
+          elsif value.keys.inject(true) { |a, i| a && RailsPlural.rails?(i) }
             Typed.new(
               'pl',
-              R18n::Utils.hash_map(value) do |k, v|
-                [RailsPlural.to_r18n(k), transform(v)]
-              end
+              value.map { |k, v| [RailsPlural.to_r18n(k), transform(v)] }.to_h
             )
           else
-            Utils.hash_map(value) { |k, v| [k.to_s, transform(v)] }
+            value.map { |k, v| [k.to_s, transform(v)] }.to_h
           end
         elsif defined?(@private_type_class) && value.is_a?(@private_type_class)
           Typed.new(value.type_id, value.value)

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

@@ -20,19 +20,19 @@
 module R18n
   # Converter between R18n and Rails I18n plural keys.
   class RailsPlural
-    # Check, that +key+ is Rails plural key.
-    def self.is_rails?(k)
-      %i[zero one few many other].include? k
+    # Check, that `key` is Rails plural key.
+    def self.rails?(key)
+      %i[zero one few many other].include? key
     end
 
     # Convert Rails I18n plural key to R18n.
-    def self.to_r18n(k)
-      { zero: 0, one: 1, few: 2, many: 'n', other: 'n' }[k]
+    def self.to_r18n(key)
+      { zero: 0, one: 1, few: 2, many: 'n', other: 'n' }[key]
     end
 
     # Convert R18n plural key to Rails I18n.
-    def self.from_r18n(k)
-      { 0 => :zero, 1 => :one, 2 => :few, 'n' => :other }[k]
+    def self.from_r18n(key)
+      { 0 => :zero, 1 => :one, 2 => :few, 'n' => :other }[key]
     end
   end
 end

data/r18n-rails-api.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.author   = 'Andrey Sitnik'
   s.email    = 'andrey@sitnik.ru'
-  s.homepage = 'https://github.com/ai/r18n/tree/master/r18n-rails-api'
+  s.homepage = 'https://github.com/r18n/r18n/tree/master/r18n-rails-api'
   s.license  = 'LGPL-3.0'
 
   s.add_dependency 'i18n', '~> 1'

data/spec/backend_spec.rb

@@ -55,17 +55,14 @@ describe R18n::Backend do
   end
 
   it 'raises error on no translation' do
-    expect(lambda {
-      I18n.backend.translate(:en, :missed)
-    }).to raise_error(::I18n::MissingTranslationData)
+    expect { I18n.backend.translate(:en, :missed) }
+      .to raise_error(::I18n::MissingTranslationData)
 
-    expect(lambda {
-      I18n.t(:missed)
-    }).to raise_error(::I18n::MissingTranslationData)
+    expect { I18n.t(:missed) }.to raise_error(::I18n::MissingTranslationData)
   end
 
   it 'reloads translations' do
-    expect(-> { I18n.t(:other) }).to raise_error(::I18n::MissingTranslationData)
+    expect { I18n.t(:other) }.to raise_error(::I18n::MissingTranslationData)
     I18n.load_path << OTHER
     I18n.reload!
     expect(I18n.t(:other)).to eq 'Other'
@@ -76,18 +73,19 @@ describe R18n::Backend do
     expect(I18n.t('in.another').class).to eq Hash
   end
 
+  ## https://github.com/rubocop-hq/rubocop/issues/7436#issuecomment-578766498
+  # rubocop:disable Style/FormatStringToken
   it 'returns correct unpluralized hash' do
     expect(I18n.t('users')).to eq(one: '1 user', other: '%{count} users')
   end
+  # rubocop:enable Style/FormatStringToken
 
   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 { I18n.t('in.another.level.deeper') }
+      .to raise_error(::I18n::MissingTranslationData)
 
-    expect(lambda {
-      I18n.t('in.another.level.go.deeper')
-    }).to raise_error(::I18n::MissingTranslationData)
+    expect { I18n.t('in.another.level.go.deeper') }
+      .to raise_error(::I18n::MissingTranslationData)
   end
 
   it "doesn't call String methods" do
@@ -95,9 +93,8 @@ describe R18n::Backend do
   end
 
   it "doesn't call object methods" do
-    expect(lambda {
-      I18n.t('in.another.level.to_sym')
-    }).to raise_error(::I18n::MissingTranslationData)
+    expect { I18n.t('in.another.level.to_sym') }
+      .to raise_error(::I18n::MissingTranslationData)
   end
 
   it 'works deeper pluralization' do

data/spec/filters_spec.rb

@@ -8,6 +8,7 @@ describe 'Rails filters' do
     expect(i18n.echo(value: 'Old')).to eq 'Value is Old'
   end
 
+  # rubocop:disable Style/FormatStringToken
   it 'pluralizes by variable %{count}' do
     i18n = R18n::Translation.new(
       EN, '', locale: EN, translations: {
@@ -24,4 +25,5 @@ describe 'Rails filters' do
     expect(i18n.users(count: 1)).to eq '1 user'
     expect(i18n.users(count: 5)).to eq '5 users'
   end
+  # rubocop:enable Style/FormatStringToken
 end

data/spec/loader_spec.rb

@@ -22,9 +22,9 @@ describe R18n::Loader::Rails do
     expect(@loader.load(EN)).to eq(
       'users' => R18n::Typed.new(
         'pl',
-        0   => 'Zero',
-        1   => 'One',
-        2   => 'Few',
+        0 => 'Zero',
+        1 => 'One',
+        2 => 'Few',
         'n' => 'Other'
       )
     )
@@ -35,9 +35,9 @@ describe R18n::Loader::Rails do
     expect(@loader.load(RU)).to eq(
       'users' => R18n::Typed.new(
         'pl',
-        0   => 'Ноль',
-        1   => 'Один',
-        2   => 'Несколько',
+        0 => 'Ноль',
+        1 => 'Один',
+        2 => 'Несколько',
         'n' => 'Много'
       )
     )
@@ -46,8 +46,8 @@ describe R18n::Loader::Rails do
   it 'reloads translations on load_path changes' do
     I18n.load_path << OTHER
     expect(@loader.load(RU)).to eq(
-      'one'   => 'Один',
-      'two'   => 'Два',
+      'one' => 'Один',
+      'two' => 'Два',
       'three' => 'Три'
     )
   end

data/spec/spec_helper.rb

@@ -1,9 +1,5 @@
 # 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 'i18n'
 require 'active_support'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 description: |2
       R18n backend for Rails I18n and R18n filters and loader to support Rails
       translation format.
@@ -75,7 +75,7 @@ files:
 - spec/filters_spec.rb
 - spec/loader_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/ai/r18n/tree/master/r18n-rails-api
+homepage: https://github.com/r18n/r18n/tree/master/r18n-rails-api
 licenses:
 - LGPL-3.0
 metadata: {}
@@ -94,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Rails I18n compatibility for R18n