copy_tuner_client 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 938a08aeb03719e98a6e118eb714b820798f91ff3d5e69cce65eeea3d8b243ca
-  data.tar.gz: 9da7bbe8fa7ed6b92b90fa090f9ebf5ec67cb8945bace845494aa7638640b3ce
+  metadata.gz: 629e99af532182c8f167b2a5acd7f5a7561147bfc97a317d13ac0d345910297e
+  data.tar.gz: 3687a78229935a75a6af2e81567f6db49a215badbf2b09574fa643f8b6ad9a3d
 SHA512:
-  metadata.gz: 86d05a06a42a06da4586d60bc80649cdb9f4cd98c26425d6528f7b121c2ca880b366bc12aeec7b20952bbc7129b2837dcd9261851bb960ddebd7de773e0b64b6
-  data.tar.gz: 831783835b4ede6b590dd298e89f596c8c9ca417260e4ae490f8b6bbca576e07c7b5f89a490eb8b2b651e305a66b0c9dac7c526f0592d2fdef7f7337d70f6607
+  metadata.gz: 79f2ca4118bc85c447d49f540ce1bfea082d47bb295d82b1b69a481685f7467d7f9afdec7ae87397d482f4953fef0e396116c8899a4ba0866db4d95b4d61d76e
+  data.tar.gz: 7a4df56a0368c1e0f25478949ebbb48f13582b0b1895fbdcb78bd776bc23edfe4391c59648c254c998a6ebd1327bdb0afb8c654149aa7307ae03b871210736fd

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -1,5 +1,6 @@
 # cf) xray-rails : xray/middleware.rb
 
+require 'rack/utils'
 require 'copy_tuner_client/copyray'
 require 'copy_tuner_client/copyray/rewriter'
 
@@ -83,7 +84,10 @@ module CopyTunerClient
     end
 
     def rewritable?(status, headers)
-      [200, 422].include?(status) &&
+      # NOTE: マーカーの注入側（copyray_injectable?）はステータスを見ないので、除去側もステータスで絞らない
+      # （絞るとリダイレクトやエラーページ（429 など）でマーカーが画面に露出する）。
+      # ボディを持たないステータスは書き換えで Content-Length が付くと Rack の仕様違反になるので除外する。
+      !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.key?(status) &&
         headers['Content-Type'] &&
         (headers['Content-Type'].include?('text/html') || turbo_stream?(headers)) &&
         !file?(headers)

data/lib/copy_tuner_client/version.rb

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

data/spec/copy_tuner_client/copyray_middleware_spec.rb

@@ -11,8 +11,7 @@ describe CopyTunerClient::CopyrayMiddleware do
 
   subject(:middleware) { described_class.new(app) }
 
-  let(:app) { ->(_env) { [status, headers, [body]] } }
-  let(:status) { 200 }
+  let(:app) { ->(_env) { [200, headers, [body]] } }
 
   before do
     CopyTunerClient.configure do |configuration|
@@ -43,6 +42,37 @@ describe CopyTunerClient::CopyrayMiddleware do
     end
   end
 
+  context '200 以外のステータスで HTML を返すとき' do
+    let(:headers) { { 'Content-Type' => 'text/html' } }
+    let(:body) { "<html><body><p>#{marker('a.b')}Hello</p></body></html>" }
+
+    def call_with_status(status)
+      status_middleware = described_class.new(->(_env) { [status, headers, [body]] })
+      allow(status_middleware).to receive(:append_js) { |html, *| html }
+      status_middleware.call({}).last.join
+    end
+
+    [302, 429, 500].each do |status|
+      it "#{status} ではマーカーを data-copyray-key 属性に書き換え、トークンを除去する" do
+        result = call_with_status(status)
+
+        expect(result).to include('data-copyray-key="a.b"')
+        expect(result).not_to match CopyTunerClient::Copyray::Marker::SCAN_REGEXP
+      end
+    end
+
+    [204, 304].each do |status|
+      it "#{status} はボディを持たないのでボディもヘッダも変えずに通過させる" do
+        status_middleware = described_class.new(->(_env) { [status, headers, ['']] })
+        allow(status_middleware).to receive(:append_js) { |html, *| html }
+        _status, result_headers, response = status_middleware.call({})
+
+        expect(response.join).to eq ''
+        expect(result_headers).to eq('Content-Type' => 'text/html')
+      end
+    end
+  end
+
   context 'turbo stream レスポンスのとき' do
     let(:headers) { { 'Content-Type' => 'text/vnd.turbo-stream.html' } }
     let(:body) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - SonicGarden