resizing 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c72ad237f9dbd4b471d9b249ed6fbc21cdb4c99a9ff8c86e3c4aec72233c21
-  data.tar.gz: 67377bf88e061f477443d37c3d5f9362e1fc8546dd09336585e5b26820b13efe
+  metadata.gz: 04cca28d70c6c4c7a361ae5714aadb8e0983a77827b7099ca3dcb18d60e41052
+  data.tar.gz: 653e75727cbeb23d3b9f799b9547df92010410b7f409d671bfaea529325060db
 SHA512:
-  metadata.gz: 982272977e217042ba1cb332a918f8877667b87731a2587cecf285664ebf669f96e2265e254f43afb42a4d8101bfda07010e5790b2cce1440363924efa05d1ab
-  data.tar.gz: fb4da505d292795e84ef79577029d0317ac199db177e0e91d51be75a2c92f89fe4bf2a3a9c0102da20c1552d1450f46ea0471065b6d10d3e8f777ead16367767
+  metadata.gz: 9f6395295e817926af6f50fdf66817c97beac4b9e4efbd9ffede1cfb597567ca43a56615a777ae333a96e841aac62f20b4804918f542dc8cf42a57c59c8e8433
+  data.tar.gz: b7368beeae3086929f303100059122f9310e18b9bbe6c2503d5d8cb11994272d5e95e480870a4a6a513162db5a87a247ccc785d1dec21dac731bd462ce7881c2

data/lib/resizing/carrier_wave.rb

@@ -32,7 +32,7 @@ module Resizing
     end
 
     def url(*args)
-      return nil unless read_column.present?
+      return default_url unless read_column.present?
 
       transforms = args.map do |version|
         version = version.intern
@@ -40,17 +40,22 @@ module Resizing
         versions[version].transform_string
       end.compact
 
-      "#{default_url}/#{transforms.join('/')}"
+      "#{build_url}/#{transforms.join('/')}"
     end
 
     def read_column
       model.read_attribute(serialization_column)
     end
 
-    def default_url
+    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
+      nil
+    end
+
     def transform_string
       transforms = processors.map do |processor|
         transform_string_from processor

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

@@ -96,7 +96,7 @@ module Resizing
                        @public_id.image_id
                      end
 
-          @response = Resizing.put(image_id, new_file.read, { content_type: @content_type })
+          @response = Resizing.put(image_id, new_file.read, { content_type: @content_type, filename: new_file.original_filename })
           @public_id = Resizing::PublicId.new(@response['public_id'])
 
           # force update column

data/lib/resizing/client.rb

@@ -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|
@@ -68,9 +70,11 @@ module Resizing
 
       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|
@@ -113,6 +117,11 @@ module Resizing
       "#{config.host}/projects/#{config.project_id}/upload/images/"
     end
 
+    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)
       "#{config.host}/projects/#{config.project_id}/upload/images/#{image_id}"
     end

data/lib/resizing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Resizing
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/test/resizing/carrier_wave_test.rb

@@ -70,6 +70,18 @@ module Resizing
       assert_equal('jpg', model.resizing_picture.format)
     end
 
+    def test_url_is_return_default_url
+      model = TestModel.new
+      model.save!
+      assert_nil model.resizing_picture_url
+    end
+
+    def test_url_is_return_default_url
+      model = TestModelWithDefaultURL.new
+      model.save!
+      assert_equal('http://example.com/test.jpg', model.resizing_picture_url)
+    end
+
     def expect_url
       'http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/'+
         'upload/images/28c49144-c00d-4cb5-8619-98ce95977b9c/v1Id850__tqNsnoGWWUibtIBZ5NgjV45M'

data/test/resizing/client_test.rb

@@ -49,6 +49,7 @@ module Resizing
         assert(!r['created_at'].nil?)
         assert(!r['updated_at'].nil?)
         assert_equal(r['public_id'], '/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/vAyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq')
+        assert_equal(r['filename'], 'sample1.jpg')
       end
     end
 

data/test/test_helper.rb

@@ -33,7 +33,7 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Schema.define do
   self.verbose = false
 
-  %i(test_models test_jpg_models).each do |model_name|
+  %i(test_models test_jpg_models test_model_with_default_urls).each do |model_name|
     connection.execute "drop table if exists #{model_name}"
 
     create_table model_name do |t|
@@ -61,6 +61,20 @@ class ResizingJPGUploader < CarrierWave::Uploader::Base
   def default_format
     'jpg'
   end
+
+  def default_url
+    'http://example.com/test.jpg'
+  end
+end
+
+class ResizingUploaderWithDefaultURL < CarrierWave::Uploader::Base
+  include Resizing::CarrierWave
+
+  process resize_to_limit: [1000]
+
+  def default_url
+    'http://example.com/test.jpg'
+  end
 end
 
 class TestModel < ::ActiveRecord::Base
@@ -74,3 +88,9 @@ class TestJPGModel < ::ActiveRecord::Base
 
   mount_uploader :resizing_picture, ResizingJPGUploader
 end
+
+class TestModelWithDefaultURL < ::ActiveRecord::Base
+  extend CarrierWave::Mount
+
+  mount_uploader :resizing_picture, ResizingUploaderWithDefaultURL
+end

data/test/vcr/client/post.yml

@@ -49,6 +49,6 @@ http_interactions:
       - chunked
     body:
       encoding: UTF-8
-      string: '{"id":"bfdaf2b3-7ec5-41f4-9caa-d53247dd9666","project_id":"098a2a0d-c387-4135-a071-1254d6d7e70a","content_type":"image/jpeg","latest_version_id":"AyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq","latest_etag":"\"190143614e6c342637584f46f18f8c58\"","created_at":"2020-05-29T03:22:55.241Z","updated_at":"2020-05-29T03:22:55.241Z","public_id":"/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/vAyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq"}'
+      string: '{"id":"bfdaf2b3-7ec5-41f4-9caa-d53247dd9666","project_id":"098a2a0d-c387-4135-a071-1254d6d7e70a","content_type":"image/jpeg","latest_version_id":"AyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq","latest_etag":"\"190143614e6c342637584f46f18f8c58\"","created_at":"2020-05-29T03:22:55.241Z","updated_at":"2020-05-29T03:22:55.241Z","public_id":"/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/bfdaf2b3-7ec5-41f4-9caa-d53247dd9666/vAyWaxx96gLaAzB9Bq.VbX1_pxfXJ0Jcq","filename":"sample1.jpg"}'
   recorded_at: Fri, 29 May 2020 03:22:55 GMT
 recorded_with: VCR 6.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resizing
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Junichiro Kasuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2020-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday