copy_tuner_client 2.1.1 → 2.2.0

data/spec/copy_tuner_client/cache_spec.rb

@@ -137,7 +137,7 @@ describe 'CopyTunerClient::Cache' do
     cache.download
 
     expect(cache['en.test.key']).to eq('test value')
-    expect(cache['en.test.empty']).to eq(nil)
+    expect(cache['en.test.empty']).to be_nil
     expect(cache.blank_keys).to contain_exactly('en.test.empty')
 
     cache['en.test.empty'] = ''
@@ -157,8 +157,8 @@ describe 'CopyTunerClient::Cache' do
   it 'flush時に接続エラーが発生した場合はエラーログを出力すること' do
     failure = 'server is napping'
     logger = FakeLogger.new
-    expect(client).to receive(:upload).and_raise(CopyTunerClient::ConnectionError.new(failure))
-    cache = build_cache(logger: logger)
+    allow(client).to receive(:upload).and_raise(CopyTunerClient::ConnectionError.new(failure))
+    cache = build_cache(logger:)
     cache['upload.key'] = 'upload'
 
     cache.flush
@@ -169,8 +169,8 @@ describe 'CopyTunerClient::Cache' do
   it 'download時に接続エラーが発生した場合はエラーログを出力すること' do
     failure = 'server is napping'
     logger = FakeLogger.new
-    expect(client).to receive(:download).and_raise(CopyTunerClient::ConnectionError.new(failure))
-    cache = build_cache(logger: logger, ready: true)
+    allow(client).to receive(:download).and_raise(CopyTunerClient::ConnectionError.new(failure))
+    cache = build_cache(logger:, ready: true)
 
     cache.download
 
@@ -179,26 +179,28 @@ describe 'CopyTunerClient::Cache' do
 
   it '最初のダウンロードが完了するまでブロックすること' do
     logger = FakeLogger.new
-    expect(logger).to receive(:flush)
+    allow(logger).to receive(:flush)
     client.delay = true
-    cache = build_cache(logger: logger)
+    cache = build_cache(logger:)
 
     t_download = Thread.new { cache.download }
     sleep 0.1 until cache.pending?
 
-    t_wait = Thread.new do
-      cache.wait_for_download
-    end
+    t_wait =
+      Thread.new do
+        cache.wait_for_download
+      end
     sleep 0.1 until logger.has_entry?(:info, 'Waiting for first download')
     client.go
     expect(t_download.join(1)).not_to be_nil
-    expect(cache.pending?).to be_falsey
+    expect(cache).not_to be_pending
     expect(t_wait.join(1)).not_to be_nil
+    expect(logger).to have_received(:flush)
   end
 
   it 'ダウンロード前はブロックしないこと' do
     logger = FakeLogger.new
-    cache = build_cache(logger: logger)
+    cache = build_cache(logger:)
 
     finished = false
     Thread.new do
@@ -208,7 +210,7 @@ describe 'CopyTunerClient::Cache' do
 
     sleep(1)
 
-    expect(finished).to eq(true)
+    expect(finished).to be(true)
     expect(logger).not_to have_entry(:info, 'Waiting for first download')
   end
 
@@ -226,21 +228,21 @@ describe 'CopyTunerClient::Cache' do
       match do |thread|
         sleep(0.1)
 
-        if thread.status === false
-          violated('アンロック前に終了してしまった')
+        if thread.status == false
+          violated?('アンロック前に終了してしまった')
         else
           mutex.unlock
           sleep(0.1)
 
-          if thread.status === false
+          if thread.status == false
             true
           else
-            violated('アンロック後もスレッドが終了しない')
+            violated?('アンロック後もスレッドが終了しない')
           end
         end
       end
 
-      def violated(failure)
+      def violated?(failure)
         @failure_message = failure
         false
       end
@@ -277,13 +279,15 @@ describe 'CopyTunerClient::Cache' do
       config.project_id = 1
       config.cache = cache
     end
-    expect(cache).to receive(:flush).at_least(:once)
+    allow(cache).to receive(:flush)
 
     CopyTunerClient.flush
+
+    expect(cache).to have_received(:flush).at_least(:once)
   end
 
   describe '#to_tree_hash' do
-    subject { cache.to_tree_hash }
+    subject(:tree_hash) { cache.to_tree_hash }
 
     let(:cache) do
       cache = build_cache
@@ -292,7 +296,7 @@ describe 'CopyTunerClient::Cache' do
     end
 
     it 'データがない場合は空ハッシュを返すこと' do
