copy_tuner_client 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f12b5601b4d8e9820a391c6604f94ac2610ecc459731c55e7bf3f8c45a93f6
-  data.tar.gz: 732cb4c984f8879f19a3e9a02e5723e4503b15b3e5bbdb1651cd41e968ae1d1e
+  metadata.gz: 077fca3432ac4660b4b4211b4546d5fe76c0ad8bb77c2c675a95bcf2e24d7090
+  data.tar.gz: 07ca6d48a19d32179a9aecc1b92d4c1550cc489b06c893cc80a25557bfbb3b8e
 SHA512:
-  metadata.gz: 6043c039ba1e0769325dd06a37ee497a8801263fcbdba75a572762dd42d0bba098412bab85e1dd5867f2cf49780c5bc8121f15ab40d90044deb5a7ae923ba179
-  data.tar.gz: 9c63db0d3b56745876c4e7b28127c9ef77843fe5deb6071a23b1c4ad38437910043a2291586e461c02d33ece18c30e76f609f8a851fa8d01683272990933f9e1
+  metadata.gz: 5806d46e0b1eae66187806615b387b9254c6c667dcf43c38312cda68f8dc1a7865475ea40e01a5166ef4678b7474652f2395e14986b29ae2cf5babc10be9725d
+  data.tar.gz: 6fe660fbe9406975a1aef91b236b3c718201606f003da46ea96b3fc1b437e0e0e50ff1dc86cd7f527c5efcde52dac3a602c0fd15ed7d2e7bdc182669c06eac77

data/lib/copy_tuner_client/cache.rb

@@ -71,7 +71,21 @@ module CopyTunerClient
     # Yaml representation of all blurbs
     # @return [String] yaml
     def export
-      lock { @blurbs.present? ? DottedHash.to_h(@blurbs).to_yaml : nil }
+      tree_hash = to_tree_hash
+      tree_hash.present? ? tree_hash.to_yaml : nil
+    end
+
+    # ツリー構造のハッシュを返す（I18nBackend用）
+    # @return [Hash] ツリー構造に変換されたblurbs
+    def to_tree_hash
+      lock { @blurbs.present? ? DottedHash.to_h(@blurbs) : {} }
+    end
+
+    # キャッシュの更新バージョンを返す（ツリーキャッシュの無効化判定用）
+    # ETags を使用してサーバーサイドの更新を検知
+    # @return [String, nil] 現在のETag値
+    def version
+      client.etag
     end
 
     # Waits until the first download has finished.

data/lib/copy_tuner_client/client.rb

@@ -18,6 +18,10 @@ module CopyTunerClient
 
     USER_AGENT = "copy_tuner_client #{CopyTunerClient::VERSION}"
 
+    # ETags を外部から取得可能にする
+    # @return [String, nil] 現在のETag値
+    attr_reader :etag
+
     # Usually instantiated from {Configuration#apply}. Copies options.
     # @param options [Hash]
     # @option options [String] :api_key API key of the project to connect to

data/lib/copy_tuner_client/configuration.rb

@@ -113,9 +113,6 @@ module CopyTunerClient
 
     attr_accessor :poller
 
-    # @return [Boolean] To enable inline-translation-mode, set true.
-    attr_accessor :inline_translation
-
     # @return [Regexp] Regular expression to exclude keys.
     attr_accessor :exclude_key_regexp
 

data/lib/copy_tuner_client/i18n_backend.rb

@@ -1,5 +1,6 @@
 require 'i18n'
 require 'copy_tuner_client/configuration'
+require 'active_support/core_ext/hash/keys'
 
 module CopyTunerClient
   # I18n implementation designed to synchronize with CopyTuner.
@@ -18,26 +19,27 @@ module CopyTunerClient
     # @param cache [Cache] must act like a hash, returning and accept blurbs by key.
     def initialize(cache)
       @cache = cache
-    end
-
-    # Translates the given local and key. See the I18n API documentation for details.
+      @tree_cache = nil
+      @cache_version = nil
+    end    # Translates the given local and key. See the I18n API documentation for details.
     #
     # @return [Object] the translated key (usually a String)
     def translate(locale, key, options = {})
+      # I18nの標準処理に任せる（内部でlookupが呼ばれる）
       content = super(locale, key, options)
-      if CopyTunerClient.configuration.inline_translation
-        content = (content.is_a?(Array) ? content : key.to_s)
-      end
 
-      if !CopyTunerClient.configuration.html_escape
+      return content if content.nil? || content.is_a?(Hash)
+
+      # HTML escapeの処理（ツリー構造のHashは除く）
+      if CopyTunerClient.configuration.html_escape
+        content
+      else
         # Backward compatible
         content.respond_to?(:html_safe) ? content.html_safe : content
-      else
-        content
       end
     end
 
-    # Returns locales availabile for this CopyTuner project.
+    # Returns locales available for this CopyTuner project.
     # @return [Array<String>] available locales
     def available_locales
       return @available_locales if defined?(@available_locales)
@@ -71,11 +73,45 @@ module CopyTunerClient
         CopyTunerClient::configuration.ignored_key_handler.call(IgnoredKey.new("Ignored key: #{key_without_locale}"))
       end
 
