resizing 1.0.0.pre → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fff2fe2e1211d6d9b8fc9d399d63df0e1fe7a7f56aca9cc5c4fb045f7877110
-  data.tar.gz: ac9be08e555131de36131bcaca8747d300b951b1ee00c848d85749c0b80b4766
+  metadata.gz: c8fa9990c253b1b932fb5b2c599aa93f045ad22dafbeef6e5b2d298f6fa1a59e
+  data.tar.gz: c58047443368aee638f48b0b4c899fcbd8a79b73c111655942ffa63ef73f9d74
 SHA512:
-  metadata.gz: b076ac07bf0c60a9a8a8af0bf18536e78b20fe9faa2565b5c79e41fbcf1f66207be30b14e92b31e8c0af3cc05d4c5589db40d9e5dbd7574343ecee10d4121b65
-  data.tar.gz: 46c7f5303f4cf0620d0205d01c68d74a483b025918cffda9ca42207c656c6fc8cfc40c6843349181aeef170aaeeffe1e93c558aacccd98ad82f9c071ea183318
+  metadata.gz: 0d287c87564b117378394d19d4c5e5172afa056b1865ba9f4e54e4d9811aa70a88e6e70b5e76b720c06c5f6731d040350d08f4170a336e9bffc325f815de8ea9
+  data.tar.gz: 5b4a247eb8747d23632c65c078a338a8db3dfc5db9cceffce67845941dbf36386ac981f93f90203b155afdee39e14b156d5adc7dba5766710464ffd96bf0eb20

data/.github/workflows/test.yml

@@ -0,0 +1,61 @@
+name: test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents: read  # This is required for actions/checkout
+
+jobs:
+  test:
+    name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.1']
+        rails: ['6.1', '7.0']
+
+    runs-on: ubuntu-22.04
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: mirromutth/mysql-action@v1.1
+        with:
+          host port: 3306
+          container port: 3306
+          character set server: 'utf8mb4'
+          collation server: 'utf8mb4_general_ci'
+          mysql version: '5.7'
+          mysql database: 'resizing_gem_test'
+          mysql root password: secret
+
+      - name: "Install ruby dependencies"
+        run: |
+          sudo apt update
+          sudo apt install -y libyaml-dev curl libmysqlclient-dev
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: false
+
+      - name: bundle install
+        run: |
+          bundle install
+
+      - name: Run test
+        run: |
+          bundle exec rake test
+
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

data/Gemfile

@@ -5,6 +5,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in resizing.gemspec
 gemspec
 
+# Allow testing against different Rails versions
+rails_version = ENV['RAILS_VERSION'] || '7.0'
+gem 'rails', "~> #{rails_version}"
+
 gem 'rake', '~> 13.0'
 gem 'github_changelog_generator'
 gem 'mysql2'

data/lib/resizing/active_storage/service/resizing_service.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_storage/service'
+
 module Resizing
   module ActiveStorage
     module Service

data/lib/resizing/active_storage/service.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Resizing
+  module ActiveStorage
+    module Service
+      autoload :ResizingService, 'resizing/active_storage/service/resizing_service'
+    end
+  end
+end

data/lib/resizing/active_storage.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Resizing
+  module ActiveStorage
+    autoload :Service, 'resizing/active_storage/service'
+  end
+end

data/lib/resizing/carrier_wave/storage/file.rb

@@ -29,9 +29,22 @@ module Resizing
         end
 
         def delete
-          @public_id = Resizing::PublicId.new(model.send :read_attribute, serialization_column)
+          # Use the identifier from constructor if available, otherwise try to get from model
+          if @public_id.present?
+            # Already set from constructor or retrieve
+          elsif model.respond_to?(:attribute_was)
+            # Try to get the value before changes (for remove! scenario)
+            column_value = model.attribute_was(serialization_column) || model.send(:read_attribute,
+                                                                                   serialization_column)
+            @public_id = Resizing::PublicId.new(column_value)
+          else
+            column_value = model.send(:read_attribute, serialization_column)
+            @public_id = Resizing::PublicId.new(column_value)
+          end
+
           return if @public_id.empty? # do nothing
 
+          # 以下、既存のコード（変更なし）
           resp = client.delete(@public_id.image_id)
           if resp['error'] == 'ActiveRecord::RecordNotFound' # 404 not found
             model.send :write_attribute, serialization_column, nil unless model.destroyed?