-      is_expected.to eq({})
+      expect(tree_hash).to eq({})
     end
 
     context 'フラットなキーの場合' do
@@ -303,17 +307,17 @@ describe 'CopyTunerClient::Cache' do
       end
 
       it 'ツリー構造に変換されること' do
-        is_expected.to eq({
-          'ja' => {
-            'views' => {
-              'hoge' => 'test',
-              'fuga' => 'test2'
-            }
-          },
-          'en' => {
-            'hello' => 'world'
-          }
-        })
+        expect(tree_hash).to eq({
+                                  'ja' => {
+                                    'views' => {
+                                      'hoge' => 'test',
+                                      'fuga' => 'test2',
+                                    },
+                                  },
+                                  'en' => {
+                                    'hello' => 'world',
+                                  },
+                                })
       end
     end
 
@@ -326,26 +330,26 @@ describe 'CopyTunerClient::Cache' do
       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'
-              }
-            }
-          }
-        })
+        expect(tree_hash).to eq({
+                                  'ja' => {
+                                    'views' => {
+                                      'users' => {
+                                        'index' => 'user index',
+                                        'show' => 'user show',
+                                      },
+                                      'posts' => {
+                                        'index' => 'post index',
+                                      },
+                                    },
+                                  },
+                                  'en' => {
+                                    'common' => {
+                                      'buttons' => {
+                                        'save' => 'Save',
+                                      },
+                                    },
+                                  },
+                                })
       end
     end
   end
@@ -353,7 +357,7 @@ describe 'CopyTunerClient::Cache' do
   describe '#version' do
     it 'クライアントのetagを返すこと（効率的なバージョンチェック）' do
       cache = build_cache
-      client_instance = cache.send(:client)
+      client_instance = cache.__send__(:client)
 
       # ETag が設定されている場合
       client_instance.etag = '"abc123"'
@@ -366,7 +370,7 @@ describe 'CopyTunerClient::Cache' do
 
     it 'etagがnilの場合も正常に動作すること' do
       cache = build_cache
-      client_instance = cache.send(:client)
+      client_instance = cache.__send__(:client)
       client_instance.etag = nil
 
       expect(cache.version).to be_nil
@@ -391,7 +395,7 @@ describe 'CopyTunerClient::Cache' do
   end
 
   describe '#export' do
-    subject { cache.export }
+    subject(:export_result) { cache.export }
 
     let(:cache) do
       cache = build_cache
@@ -404,12 +408,14 @@ describe 'CopyTunerClient::Cache' do
         config.project_id = 1
         config.cache = cache
       end
-      expect(cache).to receive(:export)
+      allow(cache).to receive(:export)
       CopyTunerClient.export
+
+      expect(cache).to have_received(:export)
     end
 
     it 'blurbキーがない場合はyamlを返さないこと' do
-      is_expected.to eq nil
+      expect(export_result).to be_nil
     end
 
     context '1階層のblurbキーがある場合' do

data/spec/copy_tuner_client/client_spec.rb

@@ -12,8 +12,7 @@ describe 'CopyTunerClient' do
     config[:download_cache_dir] = download_cache_dir
     default_config = CopyTunerClient::Configuration.new.to_hash
     default_config[:s3_host] = 'copy-tuner.com'
-    client = CopyTunerClient::Client.new(default_config.update(config))
-    client
+    CopyTunerClient::Client.new(default_config.update(config))
   end
 
   def add_project
@@ -37,31 +36,31 @@ describe 'CopyTunerClient' do
 
     it '接続時のタイムアウトが設定されていること' do
       project = add_project
-      client = build_client(:api_key => project.api_key, :http_open_timeout => 4)
-      client.download { |ignore| }
+      client = build_client(api_key: project.api_key, http_open_timeout: 4)
+      client.download {}
       expect(http.open_timeout).to eq(4)
     end
 
     it '読み込み時のタイムアウトが設定されていること' do
       project = add_project
-      client = build_client(:api_key => project.api_key, :http_read_timeout => 4)
-      client.download { |ignore| }
+      client = build_client(api_key: project.api_key, http_read_timeout: 4)
+      client.download {}
       expect(http.read_timeout).to eq(4)
     end
 
     it 'secureがtrueの場合はSSL検証付きで接続すること' do
       project = add_project
-      client = build_client(:api_key => project.api_key, :secure => true)
-      client.download { |ignore| }
-      expect(http.use_ssl?).to eq(true)
+      client = build_client(api_key: project.api_key, secure: true)
+      client.download {}
+      expect(http.use_ssl?).to be(true)
       expect(http.verify_mode).to eq(OpenSSL::SSL::VERIFY_PEER)
     end
 
     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)
