r18n-core 3.1.1 → 5.0.1

data/lib/r18n-core/utils.rb

@@ -17,43 +17,39 @@
 # 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/>.
 
-# Common methods for another R18n code.
 module R18n
+  # Common methods for another R18n code.
   module Utils
-    HTML_ENTRIES = { '&' => '&amp;', '<' => '&lt;', '>' => '&gt;' }.freeze
-
     # Escape HTML entries (<, >, &). Copy from HAML helper.
     def self.escape_html(content)
       if defined? ActiveSupport::SafeBuffer
         ActiveSupport::SafeBuffer.new + content
       else
-        content.to_s.gsub(/[><&]/) { |s| HTML_ENTRIES[s] }
-      end
-    end
-
-    # Invokes +block+ once for each key and value of +hash+. Creates a new hash
-    # with the keys and values returned by the +block+.
-    def self.hash_map(hash, &block)
-      result = {}
-      hash.each_pair do |key, val|
-        new_key, new_value = block.call(key, val)
-        result[new_key] = new_value
+        CGI.escapeHTML content
       end
-      result
     end
 
     # Recursively hash merge.
-    def self.deep_merge!(a, b)
-      b.each_pair do |key, value|
-        another = a[key]
-        a[key] =
-          if another.is_a?(Hash) && value.is_a?(Hash)
-            deep_merge!(another, value)
+    def self.deep_merge!(one, another)
+      another.each_pair do |key, another_value|
+        value = one[key]
+        one[key] =
+          if value.is_a?(Hash) && another_value.is_a?(Hash)
+            deep_merge!(value, another_value)
           else
-            value
+            another_value
           end
       end
-      a
+      one
+    end
+
+    def self.underscore(string)
+      string
+        .gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .downcase
     end
   end
 end

data/lib/r18n-core/version.rb

@@ -2,5 +2,5 @@
 
 # Version of R18n Core
 module R18n
-  VERSION = '3.1.1'.freeze unless defined? R18n::VERSION
+  VERSION = '5.0.1'
 end

data/lib/r18n-core/yaml_loader.rb

@@ -20,69 +20,73 @@
 module R18n
   module Loader
     # Loader for translations in YAML format. Them should have name like
-    # +en.yml+ (English) or en-US.yml (USA English dialect) with
+    # `en.yml` (English) or en-US.yml (USA English dialect) with
     # language/country code (RFC 3066).
     #
     #   R18n::I18n.new('en', R18n::Loader::YAML.new('dir/with/translations'))
     #
     # YAML loader is default loader, so you can just set constructor parameter
-    # to <tt>R18n::I18n.new</tt>:
+    # to `R18n::I18n.new`:
     #
     #   R18n::I18n.new('en', 'dir/with/translations')
     class YAML
       include ::R18n::YamlMethods
 
+      FILE_EXT = 'y{,a}ml'
+
       # Dir with translations.
       attr_reader :dir
 
-      # Create new loader for +dir+ with YAML translations.
+      # Create new loader for `dir` with YAML translations.
       def initialize(dir)
         @dir = File.expand_path(dir)
         detect_yaml_private_type
       end
 
-      # Array of locales, which has translations in +dir+.
+      # `Array` of locales, which has translations in `dir`.
       def available
-        Dir.glob(File.join(@dir, '**/*.yml'))
-          .map { |i| File.basename(i, '.yml') }.uniq
+        Dir.glob(File.join(@dir, "**/*.#{FILE_EXT}"))
+          .map { |i| File.basename(i, '.*').downcase }.uniq
           .map { |i| R18n.locale(i) }
       end
 
-      # Return Hash with translations for +locale+.
+      # Return `Hash` with translations for `locale`.
       def load(locale)
         initialize_types
 
         translations = {}
-        Dir.glob(File.join(@dir, "**/#{locale.code.downcase}.yml")).each do |i|
+        Dir.glob(
+          File.join(@dir, "**/#{locale.code}.#{FILE_EXT}"), File::FNM_CASEFOLD
+        ).each do |i|
           Utils.deep_merge!(translations, ::YAML.load_file(i) || {})
         end
         transform(translations)
       end
 
-      # YAML loader with same +dir+ will be have same +hash+.
+      # YAML loader with same `dir` will be have same `hash`.
       def hash
         self.class.hash + @dir.hash
       end
 
