resizing 1.1.0.pre → 1.2.1

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,24 +25,65 @@ module Resizing
 
     def test_remove_resizing_picture
       model = prepare_model TestModel
+      model.save!
+
+      # VCRカセットのDELETEリクエストが実際に発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        model.remove_resizing_picture!
+        model.save!
+      end
+
+      # DELETEが成功した結果、URLがnilになることを確認
+      assert_nil model.resizing_picture_url
+    end
+
+    def test_remove_calls_delete_immediately
+      model = prepare_model TestModel
+      model.save!
+
+      # 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
-        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
-          model.remove_resizing_picture!
+      refute model.resizing_picture.blank?, 'resizing_picture should not be blank before remove'
 
-          assert_nil model.resizing_picture_url
-        end
+      # DELETEリクエストが発行されたことを確認
+      assert_vcr_requests_made 'carrier_wave_test/remove_resizing_picture' do
+        model.remove_resizing_picture!
+        model.save!
       end
+
+      assert model.resizing_picture.blank?, 'resizing_picture should be blank after remove'
+      assert_nil model.resizing_picture_url
     end
 
-    def test_do_not_raise_if_empty_column_is_removed
+    def test_blank_returns_true_for_new_record
+      model = TestModel.new
+      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
 
-      VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
-        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
-          model.resizing_picture.remove!
-        end
+      # 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
@@ -84,42 +127,61 @@ module Resizing
     end
 
     def test_is_successful
-      model = prepare_model_with_tempfile TestModel
+      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
+      model = prepare_model 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)
+
+      file1 = model.resizing_picture.file
+      file2 = model.resizing_picture.file
+
+      assert_same file1, file2
     end
 
-    def expect_url
-      'http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/'+
-        'upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+    def test_file_returns_nil_for_blank_identifier
+      model = TestModel.new
+      assert_nil model.resizing_picture.file
     end
 
-    def prepare_model model
-      VCR.use_cassette 'carrier_wave_test/save', record: :once do
-        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
-          model = 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
-          )
-
-          model.resizing_picture = uploaded_file
-          return model
-        end
-      end
+    def test_file_uses_read_column_when_identifier_nil
+      model = prepare_model TestModel
+      model.save!
+      model.reload
+
+      file = model.resizing_picture.file
+      refute_nil file
+      assert_instance_of Resizing::CarrierWave::Storage::File, file
+    end
+
+    def expect_url
+      '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_with_tempfile model
+    def prepare_model(model)
+      result = nil
       VCR.use_cassette 'carrier_wave_test/save', record: :once do
-        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
-          model = model.new
-          file = File.open('test/data/images/sample1.jpg', 'r')
-          model.resizing_picture = file
-          return model
-        end
+        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
       end
+      result
     end
   end
 end

data/test/resizing/client_test.rb

@@ -34,11 +34,40 @@ module Resizing
       assert_equal(client.config, config)
     end
 
-    def test_is_postable_file
+    def test_is_postable_with_filename
       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)
+        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_equal(r['public_id'], '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/87263920-2081-498e-a107-9625f4fde01b/vHg9VFvdI6HRzLFbV495VdwVmHIspLRCo')
+        assert_equal(r['filename'], 'sample1.jpg')
+      end
+    end
+
+    def test_is_unpostable_with_filename
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      VCR.use_cassette 'client/post', record: :once do
+        assert_raises ArgumentError do
+          client.post('file_is_not_exists', content_type: 'image/jpeg')
+        end
+      end
+    end
+
+    def test_is_postable_with_file
+      Resizing.configure = @configuration_template
+
+      client = Resizing::Client.new
+      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')
@@ -93,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
 
@@ -123,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
 
@@ -136,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/configurable_test.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class ConfigurableTest < Minitest::Test
+    class TestConfigurable
+      include Configurable
+
+      def initialize(config = nil)
+        initialize_config(config)
+      end
+    end
+
+    def setup
+      # NOP
+    end
+
+    def teardown
+      # NOP
+    end
+
+    def test_initialize_config_with_configuration_object
+      config = Configuration.new(
+        image_host: 'https://test.example.com',
+        project_id: 'test_id',
+        secret_token: 'test_token'
+      )
+      obj = TestConfigurable.new(config)
+
+      assert_equal config, obj.config
+    end
+
+    def test_initialize_config_with_nil_uses_global_configure
+      Resizing.configure = Configuration.new(
+        image_host: 'https://global.example.com',
+        project_id: 'global_id',
+        secret_token: 'global_token'
+      )
+
+      obj = TestConfigurable.new(nil)
+
+      assert_equal Resizing.configure.image_host, obj.config.image_host
+    end
+
+    def test_initialize_config_with_hash
+      config_hash = {
+        image_host: 'https://hash.example.com',
+        project_id: 'hash_id',
+        secret_token: 'hash_token'
+      }
+      obj = TestConfigurable.new(config_hash)
+
+      assert_equal 'https://hash.example.com', obj.config.image_host
+      assert_equal 'hash_id', obj.config.project_id
+    end
+
+    def test_config_is_accessible
+      config = Configuration.new(
+        image_host: 'https://test.example.com',
+        project_id: 'test_id',
+        secret_token: 'test_token'
+      )
+      obj = TestConfigurable.new(config)
+
+      assert_instance_of Configuration, obj.config
+    end
+
+    def test_attr_reader_config_is_defined
+      config = Configuration.new(
+        image_host: 'https://test.example.com',
+        project_id: 'test_id',
+        secret_token: 'test_token'
+      )
+      obj = TestConfigurable.new(config)
+
+      # Verify that config is accessible as a reader
+      assert obj.respond_to?(:config)
+      assert !obj.respond_to?(:config=)
+    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
 
