resizing 0.3.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68f3747dc45de527ea32a40bb2586783a0ea14d76717bd85186aae178ef18bd
-  data.tar.gz: 5ecebffc8b0eb31c22e3bb408eea3d99db21b90bcdba5178e74f1f0704261ed5
+  metadata.gz: df0aac4e125b7c1c3b293001f2de5fa8846758918b5c7016aeb137fec06fc51f
+  data.tar.gz: 4564dbc3de047efbf559a188395fb666c2ad781c32daddf8f057449757497175
 SHA512:
-  metadata.gz: 233c87e03b19be35e89d373a4456aa81cdd82c110eea4cff47f2d8498a852ed203c0443567f0afb8b6d85bd419da49b6accb5e52038e823beddf40d88f84e94d
-  data.tar.gz: 66f18b1648e93a2cbdf73a2a457b9e2591262b795dfbebd232cd0388ca7787a755068a85c84f763f1c28fa7e10c61a4169915aff35184d1f602c6498cca8f63e
+  metadata.gz: 673b324144203b4d8020d93dbf725bf9faf799dc4eac563a400d53c83ca439764ecc27fb4fb9481e5262f77fe694025b8cd890e7cdb7190b0d580ca1fa23c8f5
+  data.tar.gz: 5a984d738fdb21036b35c47987e5d50f01cc9cab7275052cfa88c01d180a9441f017e7071ac5ca26d3b2c87740b7e25ed78f7fc7c0da3d4eb23866bba677f62c

data/CHANGELOG.md

