resizing 1.2.1 → 1.3.1

data/test/test_helper.rb

@@ -5,6 +5,13 @@ require 'simplecov-cobertura'
 
 SimpleCov.start do
   add_filter '/test/'
+  # bundle install で vendor/ 配下に入る gem を計測対象から除外し、
+  # カバレッジ率が lib の実態を表すようにする
+  add_filter '/vendor/'
+  # version.rb is loaded by the gemspec before SimpleCov starts, so it always shows
+  # 0% coverage. Exclude it so that release PRs do not fail the patch check.
+  add_filter '/lib/resizing/version.rb'
+  track_files 'lib/**/*.rb'
 
   if ENV['CI']
     formatter SimpleCov::Formatter::CoberturaFormatter
@@ -20,6 +27,8 @@ SimpleCov.start do
 end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+require 'digest'
+require 'socket'
 require 'time'
 require 'timecop'
 require 'vcr'
@@ -47,6 +56,40 @@ VCR.configure do |c|
   end
 end
 
+# Resizing::Client の代わりに使う偽クライアント (delete の応答を固定し、呼び出しを記録する)
+class FakeApiClient
+  attr_reader :deleted_ids
+
+  def initialize(response)
+    @response = response
+    @deleted_ids = []
+  end
+
+  def delete(image_id)
+    @deleted_ids << image_id
+    @response.dup
+  end
+end
+
+# Resizing::Client を FakeApiClient に差し替えるヘルパー
+module FakeApiClientAssertions
+  # Resizing::Client.new が FakeApiClient を返す状態でブロックを実行する
+  #
+  # @param response [Hash] 偽クライアントの delete が返す固定レスポンス
+  # @yield [FakeApiClient] 差し替えた偽クライアント
+  # @return [Object] ブロックの戻り値
+  #
+  # @example
+  #   with_fake_api_client({ 'id' => IMAGE_ID }) do |fake|
+  #     file.delete
+  #     assert_equal [IMAGE_ID], fake.deleted_ids
+  #   end
+  def with_fake_api_client(response)
+    fake = FakeApiClient.new(response)
+    Resizing::Client.stub(:new, fake) { yield fake }
+  end
+end
+
 # VCRカセットのリクエストが実際に使用されたかを検証するヘルパー
 module VCRRequestAssertions
   # VCRカセット内でブロックを実行し、カセットのインタラクションがすべて使用されたことを確認
@@ -61,7 +104,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 +137,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|
@@ -129,15 +172,172 @@ module VCRRequestAssertions
   end
 end
 