+      client = build_client(api_key: project.api_key, secure: false)
+      client.download {}
+      expect(http.use_ssl?).to be(false)
     end
 
     it 'HTTPエラーをConnectionErrorでラップすること' do
@@ -75,39 +74,39 @@ describe 'CopyTunerClient' do
         Net::ProtocolError.new,
         SocketError.new,
         OpenSSL::SSL::SSLError.new,
-        Errno::ECONNREFUSED.new
+        Errno::ECONNREFUSED.new,
       ]
 
       errors.each do |original_error|
+        expected_message = "#{original_error.class.name}: #{original_error.message}"
         allow(http).to receive(:request).and_raise(original_error)
         client = build_client_with_project
-        expect { client.download { |ignore| } }.
-          to raise_error(CopyTunerClient::ConnectionError) { |error|
-            expect(error.message).
-              to eq("#{original_error.class.name}: #{original_error.message}")
+        expect { client.download {} }
+          .to raise_error(CopyTunerClient::ConnectionError) { |error|
+            expect(error.message).to eq(expected_message)
           }
       end
     end
 
     it 'ダウンロード時に500エラーが発生した場合はConnectionErrorになること' do
-      client = build_client(:api_key => 'raise_error')
-      expect { client.download { |ignore| } }.
-        to raise_error(CopyTunerClient::ConnectionError)
+      client = build_client(api_key: 'raise_error')
+      expect { client.download {} }
+        .to raise_error(CopyTunerClient::ConnectionError)
     end
 
     it 'アップロード時に500エラーが発生した場合はConnectionErrorになること' do
-      client = build_client(:api_key => 'raise_error')
+      client = build_client(api_key: 'raise_error')
       expect { client.upload({}) }.to raise_error(CopyTunerClient::ConnectionError)
     end
 
     it 'ダウンロード時に404エラーが発生した場合はInvalidApiKeyになること' do
-      client = build_client(:api_key => 'bogus')
-      expect { client.download { |ignore| } }.
-        to raise_error(CopyTunerClient::InvalidApiKey)
+      client = build_client(api_key: 'bogus')
+      expect { client.download {} }
+        .to raise_error(CopyTunerClient::InvalidApiKey)
     end
 
     it 'アップロード時に404エラーが発生した場合はInvalidApiKeyになること' do
-      client = build_client(:api_key => 'bogus')
+      client = build_client(api_key: 'bogus')
       expect { client.upload({}) }.to raise_error(CopyTunerClient::InvalidApiKey)
     end
   end
@@ -115,71 +114,71 @@ describe 'CopyTunerClient' do
   it '既存プロジェクトのpublishedなblurbをダウンロードできること' do
     project = add_project
     project.update({
-      'draft' => {
-        'key.one'   => 'unexpected one',
-        'key.three' => 'unexpected three'
-      },
-      'published' => {
-        'key.one' => 'expected one',
-        'key.two' => 'expected two'
-      }
-    })
-    client = build_client(:api_key => project.api_key, :public => true)
+                     'draft' => {
+                       'key.one' => 'unexpected one',
+                       'key.three' => 'unexpected three',
+                     },
+                     'published' => {
+                       'key.one' => 'expected one',
+                       'key.two' => 'expected two',
+                     },
+                   })
+    client = build_client(api_key: project.api_key, public: true)
     blurbs = nil
 
     client.download { |yielded| blurbs = yielded }
 
     expect(blurbs).to eq({
-      'key.one' => 'expected one',
-      'key.two' => 'expected two'
-    })
+                           'key.one' => 'expected one',
+                           'key.two' => 'expected two',
+                         })
   end
 
   it 'ダウンロードを実行したことをログに出力すること' do
     logger = FakeLogger.new
-    client = build_client_with_project(:logger => logger)
-    client.download { |ignore| }
+    client = build_client_with_project(logger:)
+    client.download {}
     expect(logger).to have_entry(:info, 'Downloaded translations')
   end
 
   it '既存プロジェクトのdraftなblurbをダウンロードできること' do
     project = add_project
     project.update({
-      'draft' => {
-        'key.one' => 'expected one',
-        'key.two' => 'expected two'
-      },
-      'published' => {
-        'key.one'   => 'unexpected one',
-        'key.three' => 'unexpected three'
-      }
-    })
-    client = build_client(:api_key => project.api_key, :public => false)
+                     'draft' => {
+                       'key.one' => 'expected one',
+                       'key.two' => 'expected two',
+                     },
+                     'published' => {
+                       'key.one' => 'unexpected one',
+                       'key.three' => 'unexpected three',
+                     },
+                   })
+    client = build_client(api_key: project.api_key, public: false)
     blurbs = nil
 
     client.download { |yielded| blurbs = yielded }
 
     expect(blurbs).to eq({
-      'key.one' => 'expected one',
-      'key.two' => 'expected two'
-    })
+                           'key.one' => 'expected one',
+                           'key.two' => 'expected two',
+                         })
   end
 
   it '304レスポンス時は2回目以降yieldされないこと' do
     project = add_project
