resizing 0.8.3.pre → 1.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8351713d4b33f84d7bff196edaa7a842ba34cb157a56aa652067b003cc459b3d
-  data.tar.gz: d40a7f4d588283bc1535ed5f31f94f592e86430a8fb7724554b9ec502067071a
+  metadata.gz: 5fff2fe2e1211d6d9b8fc9d399d63df0e1fe7a7f56aca9cc5c4fb045f7877110
+  data.tar.gz: ac9be08e555131de36131bcaca8747d300b951b1ee00c848d85749c0b80b4766
 SHA512:
-  metadata.gz: 2d015cf9ce5e436630618fa540523b3fe8449060844938eaf3d3ea5b455c1cede10a0993a80c2b90c967da2e3399e79837001ca4f315fee3694db0e657c8ebf0
-  data.tar.gz: 4fdefce63e3f9cdc5c6629fdf769928a6ca030b2715398df4a0ddb1ac09ca1492dd25a414f2b8e7750d591e92b86fa66c2394433dbcd4ba69dfaa8d33a573600
+  metadata.gz: b076ac07bf0c60a9a8a8af0bf18536e78b20fe9faa2565b5c79e41fbcf1f66207be30b14e92b31e8c0af3cc05d4c5589db40d9e5dbd7574343ecee10d4121b65
+  data.tar.gz: 46c7f5303f4cf0620d0205d01c68d74a483b025918cffda9ca42207c656c6fc8cfc40c6843349181aeef170aaeeffe1e93c558aacccd98ad82f9c071ea183318

data/.circleci/config.yml

@@ -40,7 +40,9 @@ jobs:
             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
+            bundle config set --local path vendor/bundle
+            bundle config set --local clean true
+            bundle check || bundle install
 
       - save_cache:
           key: v2-{{ .Environment.CACHE_KEY }}-gem-cache-{{ arch }}-{{ .Branch }}

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

@@ -103,7 +103,7 @@ module Resizing
         end
       end
 
-      result = handle_metadata_response(response)
+      result = handle_metadata_response(response, options)
       result
     end
 
@@ -151,7 +151,7 @@ module Resizing
     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 +162,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 +172,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.0.pre'
 end

data/resizing.gemspec

@@ -28,12 +28,12 @@ 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'
+  spec.add_development_dependency 'carrierwave', '~> 1.3.2'
   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'

metadata

@@ -1,65 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 0.8.3.pre
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: fog-aws
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-ci
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: minitest-ci
   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
   requirement: !ruby/object:Gem::Requirement
@@ -145,7 +139,10 @@ dependencies:
 description: 'Client and utilities for Resizing '
 email:
 - junichiro.kasuya@gmail.com
-executables: []
+executables:
+- console
+- generate-changelog
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -157,10 +154,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 +217,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