resizing 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35a202fce460c80d3b476d4d9307f6345d9d13ed95c385a0e41108f35e46e61
-  data.tar.gz: 14f7f3a20d83859f121b9138931164d5eb27a5a9764cd6ff2dee2dfc71aa72cd
+  metadata.gz: 97be4b8cf7324441cfa73563ea4f102ac47b947fc95adb9ccbad206fe802f785
+  data.tar.gz: ae8df42cb9197bdfc81874d83027e266ba523e3e0c90605ddafc93b310da4368
 SHA512:
-  metadata.gz: 25a5f49e162e691ed72d147132d4a7aea069a6d148af8a1d22b0b3b3cedecc0b8bd46b674c177fdbef88179684342a230ffc23edb56340db42540beadc5f6947
-  data.tar.gz: 03b8a3544e711973f79ef66dec2400ad09fba7d571a4518f0424ede8eb3da8420fb0c8fd299bc1a7c0ad734894bcbb59fa566857790277c0c8d4f0aa67537700
+  metadata.gz: 56a57d325523e21d22a6e3c77c3907e6ec8860433e6524d8ee89da79381f29f56bb7b79af37805ab4be46c921b4e70c5cceb99039de947231c50f7838c4fa544
+  data.tar.gz: 18c995f91897d11813477ea16298c2e3101c352f611ecf84e23fb57954e86b6d2c44d28a48515f3df42548b27b0bbebb2b413af85797ce246e9ef22e52d71639

data/.gitignore

@@ -6,3 +6,9 @@
 /pkg/
 /spec/reports/
 /tmp/
+vendor/
+Gemfile.lock
+tags
+sample1.jpg
+.ruby-version
+uploads/

data/lib/resizing/carrier_wave/storage/file.rb

@@ -29,7 +29,7 @@ module Resizing
           @content_type || file.try(:content_type)
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:disable Metrics/AbcSize
         def delete
           # Use the identifier from constructor if available, otherwise try to get from model
           if @public_id.present?
@@ -44,23 +44,27 @@ module Resizing
             @public_id = Resizing::PublicId.new(column_value)
           end
 
-          return if @public_id.empty? # do nothing
+          return if @public_id.empty?
 
-          # 以下、既存のコード（変更なし）
           resp = client.delete(@public_id.image_id)
+
+          # NOTE: 削除時のカラムクリアは以下の理由で必要:
+          # - 画像更新時: 古い画像IDと新しい画像IDが異なるため、古い画像削除時に新しいIDを消さないようにする
+          # - 明示的なremove!時: カラムをnilにする必要がある
+          # - clear_column_if_current_imageは削除される画像IDと現在のカラム値を比較して判断
           if resp['error'] == 'ActiveRecord::RecordNotFound' # 404 not found
-            model.send :write_attribute, serialization_column, nil unless model.destroyed?
+            clear_column_if_current_image
             return
           end
 
           if @public_id.image_id == resp['id']
-            model.send :write_attribute, serialization_column, nil unless model.destroyed?
+            clear_column_if_current_image
             return
           end
 
           raise APIError, "raise someone error:#{resp.inspect}"
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/AbcSize
 
         def extension
           raise NotImplementedError, 'this method is do not used. maybe'
@@ -95,6 +99,10 @@ module Resizing
         end
 
         def current_path
+          # Return the path from @public_id if set (for retrieve scenarios),
+          # otherwise fall back to reading from model
+          return @public_id.to_s if @public_id.present?
+
           @current_path = model.send :read_attribute, serialization_column
         end
         alias path current_path
@@ -131,11 +139,14 @@ module Resizing
           @public_id = Resizing::PublicId.new(@response['public_id'])
           @content_type = @response['content_type']
 
-          # force update column
-          # model_class
-          #   .where(primary_key_name => model.send(primary_key_name))
-          #   .update_all(serialization_column=>@public_id)
-
+          # NOTE: 理想的にはStorage::File内でモデルのカラムをいじらず、CarrierWaveに任せるべきだが、
+          # 現在の実装では以下の理由で必要:
+          # - CarrierWaveは write_uploader(column, mounter.identifiers.first) でカラムを更新
+          # - mounter.identifiers -> uploaders.map(&:identifier) -> storage.identifier -> uploader.filename
+          # - resizing-gemの filenameメソッドは read_column を返す（既存のカラム値）
+          # - そのため、CarrierWaveに任せると旧い値が書き戻されてしまう
+          # TODO: これを修正するには、Remote#identifierをオーバーライドして@public_id.to_sを返すか、
+          #       uploader.filenameの実装を変更する必要がある
           # save new value to model class
           model.send :write_attribute, serialization_column, @public_id.to_s
 
@@ -177,6 +188,20 @@ module Resizing
           @serialization_column ||= model.send(:_mounter, uploader.mounted_as).send(:serialization_column)
         end
 
+        # Only clear the column if the deleted image is the current one
+        # (not when deleting an old image during update)
+        def clear_column_if_current_image
+          return if model.destroyed?
+
+          current_value = model.send(:read_attribute, serialization_column)
+          current_public_id = Resizing::PublicId.new(current_value)
+
+          # Only clear if the deleted image is the same as the current one
+          return unless current_public_id.image_id == @public_id.image_id
+
+          model.send :write_attribute, serialization_column, nil
+        end
+
         ##
         # client of Resizing
         def client

data/lib/resizing/carrier_wave.rb

@@ -29,11 +29,20 @@ module Resizing
     def initialize(*args)
       @requested_format = nil
       @default_format = nil
+      @retrieved_identifier = nil
       super
     end
 
+    # Override to store the identifier and set up @file for later use
+    def retrieve_from_store!(identifier)
+      @retrieved_identifier = identifier
+      super
+      # Ensure @file is set up so that remove! can call @file.delete
+      file
+    end
+
     def file
-      file_identifier = identifier || read_column
+      file_identifier = @retrieved_identifier || identifier || read_column
 
       return nil if file_identifier.blank?
 

data/lib/resizing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resizing
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/test/resizing/carrier_wave_test.rb

@@ -168,20 +168,299 @@ module Resizing
         'upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
     end
 
-    def prepare_model(model)
+    def prepare_model(model_class)
       result = nil
       VCR.use_cassette 'carrier_wave_test/save', record: :once do
-        result = model.new
-        file = File.open('test/data/images/sample1.jpg', 'r')
-        uploaded_file = ActionDispatch::Http::UploadedFile.new(
-          filename: File.basename(file.path),
-          type: 'image/jpeg',
-          tempfile: file
-        )
-
-        result.resizing_picture = uploaded_file
+        result = model_class.new
+        attach_sample_image(result)
       end
       result
     end