-      content = cache[key_with_locale] || super
-      cache[key_with_locale] = nil if content.nil?
+      # NOTE: ハッシュ化した場合に削除されるキーに対応するため、最初に完全一致をチェック（旧クライアントの動作を維持）
+      # 例: `en.test.key` が `en.test.key.conflict` のように別のキーで上書きされている場合の対応
+      exact_match = cache[key_with_locale]
+      if exact_match
+        return exact_match
+      end
+
+      ensure_tree_cache_current
+      tree_result = lookup_in_tree_cache(parts)
+      return tree_result if tree_result
+
+      content = super
+
+      if content.nil?
+        cache[key_with_locale] = nil
+      end
+
       content
     end
 
+    def ensure_tree_cache_current
+      current_version = cache.version
+      # ETag が nil の場合（初回ダウンロード前）や変更があった場合のみ更新
+      # 初回は @cache_version が nil なので、必ず更新される
+      if @cache_version != current_version || @tree_cache.nil?
+        @tree_cache = cache.to_tree_hash.deep_symbolize_keys
+        @cache_version = current_version
+      end
+    end
+
+    def lookup_in_tree_cache(keys)
+      return nil if @tree_cache.nil?
+
+      symbol_keys = keys.map(&:to_sym)
+      result = @tree_cache.dig(*symbol_keys)
+
+      result.is_a?(Hash) ? result : nil
+    end
+
     def store_item(locale, data, scope = [])
       if data.respond_to?(:to_hash)
         data.to_hash.each do |key, value|

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/cache_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CopyTunerClient::Cache do
+describe 'CopyTunerClient::Cache' do
   let(:client) { FakeClient.new }
 
   def build_cache(ready: false, **config)
@@ -12,7 +12,7 @@ describe CopyTunerClient::Cache do
     cache
   end
 
-  it 'provides access to downloaded data' do
+  it 'ダウンロードしたデータにアクセスできること' do
     client['en.test.key']       = 'expected'
     client['en.test.other_key'] = 'expected'
 
@@ -24,7 +24,7 @@ describe CopyTunerClient::Cache do
     expect(cache.keys).to match_array(%w[en.test.key en.test.other_key])
   end
 
-  it 'exclude data if exclude_key_regexp is set' do
+  it 'exclude_key_regexpが設定されている場合、該当データを除外すること' do
     cache = build_cache(exclude_key_regexp: /^en\.test\.other_key$/)
     cache['en.test.key']       = 'expected'
     cache['en.test.other_key'] = 'expected'
@@ -34,13 +34,13 @@ describe CopyTunerClient::Cache do
     expect(cache.queued.keys).to match_array(%w[en.test.key])
   end
 
-  it "doesn't upload without changes" do
+  it '変更がない場合はアップロードしないこと' do
     cache = build_cache
     cache.flush
     expect(client).not_to be_uploaded
   end
 
-  it "Don't upload incorrect key" do
+  it '不正なキーはアップロードしないこと' do
     cache = build_cache
     cache['ja'] = 'incorrect key'
 
@@ -48,7 +48,7 @@ describe CopyTunerClient::Cache do
     expect(client).not_to be_uploaded
   end
 
-  it 'uploads changes when flushed' do
+  it '変更があればflush時にアップロードすること' do
     cache = build_cache
     cache['test.key'] = 'test value'
 
@@ -57,7 +57,7 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'test.key' => 'test value' })
   end
 
-  it 'uploads empties when nil is assigned' do
+  it 'nilを代入した場合は空文字でアップロードすること' do
     cache = build_cache
     cache['test.key'] = nil
 
@@ -66,7 +66,7 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'test.key' => '' })
   end
 
-  it 'upload without locale filter' do
+  it 'ロケールフィルタなしでアップロードできること' do
     cache = build_cache
     cache['en.test.key'] = 'uploaded en'
     cache['ja.test.key'] = 'uploaded ja'
@@ -76,7 +76,7 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'en.test.key' => 'uploaded en', 'ja.test.key' => 'uploaded ja' })
   end
 
-  it 'upload with locale filter' do
+  it 'ロケールフィルタありでアップロードできること' do
     cache = build_cache(locales: %(en))
     cache['en.test.key'] = 'uploaded'
     cache['ja.test.key'] = 'not uploaded'
@@ -86,7 +86,7 @@ describe CopyTunerClient::Cache do
     expect(client.uploaded).to eq({ 'en.test.key' => 'uploaded' })
   end
 
-  it 'downloads changes' do
+  it 'ダウンロードで値を取得できること' do
     client['test.key'] = 'test value'
     cache = build_cache
 
@@ -95,7 +95,7 @@ describe CopyTunerClient::Cache do
     expect(cache['test.key']).to eq('test value')
   end
 
-  it 'downloads and uploads when synced' do
+  it 'syncでダウンロードとアップロードが両方行われること' do
     cache = build_cache
     client['test.key'] = 'test value'
     cache['other.key'] = 'other value'
@@ -106,7 +106,7 @@ describe CopyTunerClient::Cache do
     expect(cache['test.key']).to eq('test value')
   end
 
-  it 'download included empty keys' do
+  it '空文字のキーはダウンロード時にnilになること' do
     client['en.test.key'] = 'test value'
     client['en.test.empty'] = ''
     cache = build_cache
