resizing 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67c72ad237f9dbd4b471d9b249ed6fbc21cdb4c99a9ff8c86e3c4aec72233c21
-  data.tar.gz: 67377bf88e061f477443d37c3d5f9362e1fc8546dd09336585e5b26820b13efe
+  metadata.gz: b2bdfaa73ba0bd1216d010dad515e8b23fe160b5b43d86501df1a53c76817798
+  data.tar.gz: 7f2360c0077fa45befefe90e2279190729314536022698793547747895619634
 SHA512:
-  metadata.gz: 982272977e217042ba1cb332a918f8877667b87731a2587cecf285664ebf669f96e2265e254f43afb42a4d8101bfda07010e5790b2cce1440363924efa05d1ab
-  data.tar.gz: fb4da505d292795e84ef79577029d0317ac199db177e0e91d51be75a2c92f89fe4bf2a3a9c0102da20c1552d1450f46ea0471065b6d10d3e8f777ead16367767
+  metadata.gz: 3aac8436eaf6bd4471d5dc3d5474dc4d3b8c75cf30c52bb7ed496ca57cdd3e6994847bafb9b95258f5baf2863114bd178ba81a5e3863123ea147cad8c7f3ad20
+  data.tar.gz: 82ba5efdd89fb3b3d5927a3470dc65541faefe1d0b5adf8498b642e9ecc893775c6a0f67cb0fde0be0f36be42f06217bfab2646442d568d3b548957d8d36e4b2

data/CHANGELOG.md

