resizing 1.0.1 → 1.0.2

data/test/resizing/carrier_wave_test.rb

@@ -4,6 +4,8 @@ require 'test_helper'
 
 module Resizing
   class CarrierWaveTest < Minitest::Test
+    include VCRRequestAssertions
+
     def setup
       TestModel.delete_all
       TestJPGModel.delete_all
@@ -23,33 +25,42 @@ module Resizing
 
     def test_remove_resizing_picture
       model = prepare_model TestModel
+      model.save!
 
-      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
+      # VCRカセットのDELETEリクエストが実際に発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
         model.remove_resizing_picture!
-
-        assert_nil model.resizing_picture_url
+        model.save!
       end
+
+      # DELETEが成功した結果、URLがnilになることを確認
+      assert_nil model.resizing_picture_url
     end
 
-    def test_do_not_raise_if_empty_column_is_removed
+    def test_remove_calls_delete_immediately
       model = prepare_model TestModel
+      model.save!
 
-      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
+      # remove!を呼んだとき即時にDELETEリクエストがとぶことを確認する
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
         model.resizing_picture.remove!
       end
     end
 
     def test_blank_returns_true_after_remove
       model = prepare_model TestModel
+      model.save!
 
-      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
-        refute model.resizing_picture.blank?, 'resizing_picture should not be blank before remove'
+      refute model.resizing_picture.blank?, 'resizing_picture should not be blank before remove'
 
+      # DELETEリクエストが発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
         model.remove_resizing_picture!
-
-        assert model.resizing_picture.blank?, 'resizing_picture should be blank after remove'
-        assert_nil model.resizing_picture_url
+        model.save!
       end
+
+      assert model.resizing_picture.blank?, 'resizing_picture should be blank after remove'
+      assert_nil model.resizing_picture_url
     end
 
     def test_blank_returns_true_for_new_record
@@ -57,6 +68,24 @@ module Resizing
       assert model.resizing_picture.blank?, 'resizing_picture should be blank for new record'
     end
 
+    def test_remove_resizing_picture_with_flag_and_save
+      model = prepare_model TestModel
+      model.save!
+
+      refute model.resizing_picture.blank?, 'resizing_picture should not be blank before remove'
+
+      model.remove_resizing_picture = true
+
+      # save時にDELETEリクエストが発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        model.save!
+      end
+
+      # DELETEが成功した結果、blank?がtrueになることを確認
+      assert model.resizing_picture.blank?, 'resizing_picture should be blank after save'
+      assert_nil model.resizing_picture_url
+    end
+
     def test_picture_url_return_correct_value_and_when_model_reloaded
       model = prepare_model TestModel
       model.save!
@@ -98,9 +127,15 @@ module Resizing
     end
 
     def test_is_successful
-      model = prepare_model_with_tempfile TestModel
-      model.save!
-      # assert_equal('http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/28c49144-c00d-4cb5-8619-98ce95977b9c/v1Id850__tqNsnoGWWUibtIBZ5NgjV45M/', model.resizing_picture_url)
+      model = TestModel.new
+
+      # POSTリクエストが発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/save' do
+        file = File.open('test/data/images/sample1.jpg', 'r')
+        model.resizing_picture = file
+      end
+
+      assert_equal('http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e/', model.resizing_picture_url)
     end
 
     def test_file_returns_same_instance_on_multiple_calls
@@ -129,13 +164,14 @@ module Resizing
     end
 
     def expect_url
-      'http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/' +
+      'http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/' \
         'upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
     end
 
     def prepare_model(model)
+      result = nil
       VCR.use_cassette 'carrier_wave_test/save', record: :once do
-        model = model.new
+        result = model.new
         file = File.open('test/data/images/sample1.jpg', 'r')
         uploaded_file = ActionDispatch::Http::UploadedFile.new(
           filename: File.basename(file.path),
@@ -143,18 +179,9 @@ module Resizing
           tempfile: file
         )
 