@@ -120,7 +120,7 @@ describe CopyTunerClient::Cache do
     expect(cache.queued).to be_empty
   end
 
-  it 'Do not upload downloaded keys' do
+  it 'ダウンロードしたキーはアップロード対象にならないこと' do
     client['en.test.key'] = 'test value'
     cache = build_cache
 
@@ -130,7 +130,7 @@ describe CopyTunerClient::Cache do
     expect(cache.queued).to be_empty
   end
 
-  it 'handles connection errors when flushing' do
+  it 'flush時に接続エラーが発生した場合はエラーログを出力すること' do
     failure = 'server is napping'
     logger = FakeLogger.new
     expect(client).to receive(:upload).and_raise(CopyTunerClient::ConnectionError.new(failure))
@@ -142,7 +142,7 @@ describe CopyTunerClient::Cache do
     expect(logger).to have_entry(:error, failure)
   end
 
-  it 'handles connection errors when downloading' do
+  it 'download時に接続エラーが発生した場合はエラーログを出力すること' do
     failure = 'server is napping'
     logger = FakeLogger.new
     expect(client).to receive(:download).and_raise(CopyTunerClient::ConnectionError.new(failure))
@@ -153,7 +153,7 @@ describe CopyTunerClient::Cache do
     expect(logger).to have_entry(:error, failure)
   end
 
-  it 'blocks until the first download is complete' do
+  it '最初のダウンロードが完了するまでブロックすること' do
     logger = FakeLogger.new
     expect(logger).to receive(:flush)
     client.delay = true
@@ -172,7 +172,7 @@ describe CopyTunerClient::Cache do
     expect(t_wait.join(1)).not_to be_nil
   end
 
-  it "doesn't block before downloading" do
+  it 'ダウンロード前はブロックしないこと' do
     logger = FakeLogger.new
     cache = build_cache(logger: logger)
 
@@ -188,7 +188,7 @@ describe CopyTunerClient::Cache do
     expect(logger).not_to have_entry(:info, 'Waiting for first download')
   end
 
-  it "doesn't return blank copy" do
+  it '空文字のコピーは返さないこと' do
     client['en.test.key'] = ''
     cache = build_cache
 
@@ -197,13 +197,13 @@ describe CopyTunerClient::Cache do
     expect(cache['en.test.key']).to be_nil
   end
 
-  describe 'given locked mutex' do
+  describe 'ミューテックスがロックされている場合' do
     RSpec::Matchers.define :finish_after_unlocking do |mutex|
       match do |thread|
         sleep(0.1)
 
         if thread.status === false
-          violated('finished before unlocking')
+          violated('アンロック前に終了してしまった')
         else
           mutex.unlock
           sleep(0.1)
@@ -211,7 +211,7 @@ describe CopyTunerClient::Cache do
           if thread.status === false
             true
           else
-            violated('still running after unlocking')
+            violated('アンロック後もスレッドが終了しない')
           end
         end
       end
@@ -234,20 +234,20 @@ describe CopyTunerClient::Cache do
       allow(Mutex).to receive(:new).and_return(mutex)
     end
 
-    it 'synchronizes read access to keys between threads' do
+    it 'スレッド間でキーの読み取りアクセスが同期されること' do
       expect(Thread.new { cache['test.key'] }).to finish_after_unlocking(mutex)
     end
 
-    it 'synchronizes read access to the key list between threads' do
+    it 'スレッド間でキーリストの読み取りアクセスが同期されること' do
       expect(Thread.new { cache.keys }).to finish_after_unlocking(mutex)
     end
 
-    it 'synchronizes write access to keys between threads' do
+    it 'スレッド間でキーの書き込みアクセスが同期されること' do
       expect(Thread.new { cache['test.key'] = 'value' }).to finish_after_unlocking(mutex)
     end
   end
 
-  it 'flushes from the top level' do
+  it 'トップレベルからflushできること' do
     cache = build_cache
     CopyTunerClient.configure do |config|
       config.cache = cache
@@ -257,6 +257,114 @@ describe CopyTunerClient::Cache do
     CopyTunerClient.flush
   end
 
+  describe '#to_tree_hash' do
+    subject { cache.to_tree_hash }
+
+    let(:cache) do
+      cache = build_cache
+      cache.download
+      cache
+    end
+
+    it 'データがない場合は空ハッシュを返すこと' do
+      is_expected.to eq({})
+    end
+
+    context 'フラットなキーの場合' do
+      before do
+        client['ja.views.hoge'] = 'test'
+        client['ja.views.fuga'] = 'test2'
+        client['en.hello'] = 'world'
+      end
+
+      it 'ツリー構造に変換されること' do
+        is_expected.to eq({
+          'ja' => {
+            'views' => {
+              'hoge' => 'test',
+              'fuga' => 'test2'
+            }
+          },
+          'en' => {
+            'hello' => 'world'
+          }
+        })
+      end
+    end
+
+    context '複雑なネスト構造の場合' do
+      before do
+        client['ja.views.users.index'] = 'user index'
+        client['ja.views.users.show'] = 'user show'
+        client['ja.views.posts.index'] = 'post index'
+        client['en.common.buttons.save'] = 'Save'
+      end
+
+      it '正しいツリー構造になること' do
+        is_expected.to eq({
+          'ja' => {
+            'views' => {
+              'users' => {
+                'index' => 'user index',
+                'show' => 'user show'
+              },
+              'posts' => {
+                'index' => 'post index'
+              }
+            }
+          },
+          'en' => {
+            'common' => {
+              'buttons' => {
+                'save' => 'Save'
+              }
+            }
+          }
+        })
+      end
+    end
+  end
+
+  describe '#version' do
+    it 'クライアントのetagを返すこと（効率的なバージョンチェック）' do
+      cache = build_cache
+      client_instance = cache.send(:client)
+
+      # ETag が設定されている場合
+      client_instance.etag = '"abc123"'
+      expect(cache.version).to eq('"abc123"')
+
+      # ETag が変更された場合
+      client_instance.etag = '"def456"'
+      expect(cache.version).to eq('"def456"')
+    end
+
+    it 'etagがnilの場合も正常に動作すること' do
+      cache = build_cache
+      client_instance = cache.send(:client)
+      client_instance.etag = nil
+
+      expect(cache.version).to be_nil
+    end
+
+    it '大量のキャッシュでも高速にバージョン取得できること（keyのhashではなくetagを使うため）' do
+      cache = build_cache
+
+      # 大量のキーを追加
+      1000.times do |i|
+        cache.instance_variable_get(:@blurbs)["ja.category#{i % 10}.item#{i}"] = "value#{i}"
+      end
+
+      # version メソッドが etag を使用しているため高速（keys.hashだと低速）
+      start_time = Time.now
+      1000.times { cache.version }
+      end_time = Time.now
+
+      # 10ms 以下で完了することを確認
+      expect((end_time - start_time) * 1000).to be < 10
+    end
+  end
+
   describe '#export' do
     subject { cache.export }
 
@@ -266,7 +374,7 @@ describe CopyTunerClient::Cache do
       cache
     end
 
-    it 'can be invoked from the top-level constant' do
+    it 'トップレベル定数から呼び出せること' do
       CopyTunerClient.configure do |config|
         config.cache = cache
       end
@@ -274,11 +382,11 @@ describe CopyTunerClient::Cache do
       CopyTunerClient.export
     end
 
-    it 'returns no yaml with no blurb keys' do
+    it 'blurbキーがない場合はyamlを返さないこと' do
       is_expected.to eq nil
     end
 
-    context 'with single-level blurb keys' do
+    context '1階層のblurbキーがある場合' do
       before do
         client['key']       = 'test value'
         client['other_key'] = 'other test value'

data/spec/copy_tuner_client/client_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe CopyTunerClient do
+describe 'CopyTunerClient' do
   let(:download_cache_dir) { Pathname.new(Dir.mktmpdir('copy_tuner_client')) }
 
   after do
@@ -27,7 +27,7 @@ describe CopyTunerClient do
     build_client(config)
   end
 
-  describe 'opening a connection' do
+  describe 'コネクションのオープン' do
     let(:config) { CopyTunerClient::Configuration.new }
     let(:http) { Net::HTTP.new(config.host, config.port) }
 
@@ -35,21 +35,21 @@ describe CopyTunerClient do
       allow(Net::HTTP).to receive(:new).and_return(http)
     end
 
-    it 'should timeout when connecting' do
+    it '接続時のタイムアウトが設定されていること' do
       project = add_project
       client = build_client(:api_key => project.api_key, :http_open_timeout => 4)
       client.download { |ignore| }
       expect(http.open_timeout).to eq(4)
     end
 
-    it 'should timeout when reading' do
+    it '読み込み時のタイムアウトが設定されていること' do
       project = add_project
       client = build_client(:api_key => project.api_key, :http_read_timeout => 4)
       client.download { |ignore| }
       expect(http.read_timeout).to eq(4)
     end
 
-    it 'uses verified ssl when secure' do
+    it 'secureがtrueの場合はSSL検証付きで接続すること' do
       project = add_project
       client = build_client(:api_key => project.api_key, :secure => true)
       client.download { |ignore| }
@@ -57,14 +57,14 @@ describe CopyTunerClient do
       expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_PEER)
     end
 
-    it 'does not use ssl when insecure' do
+    it 'secureがfalseの場合はSSLを使用しないこと' do
       project = add_project
       client = build_client(:api_key => project.api_key, :secure => false)
       client.download { |ignore| }
       expect(http.use_ssl?).to eq(false)
     end
 