-      # Is another +loader+ load YAML translations from same +dir+.
+      # Is another `loader` load YAML translations from same `dir`.
       def ==(other)
         self.class == other.class && dir == other.dir
       end
 
       # Wrap YAML private types to Typed.
       def transform(a_hash)
-        R18n::Utils.hash_map(a_hash) do |key, value|
+        a_hash.transform_values do |value|
           if value.is_a? Hash
             value = transform(value)
           elsif defined?(@private_type_class) &&
-                value.is_a?(@private_type_class)
+              value.is_a?(@private_type_class)
             v = value.value
             if v.respond_to?(:force_encoding) && v.encoding != __ENCODING__
               v = v.force_encoding(__ENCODING__)
             end
             value = Typed.new(value.type_id, v)
           end
-          [key, value]
+          value
         end
       end
     end

data/lib/r18n-core/yaml_methods.rb

@@ -31,9 +31,11 @@ module R18n
     # Register global types in Psych
     def initialize_types
       return unless defined?(Psych)
+
       Filters.by_type.each_key do |type|
         next unless type.is_a? String
-        # Yeah, I add R18n’s types to global, send me patch if you really
+
+        # Yeah, I add R18n's types to global, send me patch if you really
         # use YAML types too ;).
         Psych.add_domain_type('yaml.org,2002', type) do |_full_type, value|
           Typed.new(type, value)

metadata

@@ -1,37 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: r18n-core
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 5.0.1
 platform: ruby
 authors:
 - Andrey Sitnik
-autorequire: 
+- Alexander Popov
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-20 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+- !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: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !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-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 is a i18n tool to translate your Ruby application.
       It 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.
-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
 - base/af.yml
 - base/az.yml
 - base/bg.yml
 - base/ca.yml
 - base/cs.yml
+- base/cy.yml
 - base/da.yml
 - base/de.yml
 - base/en.yml
@@ -69,6 +246,52 @@ files:
 - lib/r18n-core/helpers.rb
 - lib/r18n-core/i18n.rb
 - lib/r18n-core/locale.rb
+- lib/r18n-core/locales/af.rb
+- lib/r18n-core/locales/az.rb
+- lib/r18n-core/locales/bg.rb
+- lib/r18n-core/locales/ca.rb
+- lib/r18n-core/locales/cs.rb
+- lib/r18n-core/locales/cy.rb
+- lib/r18n-core/locales/da.rb
+- lib/r18n-core/locales/de.rb
+- lib/r18n-core/locales/en-au.rb
+- lib/r18n-core/locales/en-gb.rb
+- lib/r18n-core/locales/en-us.rb
+- lib/r18n-core/locales/en.rb
+- lib/r18n-core/locales/eo.rb
+- lib/r18n-core/locales/es-cl.rb
+- lib/r18n-core/locales/es-us.rb
+- lib/r18n-core/locales/es.rb
+- lib/r18n-core/locales/fa.rb
+- lib/r18n-core/locales/fi.rb
+- lib/r18n-core/locales/fr.rb
+- lib/r18n-core/locales/gl.rb
+- lib/r18n-core/locales/hr.rb
+- lib/r18n-core/locales/hu.rb
+- lib/r18n-core/locales/id.rb
+- lib/r18n-core/locales/it.rb
+- lib/r18n-core/locales/ja.rb
+- lib/r18n-core/locales/kk.rb
+- lib/r18n-core/locales/ko.rb
+- lib/r18n-core/locales/lv.rb
+- lib/r18n-core/locales/mn.rb
+- lib/r18n-core/locales/nb.rb
+- lib/r18n-core/locales/nl.rb
+- lib/r18n-core/locales/no.rb
+- lib/r18n-core/locales/pl.rb
+- lib/r18n-core/locales/pt-br.rb
+- lib/r18n-core/locales/pt.rb
+- lib/r18n-core/locales/ru.rb
+- lib/r18n-core/locales/sk.rb
+- lib/r18n-core/locales/sr-latn.rb
+- lib/r18n-core/locales/sv-se.rb
+- lib/r18n-core/locales/th.rb
+- lib/r18n-core/locales/tr.rb
+- lib/r18n-core/locales/uk.rb
+- lib/r18n-core/locales/vi.rb
+- lib/r18n-core/locales/zh-cn.rb
+- lib/r18n-core/locales/zh-tw.rb
+- lib/r18n-core/locales/zh.rb
 - lib/r18n-core/translated.rb
 - lib/r18n-core/translated_string.rb
 - lib/r18n-core/translation.rb