+
+    # モデルにサンプル画像を添付するヘルパーメソッド
+    # VCRカセット内で呼び出す必要がある
+    def attach_sample_image(model)
+      file = File.open('test/data/images/sample1.jpg', 'r')
+      uploaded_file = ActionDispatch::Http::UploadedFile.new(
+        filename: File.basename(file.path),
+        type: 'image/jpeg',
+        tempfile: file
+      )
+      model.resizing_picture = uploaded_file
+    end
+
+    # TestModelWithCallbackTracking 用のヘルパーメソッド
+    def prepare_tracking_model
+      prepare_model(TestModelWithCallbackTracking)
+    end
+
+    # 既存モデルに新しい画像をアップロードするヘルパーメソッド
+    def upload_new_image(model)
+      VCR.use_cassette 'carrier_wave_test/save', record: :once do
+        attach_sample_image(model)
+      end
+    end
+
+    # after_commit コールバックが正しく呼ばれることを確認するテスト
+    # 通常のテスト環境ではトランザクションが使われるため、after_commit が呼ばれない問題がある
+    # このテストでは、明示的にトランザクションをコミットして after_commit が呼ばれることを確認する
+
+    def test_after_commit_callback_is_called_on_create
+      # after_commit on: :create が呼ばれることを確認
+      model = prepare_tracking_model
+
+      # 明示的なトランザクション内で save! することで after_commit が呼ばれる
+      ActiveRecord::Base.transaction do
+        model.save!
+      end
+
+      assert_includes model.callback_log, :create_commit,
+                      'after_commit on: :create should be called after transaction commit'
+    end
+
+    def test_after_commit_callback_is_called_on_update
+      # after_commit on: :update が呼ばれることを確認
+      model = prepare_tracking_model
+      model.save!
+      model.callback_log.clear
+
+      # 更新時の after_commit が呼ばれることを確認
+      upload_new_image(model)
+
+      ActiveRecord::Base.transaction do
+        model.save!
+      end
+
+      assert_includes model.callback_log, :update_commit,
+                      'after_commit on: :update should be called after transaction commit'
+    end
+
+    def test_after_commit_callback_is_called_on_destroy
+      # after_commit on: :destroy が呼ばれることを確認
+      model = prepare_tracking_model
+      model.save!
+      model.callback_log.clear
+
+      # destroy 時の after_commit が呼ばれることを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        ActiveRecord::Base.transaction do
+          model.destroy!
+        end
+      end
+
+      assert_includes model.callback_log, :destroy_commit,
+                      'after_commit on: :destroy should be called after transaction commit'
+    end
+
+    def test_carrierwave_remove_previously_stored_is_called_on_update
+      # CarrierWave が登録する remove_previously_stored_#{column} が
+      # 画像の更新時に呼ばれることを確認
+      model = prepare_model TestModel
+      model.save!
+
+      model.resizing_picture_url
+
+      # 新しい画像をアップロードして更新
+      upload_new_image(model)
+
+      # 更新時には古い画像を削除するため DELETE リクエストが発行されるべき
+      # ただし、同じカセットを使用しているため同じ URL になる
+      # 実際の環境では異なる public_id が返されるため、古い画像が削除される
+      ActiveRecord::Base.transaction do
+        model.save!
+      end
+
+      # モデルが更新されたことを確認
+      refute_nil model.resizing_picture_url
+    end
+
+    def test_delete_is_called_when_image_is_updated
+      # 画像更新時に古い画像を削除する DELETE リクエストが発行されることを確認
+      # VCR カセット update_image.yml には以下が含まれる:
+      # 1. POST (古い画像のアップロード) -> old-image-id を返す
+      # 2. POST (新しい画像のアップロード) -> new-image-id を返す
+      # 3. DELETE (古い画像の削除) -> old-image-id を削除
+
+      assert_vcr_requests_made 'carrier_wave_test/update_image' do
+        model = TestModel.new
+        model.resizing_picture = File.open(File.expand_path('../data/images/sample1.jpg', __dir__))
+        model.save!
+
+        old_public_id = model.read_attribute(:resizing_picture)
+        assert_match(/old-image-id/, old_public_id)
+
+        # 新しい画像をアップロードして更新（同じカセット内で）
+        model.resizing_picture = File.open(File.expand_path('../data/images/sample1.jpg', __dir__))
+
+        ActiveRecord::Base.transaction do
+          model.save!
+        end
+
+        # 更新後は新しい画像の public_id が設定されている
+        new_public_id = model.read_attribute(:resizing_picture)
+        assert_match(/new-image-id/, new_public_id)
+      end
+      # カセット内の全リクエスト（POST x2, DELETE x1）が発行されたことを確認
+    end
+
+    # ============================================================
+    # before_save / after_save コールバックのテスト
+    # ============================================================
+
+    def test_before_save_write_identifier_is_called
+      # before_save :write_#{column}_identifier が呼ばれ、
+      # カラムに識別子が書き込まれることを確認
+      model = prepare_model TestModel
+
+      # 保存前は識別子がDBに書き込まれていない
+      assert model.new_record?
+
+      model.save!
+
+      # 保存後は識別子がDBに書き込まれている
+      assert_match %r{/projects/.+/upload/images/.+}, model.read_attribute(:resizing_picture)
+    end
+
+    def test_after_save_store_is_called
+      # after_save :store_#{column}! が呼ばれ、
+      # ファイルがストレージに保存されることを確認
+      model = prepare_model TestModel
+      model.save!
+
+      # ファイルが保存され、URLが取得できることを確認
+      refute_nil model.resizing_picture_url
+      refute model.resizing_picture.blank?
+    end
+
+    def test_after_save_store_previous_changes_is_called
+      # after_save :store_previous_changes_for_#{column} が呼ばれ、
+      # 前の変更が追跡されることを確認
+      model = prepare_model TestModel
+      model.save!
+
+      model.read_attribute(:resizing_picture)
+
+      # 新しい画像をアップロード
+      upload_new_image(model)
+
+      model.save!
+
+      # previous_changes に resizing_picture の変更が記録されていることを確認
+      # (CarrierWave が store_previous_changes_for_#{column} で追跡)
+      assert model.previous_changes.key?('resizing_picture'),
+             'previous_changes should track resizing_picture changes'
+    end
+
+    # ============================================================
+    # after_commit :mark_remove_#{column}_false のテスト
+    # ============================================================
+
+    def test_mark_remove_column_false_is_called_after_update
+      # after_commit :mark_remove_#{column}_false, on: :update が呼ばれ、
+      # remove フラグがリセットされることを確認
+      model = prepare_model TestModel
+      model.save!
+
+      # remove フラグを設定
+      model.remove_resizing_picture = '1'
+
+      # この時点ではフラグが設定されている
+      assert_equal '1', model.remove_resizing_picture
+
+      # save 後に after_commit で mark_remove_resizing_picture_false が呼ばれる
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        ActiveRecord::Base.transaction do
+          model.save!
+        end
+      end
+
+      # after_commit 後はフラグがリセットされている
+      # CarrierWave が mark_remove_#{column}_false でフラグをリセット
+      refute model.remove_resizing_picture,
+             'remove flag should be reset after commit'
+    end
+
+    # ============================================================
+    # after_commit :remove_#{column}!, on: :destroy のテスト
+    # ============================================================
+
+    def test_remove_column_is_called_on_destroy
+      # after_commit :remove_#{column}!, on: :destroy が呼ばれ、
+      # ファイルが削除されることを確認
+      model = prepare_model TestModel
+      model.save!
+
+      refute model.resizing_picture.blank?
+
+      # destroy 時に DELETE リクエストが発行されることを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        ActiveRecord::Base.transaction do
+          model.destroy!
+        end
+      end
+
+      # モデルが削除されたことを確認
+      assert model.destroyed?
+    end
+
+    # ============================================================
+    # コールバック順序のテスト
+    # ============================================================
+
+    def test_callback_order_on_create
+      # create 時のコールバック順序を確認
+      # 1. before_save :write_#{column}_identifier
+      # 2. after_save :store_#{column}!
+      # 3. after_commit (on: :create)
+      model = prepare_tracking_model
+
+      ActiveRecord::Base.transaction do
+        model.save!
+      end
+
+      # コールバックが正しい順序で呼ばれたことを確認
+      assert_equal %i[before_save after_save create_commit], model.callback_log
+    end
+
+    def test_callback_order_on_update
+      # update 時のコールバック順序を確認
+      # 1. before_save :write_#{column}_identifier
+      # 2. after_save :store_#{column}!
+      # 3. after_save :store_previous_changes_for_#{column}
+      # 4. after_commit :mark_remove_#{column}_false
+      # 5. after_commit :remove_previously_stored_#{column}
+      model = prepare_tracking_model
+      model.save!
+      model.callback_log.clear
+
+      # 更新
+      upload_new_image(model)
+
+      ActiveRecord::Base.transaction do
+        model.save!
+      end
+
+      # コールバックが正しい順序で呼ばれたことを確認
+      assert_equal %i[before_save after_save update_commit], model.callback_log
+    end
+
+    def test_callback_order_on_destroy
+      # destroy 時のコールバック順序を確認
+      # 1. before_destroy
+      # 2. after_destroy
+      # 3. after_commit :remove_#{column}!, on: :destroy
+      model = prepare_tracking_model
+      model.save!
+      model.callback_log.clear
+
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        ActiveRecord::Base.transaction do
+          model.destroy!
+        end
+      end
+
+      # コールバックが正しい順序で呼ばれたことを確認
+      assert_equal %i[before_destroy after_destroy destroy_commit], model.callback_log
+    end
   end
 end