-    project.update('draft' => { 'key.one' => "expected one" })
+    project.update('draft' => { 'key.one' => 'expected one' })
     logger = FakeLogger.new
-    client = build_client(:api_key => project.api_key,
-                          :public  => false,
-                          :logger  => logger)
+    client = build_client(api_key: project.api_key,
+                          public: false,
+                          logger:)
     yields = 0
 
     2.times do
-      client.download { |ignore| yields += 1 }
+      client.download { |_ignore| yields += 1 }
     end
 
     expect(yields).to eq(1)
-    expect(logger).to have_entry(:info, "No new translations")
+    expect(logger).to have_entry(:info, 'No new translations')
   end
 
   it '既存プロジェクトに存在しないblurbはアップロードされること' do
@@ -187,10 +186,10 @@ describe 'CopyTunerClient' do
 
     blurbs = {
       'key.one' => 'expected one',
-      'key.two' => 'expected two'
+      'key.two' => 'expected two',
     }
 
-    client = build_client(:api_key => project.api_key, :public => true)
+    client = build_client(api_key: project.api_key, public: true)
     client.upload(blurbs)
 
     expect(project.reload.draft).to eq(blurbs)
@@ -198,9 +197,9 @@ describe 'CopyTunerClient' do
 
   it 'アップロードを実行したことをログに出力すること' do
     logger = FakeLogger.new
-    client = build_client_with_project(:logger => logger)
+    client = build_client_with_project(logger:)
     client.upload({})
-    expect(logger).to have_entry(:info, "Uploaded missing translations")
+    expect(logger).to have_entry(:info, 'Uploaded missing translations')
   end
 
   it 'トップレベル定数からdeployできること' do
@@ -210,33 +209,35 @@ describe 'CopyTunerClient' do
       config.project_id = 1
       config.client = client
     end
-    expect(client).to receive(:deploy)
+    allow(client).to receive(:deploy)
 
     CopyTunerClient.deploy
+
+    expect(client).to have_received(:deploy)
   end
 
   it 'deployが実行できること' do
     project = add_project
     project.update({
-      'draft' => {
-        'key.one' => "expected one",
-        'key.two' => "expected two"
-      },
-      'published' => {
-        'key.one'   => "unexpected one",
-        'key.two'   => "unexpected one",
-      }
-    })
+                     'draft' => {
+                       'key.one' => 'expected one',
+                       'key.two' => 'expected two',
+                     },
+                     'published' => {
+                       'key.one' => 'unexpected one',
+                       'key.two' => 'unexpected one',
+                     },
+                   })
     logger = FakeLogger.new
-    client = build_client(:api_key => project.api_key, :logger => logger)
+    client = build_client(api_key: project.api_key, logger:)
 
     client.deploy
 
     expect(project.reload.published).to eq({
-      'key.one'   => "expected one",
-      'key.two'   => "expected two"
-    })
-    expect(logger).to have_entry(:info, "Deployed")
+                                             'key.one' => 'expected one',
+                                             'key.two' => 'expected two',
+                                           })
+    expect(logger).to have_entry(:info, 'Deployed')
   end
 
   it 'deploy時にエラーが発生した場合は例外が発生すること' do
@@ -256,14 +257,14 @@ describe 'CopyTunerClient' do
 
     it 'ダウンロード成功時にetagが更新されること' do
       project = add_project
-      client = build_client(:api_key => project.api_key)
+      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')
+      http = instance_double(Net::HTTP)
       allow(Net::HTTP).to receive(:new).and_return(http)
       allow(http).to receive(:open_timeout=)
       allow(http).to receive(:read_timeout=)
@@ -272,7 +273,7 @@ describe 'CopyTunerClient' do
       allow(http).to receive(:ca_file=)
       allow(http).to receive(:request).and_return(response)
 
-      client.download { |blurbs| }
+      client.download {}
       expect(client.etag).to eq('"abc123"')
     end
   end