-ActiveRecord::Base.establish_connection(
-  adapter: 'mysql2',
-  host: '127.0.0.1',
-  port: 3306,
-  database: 'resizing_gem_test',
-  encoding: 'utf8',
-  username: 'root',
-  password: 'secret'
-)
+# 全テストで共通の Resizing の設定と、アップロードのテスト用ヘルパー
+#
+# 設定値と識別子は test/vcr/ のカセットに記録されているホスト・プロジェクト・
+# レスポンスと揃えてあるので、変更するときはカセットも合わせて録り直すこと
+module ResizingTestConfiguration
+  CONFIGURATION_TEMPLATE = {
+    image_host: 'http://192.168.56.101:5000',
+    project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
+    secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
+    open_timeout: 10,
+    response_timeout: 20
+  }.freeze
+
+  # carrier_wave_test/save カセットが返す画像の public id
+  UPLOADED_IDENTIFIER = '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/' \
+                        '14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+
+  def configuration_template
+    CONFIGURATION_TEMPLATE
+  end
+
+  # @param overrides [Hash] 既定の設定を上書きする値
+  def configure_resizing(overrides = {})
+    Resizing.configure = CONFIGURATION_TEMPLATE.merge(overrides)
+  end
+
+  def expect_identifier
+    UPLOADED_IDENTIFIER
+  end
+
+  def expect_url
+    "#{CONFIGURATION_TEMPLATE[:image_host]}#{UPLOADED_IDENTIFIER}"
+  end
+
+  # アップロード用のサンプル画像
+  # 実際に POST が発行されるので VCR カセット内で使うこと
+  def sample_uploaded_file
+    file = File.open('test/data/images/sample1.jpg', 'r')
+    ActionDispatch::Http::UploadedFile.new(
+      filename: File.basename(file.path),
+      type: 'image/jpeg',
+      tempfile: file
+    )
+  end
+
+  # モデルにサンプル画像を添付するヘルパーメソッド
+  # VCRカセット内で呼び出す必要がある
+  def attach_sample_image(model)
+    model.resizing_picture = sample_uploaded_file
+  end
+
+  # `remote_<column>_url=` でダウンロードされたのと同じ形のファイル
+  # (CarrierWave::Downloader::RemoteFile) を、HTTP を発行せずに組み立てる
+  #
+  # @param url [String] ダウンロード元 URL (ファイル名の決定に使われる)
+  # @param content_type [String] レスポンスの Content-Type
+  # @param body [String] レスポンスボディ (既定はサンプル画像)
+  def sample_remote_file(url, content_type:, body: File.binread('test/data/images/sample1.jpg'))
+    response = Net::HTTPOK.new('1.1', '200', 'OK')
+    response['Content-Type'] = content_type
+    response.instance_variable_set(:@body, body)
+    response.instance_variable_set(:@read, true)
+    response.uri = URI.parse(url)
+    ::CarrierWave::Downloader::RemoteFile.new(response)
+  end
+
+  # `remote_<column>_url=` のダウンロードを差し替えて、与えた RemoteFile を返すようにする
+  # (テストからは外部 HTTP を発行しないため)
+  #
+  # @param remote_file [CarrierWave::Downloader::RemoteFile] ダウンロード結果として返すファイル
+  def with_stubbed_download(remote_file, &block)
+    downloader = Object.new
+    downloader.define_singleton_method(:download) { |_url, _headers = {}| remote_file }
+    ::CarrierWave::Downloader::Base.stub(:new, downloader, &block)
+  end
+end
+
+# Test database setup
+#
+# By default each test process creates its own database and drops it when the
+# run finishes, so that several test processes sharing one MySQL server do not
+# overwrite each other's tables and records.
+#
+# The server can be overridden with MYSQL_HOST / MYSQL_PORT / MYSQL_USER /
+# MYSQL_PASSWORD (the dev container runs MySQL in a separate container).
+# Setting MYSQL_DATABASE uses that database as is and never drops it; give each
+# concurrent process a different name in that case.
+module TestDatabase
+  BASE_NAME = 'resizing_gem_test'
+
+  module_function
+
+  # Host identifier mixed into the per-process database name, so that PIDs from
+  # different hosts do not collide on a shared MySQL server
+  def host_token
+    @host_token ||= Digest::MD5.hexdigest(Socket.gethostname)[0, 8]
+  end
+
+  def per_process_name_pattern
+    /\A#{Regexp.escape(BASE_NAME)}_#{host_token}_(\d+)\z/
+  end
+
+  def database_name
+    @database_name ||= ENV['MYSQL_DATABASE'] || "#{BASE_NAME}_#{host_token}_#{Process.pid}"
+  end
+
+  # Whether the database belongs to this process alone and can be dropped
+  def ephemeral?
+    ENV['MYSQL_DATABASE'].nil?
+  end
+
+  def server_config
+    {
+      adapter: 'mysql2',
+      host: ENV.fetch('MYSQL_HOST', '127.0.0.1'),
+      port: Integer(ENV.fetch('MYSQL_PORT', '3306')),
+      encoding: 'utf8',
+      username: ENV.fetch('MYSQL_USER', 'root'),
+      password: ENV.fetch('MYSQL_PASSWORD', 'secret')
+    }
+  end
+
+  def setup
+    ActiveRecord::Base.establish_connection(server_config)
+    drop_abandoned_databases if ephemeral?
+    ActiveRecord::Base.connection.execute("create database if not exists `#{database_name}`")
+    ActiveRecord::Base.establish_connection(server_config.merge(database: database_name))
+
+    # Minitest.after_run, not at_exit: at_exit handlers run in reverse order of
+    # registration, so this one would drop the database before the tests run
+    Minitest.after_run { drop_database } if ephemeral?
+  end
+
+  def drop_database
+    ActiveRecord::Base.establish_connection(server_config)
+    ActiveRecord::Base.connection.execute("drop database if exists `#{database_name}`")
+  rescue StandardError => e
+    warn "failed to drop test database #{database_name}: #{e.message}"
+  end
+
+  # Clean up databases left behind by processes that were killed before they
+  # could drop their own
+  def drop_abandoned_databases
+    connection = ActiveRecord::Base.connection
+
+    connection.select_values('show databases').each do |database|
+      matched = per_process_name_pattern.match(database)
+      next if matched.nil? || process_alive?(matched[1].to_i)
+
+      connection.execute("drop database if exists `#{database}`")
+    end
+  rescue StandardError => e
+    warn "failed to drop abandoned test databases: #{e.message}"
+  end
+
+  def process_alive?(pid)
+    Process.kill(0, pid)
+    true
+  rescue Errno::ESRCH
+    false
+  rescue Errno::EPERM
+    true
+  end
+end
+
+TestDatabase.setup
 
 ActiveRecord::Schema.define do
   self.verbose = false