data/test/test_helper.rb

@@ -61,7 +61,7 @@ module VCRRequestAssertions
   #     model.remove_resizing_picture!
   #     model.save!
   #   end
-  def assert_vcr_requests_made(cassette_name, options = {}, &block)
+  def assert_vcr_requests_made(cassette_name, options = {})
     options = { record: :none }.merge(options)
 
     VCR.use_cassette(cassette_name, options) do |cassette|
@@ -94,7 +94,7 @@ module VCRRequestAssertions
   #   assert_vcr_requests_count 'client/post', 1 do
   #     Resizing.post(file)
   #   end
-  def assert_vcr_requests_count(cassette_name, expected_count, options = {}, &block)
+  def assert_vcr_requests_count(cassette_name, expected_count, options = {})
     options = { record: :none }.merge(options)
 
     VCR.use_cassette(cassette_name, options) do |cassette|
@@ -197,3 +197,62 @@ end
 class TestModelWithDefaultURL < ::ActiveRecord::Base
   mount_uploader :resizing_picture, ResizingUploaderWithDefaultURL
 end
+
+# コールバックのテスト用モデル
+# mount_uploader が登録する各種コールバックが正しく動作するかをテストするため
+# カスタムコールバックを追加して呼び出しを追跡する
+class TestModelWithCallbackTracking < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploader
+
+  attr_accessor :callback_log
+
+  # before_save / after_save コールバック
+  before_save :track_before_save
+  after_save :track_after_save
+
+  # before_destroy / after_destroy コールバック
+  before_destroy :track_before_destroy
+  after_destroy :track_after_destroy
+
+  # after_commit コールバック
+  after_commit :track_create_commit, on: :create
+  after_commit :track_update_commit, on: :update
+  after_commit :track_destroy_commit, on: :destroy
+
+  def initialize(*args)
+    super
+    @callback_log = []
+  end
+
+  private
+
+  def track_before_save
+    @callback_log << :before_save
+  end
+
+  def track_after_save
+    @callback_log << :after_save
+  end
+
+  def track_before_destroy
+    @callback_log << :before_destroy
+  end
+
+  def track_after_destroy
+    @callback_log << :after_destroy
+  end
+
+  def track_create_commit
+    @callback_log << :create_commit
+  end
+
+  def track_update_commit
+    @callback_log << :update_commit
+  end
+
+  def track_destroy_commit
+    @callback_log << :destroy_commit
+  end
+end