@@ -0,0 +1,149 @@
+# Changelog
+
+## [v0.5.3](https://github.com/jksy/resizing-gem/tree/v0.5.3) (2020-10-15)
+
+[Full Changelog](https://github.com/jksy/resizing-gem/compare/v0.5.2...v0.5.3)
+
+**Merged pull requests:**
+
+- Feature/fix raise error [\#40](https://github.com/jksy/resizing-gem/pull/40) ([jksy](https://github.com/jksy))
+
+## [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))
+- change mysql port on docker-compose [\#9](https://github.com/jksy/resizing-gem/pull/9) ([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))
+- fix empty url when model is reload [\#10](https://github.com/jksy/resizing-gem/pull/10) ([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

@@ -13,7 +13,9 @@ module Resizing
 
   class Error < StandardError; end
   class ConfigurationError < Error; end
-  class APIError < Error; end
+  class APIError < Error;
+    attr_accessor :decoded_body
+  end
 
   def self.configure
     raise ConfigurationError, 'Resizing.configure is not initialized' unless defined? @configure

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

@@ -8,6 +8,7 @@ module Resizing
 
         def initialize(uploader, identifier = nil)
           @uploader = uploader
+          @file = nil
           @content_type = nil
           @public_id = Resizing::PublicId.new identifier
         end
@@ -76,6 +77,11 @@ 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)
@@ -88,15 +94,23 @@ module Resizing
             # guess content-type from extension
             @content_type ||= MIME::Types.type_for(new_file.path).first.content_type
           end
-          @public_id = PublicId.new(model.send :read_attribute, serialization_column)
 
-          image_id = if @public_id.empty?
-                       Resizing.configure.generate_image_id
-                     else
-                       @public_id.image_id
-                     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
 
-          @response = Resizing.put(image_id, new_file.read, { content_type: @content_type })
+          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
@@ -176,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/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|
@@ -61,6 +63,8 @@ module Resizing
 
       result = handle_create_response(response)
       result
+    rescue Faraday::TimeoutError => e
+      handle_timeout_error e
     end
 
     def put(image_id, file_or_binary, options)
@@ -68,9 +72,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|
@@ -79,6 +85,8 @@ module Resizing
 
       result = handle_create_response(response)
       result
+    rescue Faraday::TimeoutError => e
+      handle_timeout_error e
     end
 
     def delete(image_id)
@@ -90,6 +98,8 @@ module Resizing
 
       result = handle_delete_response(response)
       result
+    rescue Faraday::TimeoutError => e
+      handle_timeout_error e
     end
 
     def metadata(image_id, options = {})
@@ -101,6 +111,8 @@ module Resizing
 
       result = handle_metadata_response(response)
       result
+    rescue Faraday::TimeoutError => e
+      handle_timeout_error e
     end
 
     private
@@ -113,6 +125,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
@@ -136,13 +153,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
 
@@ -157,7 +174,10 @@ module Resizing
       when HTTP_STATUS_OK, HTTP_STATUS_CREATED
         JSON.parse(response.body)
       else
-        raise APIError, "invalid http status code #{response.status}"
+        result = JSON.parse(response.body) rescue {}
+        err = APIError.new("invalid http status code #{response.status}")
+        err.decoded_body = result
+        raise err
       end
     end
 
@@ -168,7 +188,10 @@ module Resizing
       when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
         JSON.parse(response.body)
       else
-        raise APIError, "invalid http status code #{response.status}"
+        result = JSON.parse(response.body) rescue {}
+        err = APIError.new("invalid http status code #{response.status}")
+        err.decoded_body = result
+        raise err
       end
     end
 
@@ -179,8 +202,16 @@ module Resizing
       when HTTP_STATUS_OK, HTTP_STATUS_NOT_FOUND
         JSON.parse(response.body)
       else
-        raise APIError, "invalid http status code #{response.status}"
+        result = JSON.parse(response.body) rescue {}
+        err = APIError.new("invalid http status code #{response.status}")
+        err.decoded_body = result
+        raise err
       end
     end
+
+    def handle_timeout_error error
+      # error: Faraday::TimeoutError
+      raise APIError.new("TimeoutError: #{error.inspect}")
+    end
   end
 end

data/lib/resizing/mock_client.rb

@@ -42,7 +42,7 @@ module Resizing
     end
 
     def library_root
-      File.join(File.dirname(__FILE__), '..', '..')
+      @library_root ||= File.expand_path('../../../', __FILE__)
     end
   end
 end

data/lib/resizing/version.rb

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

data/test/resizing/carrier_wave_test.rb

@@ -10,8 +10,8 @@ module Resizing
 
       @configuration_template = {
         host: 'http://192.168.56.101:5000',
-        project_id: '098a2a0d-c387-4135-a071-1254d6d7e70a',
-        secret_token: '4g1cshg2lq8j93ufhvqrpjswxmtjz12yhfvq6w79jpwi7cr7nnknoqgwzkwerbs6',
+        project_id: 'e06e710d-f026-4dcf-b2c0-eab0de8bb83f',
+        secret_token: 'ewbym2r1pk49x1d2lxdbiiavnqp25j2kh00hsg3koy0ppm620x5mhlmgl3rq5ci8',
         open_timeout: 10,
         response_timeout: 20
       }
@@ -70,13 +70,31 @@ module Resizing
       assert_equal('jpg', model.resizing_picture.format)
     end
 
+    def test_url_is_return_default_url_as_nil
+      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 test_is_successful
+      model = prepare_model_with_tempfile TestModel
+      model.save!
+      # assert_equal('http://192.168.56.101:5000/projects/098a2a0d-c387-4135-a071-1254d6d7e70a/upload/images/28c49144-c00d-4cb5-8619-98ce95977b9c/v1Id850__tqNsnoGWWUibtIBZ5NgjV45M/', 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'
+      'http://192.168.56.101:5000/projects/e06e710d-f026-4dcf-b2c0-eab0de8bb83f/'+
+        'upload/images/14ea7aac-a194-4330-931f-6b562aec413d/v_8c5lEhDB5RT3PZp1Fn5PYGm9YVx_x0e'
     end
 
     def prepare_model model
-      VCR.use_cassette 'carrier_wave_test/save' do
+      VCR.use_cassette 'carrier_wave_test/save', record: :once do
         SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
           model = model.new
           file = File.open('test/data/images/sample1.jpg', 'r')
@@ -91,5 +109,16 @@ module Resizing
         end
       end
     end
+
+    def prepare_model_with_tempfile model
+      VCR.use_cassette 'carrier_wave_test/save', record: :once do
+        SecureRandom.stub :uuid, '28c49144-c00d-4cb5-8619-98ce95977b9c' do
+          model = model.new
+          file = File.open('test/data/images/sample1.jpg', 'r')
+          model.resizing_picture = file
+          return model
+        end
+      end
+    end
   end
 end