r18n-rails-api 3.0.5 → 5.0.0

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)
 
@@ -49,10 +49,11 @@ module R18n
         default = [default] unless default.is_a? Array
 
         default.each do |entry|
-          if entry.is_a? Symbol
+          case entry
+          when Symbol
             value = lookup(locale, scope, entry, separator, params)
             return value unless value.is_a? Untranslated
-          elsif entry.is_a? Proc
+          when Proc
             proc_key = options.delete(:object) || key
             return entry.call(proc_key, options)
           else
@@ -66,13 +67,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
@@ -102,13 +103,12 @@ module R18n
     end
 
     def format_value(result)
-      if result.is_a? TranslatedString
+      case result
+      when TranslatedString
         result.to_s
-      elsif result.is_a? UnpluralizetedTranslation
-        Utils.hash_map(result.to_hash) do |key, value|
-          [RailsPlural.from_r18n(key), value]
-        end
-      elsif result.is_a? Translation
+      when UnpluralizedTranslation
+        result.to_hash.transform_keys { |key| RailsPlural.from_r18n(key) }
+      when Translation
         translation_to_hash(result)
       else
         result
@@ -116,18 +116,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

@@ -27,9 +27,7 @@ R18n::Filters.add(String, :named_variables) do |content, config, params|
     content = content.clone
     params.each_pair do |name, value|
       value = config[:locale].localize(value)
-      if defined? ActiveSupport::SafeBuffer
-        value = ActiveSupport::SafeBuffer.new + value
-      end
+      value = ActiveSupport::SafeBuffer.new + value if defined? ActiveSupport::SafeBuffer
       content.gsub! "%{#{name}}",  value
       content.gsub! "{{#{name}}}", value
     end
@@ -39,7 +37,7 @@ end
 
 module R18n
   # Class to mark unpluralized translation and convert Rails plural keys
-  class RailsUnpluralizetedTranslation < UnpluralizetedTranslation
+  class RailsUnpluralizedTranslation < UnpluralizedTranslation
     def [](name, *params)
       result = super
       if result.is_a? Untranslated
@@ -51,15 +49,15 @@ 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
     type = config[:locale].pluralize(param[:count])
     type = 'n' unless hash.key?(type)
     hash[type]
-  elsif content.is_a? R18n::UnpluralizetedTranslation
-    R18n::RailsUnpluralizetedTranslation.new(
+  elsif content.is_a? R18n::UnpluralizedTranslation
+    R18n::RailsUnpluralizedTranslation.new(
       config[:locale], config[:path],
       locale: config[:locale], translations: content.to_hash
     )

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

@@ -34,41 +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 = transform @backend.send(:translations)
+        @translations =
+          @backend.send(:translations).map do |locale, values|
+            [R18n::Locale.sanitize_code(locale), transform(values)]
+          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
@@ -80,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/lib/r18n-rails-api/version.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module R18n
+  module Rails
+    module API
+      VERSION = '5.0.0'
+    end
+  end
+end

metadata

@@ -1,43 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: r18n-rails-api
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Andrey Sitnik
-autorequire: 
+- Alexander Popov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-19 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: r18n-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: gem_toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: toys
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.21.0
 description: |2
       R18n backend for Rails I18n and R18n filters and loader to support Rails
       translation format.
@@ -45,41 +186,34 @@ description: |2
       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.
-email: andrey@sitnik.ru
+email:
+- andrey@sitnik.ru
+- alex.wayfer@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- ".rspec"
+- ChangeLog.md
 - LICENSE
 - README.md
-- Rakefile
 - lib/r18n-rails-api.rb
 - lib/r18n-rails-api/backend.rb
 - lib/r18n-rails-api/filters.rb
 - lib/r18n-rails-api/loader.rb
 - lib/r18n-rails-api/rails_plural.rb
-- r18n-rails-api.gemspec
-- spec/backend_spec.rb
-- spec/data/general/en.yml
-- spec/data/general/ru.yml
-- spec/data/other/en.yml
-- spec/data/other/ru.yml
-- spec/data/pl/ru.yml
-- spec/data/simple/de-CH.yml
-- spec/data/simple/en.yml
-- spec/data/simple/ru.rb
-- spec/data/simple/russian.yml
-- spec/filters_spec.rb
-- spec/loader_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/ai/r18n/tree/master/r18n-rails-api
+- lib/r18n-rails-api/version.rb
+homepage: https://github.com/r18n/r18n-rails-api
 licenses:
-- LGPL-3
-metadata: {}
-post_install_message: 
+- LGPL-3.0
+metadata:
+  bug_tracker_uri: https://github.com/r18n/r18n-rails-api/issues
+  changelog_uri: https://github.com/r18n/r18n-rails-api/blob/5.0.0/ChangeLog.md
+  documentation_uri: http://www.rubydoc.info/gems/r18n-rails-api/5.0.0
+  homepage_uri: https://github.com/r18n/r18n-rails-api
+  source_code_uri: https://github.com/r18n/r18n-rails-api
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -87,29 +221,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Rails I18n compatibility for R18n
-test_files:
-- spec/backend_spec.rb
-- spec/data/general/en.yml
-- spec/data/general/ru.yml
-- spec/data/other/en.yml
-- spec/data/other/ru.yml
-- spec/data/pl/ru.yml
-- spec/data/simple/de-CH.yml
-- spec/data/simple/en.yml
-- spec/data/simple/ru.rb
-- spec/data/simple/russian.yml
-- spec/filters_spec.rb
-- spec/loader_spec.rb
-- spec/spec_helper.rb
+test_files: []