@@ -78,85 +301,16 @@ files:
 - lib/r18n-core/version.rb
 - lib/r18n-core/yaml_loader.rb
 - lib/r18n-core/yaml_methods.rb
-- locales/af.rb
-- locales/az.rb
-- locales/bg.rb
-- locales/ca.rb
-- locales/cs.rb
-- locales/da.rb
-- locales/de.rb
-- locales/en-au.rb
-- locales/en-gb.rb
-- locales/en-us.rb
-- locales/en.rb
-- locales/eo.rb
-- locales/es-us.rb
-- locales/es.rb
-- locales/fa.rb
-- locales/fi.rb
-- locales/fr.rb
-- locales/gl.rb
-- locales/hr.rb
-- locales/hu.rb
-- locales/id.rb
-- locales/it.rb
-- locales/ja.rb
-- locales/kk.rb
-- locales/ko.rb
-- locales/lv.rb
-- locales/mn.rb
-- locales/nb.rb
-- locales/nl.rb
-- locales/no.rb
-- locales/pl.rb
-- locales/pt-br.rb
-- locales/pt.rb
-- locales/ru.rb
-- locales/sk.rb
-- locales/sr-latn.rb
-- locales/sv-se.rb
-- locales/th.rb
-- locales/tr.rb
-- locales/uk.rb
-- locales/vi.rb
-- locales/zh-cn.rb
-- locales/zh-tw.rb
-- locales/zh.rb
-- r18n-core.gemspec
-- spec/filters_spec.rb
-- spec/i18n_spec.rb
-- spec/locale_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/en_spec.rb
-- spec/locales/fa_spec.rb
-- spec/locales/fr_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/it_spec.rb
-- spec/locales/no_spec.rb
-- spec/locales/pl_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/th_spec.rb
-- spec/locales/vi_spec.rb
-- spec/r18n_spec.rb
-- spec/spec_helper.rb
-- spec/translated_spec.rb
-- spec/translation_spec.rb
-- spec/translations/extension/deep/en.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/notransl.yml
-- spec/translations/general/en.yml
-- spec/translations/general/nolocale.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/yaml_loader_spec.rb
-homepage: https://github.com/ai/r18n
+homepage: https://github.com/r18n/r18n-core
 licenses:
 - LGPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/r18n/r18n-core/issues
+  changelog_uri: https://github.com/r18n/r18n-core/blob/5.0.1/ChangeLog.md
+  documentation_uri: http://www.rubydoc.info/gems/r18n-core/5.0.1
+  homepage_uri: https://github.com/r18n/r18n-core
+  source_code_uri: https://github.com/r18n/r18n-core
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,45 +318,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: I18n tool to translate your Ruby application.
-test_files:
-- spec/filters_spec.rb
-- spec/i18n_spec.rb
-- spec/locale_spec.rb
-- spec/locales/cs_spec.rb
-- spec/locales/en-us_spec.rb
-- spec/locales/en_spec.rb
-- spec/locales/fa_spec.rb
-- spec/locales/fr_spec.rb
-- spec/locales/hu_spec.rb
-- spec/locales/it_spec.rb
-- spec/locales/no_spec.rb
-- spec/locales/pl_spec.rb
-- spec/locales/ru_spec.rb
-- spec/locales/sk_spec.rb
-- spec/locales/th_spec.rb
-- spec/locales/vi_spec.rb
-- spec/r18n_spec.rb
-- spec/spec_helper.rb
-- spec/translated_spec.rb
-- spec/translation_spec.rb
-- spec/translations/extension/deep/en.yml
-- spec/translations/extension/en.yml
-- spec/translations/extension/notransl.yml
-- spec/translations/general/en.yml
-- spec/translations/general/nolocale.yml
-- spec/translations/general/ru.yml
-- spec/translations/two/en.yml
-- spec/translations/two/fr.yml
-- spec/yaml_loader_spec.rb
+test_files: []