resizing 0.8.3.pre → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8351713d4b33f84d7bff196edaa7a842ba34cb157a56aa652067b003cc459b3d
-  data.tar.gz: d40a7f4d588283bc1535ed5f31f94f592e86430a8fb7724554b9ec502067071a
+  metadata.gz: c8fa9990c253b1b932fb5b2c599aa93f045ad22dafbeef6e5b2d298f6fa1a59e
+  data.tar.gz: c58047443368aee638f48b0b4c899fcbd8a79b73c111655942ffa63ef73f9d74
 SHA512:
-  metadata.gz: 2d015cf9ce5e436630618fa540523b3fe8449060844938eaf3d3ea5b455c1cede10a0993a80c2b90c967da2e3399e79837001ca4f315fee3694db0e657c8ebf0
-  data.tar.gz: 4fdefce63e3f9cdc5c6629fdf769928a6ca030b2715398df4a0ddb1ac09ca1492dd25a414f2b8e7750d591e92b86fa66c2394433dbcd4ba69dfaa8d33a573600
+  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

@@ -6,15 +6,16 @@ module Resizing
       class File
         include ::CarrierWave::Utilities::Uri
 
+        attr_reader :public_id
+
         def initialize(uploader, identifier = nil)
           @uploader = uploader
-          @file = nil
           @content_type = nil
-          @public_id = Resizing::PublicId.new identifier
+          @public_id = Resizing::PublicId.new(identifier)
+          @file = nil
+          @metadata = nil
         end
 
-        attr_reader :public_id
-
         def attributes
           file.attributes
         end
@@ -28,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?
@@ -88,30 +102,29 @@ 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
 
           @response = Resizing.post(content, { content_type: @content_type, filename: original_filename })
           @public_id = Resizing::PublicId.new(@response['public_id'])
+          @content_type = @response['content_type']
 
           # force update column
           # model_class
@@ -125,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
 
@@ -133,6 +146,10 @@ module Resizing
         #   CarrierWave::Storage::Fog::File.new(@uploader, @base, new_path)
         # end
 
+        def retrieve(identifier)
+          @public_id = Resizing::PublicId.new(identifier)
+        end
+
         private
 
         attr_reader :uploader
@@ -190,15 +207,6 @@ module Resizing
           parameters.count == 2 && parameters[1].include?(:options)
         end
 
-        def retrieve!(identifier)
-          raise NotImplementedError, "retrieve! #{identifier}"
-        end
-
-        # def cache!(new_file)
-        #   raise NotImplementedError,
-        #     "Need to implement #cache! if you want to use #{self.class.name} as a cache storage."
-        # 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

@@ -9,19 +9,21 @@ module Resizing
         def store!(file)
           f = Resizing::CarrierWave::Storage::File.new(uploader)
           f.store(file)
-          @filename = f.public_id.to_s
           f
         end
 
         def remove!(file)
           f = Resizing::CarrierWave::Storage::File.new(uploader)
           f.delete(file)
-          @filename = f.public_id.to_s
           f
         end
 
         def retrieve!(identifier)
-          Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+          return nil if identifier.blank?
+
+          f = Resizing::CarrierWave::Storage::File.new(uploader, identifier)
+          f.retrieve(identifier)
+          f
         end
 
         def cache!(new_file)

data/lib/resizing/carrier_wave.rb

@@ -31,12 +31,23 @@ module Resizing
       super
     end
 
+    def file
+      file_identifier = identifier || read_column
+
+      return nil if file_identifier.blank?
+
+      @file ||= Resizing::CarrierWave::Storage::File.new(self)
+      @file.retrieve(file_identifier)
+      @file
+    end
+
     def url(*args)
       return default_url unless read_column.present?
 
       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
@@ -103,7 +99,7 @@ module Resizing
         end
       end
 
-      result = handle_metadata_response(response)
+      result = handle_metadata_response(response, options)
       result
     end
 
@@ -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,24 +130,27 @@ 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 ensure_filename_or_io(filename_or_io)
+      return if filename_or_io.is_a?(File)
 
-    def to_io(data)
-      return data.to_io if data.respond_to? :to_io
+      # Accept IO-like objects (StringIO, Tempfile, etc.)
+      return if filename_or_io.respond_to?(:read) && filename_or_io.respond_to?(:rewind)
 
-      case data
-      when String
-        StringIO.new(data)
-      else
-        raise ArgumentError, "file_or_binary is required IO class or String:#{data.class}"
+      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)
-      raise APIError, "no response is returned" if response.nil?
+      raise APIError, "No response is returned" if response.nil?
 
       case response.status
       when HTTP_STATUS_OK, HTTP_STATUS_CREATED
@@ -162,7 +161,7 @@ module Resizing
     end
 
     def handle_delete_response(response)
-      raise APIError, "no response is returned" if response.nil?
+      raise APIError, "No response is returned" if response.nil?
 
       case response.status
       when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
@@ -172,12 +171,17 @@ module Resizing
       end
     end
 
-    def handle_metadata_response(response)
-      raise APIError, "no response is returned" if response.nil?
+    def handle_metadata_response(response, options = {})
+      when_not_found = options[:when_not_found] || nil
+
+      raise APIError, "No response is returned" if response.nil?
 
       case response.status
       when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
         JSON.parse(response.body)
+      when HTTP_STATUS_NOT_FOUND
+        raise decode_error_from(response) if when_not_found == :raise
+        nil
       else
         raise decode_error_from(response)
       end

data/lib/resizing/configuration.rb

@@ -103,8 +103,12 @@ module Resizing
     end
 
     def initialize_by_hash(attr)
-      # @host = attr[:host].dup.freeze || DEFAULT_HOST
       @image_host = attr[:image_host].dup.freeze || DEFAULT_IMAGE_HOST
+      if attr[:host].present?
+        Kernel.warn "[DEPRECATED] The host on configration is deprecated. Use image_host, video_host" if attr[:host].present?
+        @image_host ||= attr[:host].dup.freeze || DEFAULT_HOST # for backward compatible
+      end
+
       @video_host = attr[:video_host].dup.freeze || DEFAULT_VIDEO_HOST
       @project_id = attr[:project_id].dup.freeze
       @secret_token = attr[:secret_token].dup.freeze

data/lib/resizing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resizing
-  VERSION = '0.8.3.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'
 
@@ -28,13 +28,16 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_runtime_dependency 'faraday', '>= 1.0.1', '< 1.4.0'
-  spec.add_development_dependency 'carrierwave', '~> 2.2.0'
+  spec.add_runtime_dependency 'faraday', '~> 1.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 'rails', '~> 5.2.3'
   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