-        model.resizing_picture = uploaded_file
-        return model
-      end
-    end
-
-    def prepare_model_with_tempfile(model)
-      VCR.use_cassette 'carrier_wave_test/save', record: :once do
-        model = model.new
-        file = File.open('test/data/images/sample1.jpg', 'r')
-        model.resizing_picture = file
-        return model
+        result.resizing_picture = uploaded_file
       end
+      result
     end
   end
 end

data/test/resizing/client_test.rb

@@ -38,7 +38,7 @@ module Resizing
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
-      VCR.use_cassette 'client/post', record: :once  do
+      VCR.use_cassette 'client/post', record: :once do
         r = client.post('test/data/images/sample1.jpg', content_type: 'image/jpeg')
         assert_equal(r['id'], '87263920-2081-498e-a107-9625f4fde01b')
         assert_equal(r['project_id'], Resizing.configure.project_id)
@@ -56,7 +56,7 @@ module Resizing
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
-      VCR.use_cassette 'client/post', record: :once  do
+      VCR.use_cassette 'client/post', record: :once do
         assert_raises ArgumentError do
           client.post('file_is_not_exists', content_type: 'image/jpeg')
         end
@@ -67,7 +67,7 @@ module Resizing
       Resizing.configure = @configuration_template
 
       client = Resizing::Client.new
-      VCR.use_cassette 'client/post', record: :once  do
+      VCR.use_cassette 'client/post', record: :once do
         f = File.open('test/data/images/sample1.jpg', 'r')
         r = client.post(f, content_type: 'image/jpeg')
         assert_equal(r['id'], '87263920-2081-498e-a107-9625f4fde01b')
@@ -122,7 +122,7 @@ module Resizing
       f = File.open('test/data/images/sample1.jpg', 'r')
 
       assert_raises Resizing::APIError do
-        r = client.put(name, f, content_type: 'image/jpeg')
+        _r = client.put(name, f, content_type: 'image/jpeg')
       end
     end
 
@@ -152,7 +152,7 @@ module Resizing
         rescue Resizing::APIError => e
           response = e.decoded_body
         end
-        assert_equal response, {"error"=>"Magick::ImageMagickError", "message"=>"invalid image format found"}
+        assert_equal response, { 'error' => 'Magick::ImageMagickError', 'message' => 'invalid image format found' }
       end
     end
 
@@ -165,20 +165,76 @@ module Resizing
       VCR.use_cassette 'client/metadata', record: :once do
         name = '87263920-2081-498e-a107-9625f4fde01b'
         r = client.metadata(name)
+        # r.body
+        # {
+        #   "id":"87263920-2081-498e-a107-9625f4fde01b",
+        #   "project_id":"e06e710d-f026-4dcf-b2c0-eab0de8bb83f",
+        #   "content_type":"image/jpeg",
+        #   "latest_version_id":"Hg9VFvdI6HRzLFbV495VdwVmHIspLRCo",
+        #   "latest_etag":"\"5766f95a7f28e6a53dd6fd179bf03a32\"",
+        #   "size":848590,
+        #   "created_at":"2020-10-11T05:02:25.912Z",
+        #   "updated_at":"2020-10-11T05:02:25.912Z",
+        #   "filename":"sample1.jpg",
+        #   "width":4032,
+        #   "height":3016,
+        #   "format":"jpeg",
+        #   "version":"Hg9VFvdI6HRzLFbV495VdwVmHIspLRCo",
+        #   "public_id":"/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo"
+        # }
+
         assert_equal(r['id'], name)
         assert_equal(r['project_id'], Resizing.configure.project_id)
         assert_equal(r['content_type'], 'image/jpeg')