@@ -0,0 +1,141 @@
+# Changelog
+
+## [v0.5.2](https://github.com/jksy/resizing-gem/tree/v0.5.2) (2020-10-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.5.1...v0.5.2)
+
+## [v0.5.1](https://github.com/jksy/resizing-gem/tree/v0.5.1) (2020-10-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.5.0...v0.5.1)
+
+## [v0.5.0](https://github.com/jksy/resizing-gem/tree/v0.5.0) (2020-10-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.4.2...v0.5.0)
+
+## [v0.4.2](https://github.com/jksy/resizing-gem/tree/v0.4.2) (2020-10-01)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.4.1...v0.4.2)
+
+**Merged pull requests:**
+
+- fix raise error if tempfile is assinged [\#38](https://github.com/jksy/resizing-gem/pull/38) ([jksy](https://github.com/jksy))
+
+## [v0.4.1](https://github.com/jksy/resizing-gem/tree/v0.4.1) (2020-10-01)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.2.1...v0.4.1)
+
+**Closed issues:**
+
+- pass original filename into Resizing [\#36](https://github.com/jksy/resizing-gem/issues/36)
+- columnがnilの時はdefault\_urlを返す [\#33](https://github.com/jksy/resizing-gem/issues/33)
+
+**Merged pull requests:**
+
+- save original filename [\#37](https://github.com/jksy/resizing-gem/pull/37) ([jksy](https://github.com/jksy))
+- columnがnilの時はdefault\_urlを返す \#33 [\#34](https://github.com/jksy/resizing-gem/pull/34) ([jksy](https://github.com/jksy))
+
+## [v0.2.1](https://github.com/jksy/resizing-gem/tree/v0.2.1) (2020-09-29)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.4.0...v0.2.1)
+
+## [v0.4.0](https://github.com/jksy/resizing-gem/tree/v0.4.0) (2020-09-28)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.3.2...v0.4.0)
+
+**Merged pull requests:**
+
+- change version string when put request with mockclient [\#32](https://github.com/jksy/resizing-gem/pull/32) ([jksy](https://github.com/jksy))
+- add delete method [\#31](https://github.com/jksy/resizing-gem/pull/31) ([jksy](https://github.com/jksy))
+- Feature/add identifier to public [\#30](https://github.com/jksy/resizing-gem/pull/30) ([jksy](https://github.com/jksy))
+- add identifier [\#29](https://github.com/jksy/resizing-gem/pull/29) ([jksy](https://github.com/jksy))
+- Feature/refactor public [\#28](https://github.com/jksy/resizing-gem/pull/28) ([jksy](https://github.com/jksy))
+- divide to PublicId class [\#27](https://github.com/jksy/resizing-gem/pull/27) ([jksy](https://github.com/jksy))
+- fix some bug & errors [\#26](https://github.com/jksy/resizing-gem/pull/26) ([jksy](https://github.com/jksy))
+- fix mockclient [\#25](https://github.com/jksy/resizing-gem/pull/25) ([jksy](https://github.com/jksy))
+- fix raise no method presented, no cotent type is presented [\#24](https://github.com/jksy/resizing-gem/pull/24) ([jksy](https://github.com/jksy))
+
+## [v0.3.2](https://github.com/jksy/resizing-gem/tree/v0.3.2) (2020-09-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.3.1...v0.3.2)
+
+**Merged pull requests:**
+
+- fix raise error when call remove! with nil column [\#23](https://github.com/jksy/resizing-gem/pull/23) ([jksy](https://github.com/jksy))
+
+## [v0.3.1](https://github.com/jksy/resizing-gem/tree/v0.3.1) (2020-09-11)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.3.0...v0.3.1)
+
+## [v0.3.0](https://github.com/jksy/resizing-gem/tree/v0.3.0) (2020-08-21)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.2.0...v0.3.0)
+
+**Merged pull requests:**
+
+- Feature/fix mock client [\#22](https://github.com/jksy/resizing-gem/pull/22) ([jksy](https://github.com/jksy))
+
+## [v0.2.0](https://github.com/jksy/resizing-gem/tree/v0.2.0) (2020-08-12)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.4...v0.2.0)
+
+**Merged pull requests:**
+
+- version 0.2.0 [\#21](https://github.com/jksy/resizing-gem/pull/21) ([jksy](https://github.com/jksy))
+- support f\_auto, q\_auto parameter [\#20](https://github.com/jksy/resizing-gem/pull/20) ([jksy](https://github.com/jksy))
+
+## [v0.1.4](https://github.com/jksy/resizing-gem/tree/v0.1.4) (2020-08-08)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.3...v0.1.4)
+
+**Merged pull requests:**
+
+- Feature/update gems and change default hostname [\#19](https://github.com/jksy/resizing-gem/pull/19) ([jksy](https://github.com/jksy))
+
+## [v0.1.3](https://github.com/jksy/resizing-gem/tree/v0.1.3) (2020-06-12)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.2...v0.1.3)
+
+**Merged pull requests:**
+
+- fix error when record is not found [\#18](https://github.com/jksy/resizing-gem/pull/18) ([jksy](https://github.com/jksy))
+
+## [v0.1.2](https://github.com/jksy/resizing-gem/tree/v0.1.2) (2020-06-12)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.1...v0.1.2)
+
+**Merged pull requests:**
+
+- ignore response if delete method is received 404 status code [\#17](https://github.com/jksy/resizing-gem/pull/17) ([jksy](https://github.com/jksy))
+
+## [v0.1.1](https://github.com/jksy/resizing-gem/tree/v0.1.1) (2020-06-12)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.1.0...v0.1.1)
+
+**Merged pull requests:**
+
+- Feature/fix raise error [\#16](https://github.com/jksy/resizing-gem/pull/16) ([jksy](https://github.com/jksy))
+- fix empty url when model is reload [\#10](https://github.com/jksy/resizing-gem/pull/10) ([jksy](https://github.com/jksy))
+
+## [v0.1.0](https://github.com/jksy/resizing-gem/tree/v0.1.0) (2020-06-07)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/e817d9b883425ddae3e42439ccd1a9d2e270c363...v0.1.0)
+
+**Merged pull requests:**
+
+- add mock client for test environments [\#14](https://github.com/jksy/resizing-gem/pull/14) ([jksy](https://github.com/jksy))
+- Feature/add test test for remove xxx [\#13](https://github.com/jksy/resizing-gem/pull/13) ([jksy](https://github.com/jksy))
+- add rubocop & fix some tests [\#12](https://github.com/jksy/resizing-gem/pull/12) ([jksy](https://github.com/jksy))
+- fix the column cant be update by null value [\#11](https://github.com/jksy/resizing-gem/pull/11) ([jksy](https://github.com/jksy))
+- change mysql port on docker-compose [\#9](https://github.com/jksy/resizing-gem/pull/9) ([jksy](https://github.com/jksy))
+- fix return invalid url when model is reloaded [\#8](https://github.com/jksy/resizing-gem/pull/8) ([jksy](https://github.com/jksy))
+- add circleci [\#7](https://github.com/jksy/resizing-gem/pull/7) ([jksy](https://github.com/jksy))
+- divide some classes and add tests [\#6](https://github.com/jksy/resizing-gem/pull/6) ([jksy](https://github.com/jksy))
+- fix connect host [\#5](https://github.com/jksy/resizing-gem/pull/5) ([jksy](https://github.com/jksy))
+- Feature/carrier wave [\#4](https://github.com/jksy/resizing-gem/pull/4) ([jksy](https://github.com/jksy))
+- faraday version is down. and some fix bugs [\#3](https://github.com/jksy/resizing-gem/pull/3) ([jksy](https://github.com/jksy))
+- Feature/add default host [\#2](https://github.com/jksy/resizing-gem/pull/2) ([jksy](https://github.com/jksy))
+- first implementation [\#1](https://github.com/jksy/resizing-gem/pull/1) ([jksy](https://github.com/jksy))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/bin/generate-changelog

@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+github_changelog_generator -u jksy -p resizing-gem

data/lib/resizing.rb

@@ -9,6 +9,7 @@ module Resizing
   autoload :MockClient, 'resizing/mock_client'
   autoload :Configuration, 'resizing/configuration'
   autoload :CarrierWave, 'resizing/carrier_wave'
+  autoload :PublicId, 'resizing/public_id'
 
   class Error < StandardError; end
   class ConfigurationError < Error; end
@@ -41,6 +42,14 @@ module Resizing
     self.client.put name, file_or_binary, options
   end
 
+  def self.delete(name)
+    self.client.delete name
+  end
+
+  def self.metadata(name, options)
+    self.client.metadata name, options
+  end
+
   # TODO: refactoring
   #
   # identifier:
@@ -54,7 +63,7 @@ module Resizing
   end
 
   def self.separate_public_id public_id
-    public_id.match('/projects/(?<project_id>[0-9a-f-]+)/upload/images/(?<image_id>[0-9a-f-]+)(/v(?<version>[^/]+))?')
+    public_id.match('/projects/(?<project_id>[0-9a-f-]+)/upload/images/(?<image_id>[^/]+)(/v(?<version>[^/]+))?')
   end
 
   def self.client

data/lib/resizing/carrier_wave.rb

@@ -25,23 +25,35 @@ module Resizing
       base.extend ClassMethods
     end
 
+    def initialize(*args)
+      @requested_format = nil
+      @default_format = nil
+      super
+    end
+
     def url(*args)
-      return nil unless read_column.present?
+      return default_url unless read_column.present?
 
-      transforms = [transform_string]
+      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
 
-      while (version = args.pop)
-        transforms << versions[version].transform_string
-      end
-      "#{default_url}/#{transforms.join('/')}"
+      "#{build_url}/#{transforms.join('/')}"
     end
 
     def read_column
-      model.read_attribute(mounted_as)
+      model.read_attribute(serialization_column)
     end
 
+    def build_url
+      "#{Resizing.configure.host}#{model.read_attribute(serialization_column)}"
+    end
+
+    # need override this. if you want to return some url when target_column is nil
     def default_url
-      "#{Resizing.configure.host}#{model.read_attribute(mounted_as)}"
+      nil
     end
 
     def transform_string
@@ -79,16 +91,21 @@ module Resizing
       # save to resizing directly
       # @cache_id = file.public_id
 
-      @filename = file.public_id
+      @filename = file.public_id.to_s
       @file = file
     end
 
+    def filename
+      read_column
+    end
+
     def store!
       # DO NOTHING
       super
     end
 
-    module ClassMethods
+    def serialization_column
+      model.send(:_mounter, mounted_as).send(:serialization_column)
     end
 
     # store_versions! is called after store!
@@ -105,6 +122,23 @@ module Resizing
       # NOP
     end
 
+    def requested_format
+      # TODO
+      # The request with uploading format parameter is not working on the Resizing until 2020/09/25
+      @requested_format
+    end
+
+    def default_format
+      @default_format
+    end
+
+    def format
+      requested_format || default_format
+    end
+
+    module ClassMethods
+    end
+
     private
 
     # rubocop:disable Metrics/AbcSize

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

@@ -8,10 +8,13 @@ module Resizing
 
         def initialize(uploader, identifier = nil)
           @uploader = uploader
+          @file = nil
           @content_type = nil
-          @identifier = identifier
+          @public_id = Resizing::PublicId.new identifier
         end
 
+        attr_reader :public_id
+
         def attributes
           file.attributes
         end
@@ -24,24 +27,18 @@ module Resizing
           @content_type || file.try(:content_type)
         end
 
-        attr_writer :content_type
-
         def delete
-          public_id = model.send :read_attribute, serialization_column
-          return if public_id.nil? # do nothing
-
-          # TODO:
-          # refactoring
-          separted = Resizing.separate_public_id(public_id)
-          image_id = separted[:image_id]
-          resp = client.delete(image_id)
+          @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
+            model.send :write_attribute, serialization_column, nil unless model.destroyed?
             return
           end
 
-          if public_id == resp['public_id']
-            model.send :write_attribute, serialization_column, nil
+          if @public_id.image_id == resp['id']
+            model.send :write_attribute, serialization_column, nil unless model.destroyed?
             return
           end
 
@@ -80,15 +77,41 @@ module Resizing
           !!file
         end
 
+        def current_path
+          @current_path = model.send :read_attribute, serialization_column
+        end
+        alias path current_path
+
         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 ||= new_file.content_type
-          @response = Resizing.put(identifier, new_file.read, { content_type: @content_type })
-          @public_id = @response['public_id']
+          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)
+          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)
+                      new_file.read.tap do
+                        new_file.rewind
+                      end
+                    else
+                      new_file
+                    end
+
+          @response = Resizing.post(content, { content_type: @content_type, filename: original_filename })
+          @public_id = Resizing::PublicId.new(@response['public_id'])
 
           # force update column
           # model_class
@@ -96,26 +119,14 @@ module Resizing
           #   .update_all(serialization_column=>@public_id)
 
           # save new value to model class
-          model.send :write_attribute, serialization_column, @public_id
+          model.send :write_attribute, serialization_column, @public_id.to_s
 
           true
         end
 
-        attr_reader :public_id
-
-        def identifier
-          if public_id.present?
-            public_id
-          else
-            @identifier = SecureRandom.uuid
-          end
-        end
-
-        def filename(options = {})
-          file_url = url(options)
-          return unless file_url
-
-          CGI.unescape(file_url.split('?').first).gsub(%r{.*/(.*?$)}, '\1')
+        def name(options = {})
+          @public_id = PublicId.new(model.send :read_attribute, serialization_column)
+          CGI.unescape(@public_id.filename)
         end
 
         # def copy_to(new_path)
@@ -179,12 +190,6 @@ module Resizing
           parameters.count == 2 && parameters[1].include?(:options)
         end
 
-        # def store! sanitized_file
-        #   puts sanitized_file.inspect
-        #   client = Resizing::Client.new
-        #   @store_response = client.post(sanitized_file.to_file, {content_type: sanitized_file.content_type})
-        # end
-
         def retrieve!(identifier)
           raise NotImplementedError, "retrieve! #{identifier}"
         end

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

@@ -9,7 +9,14 @@ module Resizing
         def store!(file)
           f = Resizing::CarrierWave::Storage::File.new(uploader)
           f.store(file)
-          @filename = f.public_id
+          @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
 

data/lib/resizing/client.rb

@@ -41,7 +41,7 @@ module Resizing
                 end
     end
 
-    def get(name)
+    def get(image_id)
       raise NotImplementedError
     end
 
@@ -50,9 +50,11 @@ module Resizing
 
       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])
+        image: Faraday::UploadIO.new(body, options[:content_type], filename)
       }
 
       response = http_client.post(url, params) do |request|
@@ -63,14 +65,16 @@ module Resizing
       result
     end
 
-    def put(name, file_or_binary, options)
+    def put(image_id, file_or_binary, options)
       ensure_content_type(options)
 
-      url = build_put_url(name)
+      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])
+        image: Faraday::UploadIO.new(body, options[:content_type], filename)
       }
 
       response = http_client.put(url, params) do |request|
@@ -81,8 +85,8 @@ module Resizing
       result
     end
 
-    def delete(name)
-      url = build_delete_url(name)
+    def delete(image_id)
+      url = build_delete_url(image_id)
 
       response = http_client.delete(url) do |request|
         request.headers['X-ResizingToken'] = config.generate_auth_header
@@ -92,22 +96,42 @@ module Resizing
       result
     end
 
+    def metadata(image_id, options = {})
+      url = build_metadata_url(image_id)
+
+      response = http_client.get(url) do |request|
+        request.headers['X-ResizingToken'] = config.generate_auth_header
+      end
+
+      result = handle_metadata_response(response)
+      result
+    end
+
     private
 
-    def build_get_url(name)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{name}"
+    def build_get_url(image_id)
+      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
     end
 
     def build_post_url
       "#{config.host}/projects/#{config.project_id}/upload/images/"
     end
 
-    def build_put_url(name)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{name}"
+    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_delete_url(name)
-      "#{config.host}/projects/#{config.project_id}/upload/images/#{name}"
+    def build_put_url(image_id)
+      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
+    end
+
+    def build_delete_url(image_id)
+      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
+    end
+
+    def build_metadata_url(image_id)
+      "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}/metadata"
     end
 
     def http_client
@@ -121,13 +145,13 @@ module Resizing
     end
 
     def to_io(data)
+      return data.to_io if data.respond_to? :to_io
+
       case data
-      when IO
-        data
       when String
         StringIO.new(data)
       else
-        raise ArgumentError, 'file_or_binary is required IO class or String'
+        raise ArgumentError, "file_or_binary is required IO class or String:#{data.class}"
       end
     end
 
@@ -150,7 +174,18 @@ module Resizing
       raise APIError, "no response is returned" if response.nil?
 
       case response.status
-      when HTTP_STATUS_OK, HTTP_STATUS_CREATED, HTTP_STATUS_NOT_FOUND
+      when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
+        JSON.parse(response.body)
+      else
+        raise APIError, "invalid http status code #{response.status}"
+      end
+    end
+
+    def handle_metadata_response(response)
+      raise APIError, "no response is returned" if response.nil?
+
+      case response.status
+      when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
         JSON.parse(response.body)
       else
         raise APIError, "invalid http status code #{response.status}"