@@ -147,5 +146,122 @@ module Resizing
       config = Resizing::Configuration.new @template
       assert_match %r{/projects/#{config.project_id}/upload/images/[\da-z-]}, config.generate_identifier
     end
+
+    def test_generate_image_id_returns_uuid
+      config = Resizing::Configuration.new @template
+      image_id = config.generate_image_id
+
+      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)
+    end
+
+    def test_generate_image_id_returns_different_uuids
+      config = Resizing::Configuration.new @template
+      id1 = config.generate_image_id
+      id2 = config.generate_image_id
+
+      refute_equal id1, id2
+    end
+
+    def test_equality_returns_true_for_same_configurations
+      config1 = Resizing::Configuration.new @template
+      config2 = Resizing::Configuration.new @template
+
+      assert_equal config1, config2
+    end
+
+    def test_equality_returns_false_for_different_image_host
+      config1 = Resizing::Configuration.new @template
+      template2 = @template.dup
+      template2[:image_host] = 'http://different.host'
+      config2 = Resizing::Configuration.new template2
+
+      refute_equal config1, config2
+    end
+
+    def test_equality_returns_false_for_different_project_id
+      config1 = Resizing::Configuration.new @template
+      template2 = @template.dup
+      template2[:project_id] = 'different-project-id'
+      config2 = Resizing::Configuration.new template2
+
+      refute_equal config1, config2
+    end
+
+    def test_equality_returns_false_for_different_class
+      config = Resizing::Configuration.new @template
+
+      refute_equal config, 'not a configuration'
+      refute_equal config, @template
+    end
+
+    def test_transformation_path_with_multiple_transforms
+      config = Resizing::Configuration.new @template
+      transforms = [
+        { w: 100, h: 200 },
+        { f: 'webp', q: 80 }
+      ]
+
+      path = config.transformation_path(transforms)
+
+      assert_equal 'w_100,h_200/f_webp,q_80', path
+    end
+
+    def test_transformation_path_with_single_hash
+      config = Resizing::Configuration.new @template
+      transform = { w: 300, h: 300, c: 'fill' }
+
+      path = config.transformation_path(transform)
+
+      assert_equal 'w_300,h_300,c_fill', path
+    end
+
+    def test_transformation_path_ignores_unknown_options
+      config = Resizing::Configuration.new @template
+      transform = { w: 100, unknown_option: 'ignored', h: 200 }
+
+      path = config.transformation_path(transform)
+
+      assert_equal 'w_100,h_200', path
+      refute_includes path, 'unknown_option'
+    end
+
+    def test_transformation_path_with_empty_array
+      config = Resizing::Configuration.new @template
+      path = config.transformation_path([])
+
+      assert_equal '', path
+    end
+
+    def test_generate_identifier_includes_project_id
+      config = Resizing::Configuration.new @template
+      identifier = config.generate_identifier
+
+      assert_includes identifier, config.project_id
+    end
+
+    def test_generate_identifier_has_correct_format
+      config = Resizing::Configuration.new @template
+      identifier = config.generate_identifier
+
+      assert_match %r{\A/projects/[\da-z-]+/upload/images/[\da-z-]+\z}, identifier
+    end
+
+    def test_enable_mock_defaults_to_false
+      template = @template.dup
+      template.delete(:enable_mock)
+      config = Resizing::Configuration.new template
+
+      assert_equal false, config.enable_mock
+    end
+
+    def test_enable_mock_can_be_set_to_true
+      template = @template.dup
+      template[:enable_mock] = true
+      config = Resizing::Configuration.new template
+
+      assert_equal true, config.enable_mock
+    end
   end
 end

data/test/resizing/constants_test.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class ConstantsTest < Minitest::Test
+    def test_http_status_ok_is_defined
+      assert_equal 200, Resizing::Constants::HTTP_STATUS_OK
+    end
+
+    def test_http_status_created_is_defined
+      assert_equal 201, Resizing::Constants::HTTP_STATUS_CREATED
+    end
+
+    def test_http_status_not_found_is_defined
+      assert_equal 404, Resizing::Constants::HTTP_STATUS_NOT_FOUND
+    end
+
+    def test_constants_are_integers
+      assert_instance_of Integer, Resizing::Constants::HTTP_STATUS_OK
+      assert_instance_of Integer, Resizing::Constants::HTTP_STATUS_CREATED
+      assert_instance_of Integer, Resizing::Constants::HTTP_STATUS_NOT_FOUND
+    end
+  end
+end

data/test/resizing/error_test.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  class ErrorTest < Minitest::Test
+    def test_error_is_standard_error_subclass
+      assert Resizing::Error < StandardError
+    end
+
+    def test_configuration_error_is_error_subclass
+      assert Resizing::ConfigurationError < Resizing::Error
+    end
+
+    def test_api_error_is_error_subclass
+      assert Resizing::APIError < Resizing::Error
+    end
+
+    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
+    end
+
+    def test_api_error_decoded_body_raises_argument_error_for_array
+      error = Resizing::APIError.new('test error')
+
+      assert_raises ArgumentError do
+        error.decoded_body = %w[not a hash]
+      end
+    end
+
+    def test_configuration_error_can_be_raised_with_message
+      error = assert_raises Resizing::ConfigurationError do
+        raise Resizing::ConfigurationError, 'test configuration error'
+      end
+
+      assert_equal 'test configuration error', error.message
+    end
+
+    def test_api_error_can_be_raised_with_message
+      error = assert_raises Resizing::APIError do
+        raise Resizing::APIError, 'test api error'
+      end
+
+      assert_equal 'test api error', error.message
+    end
+  end
+end