-    it 'wraps HTTP errors with ConnectionError' do
+    it 'HTTPエラーをConnectionErrorでラップすること' do
       errors = [
         Timeout::Error.new,
         Errno::EINVAL.new,
@@ -89,30 +89,30 @@ describe CopyTunerClient do
       end
     end
 
-    it 'handles 500 errors from downloads with ConnectionError' do
+    it 'ダウンロード時に500エラーが発生した場合はConnectionErrorになること' do
       client = build_client(:api_key => 'raise_error')
       expect { client.download { |ignore| } }.
         to raise_error(CopyTunerClient::ConnectionError)
     end
 
-    it 'handles 500 errors from uploads with ConnectionError' do
+    it 'アップロード時に500エラーが発生した場合はConnectionErrorになること' do
       client = build_client(:api_key => 'raise_error')
       expect { client.upload({}) }.to raise_error(CopyTunerClient::ConnectionError)
     end
 
-    it 'handles 404 errors from downloads with ConnectionError' do
+    it 'ダウンロード時に404エラーが発生した場合はInvalidApiKeyになること' do
       client = build_client(:api_key => 'bogus')
       expect { client.download { |ignore| } }.
         to raise_error(CopyTunerClient::InvalidApiKey)
     end
 
-    it 'handles 404 errors from uploads with ConnectionError' do
+    it 'アップロード時に404エラーが発生した場合はInvalidApiKeyになること' do
       client = build_client(:api_key => 'bogus')
       expect { client.upload({}) }.to raise_error(CopyTunerClient::InvalidApiKey)
     end
   end
 
-  it 'downloads published blurbs for an existing project' do
+  it '既存プロジェクトのpublishedなblurbをダウンロードできること' do
     project = add_project
     project.update({
       'draft' => {
@@ -135,14 +135,14 @@ describe CopyTunerClient do
     })
   end
 
-  it 'logs that it performed a download' do
+  it 'ダウンロードを実行したことをログに出力すること' do
     logger = FakeLogger.new
     client = build_client_with_project(:logger => logger)
     client.download { |ignore| }
     expect(logger).to have_entry(:info, 'Downloaded translations')
   end
 
-  it 'downloads draft blurbs for an existing project' do
+  it '既存プロジェクトのdraftなblurbをダウンロードできること' do
     project = add_project
     project.update({
       'draft' => {
@@ -165,7 +165,7 @@ describe CopyTunerClient do
     })
   end
 
-  it "handles a 304 response when downloading" do
+  it '304レスポンス時は2回目以降yieldされないこと' do
     project = add_project
     project.update('draft' => { 'key.one' => "expected one" })
     logger = FakeLogger.new
@@ -182,7 +182,7 @@ describe CopyTunerClient do
     expect(logger).to have_entry(:info, "No new translations")
   end
 
-  it "uploads defaults for missing blurbs in an existing project" do
+  it '既存プロジェクトに存在しないblurbはアップロードされること' do
     project = add_project
 
     blurbs = {
@@ -196,14 +196,14 @@ describe CopyTunerClient do
     expect(project.reload.draft).to eq(blurbs)
   end
 
-  it "logs that it performed an upload" do
+  it 'アップロードを実行したことをログに出力すること' do
     logger = FakeLogger.new
     client = build_client_with_project(:logger => logger)
     client.upload({})
     expect(logger).to have_entry(:info, "Uploaded missing translations")
   end
 
-  it "deploys from the top-level constant" do
+  it 'トップレベル定数からdeployできること' do
     client = build_client
     allow(client).to receive(:download)
     CopyTunerClient.configure do |config|
@@ -214,7 +214,7 @@ describe CopyTunerClient do
     CopyTunerClient.deploy
   end
 
-  it "deploys" do
+  it 'deployが実行できること' do
     project = add_project
     project.update({
       'draft' => {
@@ -238,7 +238,41 @@ describe CopyTunerClient do
     expect(logger).to have_entry(:info, "Deployed")
   end
 
-  it "handles deploy errors" do
+  it 'deploy時にエラーが発生した場合は例外が発生すること' do
     expect { build_client.deploy }.to raise_error(CopyTunerClient::InvalidApiKey)
   end
+
+  describe '#etag' do
+    it 'etagが読み取り可能な属性として公開されていること' do
+      client = build_client
+      expect(client).to respond_to(:etag)
+    end
+
+    it '初期状態ではetagがnilであること' do
+      client = build_client
+      expect(client.etag).to be_nil
+    end
+
+    it 'ダウンロード成功時にetagが更新されること' do
+      project = add_project
+      client = build_client(:api_key => project.api_key)
+
+      # モックでETagを設定
+      response = Net::HTTPSuccess.new('1.1', '200', 'OK')
+      allow(response).to receive(:body).and_return('{}')
+      allow(response).to receive(:[]).with('ETag').and_return('"abc123"')
+
+      http = double('http')
+      allow(Net::HTTP).to receive(:new).and_return(http)
+      allow(http).to receive(:open_timeout=)
+      allow(http).to receive(:read_timeout=)
+      allow(http).to receive(:use_ssl=)
+      allow(http).to receive(:verify_mode=)
+      allow(http).to receive(:ca_file=)
+      allow(http).to receive(:request).and_return(response)
+
+      client.download { |blurbs| }
+      expect(client.etag).to eq('"abc123"')
+    end
+  end
 end

data/spec/copy_tuner_client/i18n_backend_spec.rb

@@ -1,7 +1,35 @@
 require 'spec_helper'
 
-describe CopyTunerClient::I18nBackend do
-  let(:cache) { {} }
+describe 'CopyTunerClient::I18nBackend' do
+  # テスト用のキャッシュクラス：既存のHashインターフェースを維持しつつ新機能をサポート
+  class TestCache < Hash
+    def initialize(initial_etag = 'test-etag-1')
+      super()
+      @test_etag = initial_etag
+    end
+
+    def version
+      @test_etag
+    end
+
+    def to_tree_hash
+      CopyTunerClient::DottedHash.to_h(self)
+    end
+
+    def wait_for_download
+      # テスト用のスタブメソッド
+    end
+
+    def etag=(value)
+      @test_etag = value
+    end
+
+    def etag
+      @test_etag
+    end
+  end
+
+  let(:cache) { TestCache.new }
 
   def build_backend
     backend = CopyTunerClient::I18nBackend.new(cache)
@@ -11,25 +39,24 @@ describe CopyTunerClient::I18nBackend do
 
   before do
     @default_backend = I18n.backend
-    allow(cache).to receive(:wait_for_download)
   end
 
   after { I18n.backend = @default_backend }
 
   subject { build_backend }
 
-  it "reloads locale files and waits for the download to complete" do
+  it 'ロケールファイルをリロードし、ダウンロード完了まで待機すること' do
     expect(I18n).to receive(:load_path).and_return([])
-    expect(cache).to receive(:wait_for_download)
+    # wait_for_downloadはTestCacheクラス内で呼ばれる
     subject.reload!
     subject.translate('en', 'test.key', :default => 'something')
   end
 
-  it "includes the base i18n backend" do
+  it 'i18nのBaseバックエンドを継承していること' do
     is_expected.to be_kind_of(I18n::Backend::Base)
   end
 
-  it "looks up a key in cache" do
+  it 'キャッシュからキーを検索できること' do
     value = 'hello'
     cache['en.prefix.test.key'] = value
 
@@ -38,7 +65,7 @@ describe CopyTunerClient::I18nBackend do
     expect(backend.translate('en', 'test.key', :scope => 'prefix')).to eq(value)
   end
 
-  it "finds available locales from locale files and cache" do
+  it 'ロケールファイルとキャッシュから利用可能なロケールを取得できること' do
     allow(YAML).to receive(:unsafe_load_file).and_return({ 'es' => { 'key' => 'value' } })
     allow(I18n).to receive(:load_path).and_return(["test.yml"])
 
@@ -48,7 +75,7 @@ describe CopyTunerClient::I18nBackend do
     expect(subject.available_locales).to match_array([:en, :es, :fr])
   end
 
-  it "queues missing keys with default" do
+  it 'default付きで未登録キーをキューイングすること' do
     default = 'default value'
 
     expect(subject.translate('en', 'test.key', :default => default)).to eq(default)
@@ -56,7 +83,7 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq(default)
   end
 
-  it "queues missing keys with default string in an array" do
+  it 'defaultが配列（文字列1つ）の場合も未登録キーをキューイングすること' do
     default = 'default value'
 
     expect(subject.translate('en', 'test.key', :default => [default])).to eq(default)
@@ -64,7 +91,7 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq(default)
   end
 
-  it "queues missing keys without default" do
+  it 'defaultなしで未登録キーをキューイングすること' do
     expect { subject.translate('en', 'test.key') }.
       to throw_symbol(:exception)
 
@@ -72,7 +99,7 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to be_nil
   end
 
-  it "queues missing keys with scope" do
+  it 'scope付きで未登録キーをキューイングすること' do
     default = 'default value'
 
     expect(subject.translate('en', 'key', :default => default, :scope => ['test'])).
@@ -81,7 +108,7 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq(default)
   end
 
-  it "does not queues missing keys with a symbol of default" do
+  it 'defaultがシンボルの場合は未登録キーをキューイングしないこと' do
     cache['en.key.one'] = "Expected"
 
     expect(subject.translate('en', 'key.three', :default => :"key.one")).to eq 'Expected'
@@ -92,7 +119,7 @@ describe CopyTunerClient::I18nBackend do
     expect(subject.translate('en', 'key.three', :default => :"key.one")).to eq 'Expected'
   end
 
-  it "does not queues missing keys with an array of default" do
+  it 'defaultが配列（シンボル含む）の場合は未登録キーをキューイングしないこと' do
     cache['en.key.one'] = "Expected"
 
     expect(subject.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).to eq 'Expected'
@@ -103,7 +130,7 @@ describe CopyTunerClient::I18nBackend do
     expect(subject.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).to eq 'Expected'
   end
 
-  it "queues missing keys with interpolation" do
+  it '補間付きで未登録キーをキューイングすること' do
     default = 'default %{interpolate}'
 
     expect(subject.translate('en', 'test.key', :default => default, :interpolate => 'interpolated')).to eq 'default interpolated'
@@ -111,20 +138,20 @@ describe CopyTunerClient::I18nBackend do
     expect(cache['en.test.key']).to eq 'default %{interpolate}'
   end
 
-  it "dose not mark strings as html safe" do
+  it 'html safeを付与しないこと' do
     cache['en.test.key'] = FakeHtmlSafeString.new("Hello")
     backend = build_backend
     expect(backend.translate('en', 'test.key')).to_not be_html_safe
   end
 
-  it "looks up an array of defaults" do
+  it 'defaultが配列の場合に順に検索できること' do
     cache['en.key.one'] = "Expected"
     backend = build_backend
     expect(backend.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).
       to eq('Expected')
   end
 
-  context "html_escape option is true" do
+  context 'html_escapeオプションがtrueの場合' do
     before do
       CopyTunerClient.configure do |configuration|
         configuration.html_escape = true
@@ -132,71 +159,71 @@ describe CopyTunerClient::I18nBackend do
       end
     end
 
-    it "do not marks strings as html safe" do
+    it 'html safeを付与しないこと' do
       cache['en.test.key'] = FakeHtmlSafeString.new("Hello")
       backend = build_backend
       expect(backend.translate('en', 'test.key')).not_to be_html_safe
     end
   end
 
-  context 'non-string key' do
-    it 'Not to be registered in the cache' do
+  context '非文字列キーの場合' do
+    it 'キャッシュに登録されないこと' do
       expect { subject.translate('en', {}) }.to throw_symbol(:exception)
       expect(cache).not_to have_key 'en.{}'
     end
   end
 
-  describe "with stored translations" do
+  describe 'store_translations利用時' do
     subject { build_backend }
 
-    it "uses stored translations as a default" do
+    it 'store_translationsで登録した値をdefaultとして利用できること' do
       subject.store_translations('en', 'test' => { 'key' => 'Expected' })
       expect(subject.translate('en', 'test.key', :default => 'Unexpected')).
         to include('Expected')
       expect(cache['en.test.key']).to eq('Expected')
     end
 
-    it "preserves interpolation markers in the stored translation" do
+    it '補間マーカーを保持したまま保存できること' do
       subject.store_translations('en', 'test' => { 'key' => '%{interpolate}' })
       expect(subject.translate('en', 'test.key', :interpolate => 'interpolated')).
         to include('interpolated')
       expect(cache['en.test.key']).to eq('%{interpolate}')
     end
 
-    it "uses the default if the stored translations don't have the key" do
+    it 'store_translationsでキーがなければdefaultを利用すること' do
       expect(subject.translate('en', 'test.key', :default => 'Expected')).
         to include('Expected')
     end
 
-    it "uses the cached key when present" do
+    it 'キャッシュにキーがあればそちらを優先すること' do
       subject.store_translations('en', 'test' => { 'key' => 'Unexpected' })
       cache['en.test.key'] = 'Expected'
       expect(subject.translate('en', 'test.key', :default => 'default')).
         to include('Expected')
     end
 
-    it "stores a nested hash" do
+    it 'ネストしたハッシュを保存できること' do
       nested = { :nested => 'value' }
       subject.store_translations('en', 'key' => nested)
       expect(subject.translate('en', 'key', :default => 'Unexpected')).to eq(nested)
       expect(cache['en.key.nested']).to eq('value')
     end
 
-    it "returns an array directly without storing" do
+    it '配列はそのまま返しキャッシュしないこと' do
       array = ['value']
       subject.store_translations('en', 'key' => array)
       expect(subject.translate('en', 'key', :default => 'Unexpected')).to eq(array)
       expect(cache['en.key']).to be_nil
     end
 
-    it "looks up an array of defaults" do
+    it 'defaultが配列の場合に順に検索できること' do
       subject.store_translations('en', 'key' => { 'one' => 'Expected' })
       expect(subject.translate('en', 'key.three', :default => [:"key.two", :"key.one"])).
         to include('Expected')
     end
   end
 
-  describe "with a backend using fallbacks" do
+  describe 'Fallbacks利用時' do
     subject { build_backend }
 
     before do
@@ -205,7 +232,7 @@ describe CopyTunerClient::I18nBackend do
       end
     end
 
-    it "queues missing keys with blank string" do
+    it 'defaultとFallbacks併用時はキャッシュにデフォルト値を入れないこと' do
       default = 'default value'
       expect(subject.translate('en', 'test.key', :default => default)).to eq(default)
 
@@ -215,4 +242,181 @@ describe CopyTunerClient::I18nBackend do
       expect(cache['en.test.key']).to be_nil
     end
   end
+
+  describe 'ツリー構造のlookup' do
+    subject { build_backend }
+
+    context '完全一致が存在する場合' do
+      it 'ツリー構造より完全一致を優先すること' do
+        cache['ja.views.hoge'] = 'exact_value'
+        cache['ja.views.hoge.sub'] = 'sub_value'
+
+        result = subject.translate('ja', 'views.hoge')
+        expect(result).to eq('exact_value')
+      end
+    end
+
+    context 'ツリー構造のみ存在する場合' do
+      it '部分キーでツリー構造を返すこと' do
+        cache['ja.views.hoge'] = 'test'
+        cache['ja.views.fuga'] = 'test2'
+        cache['ja.other.key'] = 'other'
+
+        result = subject.translate('ja', 'views')
+        expect(result).to eq({
+          :hoge => 'test',
+          :fuga => 'test2'
+        })
+      end
+
+      it '存在しない部分キーはnilを返すこと' do
+        cache['ja.views.hoge'] = 'test'
+
+        result = subject.translate('ja', 'nonexistent', default: nil)
+        expect(result).to be_nil
+      end
+
+      it 'ネストしたツリー構造を返すこと' do
+        cache['ja.views.users.index'] = 'user index'
+        cache['ja.views.users.show'] = 'user show'
+        cache['ja.views.posts.index'] = 'post index'
+
+        result = subject.translate('ja', 'views')
+        expect(result).to eq({
+          :users => {
+            :index => 'user index',
+            :show => 'user show'
+          },
+          :posts => {
+            :index => 'post index'
+          }
+        })
+      end
+    end
+
+    context '混在シナリオ' do
+      before do
+        cache['ja.views.hoge'] = 'exact_hoge'
+        cache['ja.views.hoge.sub'] = 'sub_value'
+        cache['ja.views.fuga.one'] = 'one'
+        cache['ja.views.fuga.two'] = 'two'
+      end
+
+      it '完全一致を正しく扱うこと' do
+        expect(subject.translate('ja', 'views.hoge')).to eq('exact_hoge')
+      end
+
+      it 'ツリー構造を正しく扱うこと' do
+        expect(subject.translate('ja', 'views.fuga')).to eq({
+          :one => 'one',
+          :two => 'two'
+        })
+      end
+
+      it 'より深い完全一致も正しく扱うこと' do
+        expect(subject.translate('ja', 'views.hoge.sub')).to eq('sub_value')
+      end
+    end
+
+    context 'ツリーキャッシュ管理' do
+      it '最初のlookupでツリーキャッシュを構築すること' do
+        cache['ja.views.hoge'] = 'test'
+        cache['ja.views.fuga'] = 'test2'
+
+        # 最初のlookupでツリーキャッシュが構築される
+        result = subject.translate('ja', 'views')
+        expect(result).to eq({
+          :hoge => 'test',
+          :fuga => 'test2'
+        })
+      end
+
+      it '2回目以降はツリーキャッシュを再利用すること' do
+        cache['ja.views.hoge'] = 'test'
+
+        # 1回目
+        subject.translate('ja', 'views')
+
+        # ツリーキャッシュの再構築が発生しないことを確認
+        expect(cache).not_to receive(:to_tree_hash)
+
+        # 2回目
+        subject.translate('ja', 'views')
+      end
+
+      it 'キャッシュバージョンが変わった場合はツリーキャッシュを再構築すること' do
+        cache['ja.views.hoge'] = 'test'
+        subject.translate('ja', 'views')
+
+        # ETag（バージョン）を変更してキャッシュを更新
+        cache.etag = '"new_etag"'
+
+        # 新しい値を追加
+        cache['ja.views.new'] = 'new value'
+        result = subject.translate('ja', 'views')
+        expect(result).to include(:new => 'new value')
+      end
+
+      it 'キャッシュバージョンがnilでも正常に動作すること' do
+        cache['ja.views.test'] = 'value'
+        cache.etag = nil
+
+        result = subject.translate('ja', 'views')
+        expect(result).to eq({ :test => 'value' })
+      end
+    end
+
+    context '大規模キャッシュ時のパフォーマンス' do
+      it 'etagバージョン管理でツリーキャッシュを効率的に扱うこと' do
+        # 大量のキャッシュエントリを追加
+        1000.times do |i|
+          cache["ja.category#{i % 10}.item#{i}"] = "value#{i}"
+        end
+
+        # 初回のツリーキャッシュ構築
+        subject.translate('ja', 'category1')
+
+        # ETag が変わらない限り、再構築されない
+        expect(cache).not_to receive(:to_tree_hash)
+
+        # 複数回の lookup が高速で実行される
+        start_time = Time.now
+        10.times { subject.translate('ja', 'category2') }
+        end_time = Time.now
+
+        # 10ms 以下で完了することを確認
+        expect((end_time - start_time) * 1000).to be < 10
+      end
+    end
+
+    context 'エッジケース' do
+      it '空キャッシュでも正常に動作すること' do
+        result = subject.translate('ja', 'views', default: nil)
+        expect(result).to be_nil
+      end
+
+      it '1階層のキーも正常に扱えること' do
+        cache['ja.simple'] = 'simple value'
+
+        result = subject.translate('ja', 'simple')
+        expect(result).to eq('simple value')
+      end
+
+      it 'ignored_keysの機能がツリーlookupでも維持されること' do
+        # ignored_keys 設定
+        allow(CopyTunerClient.configuration).to receive(:ignored_keys).and_return(['views.secret'])
+        handler = double('ignored_key_handler')
+        allow(CopyTunerClient.configuration).to receive(:ignored_key_handler).and_return(handler)
+
+        cache['ja.views.public'] = 'public'
+        cache['ja.views.secret'] = 'secret'
+
+        # ignored_key_handler が呼ばれることを確認
+        expect(handler).to receive(:call).with(instance_of(CopyTunerClient::IgnoredKey))
+
+        # ignored_keys が動作することを確認
+        subject.translate('ja', 'views.secret')
+      end
+    end
+  end
 end

data/spec/support/fake_client.rb

@@ -7,10 +7,11 @@ class FakeClient
     @mutex = Mutex.new
     @cond = ConditionVariable.new
     @go = false
+    @etag = nil
   end
 
   attr_reader :uploaded, :uploads, :downloads
-  attr_accessor :delay, :error
+  attr_accessor :delay, :error, :etag
 
   def []=(key, value)
     @data[key] = value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - SonicGarden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n