@@ -89,24 +102,22 @@ module Resizing
             raise NotImplementedError, 'new file is required duplicating'
           end
 
-          if new_file.respond_to? :content_type
-            @content_type ||= new_file.content_type
-          else
-            # guess content-type from extension
-            @content_type ||= MIME::Types.type_for(new_file.path).first.content_type
-          end
+          @content_type ||= if new_file.respond_to? :content_type
+                              new_file.content_type
+                            else
+                              # guess content-type from extension
+                              MIME::Types.type_for(new_file.path).first.content_type
+                            end
 
           original_filename = new_file.try(:original_filename) || new_file.try(:filename) || new_file.try(:path)
-          if original_filename.present?
-            original_filename = ::File.basename(original_filename)
-          end
+          original_filename = ::File.basename(original_filename) if original_filename.present?
 
           content = if new_file.respond_to?(:to_io)
                       new_file.to_io.tap(&:rewind)
                     elsif new_file.respond_to?(:read) && new_file.respond_to?(:rewind)
-                      new_file.read.tap do
-                        new_file.rewind
-                      end
+                      # Pass the IO object itself, not the read result
+                      new_file.rewind
+                      new_file
                     else
                       new_file
                     end
@@ -127,7 +138,7 @@ module Resizing
         end
 
         def name(options = {})
-          @public_id = PublicId.new(model.send :read_attribute, serialization_column)
+          @public_id = PublicId.new(model.send(:read_attribute, serialization_column))
           CGI.unescape(@public_id.filename)
         end
 
@@ -138,6 +149,7 @@ module Resizing
         def retrieve(identifier)
           @public_id = Resizing::PublicId.new(identifier)
         end
+
         private
 
         attr_reader :uploader
@@ -195,7 +207,6 @@ module Resizing
           parameters.count == 2 && parameters[1].include?(:options)
         end
 
-
         # def retrieve_from_cache!(identifier)
         #   raise NotImplementedError,
         #     "Need to implement #retrieve_from_cache! if you want to use #{self.class.name} as a cache storage."

data/lib/resizing/carrier_wave/storage/remote.rb

@@ -18,9 +18,13 @@ module Resizing
           f
         end
 
-        # def retrieve!(identifier)
-        #   super
-        # end
+        def retrieve!(identifier)
+          return nil if identifier.blank?
+
+          f = Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+          f.retrieve(identifier)
+          f
+        end
 
         def cache!(new_file)
           f = Resizing::CarrierWave::Storage::File.new(uploader)

data/lib/resizing/carrier_wave.rb

@@ -32,11 +32,12 @@ module Resizing
     end
 
     def file
-      return if identifier.nil?
-      return @file unless defined? @file
+      file_identifier = identifier || read_column
+
+      return nil if file_identifier.blank?
 
       @file ||= Resizing::CarrierWave::Storage::File.new(self)
-      @file.retrieve(identifier)
+      @file.retrieve(file_identifier)
       @file
     end
 
@@ -46,6 +47,7 @@ module Resizing
       transforms = args.map do |version|
         version = version.intern
         raise "No version is found: #{version}, #{versions.keys} are exists." unless versions.has_key? version
+
         versions[version].transform_string
       end.compact
 

data/lib/resizing/client.rb

@@ -37,16 +37,14 @@ module Resizing
       raise NotImplementedError
     end
 
-    def post(file_or_binary, options = {})
+    def post(filename_or_io, options = {})
       ensure_content_type(options)
+      ensure_filename_or_io(filename_or_io)
+      filename = gather_filename filename_or_io, options
 
       url = build_post_url
