copy_tuner_client 0.16.0 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d026c94fe7b434afec7fa13369e91ddd784ed649336de71bb5d2d0a373201e0f
-  data.tar.gz: f882fbc15358fb560d5ba695e138f2ca904ed3f1e4e5b29ccac1a4c3d7e9fe06
+  metadata.gz: f71a4d30fba150acdb6fcaf87bb23d1dac860938ed1ea49c4f66147b0c745f2d
+  data.tar.gz: 7bf32e6a7d61f91f6963dd93d4a6cfd061bf7178e74eafbd7b750ab28c19a8d7
 SHA512:
-  metadata.gz: fc0818f17179df0462efa7a739edbd1126d4b0170d550e15834980eeaf15c61197345b2a82dc2affc911d7914a82abbb5c5a70ff71b9e8d418425841f2f51bf8
-  data.tar.gz: ac73b7c43742c17061f318c32ff2f642d53afaa9dad02703a5e166181ac2027312a8a4f5c70626fb77923e29410c026f834db7b4ba1948fe306b6384396fc6d5
+  metadata.gz: 4e67f8c08453b08b0fbff07ff08adf949ba8738d71b7f79402c99a2c195def37a2b05ec9c642eeedb70bc6bc5ab7669df62b9f0bb6ef26a45ed0d3d5354475c2
+  data.tar.gz: 82f76ec81af6b689f37fe692a04771ed23e0e1987c8bb83f925f00afa23f5e3c16fd769828ca50721389fe7c69def403c4c04826c5c0f6b0446581b3293b09a5

data/.ruby-version

@@ -1 +1 @@
-3.0.4
+3.2.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.16.1
+
+- Support for i18n@1.13.0
+- キーの相対パス指定とdefaultオプションを組み合わせた場合の不具合修正
+
 ## 0.16.0
 
 - Railsエンジン内のviewではオリジナルのtヘルパが呼ばれるように修正

data/lib/copy_tuner_client/helper_extension.rb

@@ -13,20 +13,23 @@ module CopyTunerClient
             # TODO: test
             # NOTE: default引数が設定されている場合は、copytunerキャッシュの値をI18n.t呼び出しにより上書きしている
             # SEE: https://github.com/rails/rails/blob/6c43ebc220428ce9fc9569c2e5df90a38a4fc4e4/actionview/lib/action_view/helpers/translation_helper.rb#L82
-            I18n.t(key, **options) if options.key?(:default)
+            if options.key?(:default)
+              I18n.t(key.to_s.first == '.' ? scope_key_by_partial(key) : key, **options)
+            end
 
             if CopyTunerClient.configuration.disable_copyray_comment_injection
               source
             else
               separator = options[:separator] || I18n.default_separator
               scope = options[:scope]
-              normalized_key =
+              scope_key =
                 if key.to_s.first == '.'
                   scope_key_by_partial(key)
                 else
-                  I18n.normalize_keys(nil, key, scope, separator).join(separator)
+                  # NOTE: locale prefix無しのkeyが必要のためこうしている
+                  I18n.normalize_keys(nil, key, scope, separator).compact.join(separator)
                 end
-              CopyTunerClient::Copyray.augment_template(source, normalized_key)
+              CopyTunerClient::Copyray.augment_template(source, scope_key)
             end
           end
           if middleware_enabled

data/lib/copy_tuner_client/translation_log.rb

@@ -25,9 +25,9 @@ module CopyTunerClient
             result = translate_without_copy_tuner_hook(key, **options)
 
             if key.is_a?(Array)
-              key.zip(result).each { |k, v| CopyTunerClient::TranslationLog.add(I18n.normalize_keys(nil, k, scope).join('.'), v) unless v.is_a?(Array) }
+              key.zip(result).each { |k, v| CopyTunerClient::TranslationLog.add(I18n.normalize_keys(nil, k, scope).compact.join('.'), v) unless v.is_a?(Array) }
             else
-              CopyTunerClient::TranslationLog.add(I18n.normalize_keys(nil, key, scope).join('.'), result) unless result.is_a?(Array)
+              CopyTunerClient::TranslationLog.add(I18n.normalize_keys(nil, key, scope).compact.join('.'), result) unless result.is_a?(Array)
             end
             result
           end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.16.2'.freeze
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.2
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-19 00:00:00.000000000 Z
+date: 2023-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -281,7 +281,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Client for the CopyTuner copy management service