@@ -186,10 +386,98 @@ class ResizingUploaderWithDefaultURL < CarrierWave::Uploader::Base
   end
 end
 
+# before :cache コールバック (拡張子 / content_type / サイズのチェック) のテスト用アップローダ
+class ResizingUploaderWithExtensionAllowlist < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  def extension_allowlist
+    %w[png]
+  end
+end
+
+class ResizingUploaderWithExtensionDenylist < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  def extension_denylist
+    %w[jpg]
+  end
+end
+
+# 拡張子の判定が content_type から行われることのテスト用アップローダ
+# (sample1.jpg / image/jpeg を受け付け、image/png は拒否する)
+class ResizingUploaderWithJpegAllowlist < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  def extension_allowlist
+    %w[jpg jpeg]
+  end
+end
+
+class ResizingUploaderWithContentTypeAllowlist < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  def content_type_allowlist
+    ['image/png']
+  end
+end
+
+class ResizingUploaderWithSizeRange < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  def size_range
+    0..10
+  end
+end
+
+# process! が発火しないことのテスト用アップローダ
+# convert / transformation は配信 URL の transform を組み立てるための宣言であり
+# uploader のメソッドとしては存在しないので、process! が走ると NoMethodError になる
+class ResizingUploaderWithUndefinedProcessor < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  process convert: 'png'
+end
+
 class TestModel < ::ActiveRecord::Base
   mount_uploader :resizing_picture, ResizingUploader
 end
 
+class TestModelWithExtensionAllowlist < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithExtensionAllowlist
+end
+
+class TestModelWithExtensionDenylist < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithExtensionDenylist
+end
+
+class TestModelWithJpegAllowlist < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithJpegAllowlist
+end
+
+class TestModelWithContentTypeAllowlist < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithContentTypeAllowlist
+end
+
+class TestModelWithSizeRange < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithSizeRange
+end
+
+class TestModelWithUndefinedProcessor < ::ActiveRecord::Base
+  self.table_name = 'test_models'
+
+  mount_uploader :resizing_picture, ResizingUploaderWithUndefinedProcessor
+end
+
 class TestJPGModel < ::ActiveRecord::Base
   mount_uploader :resizing_picture, ResizingJPGUploader
 end
@@ -197,3 +485,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,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-18 00:00:00.000000000 Z
+date: 2026-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -185,10 +191,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/compose.yaml"
+- ".devcontainer/devcontainer-lock.json"
+- ".devcontainer/devcontainer.json"
+- ".devcontainer/post-create.sh"
+- ".github/copilot-instructions.md"
+- ".github/labeler.yml"
+- ".github/release.yml"
+- ".github/workflows/labeler.yml"
+- ".github/workflows/lint.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- AGENTS.md
 - CHANGELOG.md
+- CLAUDE.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -197,11 +215,14 @@ files:
 - bin/generate-changelog
 - bin/setup
 - docker-compose.yml
+- git-hooks/pre-push
+- git-hooks/pre-push-ruby.sh
 - lib/resizing.rb
 - lib/resizing/active_storage.rb
 - lib/resizing/active_storage/service.rb
 - lib/resizing/active_storage/service/resizing_service.rb
 - lib/resizing/carrier_wave.rb
+- lib/resizing/carrier_wave/callback_file.rb
 - lib/resizing/carrier_wave/storage/file.rb
 - lib/resizing/carrier_wave/storage/remote.rb
 - lib/resizing/client.rb
@@ -218,7 +239,10 @@ files:
 - test/resizing/active_storage_service_test.rb
 - test/resizing/carrier_wave/storage/file_test.rb
 - test/resizing/carrier_wave/storage/remote_test.rb
+- test/resizing/carrier_wave_cache_callbacks_test.rb
+- test/resizing/carrier_wave_callback_file_test.rb
 - test/resizing/carrier_wave_test.rb
+- test/resizing/carrier_wave_uploader_test.rb
 - test/resizing/client_test.rb
 - test/resizing/configurable_test.rb
 - test/resizing/configuration_test.rb
@@ -232,6 +256,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
@@ -252,14 +277,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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