-
-      filename = gather_filename file_or_binary, options
-
-      body = to_io(file_or_binary)
       params = {
-        image: Faraday::UploadIO.new(body, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(filename_or_io, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -59,16 +57,14 @@ module Resizing
       result
     end
 
-    def put(image_id, file_or_binary, options)
+    def put(image_id, filename_or_io, options)
       ensure_content_type(options)
+      ensure_filename_or_io(filename_or_io)
+      filename = gather_filename filename_or_io, options
 
       url = build_put_url(image_id)
-
-      filename = gather_filename file_or_binary, options
-
-      body = to_io(file_or_binary)
       params = {
-        image: Faraday::UploadIO.new(body, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(filename_or_io, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -117,9 +113,9 @@ module Resizing
       "#{config.image_host}/projects/#{config.project_id}/upload/images/"
     end
 
-    def gather_filename file_or_binary, options
+    def gather_filename(filename_or_io, options)
       filename = options[:filename]
-      filename ||= file_or_binary.respond_to?(:path) ? File.basename(file_or_binary.path) : nil
+      filename ||= filename_or_io.respond_to?(:path) ? File.basename(filename_or_io.path) : nil
     end
 
     def build_put_url(image_id)
@@ -134,20 +130,23 @@ module Resizing
       "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
     end
 
+    def ensure_content_type(options)
+      raise ArgumentError, "need options[:content_type] for #{options.inspect}" unless options[:content_type]
+    end
 
-    def to_io(data)
-      return data.to_io if data.respond_to? :to_io
+    def ensure_filename_or_io(filename_or_io)
+      return if filename_or_io.is_a?(File)
 
-      case data
-      when String
-        StringIO.new(data)
-      else
-        raise ArgumentError, "file_or_binary is required IO class or String:#{data.class}"
+      # Accept IO-like objects (StringIO, Tempfile, etc.)
+      return if filename_or_io.respond_to?(:read) && filename_or_io.respond_to?(:rewind)
+
+      if filename_or_io.is_a?(String)
+        if File.exist?(filename_or_io)
+          return
+        end
       end
-    end
 
-    def ensure_content_type(options)
-      raise ArgumentError, "need options[:content_type] for #{options.inspect}" unless options[:content_type]
+      raise ArgumentError, "filename_or_io must be a File object, an IO-like object, or a path to a file (#{filename_or_io.class})"
     end
 
     def handle_create_response(response)

data/lib/resizing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resizing
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.1'
 end

data/lib/resizing.rb

@@ -2,6 +2,7 @@
 
 require 'resizing/version'
 require 'faraday'
+require 'faraday/multipart'
 require 'json'
 
 module Resizing
@@ -14,6 +15,7 @@ module Resizing
   autoload :CarrierWave, 'resizing/carrier_wave'
   autoload :PublicId, 'resizing/public_id'
   autoload :Video, 'resizing/video'
+  autoload :ActiveStorage, 'resizing/active_storage'
 
   class Error < StandardError; end
   class ConfigurationError < Error; end

data/resizing.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Client and utilities for Resizing '
   spec.homepage      = 'https://github.com/jksy/resizing-gem'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 3.0.0')
 
   spec.metadata['allowed_push_host'] = 'https://rubygems.org'
 
@@ -29,12 +29,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
   spec.add_runtime_dependency 'faraday', '~> 1.0'
-  spec.add_development_dependency 'rails', '~> 6.0'
+  spec.add_development_dependency 'rails', ">= 6.0", '< 7.1'
   spec.add_development_dependency 'carrierwave', '~> 1.3.2'
   spec.add_development_dependency 'fog-aws'
-  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest', '~> 5.16'
   spec.add_development_dependency 'minitest-ci'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-cobertura'
 end

data/test/resizing/active_storage_service_test.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Resizing
+  module ActiveStorage
+    module Service
+      class ResizingServiceTest < Minitest::Test
+        def setup
+          @service = Resizing::ActiveStorage::Service::ResizingService.new
+        end
+
+        def teardown
+          # NOP
+        end
+
+        def test_service_initialization
+          assert_instance_of Resizing::ActiveStorage::Service::ResizingService, @service
+        end
+
+        def test_upload_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.upload('test_key', StringIO.new('test data'))
+          end
+        end
+
+        def test_download_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.download('test_key')
+          end
+        end
+
+        def test_download_chunk_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.download_chunk('test_key', 0..99)
+          end
+        end
+
+        def test_delete_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.delete('test_key')
+          end
+        end
+
+        def test_exist_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.exist?('test_key')
+          end
+        end
+
+        def test_url_for_direct_upload_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.url_for_direct_upload(
+              'test_key',
+              expires_in: 3600,
+              content_type: 'image/png',
+              conteont_length: 1024,
+              checksum: 'test_checksum'
+            )
+          end
+        end
+
+        def test_headers_for_direct_upload_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.headers_for_direct_upload(
+              'test_key',
+              content_type: 'image/png',
+              checksum: 'test_checksum'
+            )
+          end
+        end
+
+        def test_private_url_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.send(
+              :private_url,
+              'test_key',
+              expires_in: 3600,
+              filename: 'test.png',
+              content_type: 'image/png',
+              disposition: :attachment
+            )
+          end
+        end
+
+        def test_public_url_raises_not_implemented_error
+          assert_raises NotImplementedError do
+            @service.send(
+              :public_url,
+              'test_key',
+              filename: 'test.png'
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/test/resizing/carrier_wave/storage/file_test.rb

@@ -7,22 +7,163 @@ module Resizing
     module Storage
       class FileTest < Minitest::Test
         def setup
-          # NOP
+          @configuration_template = {
+            image_host: 'http://192.168.56.101:5000',
+            video_host: 'http://192.168.56.101:5000',
+            project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
+            secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
+            open_timeout: 10,
+            response_timeout: 20
+          }
+          Resizing.configure = @configuration_template
         end
 
         def teardown
           # NOP
         end
 
-        def test_store
-          # f = Resizing::CarrierWave::Storage::File.new(uploader)
-          # upload_file = File.new(uploader, path)
-          # f.store(upload_file)
-          # f.save!
+        def test_initialize_without_identifier
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_instance_of Resizing::CarrierWave::Storage::File, file
+          assert file.public_id.empty?
+        end
+
+        def test_initialize_with_identifier
+          model = TestModel.new
+          uploader = model.resizing_picture
+          identifier = '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+          file = Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+
+          assert_instance_of Resizing::CarrierWave::Storage::File, file
+          assert_equal identifier, file.public_id.to_s
+        end
+
+        def test_retrieve_sets_public_id
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+          identifier = '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+
+          file.retrieve(identifier)
+
+          assert_equal identifier, file.public_id.to_s
+        end
+
+        def test_delete_does_nothing_when_public_id_empty
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          # Should not raise any error and should return early
+          result = file.delete
+          assert_nil result
+        end
+
+        def test_current_path_returns_nil_for_new_model
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_nil file.current_path
+        end
+
+        def test_path_alias
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_nil file.current_path
+          assert_nil file.path
+        end
+
+        def test_authenticated_url_returns_nil
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_nil file.authenticated_url
         end
 
-        def uploader
-          MiniTest::Mock.expect(:cache_path)
+        def test_authenticated_url_with_options_returns_nil
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_nil file.authenticated_url(expires_in: 3600)
+        end
+
+        def test_extension_raises_not_implemented_error
+          model = TestModel.new
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+          assert_raises(NotImplementedError) do
+            file.extension
+          end
+        end
+
+        def test_name_returns_image_id_from_public_id
+          model = TestModel.new
+          identifier = '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+          # Use write_attribute to set the column directly
+          model.send(:write_attribute, :resizing_picture, identifier)
+          uploader = model.resizing_picture
+          file = Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+
+          # name returns image_id (UUID) from public_id
+          assert_equal '14ea7aac-a194-4330-931f-6b562aec413d', file.name
+        end
+
+        def test_store_uploads_file_and_sets_public_id
+          VCR.use_cassette 'carrier_wave_test/save', record: :once do
+            model = TestModel.new
+            uploader = model.resizing_picture
+            file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+            source_file = ::File.open('test/data/images/sample1.jpg', 'r')
+            uploaded_file = ActionDispatch::Http::UploadedFile.new(
+              filename: ::File.basename(source_file.path),
+              type: 'image/jpeg',
+              tempfile: source_file
+            )
+
+            result = file.store(uploaded_file)
+
+            assert result
+            refute file.public_id.empty?
+            assert_equal 'image/jpeg', file.content_type
+          end
+        end
+
+        def test_store_with_file_object
+          VCR.use_cassette 'carrier_wave_test/save', record: :once do
+            model = TestModel.new
+            uploader = model.resizing_picture
+            file = Resizing::CarrierWave::Storage::File.new(uploader)
+
+            source_file = ::File.open('test/data/images/sample1.jpg', 'r')
+
+            result = file.store(source_file)
+
+            assert result
+            refute file.public_id.empty?
+          end
+        end
+
+        def test_delete_with_valid_public_id
+          VCR.use_cassette 'carrier_wave_test/remove_resizing_picture' do
+            model = TestModel.new
+            identifier = '/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
+            model.send(:write_attribute, :resizing_picture, identifier)
+            uploader = model.resizing_picture
+            file = Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+
+            # This should call delete on Resizing API
+            file.delete
+          end
         end
       end
     end