i18n-backend-side_by_side 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb09d448c322c9e08438f478d0136d998580cddbd0ab4711355ebacb006b5bf
-  data.tar.gz: ec83849a97886478c059f42fae7d6729acb14343c7f0b99eb60193085c1f7bda
+  metadata.gz: 4a7f5433094b30b366c592d1073bc92dd7b6e6d42545c7b3c5d33a2fbaac6f18
+  data.tar.gz: 6f1e071a3dda21deee16653b2e006085ea57ea6d2498fde0f41fa4acde4cc401
 SHA512:
-  metadata.gz: 58ff92fdc52b1042178b74b69aec8eab6c2ddc0b3e91f978454988887c668ba8186e9c0b6d6fe9784ee7df4a4bb02b9c8754ebd64a4d54c5480815733f7793ee
-  data.tar.gz: 8db27c55cbe778ce3d8f67581adcc3cb4b23b40336942bbfe7f9e05756ee8143ebe558b3c7e37da49fcf46a12bf43204fdf4d2f53bb38eded3db3e15ccfbdc91
+  metadata.gz: d8a6e4ea084637478ca26f05fec5d15cb765fc8f0646e8f97e9dc92f85cd57ef2eadabb72b120370da44a01c41b489191ad5db97188093ed10a08bbf7da25abd
+  data.tar.gz: 697d59776e3f6cf1a526c0f4c81f3b13ba20ac55fd8a38d97c778997cdfa9c629343bd601d14c9da87b77b00ba4ec872018ed2c51977bfa40a51a22053877367

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['3.2', '3.1', '3.0', '2.7']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## v1.3.0
+
+- Add Ruby 3.1 and 3.2 to CI
+- Support translations keys without specified language #8
+
+## v1.2.0
+
+- Support i18n 1.10.0
+- Drop support for Ruby < 2.7
+
 ## v1.1.0
 
 - Remove upper bound on i18n dependency

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-gem 'i18n', github: 'svenfuchs/i18n' if ENV['I18N_HEAD'] == '1'

data/README.md

@@ -1,6 +1,6 @@
 # i18n-backend-side\_by\_side
 
-[![Build Status](https://travis-ci.org/electric-feel/i18n-backend-side_by_side.svg)](https://travis-ci.org/electric-feel/i18n-backend-side_by_side)
+[![Tests Status](https://github.com/electric-feel/i18n-backend-side_by_side/workflows/Ruby/badge.svg)](https://github.com/electric-feel/i18n-backend-side_by_side/actions?query=workflow%3ARuby)
 [![Gem Version](https://badge.fury.io/rb/i18n-backend-side_by_side.svg)](https://rubygems.org/gems/i18n-backend-side_by_side)
 
 **Tired of jumping between language files when translating keys? Stop jumping

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.3.0

data/i18n-backend-side_by_side.gemspec

@@ -16,9 +16,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.7.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
-  spec.add_dependency 'i18n', '>= 1.3.0'
+  spec.add_dependency 'i18n', '>= 1.10.0'
+  spec.add_dependency 'activesupport', '>= 6.0.0'
 end

data/lib/i18n/backend/side_by_side.rb

@@ -1,10 +1,8 @@
 require 'i18n'
-require 'i18n/core_ext/hash'
+require 'active_support/core_ext/hash/keys'
 
 module I18n
   module Backend
-    using HashRefinements
-
     class SideBySide < Simple
       VERSION = File.read(File.expand_path('../../../../VERSION', __FILE__))
       LOCALE_PREFIX = '_'
@@ -14,13 +12,13 @@ module I18n
       def load_file(filename)
         type = File.extname(filename).tr('.', '').downcase
         raise UnknownFileType.new(type, filename) unless respond_to?(:"load_#{type}", true)
-        data = send(:"load_#{type}", filename)
+        data = send(:"load_#{type}", filename).first
         unless data.is_a?(Hash)
           raise InvalidLocaleData.new(filename, 'expects it to return a hash, but does not')
         end
 
-        if data.first.first == LOCALE_PREFIX
-          _process([], data[LOCALE_PREFIX].deep_symbolize_keys)
+        if data.first.first.to_s == LOCALE_PREFIX
+          _process([], data.deep_symbolize_keys[LOCALE_PREFIX.to_sym])
         else
           data.each { |locale, d| store_translations(locale, d || {}) }
         end
@@ -29,7 +27,13 @@ module I18n
       private
 
       def _process(path, hash)
-        if _contains_locales?(hash)
+        if !hash.is_a?(Hash)
+          ### TRANSLATION KEY WITHOUT SPECIFIED LANGUAGE - WILL BE APPLIED TO ALL LANGUAGES
+          value = hash
+          translations.keys.each do |locale|
+            _store([locale] + path, value)
+          end
+        elsif _contains_locales?(hash)
           hash.each do |locale, value|
             _store([_strip_locale_prefix(locale)] + path, value)
           end

data/test/locales/novel.yml

@@ -19,3 +19,4 @@ _:
     only_en:
       some_key:
         _en: 'some value'
+    without_language: "Without Language"

data/test/test.rb

@@ -32,4 +32,9 @@ class Test < Minitest::Test
     assert_raises { I18n.t('foo.only_en.some_key', locale: :de, raise: true) }
     assert_raises { I18n.t('foo.only_en', locale: :de, raise: true) }
   end
+
+  def test_without_language
+    assert_equal('Without Language', I18n.t('foo.without_language', language: :en))
+    assert_equal('Without Language', I18n.t('foo.without_language', language: :de))
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: i18n-backend-side_by_side
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Philipe Fatio
 - Pratik Mukerji
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2023-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
 description: Tired of jumping between language files when translating keys? Stop jumping
   and have all the languages side by side.
 email:
@@ -62,8 +76,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -80,7 +94,7 @@ homepage: https://github.com/electric-feel/i18n-backend-side_by_side
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,15 +102,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.10
+signing_key:
 specification_version: 4
 summary: Tired of jumping between language files when translating keys? Stop jumping
   and have all the languages side by side.

data/.travis.yml

@@ -1,12 +0,0 @@
-sudo: false
-language: ruby
-cache: bundler
-script: bundle exec rake test
-rvm:
-  - 2.7.0
-env:
-  - I18N_HEAD=0
-  - I18N_HEAD=1
-matrix:
-  allow_failures:
-    - env: I18N_HEAD=1