resizing 0.8.3.pre → 1.1.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8351713d4b33f84d7bff196edaa7a842ba34cb157a56aa652067b003cc459b3d
-  data.tar.gz: d40a7f4d588283bc1535ed5f31f94f592e86430a8fb7724554b9ec502067071a
+  metadata.gz: 2d601d6b8f87f6440de0c1c4d4dcbb74e7bc386dd3e217b66b8ac259d35939f0
+  data.tar.gz: 3f2ce39dcb8879dee7a9717142bfa794e6cad5671e19cdd01afbb5f7dacc6787
 SHA512:
-  metadata.gz: 2d015cf9ce5e436630618fa540523b3fe8449060844938eaf3d3ea5b455c1cede10a0993a80c2b90c967da2e3399e79837001ca4f315fee3694db0e657c8ebf0
-  data.tar.gz: 4fdefce63e3f9cdc5c6629fdf769928a6ca030b2715398df4a0ddb1ac09ca1492dd25a414f2b8e7750d591e92b86fa66c2394433dbcd4ba69dfaa8d33a573600
+  metadata.gz: c221c9290ccf562d804bb9f5dca6657568c891ce4c14d825fb8a19627feec1982c09773bfb55304cd5a13b8c4bb786a57d1abe3589684da312fd0167ecfc9a28
+  data.tar.gz: ee2dde3b29accd86dae059daf0e164fef634476886fb254b2145e3be33764d3a81308d9eea382a557817951714cbc8d4e98b02318417042a38590a4109334630

data/.github/workflows/test.yml

@@ -0,0 +1,56 @@
+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:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.7.6', '3.1', '3.2','3.3']
+
+    runs-on: ubuntu-22.04
+
+    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/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
@@ -112,6 +113,7 @@ module Resizing
 
           @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
@@ -133,6 +135,9 @@ 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,14 +195,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,

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

@@ -9,20 +9,18 @@ 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)
-        end
+        # def retrieve!(identifier)
+        #   super
+        # end
 
         def cache!(new_file)
           f = Resizing::CarrierWave::Storage::File.new(uploader)

data/lib/resizing/carrier_wave.rb

@@ -31,6 +31,15 @@ module Resizing
       super
     end
 
+    def file
+      return if identifier.nil?
+      return @file unless defined? @file
+
+      @file ||= Resizing::CarrierWave::Storage::File.new(self)
+      @file.retrieve(identifier)
+      @file
+    end
+
     def url(*args)
       return default_url unless read_column.present?
 

data/lib/resizing/client.rb

@@ -39,14 +39,11 @@ module Resizing
 
     def post(file_or_binary, options = {})
       ensure_content_type(options)
-
-      url = build_post_url
-
       filename = gather_filename file_or_binary, options
 
