resizing 1.0.2 → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5da346f4f6420f1f586bc20af1e983e7dfa3d2c12a452a8a3493efff172b2cb6
-  data.tar.gz: 5e37eb4217eb0b71562fa49f8e4c5bcb9392b84d589bf0e88b6507a437208778
+  metadata.gz: 2d601d6b8f87f6440de0c1c4d4dcbb74e7bc386dd3e217b66b8ac259d35939f0
+  data.tar.gz: 3f2ce39dcb8879dee7a9717142bfa794e6cad5671e19cdd01afbb5f7dacc6787
 SHA512:
-  metadata.gz: becfa5580edcf664eef716cb15e2e511872ef1360e81b8218e296ac14f031b05cb3bc2b70d6876247baaedc8cf03571cd8987c8149af15bd7e3e8441ca17040c
-  data.tar.gz: fb7c57ece63ce14d5fe33f8a8e0e479e68becea5edd9e23b17a4a28cbe618183bc6a4d9c442dfdbd8da5cb04e570adb8c25362c6e24ad83e22487d1ba5cacecb
+  metadata.gz: c221c9290ccf562d804bb9f5dca6657568c891ce4c14d825fb8a19627feec1982c09773bfb55304cd5a13b8c4bb786a57d1abe3589684da312fd0167ecfc9a28
+  data.tar.gz: ee2dde3b29accd86dae059daf0e164fef634476886fb254b2145e3be33764d3a81308d9eea382a557817951714cbc8d4e98b02318417042a38590a4109334630

data/.github/workflows/test.yml

@@ -7,23 +7,18 @@ on:
       - master
 
 permissions:
-  id-token: write # This is required for codecov/codecov-action
+  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']
+        ruby: ['2.7.6', '3.1', '3.2','3.3']
 
     runs-on: ubuntu-22.04
 
-    env:
-      RAILS_VERSION: ${{ matrix.rails }}
-
     steps:
       - uses: actions/checkout@v4
 

data/Gemfile

@@ -5,12 +5,8 @@ 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 'byebug'
+gem 'rake', '~> 13.0'
 gem 'github_changelog_generator'
 gem 'mysql2'
+gem 'byebug'
 gem 'pry-byebug'
-gem 'rake', '~> 13.0'

data/README.md

@@ -1,14 +1,8 @@
 # Resizing
 