data/test/vcr/carrier_wave_test/update_image.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+    body:
+      encoding: UTF-8
+      string: '{"id":"old-image-id-1111-1111-111111111111","project_id":"e06e710d-f026-4dcf-b2c0-eab0de8bb83f","content_type":"image/jpeg","version":"v1","public_id":"/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/old-image-id-1111-1111-111111111111/v1"}'
+  recorded_at: Sun, 11 Oct 2020 04:56:48 GMT
+- request:
+    method: post
+    uri: http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/
+    body:
+      encoding: ASCII-8BIT
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+    body:
+      encoding: UTF-8
+      string: '{"id":"new-image-id-2222-2222-222222222222","project_id":"e06e710d-f026-4dcf-b2c0-eab0de8bb83f","content_type":"image/jpeg","version":"v2","public_id":"/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/new-image-id-2222-2222-222222222222/v2"}'
+  recorded_at: Sun, 11 Oct 2020 04:56:49 GMT
+- request:
+    method: delete
+    uri: http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/old-image-id-1111-1111-111111111111
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v1.0.1
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      content-type:
+      - application/json; charset=utf-8
+    body:
+      encoding: UTF-8
+      string: '{"id":"old-image-id-1111-1111-111111111111","project_id":"e06e710d-f026-4dcf-b2c0-eab0de8bb83f"}'
+  recorded_at: Sun, 11 Oct 2020 04:56:50 GMT
+recorded_with: VCR 6.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-18 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -232,6 +232,7 @@ files:
 - test/test_helper.rb
 - test/vcr/carrier_wave_test/remove_resizing_picture.yml
 - test/vcr/carrier_wave_test/save.yml
+- test/vcr/carrier_wave_test/update_image.yml
 - test/vcr/client/delete.yml
 - test/vcr/client/error.yml
 - test/vcr/client/metadata.yml
@@ -259,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Client and utilities for Resizing