-        assert(r['latest_version_id'] != nil)
-        assert(r['latest_etag'] != nil)
-        assert(r['created_at'] != nil)
-        assert(r['updated_at'] != nil)
-        assert(r['height'] != nil)
-        assert(r['width'] != nil)
+        assert_equal(r['latest_version_id'], 'Hg9VFvdI6HRzLFbV495VdwVmHIspLRCo')
+        assert_equal(r['latest_etag'], '"5766f95a7f28e6a53dd6fd179bf03a32"')
+        assert_equal(r['created_at'], '2020-10-11T05:02:25.912Z')
+        assert_equal(r['updated_at'], '2020-10-11T05:02:25.912Z')
+        assert_equal(r['width'], 4032)
+        assert_equal(r['height'], 3016)
+        assert_equal(r['format'], 'jpeg')
+        assert_equal(r['version'], 'Hg9VFvdI6HRzLFbV495VdwVmHIspLRCo')
         assert_equal(
           r['public_id'],
-          "/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo"
+          '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo'
         )
       end
     end
+
+    def test_get_raises_not_implemented_error
+      Resizing.configure = @configuration_template
+      client = Resizing::Client.new
+
+      assert_raises NotImplementedError do
+        client.get('some_image_id')
+      end
+    end
+
+    def test_post_raises_error_without_content_type
+      Resizing.configure = @configuration_template
+      client = Resizing::Client.new
+
+      assert_raises ArgumentError do
+        client.post('test/data/images/sample1.jpg', {})
+      end
+    end
+
+    def test_post_raises_error_with_invalid_io
+      Resizing.configure = @configuration_template
+      client = Resizing::Client.new
+
+      assert_raises ArgumentError do
+        client.post(12_345, content_type: 'image/jpeg')
+      end
+    end
+
+    def test_put_raises_error_without_content_type
+      Resizing.configure = @configuration_template
+      client = Resizing::Client.new
+
+      assert_raises ArgumentError do
+        client.put('image_id', 'test/data/images/sample1.jpg', {})
+      end
+    end
   end
 end

data/test/resizing/configuration_test.rb

@@ -23,7 +23,6 @@ module Resizing
       template = @template.dup
       template.delete(:image_host)
       config = Resizing::Configuration.new template
-      assert_equal(config.host, Resizing::Configuration::DEFAULT_IMAGE_HOST)
       assert_equal(config.image_host, Resizing::Configuration::DEFAULT_IMAGE_HOST)
     end
 
@@ -38,7 +37,7 @@ module Resizing
       template = @template.dup
       template[:host] = 'need raise execption if host is presented'
       assert_raises ConfigurationError do
-        config = Resizing::Configuration.new template
+        _config = Resizing::Configuration.new template
       end
     end
 
@@ -154,7 +153,7 @@ module Resizing
 
       assert_instance_of String, image_id
       # UUID format: 8-4-4-4-12
-      assert_match /\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/, image_id
+      assert_match(/\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/, image_id)
     end
 
     def test_generate_image_id_returns_different_uuids

data/test/resizing/error_test.rb

@@ -18,29 +18,29 @@ module Resizing
 
     def test_api_error_has_decoded_body_accessor
       error = Resizing::APIError.new('test error')
-      
+
       assert_respond_to error, :decoded_body
       assert_respond_to error, :decoded_body=
     end
 
     def test_api_error_decoded_body_defaults_to_empty_hash
       error = Resizing::APIError.new('test error')
-      
+
       assert_equal({}, error.decoded_body)
     end
 
     def test_api_error_decoded_body_can_be_set_with_hash
       error = Resizing::APIError.new('test error')
       body = { 'error' => 'test', 'code' => 400 }
-      
+
       error.decoded_body = body
-      
+
       assert_equal body, error.decoded_body
     end
 
     def test_api_error_decoded_body_raises_argument_error_for_non_hash
       error = Resizing::APIError.new('test error')
-      
+
       assert_raises ArgumentError do
         error.decoded_body = 'not a hash'
       end
@@ -48,9 +48,9 @@ module Resizing
 
     def test_api_error_decoded_body_raises_argument_error_for_array
       error = Resizing::APIError.new('test error')
-      
+
       assert_raises ArgumentError do
-        error.decoded_body = ['not', 'a', 'hash']
+        error.decoded_body = %w[not a hash]
       end
     end
 
@@ -58,7 +58,7 @@ module Resizing
       error = assert_raises Resizing::ConfigurationError do
         raise Resizing::ConfigurationError, 'test configuration error'
       end