-[![Gem Version](https://img.shields.io/gem/v/resizing.svg)](https://rubygems.org/gems/resizing)
-[![test](https://github.com/jksy/resizing-gem/actions/workflows/test.yml/badge.svg)](https://github.com/jksy/resizing-gem/actions/workflows/test.yml)
-[![codecov](https://codecov.io/gh/jksy/resizing-gem/graph/badge.svg)](https://codecov.io/gh/jksy/resizing-gem)
+Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/resizing`. To experiment with that code, run `bin/console` for an interactive prompt.
 
-Client and utilities for [Resizing](https://www.resizing.net/) - an image hosting and transformation service.
-
-## Requirements
-
-- Ruby 3.1.0 or later
+TODO: Delete this and the text above, and describe your gem
 
 ## Installation
 
@@ -26,59 +20,37 @@ Or install it yourself as:
 
     $ gem install resizing
 
-## Configuration
-
-```ruby
-Resizing.configure = {
-  image_host: 'https://img.resizing.net',
-  video_host: 'https://video.resizing.net',
-  project_id: 'your-project-id',
-  secret_token: 'your-secret-token'
-}
-```
-
 ## Usage
 
-### Basic Client Usage
-
-```ruby
-# Initialize client
-client = Resizing::Client.new
-
-# Upload image to resizing
-file = File.open('sample.jpg', 'r')
-response = client.post(file)
-# => {
-#      "id"=>"a4ed2bf0-a4cf-44fa-9c82-b53e581cb469",
-#      "project_id"=>"098a2a0d-0000-0000-0000-000000000000",
-#      "content_type"=>"image/jpeg",
-#      "latest_version_id"=>"LJY5bxBF7Ryxfr5kC1F.63W8bzp3pcUm",
-#      "latest_etag"=>"\"190143614e6c342637584f46f18f8c58\"",
-#      "created_at"=>"2020-05-15T15:33:10.711Z",
-#      "updated_at"=>"2020-05-15T15:33:10.711Z",
-#      "url"=>"/projects/098a2a0d-0000-0000-0000-000000000000/upload/images/a4ed2bf0-a4cf-44fa-9c82-b53e581cb469"
-#    }
-
-# Generate transformation URL
-image_id = response['id']
-transformation_url = Resizing.url_from_image_id(image_id, nil, ['w_200', 'h_300'])
-# => "https://img.resizing.net/projects/.../upload/images/.../w_200,h_300"
 ```
-
-### CarrierWave Integration
-
-```ruby
-class ImageUploader < CarrierWave::Uploader::Base
-  include Resizing::CarrierWave
-
-  version :list_smallest do
-    process resize_to_fill: [200, 200]
-  end
-end
-
-class User
-  mount_uploader :image, ImageUploader
-end
+  # initialize client
+  options = {
+    project_id: '098a2a0d-0000-0000-0000-000000000000',
+    secret_token: '4g1cshg......rbs6'
+  }
+  client = Resizing::Client.new(options)
+
+  # upload image to resizing
+  file = File.open('sample.jpg', 'r')
+  response = client.post(file)
+  => {
+       "id"=>"a4ed2bf0-a4cf-44fa-9c82-b53e581cb469",
+       "project_id"=>"098a2a0d-0000-0000-0000-000000000000",
+       "content_type"=>"image/jpeg",
+       "latest_version_id"=>"LJY5bxBF7Ryxfr5kC1F.63W8bzp3pcUm",
+       "latest_etag"=>"\"190143614e6c342637584f46f18f8c58\"",
+       "created_at"=>"2020-05-15T15:33:10.711Z",
+       "updated_at"=>"2020-05-15T15:33:10.711Z",
+       "url"=>"/projects/098a2a0d-0000-0000-0000-000000000000/upload/images/a4ed2bf0-a4cf-44fa-9c82-b53e581cb469"
+     }
+
+  name = response['url']
+  # get transformation url
+  name = response['url']
+  transform = {width: 200, height: 300}
+
+  transformation_url = Resizing.url(name, transform)
+  => "https://www.resizing.net/projects/098a2a0d-0000-0000-0000-000000000000/upload/images/a4ed2bf0-a4cf-44fa-9c82-b53e581cb469/width_200,height_300"
 ```
 
 ## Development
@@ -89,7 +61,8 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/jksy/resizing-gem.
+Bug reports and pull requests are welcome on GitHub at https://github.com/jksy/resizing.
+
 
 ## License
 

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

@@ -1,19 +1,15 @@
 # frozen_string_literal: true
 
-require 'active_storage/service'
-
 module Resizing
   module ActiveStorage
     module Service
       # ref.
       # https://github.com/rails/rails/blob/master/activestorage/lib/active_storage/service/s3_service.rb
       #
-      # rubocop:disable Metrics/ParameterLists
+      # rubocop:disable Lint/UnusedMethodArgument,Metrics/ParameterLists
       class ResizingService < ::ActiveStorage::Service
         # def initialize(bucket:, upload: {}, public: false, **options)
-        # rubocop:disable Lint/MissingSuper
         def initialize; end
-        # rubocop:enable Lint/MissingSuper
 
         def upload(_key, _io, checksum: nil, filename: nil, content_type: nil, disposition: nil, **)
           raise NotImplementedError, 'upload is not implemented'
@@ -55,7 +51,7 @@ module Resizing
           raise NotImplementedError, 'public_url is not implemented'
         end
       end
-      # rubocop:enable Metrics/ParameterLists
+      # rubocop:enable Lint/UnusedMethodArgument,Metrics/ParameterLists
     end
   end
 end

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

@@ -3,7 +3,6 @@
 module Resizing
   module CarrierWave
     module Storage
-      # rubocop:disable Metrics/ClassLength
       class File
         include ::CarrierWave::Utilities::Uri
 
@@ -29,24 +28,10 @@ module Resizing
           @content_type || file.try(:content_type)
         end
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         def delete
-          # 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
-
+          @public_id = Resizing::PublicId.new(model.send :read_attribute, serialization_column)
           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?
@@ -60,7 +45,6 @@ module Resizing
 
           raise APIError, "raise someone error:#{resp.inspect}"
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
         def extension
           raise NotImplementedError, 'this method is do not used. maybe'
@@ -99,30 +83,30 @@ module Resizing
         end
         alias path current_path
 
-        # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
         def store(new_file)
           if new_file.is_a?(self.class)
             # new_file.copy_to(path)
             raise NotImplementedError, 'new file is required duplicating'
           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
+          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
 
           original_filename = new_file.try(:original_filename) || new_file.try(:filename) || new_file.try(:path)
-          original_filename = ::File.basename(original_filename) if original_filename.present?
+          if original_filename.present?
+            original_filename = ::File.basename(original_filename)
+          end
 
           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)
-                      # Pass the IO object itself, not the read result
-                      new_file.rewind
-                      new_file
+                      new_file.read.tap do
+                        new_file.rewind
+                      end
                     else
                       new_file
                     end
@@ -141,11 +125,9 @@ module Resizing
 
           true
         end
-        # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/MethodLength, Metrics/PerceivedComplexity
 
-        def name(_options = {})
-          @public_id = PublicId.new(model.send(:read_attribute, serialization_column))
+        def name(options = {})
+          @public_id = PublicId.new(model.send :read_attribute, serialization_column)
           CGI.unescape(@public_id.filename)
         end
 
@@ -156,7 +138,6 @@ module Resizing
         def retrieve(identifier)
           @public_id = Resizing::PublicId.new(identifier)
         end
-
         private
 
         attr_reader :uploader
@@ -214,6 +195,7 @@ 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."
@@ -229,7 +211,6 @@ module Resizing
         #     "Need to implement #clean_cache! if you want to use #{self.class.name} as a cache storage."
         # end
       end
-      # rubocop:enable Metrics/ClassLength
     end
   end
 end

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

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

data/lib/resizing/carrier_wave.rb

@@ -4,7 +4,6 @@ require 'resizing/carrier_wave/storage/file'
 require 'resizing/carrier_wave/storage/remote'
 
 module Resizing
-  # rubocop:disable Metrics/ModuleLength
   module CarrierWave
     class Railtie < ::Rails::Railtie
       # Railtie skelton codes
@@ -33,12 +32,11 @@ module Resizing
     end
 
     def file
-      file_identifier = identifier || read_column
-
-      return nil if file_identifier.blank?
+      return if identifier.nil?
+      return @file unless defined? @file
 
       @file ||= Resizing::CarrierWave::Storage::File.new(self)
-      @file.retrieve(file_identifier)
+      @file.retrieve(identifier)
       @file
     end
 
@@ -47,8 +45,7 @@ module Resizing
 
       transforms = args.map do |version|
         version = version.intern
-        raise "No version is found: #{version}, #{versions.keys} are exists." unless versions.key? version
-
+        raise "No version is found: #{version}, #{versions.keys} are exists." unless versions.has_key? version
         versions[version].transform_string
       end.compact
 
@@ -111,6 +108,11 @@ module Resizing
       read_column
     end
 
+    def store!
+      # DO NOTHING
+      super
+    end
+
     def serialization_column
       model.send(:_mounter, mounted_as).send(:serialization_column)
     end
@@ -148,7 +150,7 @@ module Resizing
 
     private
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/AbcSize
     def transform_string_from(processor)
       action = processor.first
       value = processor.second
@@ -171,7 +173,6 @@ module Resizing
         "#{key}_#{value}"
       end.compact.join(',')
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/AbcSize
   end
-  # rubocop:enable Metrics/ModuleLength
 end

data/lib/resizing/client.rb

@@ -24,7 +24,6 @@ module Resizing
   #   }
   #
   #++
-  # rubocop:disable Metrics/ClassLength
   class Client
     include Resizing::Constants
     include Resizing::Configurable
@@ -38,14 +37,13 @@ module Resizing
       raise NotImplementedError
     end
 
-    def post(filename_or_io, options = {})
+    def post(file_or_binary, options = {})
       ensure_content_type(options)
-      ensure_filename_or_io(filename_or_io)
-      filename = gather_filename filename_or_io, options
+      filename = gather_filename file_or_binary, options
 
       url = build_post_url
       params = {
-        image: Faraday::Multipart::FilePart.new(filename_or_io, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(file_or_binary, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -54,17 +52,17 @@ module Resizing
         end
       end
 
-      handle_create_response(response)
+      result = handle_create_response(response)
+      result
     end
 
-    def put(image_id, filename_or_io, options)
+    def put(image_id, file_or_binary, options)
       ensure_content_type(options)
-      ensure_filename_or_io(filename_or_io)
-      filename = gather_filename filename_or_io, options
+      filename = gather_filename file_or_binary, options
 
       url = build_put_url(image_id)
       params = {
-        image: Faraday::Multipart::FilePart.new(filename_or_io, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(file_or_binary, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -73,7 +71,8 @@ module Resizing
         end
       end
 
-      handle_create_response(response)
+      result = handle_create_response(response)
+      result
     end
 
     def delete(image_id)
@@ -85,7 +84,8 @@ module Resizing
         end
       end
 
-      handle_delete_response(response)
+      result = handle_delete_response(response)
+      result
     end
 
     def metadata(image_id, options = {})
@@ -97,7 +97,8 @@ module Resizing
         end
       end
 
-      handle_metadata_response(response, options)
+      result = handle_metadata_response(response, options)
+      result
     end
 
     private
@@ -110,8 +111,9 @@ module Resizing
       "#{config.image_host}/projects/#{config.project_id}/upload/images/"
     end
 
-    def gather_filename(filename_or_io, options)
-      options[:filename] || (filename_or_io.respond_to?(:path) ? File.basename(filename_or_io.path) : nil)
+    def gather_filename file_or_binary, options
+      filename = options[:filename]
+      filename ||= file_or_binary.respond_to?(:path) ? File.basename(file_or_binary.path) : nil
     end
 
     def build_put_url(image_id)
@@ -130,20 +132,8 @@ module Resizing
       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)
-
-      # Accept IO-like objects (StringIO, Tempfile, etc.)
-      return if filename_or_io.respond_to?(:read) && filename_or_io.respond_to?(:rewind)
-
-      return if filename_or_io.is_a?(String) && File.exist?(filename_or_io)
-
-      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
@@ -154,7 +144,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
@@ -167,30 +157,24 @@ module Resizing
     def handle_metadata_response(response, options = {})
       when_not_found = options[:when_not_found] || nil
 
-      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
+      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
-
-        JSON.parse(response.body)
+        nil
       else
         raise decode_error_from(response)
       end
     end
 
-    def decode_error_from(response)
-      result = begin
-        JSON.parse(response.body)
-      rescue StandardError
-        {}
-      end
+    def decode_error_from response
+      result = JSON.parse(response.body) rescue {}
       err = APIError.new(result['message'] || "invalid http status code #{response.status}")
       err.decoded_body = result
       err
     end
   end
-  # rubocop:enable Metrics/ClassLength
 end

data/lib/resizing/configurable.rb

@@ -2,7 +2,7 @@
 
 module Resizing
   module Configurable
-    def self.included(mod)
+    def self.included mod
       mod.send(:attr_reader, :config)
     end
 

data/lib/resizing/configuration.rb

@@ -27,8 +27,12 @@ module Resizing
     def initialize(*attrs)
       case attr = attrs.first
       when Hash
-        raise_configiration_error if attr[:project_id].nil? || attr[:secret_token].nil?
-        raise_configiration_error if attr[:host].present?
+        if attr[:project_id].nil? || attr[:secret_token].nil?
+          raise_configiration_error
+        end
+        if attr[:host].present?
+          raise_configiration_error
+        end
 
         initialize_by_hash attr
         return
@@ -37,6 +41,11 @@ module Resizing
       raise_configiration_error
     end
 
+    def host
+      Kernel.warn "[DEPRECATED] The Configuration#host is deprecated. Use Configuration#image_host."
+      self.image_host
+    end
+
     def generate_auth_header
       current_timestamp = Time.now.to_i
       data = [current_timestamp, secret_token].join('|')
@@ -93,11 +102,13 @@ module Resizing
       raise ConfigurationError, 'need hash and some keys like :image_host, video_host, :project_id, :secret_token'
     end
 
-    # rubocop:disable Metrics/AbcSize
     def initialize_by_hash(attr)
-      raise 'The host on configuration is deprecated. Use image_host, video_host' if attr[:host].present?
-
       @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
@@ -105,6 +116,5 @@ module Resizing
       @response_timeout = attr[:response_timeout] || DEFAULT_RESPONSE_TIMEOUT
       @enable_mock = attr[:enable_mock] || false
     end
-    # rubocop:enable Metrics/AbcSize
   end
 end

data/lib/resizing/http_clientable.rb

@@ -12,14 +12,14 @@ module Resizing
       end
     end
 
-    def handle_faraday_error
+    def handle_faraday_error &block
       yield
     rescue Faraday::TimeoutError => e
       handle_timeout_error e
     end
 
-    def handle_timeout_error(error)
-      raise APIError, "TimeoutError: #{error.inspect}"
+    def handle_timeout_error error
+      raise APIError.new("TimeoutError: #{error.inspect}")
     end
   end
 end

data/lib/resizing/mock_client.rb

@@ -2,12 +2,12 @@
 
 module Resizing
   class MockClient
-    def post(_file_or_binary, _options = {})
+    def post(file_or_binary, options = {})
       r = load_yaml('test/vcr/client/post.yml')
       JSON.parse(r['string'])
     end
 
-    def put(name, _file_or_binary, _options)
+    def put(name, file_or_binary, options)
       r = load_yaml('test/vcr/client/put.yml')
       result = JSON.parse(r['string'])
       # replace name, public_id and version by name argument
@@ -26,7 +26,7 @@ module Resizing
       result
     end
 
-    def metadata(name, _options = {})
+    def metadata(name)
       r = load_yaml('test/vcr/client/metadata.yml')
       result = JSON.parse(r['string'])
       # replace name and public_id by name argument
@@ -34,16 +34,15 @@ module Resizing
       result['public_id'].gsub!(/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/, name)
       result
     end
-
     private
 
-    def load_yaml(filename)
+    def load_yaml filename
       path = "#{library_root}/#{filename}"
       YAML.load_file(path)['http_interactions'].first['response']['body']
     end
 
     def library_root
-      @library_root ||= File.expand_path('../..', __dir__)
+      @library_root ||= File.expand_path('../../../', __FILE__)
     end
   end
 end