-      body = to_io(file_or_binary)
+      url = build_post_url
       params = {
-        image: Faraday::UploadIO.new(body, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(file_or_binary, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -61,14 +58,11 @@ module Resizing
 
     def put(image_id, file_or_binary, options)
       ensure_content_type(options)
-
-      url = build_put_url(image_id)
-
       filename = gather_filename file_or_binary, options
 
-      body = to_io(file_or_binary)
+      url = build_put_url(image_id)
       params = {
-        image: Faraday::UploadIO.new(body, options[:content_type], filename)
+        image: Faraday::Multipart::FilePart.new(file_or_binary, options[:content_type], filename)
       }
 
       response = handle_faraday_error do
@@ -103,7 +97,7 @@ module Resizing
         end
       end
 
-      result = handle_metadata_response(response)
+      result = handle_metadata_response(response, options)
       result
     end
 
@@ -134,24 +128,12 @@ module Resizing
       "#{config.image_host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
     end
 
-
-    def to_io(data)
-      return data.to_io if data.respond_to? :to_io
-
-      case data
-      when String
-        StringIO.new(data)
-      else
-        raise ArgumentError, "file_or_binary is required IO class or String:#{data.class}"
-      end
-    end
-
     def ensure_content_type(options)
       raise ArgumentError, "need options[:content_type] for #{options.inspect}" unless options[:content_type]
     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 +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
@@ -172,12 +154,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.1.0.pre'
 end

data/lib/resizing.rb

@@ -2,6 +2,7 @@
 
 require 'resizing/version'
 require 'faraday'
+require 'faraday/multipart'
 require 'json'
 
 module Resizing

data/resizing.gemspec

@@ -28,13 +28,17 @@ 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', '~> 2.3'
+  spec.add_runtime_dependency 'faraday-multipart'
+  spec.add_development_dependency 'rails', '~> 6.0'
+  spec.add_development_dependency 'carrierwave', '~> 2.2.5'
   spec.add_development_dependency 'fog-aws'
   spec.add_development_dependency 'minitest'
   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/test_helper.rb

@@ -1,4 +1,22 @@
 # frozen_string_literal: true
+require 'simplecov'
+require 'simplecov-cobertura'
+
+SimpleCov.start do
+  add_filter "/test/"
+
+  if ENV['CI']
+    formatter SimpleCov::Formatter::CoberturaFormatter
+  else
+    formatter SimpleCov::Formatter::MultiFormatter.new([
+                                                         SimpleCov::Formatter::SimpleFormatter,
+                                                         SimpleCov::Formatter::HTMLFormatter
+                                                       ])
+  end
+
+  enable_coverage :branch
+  primary_coverage :branch
+end
 
 $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 require 'time'

metadata

@@ -1,49 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 0.8.3.pre
+  version: 1.1.0.pre
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2024-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+        version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.2.5
 - !ruby/object:Gem::Dependency
   name: fog-aws
   requirement: !ruby/object:Gem::Requirement
@@ -87,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -115,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -145,11 +195,14 @@ dependencies:
 description: 'Client and utilities for Resizing '
 email:
 - junichiro.kasuya@gmail.com
-executables: []
+executables:
+- console
+- generate-changelog
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -157,10 +210,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/generate-changelog
-- bin/setup
 - docker-compose.yml
+- exe/console
+- exe/generate-changelog
+- exe/setup
 - lib/resizing.rb
 - lib/resizing/active_storage/service/resizing_service.rb
 - lib/resizing/carrier_wave.rb
@@ -220,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Client and utilities for Resizing

data/.circleci/config.yml

@@ -1,71 +0,0 @@
-version: 2
-
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.6.2-node
-        environment:
-          BUNDLE_JOBS: 4
-          BUNDLE_RETRY: 3
-          BUNDLE_PATH: vendor/bundle
-          BUNDLE_APP_CONFIG: "./.bundle"
-          TZ: /usr/share/zoneinfo/Asia/Tokyo
-          LANG: ja_JP.UTF8
-      - image: circleci/mysql:5.7
-        environment:
-          MYSQL_ROOT_PASSWORD: secret
-          MYSQL_DATABASE: resizing_gem_test
-          MYSQL_USER: resizing_gem
-          MYSQL_PASSWORD: secret
-          TZ: /usr/share/zoneinfo/Asia/Tokyo
-          LANG: ja_JP.UTF8
-        command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_bin
-
-    steps:
-      - checkout
-      - run:
-          name: Which bundler?
-          command: |
-            bundle -v
-            bundle config
-
-      - restore_cache:
-          keys:
-            - v2-{{ .Environment.CACHE_KEY }}-gem-cache-{{ arch }}-{{ .Branch }}
-            - v2-{{ .Environment.CACHE_KEY }}-gem-cache
-
-      - run:
-          name: reinstall rake && bundle install
-          command: |
-            sudo gem install bundler
-            sudo gem uninstall -x rake
-            echo "install: --no-document" >> ~/.gemrc
-              bundle check --path vendor/bundle || bundle install --path vendor/bundle --clean
-
-      - save_cache:
-          key: v2-{{ .Environment.CACHE_KEY }}-gem-cache-{{ arch }}-{{ .Branch }}
-          paths:
-            - vendor/bundle
-
-      - run:
-          name: connectable MySQL?
-          command: |
-            dockerize -wait tcp://127.0.0.1:3306 -timeout 1m
-
-      # - run:
-      #     name: rubocop
-      #     command: bundle exec rubocop --parallel
-      # - run:
-      #     name: brakeman
-      #     command: bundle exec brakeman --no-exit-on-error -w 1 -z
-      - run:
-          command: bundle exec rake test
-          when: always
-      - store_test_results:
-          path: test/reports
-
-workflows:
-  version: 2
-  build-deploy:
-    jobs:
-      - build