-      
+
       assert_equal 'test configuration error', error.message
     end
 
@@ -66,7 +66,7 @@ module Resizing
       error = assert_raises Resizing::APIError do
         raise Resizing::APIError, 'test api error'
       end
-      
+
       assert_equal 'test api error', error.message
     end
   end

data/test/resizing/http_clientable_test.rb

@@ -58,7 +58,7 @@ module Resizing
     def test_handle_faraday_error_catches_timeout_error
       assert_raises Resizing::APIError do
         @client.handle_faraday_error do
-          raise Faraday::TimeoutError.new('timeout')
+          raise Faraday::TimeoutError, 'timeout'
         end
       end
     end

data/test/resizing/public_id_test.rb

@@ -30,7 +30,7 @@ module Resizing
 
     def test_expect_equal_identifier
       public_id = Resizing::PublicId.new @public_id_as_string
-      assert_equal @public_id_as_string.gsub(/\/v.*$/, ''), public_id.identifier
+      assert_equal @public_id_as_string.gsub(%r{/v.*$}, ''), public_id.identifier
     end
 
     def test_expect_equal_public_id

data/test/resizing_module_test.rb

@@ -5,16 +5,16 @@ require 'test_helper'
 class ResizingModuleTest < Minitest::Test
   def setup
     # Reset configure before each test to ensure clean state
-    if Resizing.instance_variable_defined?(:@configure)
-      Resizing.remove_instance_variable(:@configure)
-    end
+    return unless Resizing.instance_variable_defined?(:@configure)
+
+    Resizing.remove_instance_variable(:@configure)
   end
 
   def teardown
     # Reset configure after each test
-    if Resizing.instance_variable_defined?(:@configure)
-      Resizing.remove_instance_variable(:@configure)
-    end
+    return unless Resizing.instance_variable_defined?(:@configure)
+
+    Resizing.remove_instance_variable(:@configure)
   end
 
   def test_configure_raises_error_when_not_initialized
@@ -121,4 +121,86 @@ class ResizingModuleTest < Minitest::Test
     assert_includes url, 'image456/v789/'
     assert_includes url, 'w_100'
   end
+
+  def test_generate_identifier_returns_identifier_string
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123'
+    }
+
+    identifier = Resizing.generate_identifier
+
+    assert_instance_of String, identifier
+    assert_includes identifier, 'project123'
+    assert_match %r{/projects/project123/upload/images/}, identifier
+  end
+
+  def test_client_returns_mock_client_when_enable_mock_is_true
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123',
+      enable_mock: true
+    }
+
+    client = Resizing.client
+
+    assert_instance_of Resizing::MockClient, client
+  end
+
+  def test_client_returns_real_client_when_enable_mock_is_false
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123',
+      enable_mock: false
+    }
+
+    client = Resizing.client
+
+    assert_instance_of Resizing::Client, client
+  end
+
+  def test_put_delegates_to_client
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123',
+      enable_mock: true
+    }
+
+    result = Resizing.put('image_id', 'dummy', content_type: 'image/jpeg')
+
+    assert_instance_of Hash, result
+    assert_equal 'image_id', result['id']
+  end
+
+  def test_delete_delegates_to_client
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123',
+      enable_mock: true
+    }
+
+    result = Resizing.delete('image_id')
+
+    assert_instance_of Hash, result
+    assert_equal 'image_id', result['id']
+  end
+
+  def test_metadata_delegates_to_client
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123',
+      enable_mock: true
+    }
+
+    result = Resizing.metadata('image_id', {})
+
+    assert_instance_of Hash, result
+    assert_equal 'image_id', result['id']
+  end
 end

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
@@ -28,6 +29,7 @@ require 'rails'
 require 'active_record'
 require 'fog-aws'
 require 'carrierwave'
+require 'carrierwave/orm/activerecord'
 require 'resizing'
 require 'pry-byebug'
 
@@ -40,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 = {}, &block)
+    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 = {}, &block)
+    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',
@@ -58,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|
@@ -103,19 +187,13 @@ 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