resizing 1.1.0.pre → 1.2.1

data/test/resizing/http_clientable_test.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class HttpClientableTest < Minitest::Test
+    class TestClient
+      include HttpClientable
+
+      def config
+        @config ||= Configuration.new(
+          image_host: 'https://image.example.com',
+          project_id: 'test_project',
+          secret_token: 'test_token'
+        )
+      end
+    end
+
+    def setup
+      @client = TestClient.new
+    end
+
+    def teardown
+      # NOP
+    end
+
+    def test_http_client_initialization
+      http_client = @client.http_client
+
+      assert_instance_of Faraday::Connection, http_client
+    end
+
+    def test_http_client_has_open_timeout
+      http_client = @client.http_client
+
+      assert_equal @client.config.open_timeout, http_client.options[:open_timeout]
+    end
+
+    def test_http_client_has_response_timeout
+      http_client = @client.http_client
+
+      assert_equal @client.config.response_timeout, http_client.options[:timeout]
+    end
+
+    def test_http_client_is_cached
+      http_client1 = @client.http_client
+      http_client2 = @client.http_client
+
+      assert_equal http_client1.object_id, http_client2.object_id
+    end
+
+    def test_handle_faraday_error_yields_block
+      result = @client.handle_faraday_error { 'test_result' }
+
+      assert_equal 'test_result', result
+    end
+
+    def test_handle_faraday_error_catches_timeout_error
+      assert_raises Resizing::APIError do
+        @client.handle_faraday_error do
+          raise Faraday::TimeoutError, 'timeout'
+        end
+      end
+    end
+
+    def test_handle_timeout_error_raises_api_error
+      error = Faraday::TimeoutError.new('test timeout')
+
+      assert_raises Resizing::APIError do
+        @client.handle_timeout_error(error)
+      end
+    end
+
+    def test_handle_timeout_error_message_includes_error_info
+      error = Faraday::TimeoutError.new('test timeout')
+
+      begin
+        @client.handle_timeout_error(error)
+      rescue Resizing::APIError => e
+        assert_includes e.message, 'TimeoutError'
+      end
+    end
+  end
+end

data/test/resizing/mock_client_test.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class MockClientTest < Minitest::Test
+    def setup
+      @client = Resizing::MockClient.new
+    end
+
+    def teardown
+      # NOP
+    end
+
+    def test_post_returns_parsed_json
+      VCR.use_cassette('client/post', record: :none) do
+        result = @client.post(nil)
+
+        assert_instance_of Hash, result
+        assert result.key?('id')
+        assert result.key?('public_id')
+        assert result.key?('latest_version_id')
+        assert result.key?('latest_etag')
+      end
+    end
+
+    def test_put_returns_parsed_json_with_modified_name
+      VCR.use_cassette('client/put', record: :none) do
+        name = 'test-image-123'
+        result = @client.put(name, nil, {})
+
+        assert_instance_of Hash, result
+        assert_equal name, result['id']
+        assert_includes result['public_id'], name
+        assert result.key?('latest_version_id')
+        assert result.key?('latest_etag')
+      end
+    end
+
+    def test_delete_returns_parsed_json_with_modified_name
+      VCR.use_cassette('client/delete', record: :none) do
+        name = 'delete-test-image'
+        result = @client.delete(name)
+
+        assert_instance_of Hash, result
+        assert_equal name, result['id']
+        assert_includes result['public_id'], name
+      end
+    end
+
+    def test_metadata_returns_parsed_json_with_modified_name
+      VCR.use_cassette('client/metadata', record: :none) do
+        name = 'metadata-test-image'
+        result = @client.metadata(name)
+
+        assert_instance_of Hash, result
+        assert_equal name, result['id']
+        # The cassette contains a fixed public_id, so we just check it exists
+        assert result.key?('public_id')
+      end
+    end
+
+    def test_post_response_contains_expected_fields
+      VCR.use_cassette('client/post', record: :none) do
+        result = @client.post(nil)
+
+        # Verify response structure
+        assert result['id'].is_a?(String)
+        assert result['public_id'].is_a?(String)
+        assert result['latest_version_id'].is_a?(String)
+        assert result['latest_etag'].is_a?(String)
+      end
+    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

@@ -0,0 +1,206 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class ResizingModuleTest < Minitest::Test
+  def setup
+    # Reset configure before each test to ensure clean state
+    return unless Resizing.instance_variable_defined?(:@configure)
+
+    Resizing.remove_instance_variable(:@configure)
+  end
+
+  def teardown
+    # Reset configure after each test
+    return unless Resizing.instance_variable_defined?(:@configure)
+
+    Resizing.remove_instance_variable(:@configure)
+  end
+
+  def test_configure_raises_error_when_not_initialized
+    assert_raises Resizing::ConfigurationError do
+      Resizing.configure
+    end
+  end
+
+  def test_configure_returns_duplicate_of_configuration
+    config = Resizing::Configuration.new(
+      image_host: 'https://test.example.com',
+      project_id: 'test_id',
+      secret_token: 'test_token'
+    )
+    Resizing.configure = config
+
+    result = Resizing.configure
+
+    assert_instance_of Resizing::Configuration, result
+    assert_equal config.image_host, result.image_host
+    assert_equal config.project_id, result.project_id
+    refute_equal config.object_id, result.object_id # Should be a duplicate
+  end
+
+  def test_configure_setter_accepts_configuration_object
+    config = Resizing::Configuration.new(
+      image_host: 'https://test.example.com',
+      project_id: 'test_id',
+      secret_token: 'test_token'
+    )
+
+    Resizing.configure = config
+
+    assert_equal config, Resizing.instance_variable_get(:@configure)
+  end
+
+  def test_configure_setter_converts_hash_to_configuration
+    config_hash = {
+      image_host: 'https://hash.example.com',
+      project_id: 'hash_id',
+      secret_token: 'hash_token'
+    }
+
+    Resizing.configure = config_hash
+
+    result = Resizing.instance_variable_get(:@configure)
+    assert_instance_of Resizing::Configuration, result
+    assert_equal 'https://hash.example.com', result.image_host
+    assert_equal 'hash_id', result.project_id
+  end
+
+  def test_get_raises_not_implemented_error
+    assert_raises NotImplementedError do
+      Resizing.get('test')
+    end
+  end
+
+  def test_url_from_image_id_returns_url_without_version_and_transforms
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123'
+    }
+
+    url = Resizing.url_from_image_id('image456')
+
+    assert_equal 'https://img.example.com/projects/project123/upload/images/image456', url
+  end
+
+  def test_url_from_image_id_returns_url_with_version
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123'
+    }
+
+    url = Resizing.url_from_image_id('image456', '789')
+
+    assert_equal 'https://img.example.com/projects/project123/upload/images/image456/v789', url
+  end
+
+  def test_url_from_image_id_returns_url_with_transformations
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123'
+    }
+
+    url = Resizing.url_from_image_id('image456', nil, [{ w: 100, h: 200 }])
+
+    assert_includes url, 'https://img.example.com/projects/project123/upload/images/image456/'
+    assert_includes url, 'w_100,h_200'
+  end
+
+  def test_url_from_image_id_returns_url_with_version_and_transformations
+    Resizing.configure = {
+      image_host: 'https://img.example.com',
+      project_id: 'project123',
+      secret_token: 'token123'
+    }
+
+    url = Resizing.url_from_image_id('image456', '789', [{ w: 100 }])
+
+    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
@@ -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 = {}, &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',
@@ -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,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