resizing 1.2.0 → 1.2.2

data/test/test_helper.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'simplecov'
 require 'simplecov-cobertura'
 
 SimpleCov.start do
-  add_filter "/test/"
+  add_filter '/test/'
 
   if ENV['CI']
     formatter SimpleCov::Formatter::CoberturaFormatter
@@ -22,15 +23,18 @@ $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'time'
 require 'timecop'
 require 'vcr'
+require 'logger'
 
 require 'rails'
 require 'active_record'
 require 'fog-aws'
 require 'carrierwave'
+require 'carrierwave/orm/activerecord'
 require 'resizing'
 require 'pry-byebug'
 
 require 'minitest/autorun'
+require 'minitest/mock'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'test/vcr'
@@ -38,11 +42,93 @@ VCR.configure do |c|
   c.allow_http_connections_when_no_cassette = false
 
   # raise Faraday::TimeoutError, when project_id is timeout_project_id
-  c.before_http_request(lambda {|r| URI(r.uri).path.match? %r(/projects/timeout_project_id) } ) do
+  c.before_http_request(->(r) { URI(r.uri).path.match? %r{/projects/timeout_project_id} }) do
     raise Faraday::TimeoutError
   end
 end
 
+# VCRカセットのリクエストが実際に使用されたかを検証するヘルパー
+module VCRRequestAssertions
+  # VCRカセット内でブロックを実行し、カセットのインタラクションがすべて使用されたことを確認
+  #
+  # @param cassette_name [String] VCRカセット名
+  # @param options [Hash] VCR.use_cassetteに渡すオプション
+  # @yield 実行するブロック
+  # @return [void]
+  #
+  # @example
+  #   assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+  #     model.remove_resizing_picture!
+  #     model.save!
+  #   end
+  def assert_vcr_requests_made(cassette_name, options = {})
+    options = { record: :none }.merge(options)
+
+    VCR.use_cassette(cassette_name, options) do |cassette|
+      interaction_list = cassette.http_interactions
+      initial_count = interaction_list.remaining_unused_interaction_count
+
+      assert initial_count.positive?,
+             "Cassette '#{cassette_name}' should have at least 1 interaction"
+
+      yield cassette if block_given?
+
+      remaining_count = interaction_list.remaining_unused_interaction_count
+      used_count = initial_count - remaining_count
+
+      assert_equal 0, remaining_count,
+                   "Expected all #{initial_count} cassette interactions to be used, " \
+                   "but #{remaining_count} remain unused (#{used_count} were used)"
+    end
+  end
+
+  # VCRカセット内でブロックを実行し、指定した数のインタラクションが使用されたことを確認
+  #
+  # @param cassette_name [String] VCRカセット名
+  # @param expected_count [Integer] 使用されるべきインタラクション数
+  # @param options [Hash] VCR.use_cassetteに渡すオプション
+  # @yield 実行するブロック
+  # @return [void]
+  #
+  # @example
+  #   assert_vcr_requests_count 'client/post', 1 do
+  #     Resizing.post(file)
+  #   end
+  def assert_vcr_requests_count(cassette_name, expected_count, options = {})
+    options = { record: :none }.merge(options)
+
+    VCR.use_cassette(cassette_name, options) do |cassette|
+      interaction_list = cassette.http_interactions
+      initial_count = interaction_list.remaining_unused_interaction_count
+
+      yield cassette if block_given?
+
+      remaining_count = interaction_list.remaining_unused_interaction_count
+      used_count = initial_count - remaining_count
+
+      assert_equal expected_count, used_count,
+                   "Expected #{expected_count} cassette interactions to be used, " \
+                   "but #{used_count} were used"
+    end
+  end
+
+  # VCRカセット内でブロックを実行し、リクエストが発行されないことを確認
+  #
+  # @param cassette_name [String] VCRカセット名
+  # @param options [Hash] VCR.use_cassetteに渡すオプション
+  # @yield 実行するブロック
+  # @return [void]
+  #
+  # @example
+  #   assert_vcr_no_requests 'carrier_wave_test/remove_resizing_picture' do
+  #     model.remove_resizing_picture = true
+  #     # save!を呼ばないのでリクエストは発行されない
+  #   end
+  def assert_vcr_no_requests(cassette_name, options = {}, &block)
+    assert_vcr_requests_count(cassette_name, 0, options, &block)
+  end
+end
+
 ActiveRecord::Base.establish_connection(
   adapter: 'mysql2',
   host: '127.0.0.1',
@@ -56,7 +142,7 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  %i(test_models test_jpg_models test_model_with_default_urls).each do |model_name|
+  %i[test_models test_jpg_models test_model_with_default_urls].each do |model_name|
     connection.execute "drop table if exists #{model_name}"
 
     create_table model_name do |t|
@@ -101,19 +187,72 @@ class ResizingUploaderWithDefaultURL < CarrierWave::Uploader::Base
 end
 
 class TestModel < ::ActiveRecord::Base
-  extend CarrierWave::Mount
-
   mount_uploader :resizing_picture, ResizingUploader
 end
 
 class TestJPGModel < ::ActiveRecord::Base
-  extend CarrierWave::Mount
-
   mount_uploader :resizing_picture, ResizingJPGUploader
 end
 
 class TestModelWithDefaultURL < ::ActiveRecord::Base
-  extend CarrierWave::Mount
-
   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.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire:
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2024-09-29 00:00:00.000000000 Z
+date: 2026-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +70,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.16'
 - !ruby/object:Gem::Dependency
   name: minitest-ci
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -195,10 +181,7 @@ dependencies:
 description: 'Client and utilities for Resizing '
 email:
 - junichiro.kasuya@gmail.com
-executables:
-- console
-- generate-changelog
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -210,11 +193,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
+- bin/generate-changelog
+- bin/setup
 - docker-compose.yml
-- exe/console
-- exe/generate-changelog
-- exe/setup
 - 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/storage/file.rb
@@ -230,16 +215,24 @@ files:
 - resizing.gemspec
 - test/data/images/empty_file.jpg
 - test/data/images/sample1.jpg
+- 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_test.rb
 - test/resizing/client_test.rb
+- test/resizing/configurable_test.rb
 - test/resizing/configuration_test.rb
+- test/resizing/constants_test.rb
+- test/resizing/error_test.rb
+- test/resizing/http_clientable_test.rb
+- test/resizing/mock_client_test.rb
 - test/resizing/public_id_test.rb
+- test/resizing_module_test.rb
 - test/resizing_test.rb
 - 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
@@ -260,14 +253,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Client and utilities for Resizing