balloon 1.0.3 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 484f47f52881d0416b591ade66e361ad5c04d745b13c49e8e4715b417a912e92
-  data.tar.gz: 6fdc98cc0a8ab9f8788654b95127470617d0188f22c74e9257b77c2567d5feff
+  metadata.gz: 909d8652d1b69823ed4a0a65e8802e5adf41fe37183111ad6d0f9e4035e7e882
+  data.tar.gz: 23e566f565e83f05d92740761ad7b9d1c6b851e73e038d23d9cac833ae09f483
 SHA512:
-  metadata.gz: 5ffd6489b6c336d601219c3d11948440bc8f3c4b829c996af90a6f34590444a7b85b7bc120d1ea06318b8d487f4d5d99ff44e32d9c1210c33d1607c618ee9ca7
-  data.tar.gz: ab7933c8a10252c0348dec8610d8fa707fe8d09468f844535fbcccdfaeb56c14860e3a1fe7d038db1497039aff9213632527625e933189fec330342f0f43fa8d
+  metadata.gz: 99174822071a213f398c7fcec40c40f232852dce889f095241df9a7225099040cef5834104b878a1a41398231fad1624b29e286ca5b8063f5629cec017249459
+  data.tar.gz: 4c12e055ccc06b235e951b3edeb0f5adad4d04f58a2ff9a282827302199c1422bcb8f481884313143e9c32046e9599117e24fa6a9c4f6e6d8c92ceaf19d64b18

data/.gitignore

@@ -8,3 +8,4 @@ spec/fixtures/tmp
 spec/fixtures/public
 spec/fixtures/cache
 spec/config/balloon.yml
+examples/output

data/.rubocop.yml

@@ -0,0 +1,4 @@
+AllCops:
+  NewCops: enable
+  SuggestExtensions: false
+

data/README.md

@@ -1,7 +1,8 @@
 # Balloon 
 
 
-Balloon是基于Ruby的图片上传插件， 并且可以完美配合Rails使用。
+Balloon是基于mini_magick的Rails项目图片上传插件。
+
 
 
 ## 安装
@@ -25,30 +26,47 @@ Balloon是基于Ruby的图片上传插件， 并且可以完美配合Rails使用
 
     $ gem install balloon
 
+
+
 ## 单独使用
 
-```
+Class 例子
+
+```ruby
 require 'balloon'
 
 Balloon.configure do |config|
   config.store_storage = :file
+  config.root = "output"
 end
 
 class Upload < Balloon::Base
-  uploader :avatar
-  uploader_size t: "100x100"
-  uploader_name_format 
+  uploader :image
+  uploader_dir 'uploads'
+  uploader_mimetype_white %w[image/jpeg image/png image/gif image/webp]
+  uploader_name_format name: "output", format: "upcase" # 输出文件名
+  uploader_type_format 'webp' # ImageMagick支持的类型
+  uploader_size thumb: "100x100", small: "200x", medium: '500x>' # https://legacy.imagemagick.org/Usage/resize/
 end
+```
+
+文件上传
 
-file = File.new("file.jpg")
+````ruby
+file = File.new("input.jpg")
+upload = Upload.new(file)
 
-upload = Upload.new("file")
+or
+
+upload = Upload.new("input.jpg")
 
 upload.upload_store #上传图片
+upload.image #获取图片上传信息
 
 upload.from_store(:t) #获得图片Path
+````
+
 
-```
 
 ## 在Rails中使用
 
@@ -56,7 +74,7 @@ upload.from_store(:t) #获得图片Path
 在Rails应用程序中运行下述命令来完成Balloon插件的初始化
 
 	$ rails g balloon:config
-	
+
 在运行命令后， 会在config目录中生成一个balloon.yml配置文件
 
 ###### 默认生成balloon.yml文件
@@ -91,22 +109,7 @@ store_dir: 设置存储目录， 默认为主目录下的"public"目录
 cache_dir: "tmp" # 设置临时文件储存目录， 默认为主目录下的“tmp”目录
 ```
 
-###### 在为model文件添加下列格式
-  
-Mongomapper, Mongoid
 
-```
-  class Image 
-    include MongoMapper::Document
-    include Balloon::Up
-    
-    uploader :image, :db 
-    uploader_size t: "45", s: "450", m: "770"
-    uploader_dir "uploads/product"
-    uploader_mimetype_white %w{image/jpeg image/png image/gif}
-    uploader_name_format name: Proc.new{|p| p.id.to_s }
-  end 
-```
 
 model 配置介绍
 
@@ -123,7 +126,8 @@ uploader_name_format #对上传文件进行重命名，
 ```
 
 
-ActiveRecord
+
+#### ActiveRecord
 
 先生成 model文件
 
@@ -131,16 +135,24 @@ ActiveRecord
 
 并修改migration文件, 为下列格式
 
-```
+```ruby
 
 class CreateImages < ActiveRecord::Migration
   def change
     create_table :pictures do |t|
+      t.string :file_id, null: false, index: true
       t.string :file_name
+      t.integer :width
+      t.integer :height
       t.string :content_type
-      t.integer :file_size
+      t.bigint :file_size
       t.string :storage
-      t.datetime :created_at
+      
+      # Postgresql 可以JSONB 作为metadata格式
+      t.jsonb :metadata 
+      # Mysql和其它需要使用text
+      t.text :metadata
+   
       t.timestamps
     end
   end
@@ -148,29 +160,73 @@ end
 
 ```
 
-在 model 文件
+model 文件
 
-```
-class Image < ActiveRecord::Base
+```ruby
+class Picture < ActiveRecord::Base
   include Balloon::Up
     
-  uploader :image
+  uploader :image, :db
+  uploader_dir 'uploads/images'
+  uploader_mimetype_white %w[image/jpeg image/png image/gif image/webp]
+  uploader_name_format name: proc { |img| img.file_id }
+  uploader_type_format 'webp'
+  uploader_size thumb: '150x', small: '450x>'
+    
+  before_validation :create_file_id, on: :create
+  
+  def create_file_id
+    self.file_id = generate_file_id
+  end
+
+  def generate_file_id
+    loop do
+      token = SecureRandom.hex
+      break token unless Picture.exists?(file_id: token)
+    end
+  end  
 end
 
 ```
 
-###### rails实现图片上传
+
+
+####  Mongoid
+
+```
+  class Image 
+    include MongoMapper::Document
+    include Balloon::Up
+    
+    uploader :image, :db 
+    uploader_size t: "45", s: "450", m: "770"
+    uploader_dir "uploads/product"
+    uploader_mimetype_white %w{image/jpeg image/png image/gif}
+    uploader_name_format name: Proc.new{|p| p.id.to_s }
+  end 
+```
+
+
+
+#### rails 实现图片上传
 
 直接试用model原生操作， 用uploader设置的参数作为上传参数
-  
- 	@image = Images.new(image: file)
- 	@image.save
 
-###### 又拍云支持
+```ruby
+@picture = Picture.new(image: params[:image])
+@picture.save
+
+@picture.url #获取原图
+@picture.url(size) #获得图片地址
+```
+
+
+
+##### 又拍云支持
 
 将store_storage 修改为 ‘upyun’, 在config/balloon.yml内添加下列内容
 
-```
+```yaml
   upyun_domain: ""
   upyun_bucket: "" 
   upyun_username: ""
@@ -181,5 +237,3 @@ end
 
 
 
-
- 

data/balloon.gemspec

@@ -1,42 +1,39 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "balloon/version"
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'balloon/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = "balloon"
+  spec.name        = 'balloon'
   spec.version     = Balloon::VERSION
-  spec.authors     = ["yeeli"]
-  spec.email       = ["yeeli@outlook.com"]
+  spec.authors     = ['yeeli']
+  spec.email       = ['yeeli@outlook.com']
 
-  spec.homepage    = "https://github.com/yeeli/balloon"
-  spec.summary     = %q{Ruby image upload libary}
-  spec.description = %q{Ruby image upload libary}
+  spec.homepage    = 'https://github.com/yeeli/balloon'
+  spec.summary     = 'Ruby image upload libary'
+  spec.description = 'Ruby image upload libary'
 
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = spec.homepage
-  spec.metadata["changelog_uri"] = spec.homepage
+  spec.metadata['homepage_uri'] = spec.homepage
+  spec.metadata['source_code_uri'] = spec.homepage
+  spec.metadata['changelog_uri'] = spec.homepage
 
-
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activesupport"
-  spec.add_dependency "mini_magick"
-  spec.add_dependency "faraday"
-  spec.add_dependency "mime-types"
+  spec.add_dependency 'activesupport'
+  spec.add_dependency 'faraday'
+  spec.add_dependency 'mime-types'
+  spec.add_dependency 'mini_magick'
 
   # Development dependency
 
-  spec.add_development_dependency "rails"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "mysql2"
-  spec.add_development_dependency "mongo_mapper"
-  spec.add_development_dependency "mongoid"
-  spec.add_development_dependency "bson_ext"
-  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'bson_ext'
+  spec.add_development_dependency 'mongoid'
+  spec.add_development_dependency 'mongo_mapper'
+  spec.add_development_dependency 'mysql2'
+  spec.add_development_dependency 'rails'
+  spec.add_development_dependency 'rspec'
 end

data/examples/upload.rb

@@ -0,0 +1,19 @@
+$LOAD_PATH.unshift(File.expand_path('../lib'))
+require 'balloon'
+
+Balloon.configure do |config|
+  config.store_storage = :file
+  config.root = "output"
+end
+
+class Upload < Balloon::Base
+  uploader :image
+  uploader_dir 'uploads'
+  uploader_mimetype_white %w[image/jpeg image/png image/gif image/webp]
+  uploader_name_format name: 'output', format: 'upcase'
+  uploader_type_format 'webp'
+  uploader_size thumb: '200x', small: '600x>', large: '800x>'
+end
+
+upload = Upload.new("input.jpg")
+upload.upload_store

data/examples/upload_gif.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH.unshift(File.expand_path('../lib'))
+require 'balloon'
+require "mini_magick"
+
+Balloon.configure do |config|
+  config.store_storage = :file
+  config.root = "output"
+end
+
+class Upload < Balloon::Base
+  uploader :image
+  uploader_dir 'uploads/images'
+  uploader_mimetype_white %w[image/jpeg image/png image/gif image/webp]
+  uploader_name_format name: proc { |img| img.file_name }
+  uploader_type_format 'webp'
+  uploader_size thumb: '100x100', small: '200x>'
+
+  def file_name
+    "output_gif"
+  end
+end
+
+upload = Upload.new("input.gif")
+upload.upload_store

data/lib/balloon/base.rb

@@ -9,6 +9,10 @@ module Balloon
           @file = upload_file.is_a?(Hash) ? upload_file[:#{name}] : upload_file 
         end
 
+        def #{name}
+          @meta
+        end
+
         def uploader_name
           "#{name}".pluralize
         end
@@ -28,8 +32,8 @@ module Balloon
       uploader_file = upload_file.nil? ? @file : upload_file
       save_to_cache(uploader_file)
       store_info = storage_engine.store!
-      @info[:filename] = store_info[:filename]
-      @info[:basename] = store_info[:basename]
+      @meta[:filename] = store_info[:filename]
+      @meta[:basename] = store_info[:basename]
     end
     
     def from_store(size_name = nil)

data/lib/balloon/configuration.rb

@@ -1,7 +1,10 @@
 module Balloon
   module Configuration
 
-    STORAGE_EGINE = { file: "Balloon::Storage::File", upyun: "Balloon::Storage::Upyun" }
+    STORAGE_EGINE = {
+      file: "Balloon::Storage::File",
+      upyun: "Balloon::Storage::Upyun"
+    }
 
     class << self
       def included(base)

data/lib/balloon/file_extension.rb

@@ -32,7 +32,8 @@ module Balloon
     IMAGE_EXT_LIST = { 
       "image/gif" => "gif",
       "image/jpeg" => "jpg",
-      "image/png" => "png" 
+      "image/png" => "png",
+      "image/webp" => "webp"
     }
 
     def initialize(file, mime_type = nil)
@@ -133,6 +134,9 @@ module Balloon
       end
     end
 
+    def self.get_extension(mime_type)
+      IMAGE_EXT_LIST[mime_type]
+    end
 
     # @todo What Change basename add extension
     def save_to(new_path, permissions = nil, directory_permission = nil)

data/lib/balloon/load.rb

@@ -8,7 +8,8 @@ if defined?(Rails)
       initializer "Baloon.configure_rails_initializeation" do
         config_file = Rails.root.join('config/balloon.yml')
         if config_file.file?
-          config = YAML.load(ERB.new(config_file.read).result)
+          config_result = config_file.read
+          config = Psych.load_stream(ERB.new(config_result).result)[0]
           Balloon.configure_load(config, Rails.env)
         end
       end
@@ -25,7 +26,8 @@ elsif defined?(Sinatra)
   Balloon.root = root
   config_file = File.join(root, 'config/balloon.yml')
   if File.exist?(config_file)
-    config = YAML.load(ERB.new(File.read(config_file)).result)
+    config_result = File.read(config_file)
+    config = Psych.load_stream(ERB.new(config_result).result)[0]
     Balloon.configure_load(config, env)
   end
 end

data/lib/balloon/processing.rb

@@ -4,71 +4,136 @@ module Balloon
   module Processing
     extend ActiveSupport::Concern
 
-    def resize_with_string(file)
-      width, height = "", ""
-      oranginl_img = MiniMagick::Image.open(file.path)
-      auto_orient!(oranginl_img, file.path)
-      if self.respond_to?(:uploader_size) && !(store_storage.to_s == "upyun" && upyun_is_image)
-        uploader_size.each do |s, o|
-          img = MiniMagick::Image.open(file.path)
-          raise ProcessError, "process error" unless img
-          width = img[:width]
-          height = img[:height]
-          new_img = resize(img, o)
-          new_img.write File.join(cache_path, "#{file.basename}_#{s}.#{file.extension}")
-        end
+    def image_processing(image)
+      data = {}
+      ext = image.extension
+
+      if respond_to?(:uploader_type_format)
+        ext = uploader_type_format
+      end
+
+      processed_img = handle_original(image, ext)
+      data[:original] = get_image_data(processed_img)
+
+      resized_img = handle_resize(image, ext)
+      data.merge!(resized_img)
+
+      mime_type = processed_img.mime_type
+      extension = FileExtension.get_extension(mime_type)
+      filename = "#{image.basename}.#{extension}"
+
+      return {
+        basename: image.basename,
+        width: processed_img.width,
+        height: processed_img.height,
+        size: processed_img.size,
+        filename: filename,
+        mime_type: mime_type,
+        extension: extension,
+        data: data
+      }
+    end
+
+    def handle_original(file, ext)
+      original_image =  MiniMagick::Image.open(file.path)
+      convert = MiniMagick::Tool::Convert.new
+      convert << file.path
+
+      auto_orient!(original_image, convert)
+      convert.format ext
+
+      cache_file = File.join(cache_path, "#{file.basename}.#{ext}")
+      convert << cache_file
+      convert.call
+      
+      return MiniMagick::Image.open(cache_file)
+    end
+
+    def handle_resize(file, ext)
+      return {} unless self.respond_to?(:uploader_size)
+      return {} if store_storage.to_s == "upyun" && upyun_is_image
+      data = {}
+
+      uploader_size.each do |size, o|
+        img = MiniMagick::Image.open(file.path)
+        raise ProcessError, "process error" unless img
+
+        convert = MiniMagick::Tool::Convert.new
+        convert << file.path
+
+        auto_orient!(img, convert)
+        convert.format ext
+
+        resize(convert, img, o)
+        cache_file = File.join(cache_path, "#{file.basename}_#{size}.#{ext}")
+        convert << cache_file
+        convert.call
+
+        processed_img = MiniMagick::Image.open(cache_file)
+        data[size] = get_image_data(processed_img)
       end
-      return {width: oranginl_img[:width], height: oranginl_img[:height]}
+
+      return data
     end
 
-    def resize(image, size)
+    def resize(convert, image, size)
       width, height, symbol = size[:width], size[:height], size[:symbol]     
+
       if !symbol.empty? || width.match(/\%/) || height.match(/\%/)
         if width == height
-          image = shave(image)
-          image.resize "#{width}"
+          shave(convert, image)
+          convert.resize "#{width}"
         else
-          image.resize "#{width}x#{height}#{symbol}"
+          convert.resize "#{width}x#{height}#{symbol}"
         end
+        return
+      end
+
+      if width == height
+        shave(convert, image)
+        value = (width.to_f / image[:width].to_f) * 100
+        convert.resize "#{value}%"
+        return
+      end
+
+      if width.empty?
+        value = (height.to_f / image[:height].to_f)  * 100
+        convert.resize "#{value}%"
+      elsif height.empty?
+        value = (width.to_f / image[:width].to_f)  * 100
+        convert.resize "#{value}%"
       else
-        if width == height
-          image = shave(image)
-          value = (width.to_f / image[:width].to_f) * 100
-          image.resize "#{value}%"
-        else
-          if width.empty?
-            value = (height.to_f / image[:height].to_f)  * 100
-            image.resize "#{value}%"
-          elsif height.empty?
-            value = (width.to_f / image[:width].to_f)  * 100
-            image.resize "#{value}%"
-          else
-            image.resize "#{width}x#{height}"
-          end
-        end
+        convert.resize "#{width}x#{height}"
       end
-      return image
     end
 
-    def shave(image)
+    def shave(convert, image)
       w, h = image[:width], image[:height]
+
       if w > h
         shave_off = ((w - h) / 2).round
-        image.shave "#{shave_off}x0"
-      else
-        shave_off = ((h - w) / 2).round
-        image.shave "0x#{shave_off}"
+        convert.shave "#{shave_off}x0"
+        return
       end 
-      return image
+
+      shave_off = ((h - w) / 2).round
+      convert.shave "0x#{shave_off}"
     end
 
-    def auto_orient!(img, file)
+    def auto_orient!(img, covert)
       if img.exif["Orientation"].to_i > 1
-        img.auto_orient
-        img.write file
+        convert.auto_orient
       end
     end
 
+    def get_image_data(img)
+      return {
+        width: img.width,
+        height: img.height,
+        size: img.size
+      }
+    end
+
     # parseing the size string
     #
     # @return [Hash] the options for string

data/lib/balloon/storage/file.rb

@@ -3,6 +3,7 @@ module Balloon
     class File < Balloon::Storage::Store
       def store!
         _store_path = store_path
+        cache_meta = @uploader.cache_meta
 
         if !::File.exists? _store_path
           FileUtils.mkdir_p _store_path
@@ -10,17 +11,23 @@ module Balloon
         end
 
         original_file = set_upload_name
+
         store_original_file = ::File.join _store_path, original_file
-        cache_original_file = ::File.join @uploader.cache_path, @uploader.info[:filename]
+        cache_original_file = ::File.join @uploader.cache_path, cache_meta[:filename]
+
         FileUtils.mv cache_original_file, store_original_file
 
         if @uploader.respond_to?(:uploader_size)
           @uploader.uploader_size.each do |s, o|
             store_file = ::File.join _store_path, set_upload_name(s)
-            cache_file = ::File.join @uploader.cache_path, @uploader.info[:basename]+ "_#{s}"+"."+ @uploader.info[:extension]
+            cache_file = ::File.join @uploader.cache_path, cache_meta[:basename]+ "_#{s}"+"."+ cache_meta[:extension]
             FileUtils.mv cache_file, store_file
           end
         end
+
+        # Remove cache path
+        FileUtils.remove_dir(@uploader.cache_path)
+
         return { filename: original_file, basename: store_name}
       end
 
@@ -55,7 +62,8 @@ module Balloon
       end
 
       def store_path
-        ::File.expand_path ::File.join(@uploader.root, @uploader.store_dir, upload_dir)
+        root_path = @uploader.root || "."
+        ::File.expand_path ::File.join(root_path, @uploader.store_dir, upload_dir)
       end
     end
   end

data/lib/balloon/storage/store.rb

@@ -10,8 +10,9 @@ module Balloon
       def retrieve!(size_name = nil); end
 
       def upload_file
-        file_info = @uploader.info
+        file_info = @uploader.meta
         return {} if file_info.nil?
+
         basename = file_info[:basename] || ""
         extension = file_info[:extension] || ""
         { basename: basename, extension: extension }
@@ -22,24 +23,30 @@ module Balloon
       end
 
       def store_name
-        return upload_file[:basename] if !@uploader.respond_to?(:uploader_name_format) 
+        if !@uploader.respond_to?(:uploader_name_format)
+          return @uploader.cache_meta[:basename]
+        end
+
         name_format = @uploader.uploader_name_format
         name = name_format[:name]
-        if name_format[:format].to_s == "downcase" 
-          name = name.downcase
-        elsif name_format[:format].to_s == "upcase"
-          name = name.upcase
-        else
-          name
+
+        if name_format[:format].to_s == "downcase"
+          return name.downcase
         end
+
+        if name_format[:format].to_s == "upcase"
+          return name.upcase
+        end
+
+        name
       end
 
       def set_upload_name(size_name = nil )
-        if size_name 
-          store_name + "_#{size_name.to_s}" + "." + upload_file[:extension] 
-        else
-          store_name + "." + upload_file[:extension] 
+        cache_meta = @uploader.cache_meta
+        if size_name
+          return store_name + "_#{size_name.to_s}" + "." + cache_meta[:extension]
         end
+        store_name + "." + cache_meta[:extension]
       end
 
       def connection
@@ -49,7 +56,7 @@ module Balloon
         conn = Http::Client.new(options[:url]) do |builder|
           builder.headers = options[:headers]
           builder.basic_auth(basic[:user], basic[:password]) if !basic.nil?
-          builder.token_auth(self, token) if !token.nil? 
+          builder.token_auth(self, token) if !token.nil?
         end
         return conn
       end

data/lib/balloon/storage/upyun.rb

@@ -16,9 +16,11 @@ module Balloon
 
       def store!
         _store_path = store_path
+        cache_meta = @uploader.cache_meta
         original_file = set_upload_name
+
         store_original_file = ::File.join _store_path, original_file       
-        cache_original_file = ::File.join @uploader.cache_path, @uploader.info[:filename]
+        cache_original_file = ::File.join @uploader.cache_path, cache_meta[:filename]
         file = ::File.new cache_original_file
         response = connection.put(store_original_file, file.read, file.size)
         raise "Connection errors" if response.nil?
@@ -26,12 +28,13 @@ module Balloon
         if !@uploader.upyun_is_image && @uploader.respond_to?(:uploader_size)
           @uploader.uploader_size.each do |s, o|
             store_file = ::File.join _store_path, set_upload_name(s)
-            cache_file = ::File.join @uploader.cache_path, @uploader.info[:basename]+ "_#{s}"+"."+ @uploader.info[:extension]
+            cache_file = ::File.join @uploader.cache_path, cache_meta[:basename]+ "_#{s}"+"."+ cache_meta[:extension]
             file = ::File.new cache_file
             connection.put(store_file, file.read, file.size)
           end
         end
 
+        FileUtils.remove_dir(@uploader.cache_path)
         return { filename: original_file, basename: store_name }
       end
 

data/lib/balloon/up.rb

@@ -22,15 +22,15 @@ module Balloon
           end
 
           def #{name}
-            @info
+            @meta
           end
 
           def uploader_save
-            return if info.nil?
+            return if cache_meta.nil?
             set_storage_engine
             store_info = storage_engine.store!
-            @info[:filename] = store_info[:filename]
-            @info[:basename] = store_info[:basename]
+            @meta[:filename] = store_info[:filename]
+            @meta[:basename] = store_info[:basename]
           end
 
           def uploader_name
@@ -51,6 +51,7 @@ module Balloon
           key :content_type, String
           key :file_size, Integer
           key :storage, String
+          key :metadata
           key :created_at
         elsif defined?(Mongoid)
           field :file_name, type: String
@@ -59,6 +60,7 @@ module Balloon
           field :content_type, type: String
           field :file_size, type: String
           field :storage, type: String
+          field :metadata
           field :created_at
         end
 
@@ -67,20 +69,23 @@ module Balloon
 
         class_eval <<-RUBY
           def save_db
-            return if info.nil?
-            self.file_name = info[:filename]
-            self.content_type = info[:mime_type]
-            self.file_size = info[:size]
+            return if meta.nil?
+            self.file_name = meta[:filename]
+            self.content_type = meta[:mime_type]
+            self.file_size = meta[:size]
             self.storage = store_storage.to_s
-            self.width = info[:width]
-            self.height = info[:height]
+            self.width = meta[:width]
+            self.height = meta[:height]
+            if self.respond_to?(:metadata)
+              self.metadata = meta[:data]
+            end
           end
 
           def url(size_name = nil)
            return "" if !respond_to?(:file_name) || file_name.nil?
            extension = self.file_name.to_s.match(%r"(?!\\.{1})\\w{2,}$")
            basename = self.file_name.to_s.gsub(%r"\\.{1}\\w{2,}$",'')
-           @info = { basename: basename, extension: extension.to_s }
+           @meta = { basename: basename, extension: extension.to_s }
            set_storage_engine
            storage_engine.retrieve!(size_name)
           end
@@ -89,7 +94,7 @@ module Balloon
            return if !respond_to?(:file_name) || file_name.nil?
            extension = self.file_name.to_s.match(%r"(?!\\.{1})\\w{2,}$")
            basename = self.file_name.to_s.gsub(%r"\\.{1}\\w{2,}$",'')
-           @info = { basename: basename, extension: extension.to_s }
+           @meta = { basename: basename, extension: extension.to_s }
            set_storage_engine
            storage_engine.delete!
           end

data/lib/balloon/uploader.rb

@@ -9,7 +9,7 @@ module Balloon
       include Balloon::Download
       attr_accessor :file
       attr_reader :storage_engine
-      attr_reader :info
+      attr_reader :cache_meta, :meta
       attr_accessor :download_error, :process_error
     end
 
@@ -24,27 +24,27 @@ module Balloon
       file_mime_type = uploader_file_ext.mime_type
 
       if self.respond_to?(:uploader_mimetype_white)
-        if !uploader_mimetype_white.include?(file_mime_type)          
+        if !uploader_mimetype_white.include?(file_mime_type)
           raise Balloon::DownloadError, I18n.translate(:"errors.messages.down_mime_error")
         end
-      elsif self.respond_to?(:uploader_mimetype_black)
-        if !uploader_mimetype_black.include?(file_mime_type)          
+      end
+
+      if self.respond_to?(:uploader_mimetype_black)
+        if !uploader_mimetype_black.include?(file_mime_type)
           raise Balloon::DownloadError, I18n.translate(:"errors.messages.down_mime_error")
         end
       end
 
       generate_cache_directory
       up_file = uploader_file_ext.save_to cache_path, permissions
-      uploader_file = up_file
-      img = resize_with_string up_file
-      @info = { 
-        width: img[:width],
-        height: img[:height],
-        size: up_file.size,
-        mime_type: up_file.mime_type,
-        filename: up_file.filename,  
-        basename: up_file.basename,
-        extension: up_file.extension 
+      @cache_meta = image_processing up_file
+      @meta = {
+        width: @cache_meta[:width],
+        height: @cache_meta[:height],
+        size: @cache_meta[:size],
+        mime_type: @cache_meta[:mime_type],
+        extension: @cache_meta[:extension],
+        data: @cache_meta[:data]
       }
     end
 
@@ -71,16 +71,21 @@ module Balloon
 
       def uploader_name_format(info)
         define_method "uploader_name_format" do
-          name = info[:name].nil? ? info[:name] : info[:name].call(self)
+          name = info[:name].is_a?(Proc) ? info[:name].call(self) : info[:name].to_s
           { name: name, format: info[:format] }
         end
       end
 
+      def uploader_type_format(ext)
+        define_method "uploader_type_format" do; ext; end
+      end
+
       def uploader_mimetype_white(list)
         raise "just choise one method" if respond_to?(:uploader_mime_type_black)
         define_method "uploader_mimetype_white" do; list; end
       end
 
+
       def uploader_mimetype_black(list)
         raise "just choise one method" if respond_to?(:uploader_mime_type_black)
         define_method "uploader_mimetype_black" do; list; end

data/lib/balloon/version.rb

@@ -1,3 +1,3 @@
 module Balloon
-  VERSION = "1.0.3"
+  VERSION = "1.1.1"
 end

data/lib/balloon.rb

@@ -1,13 +1,13 @@
-#coding:utf-8
-require "balloon/version"
+require 'balloon/version'
 require 'active_support'
 require 'active_support/core_ext'
 
+# Balloon
 module Balloon
   class << self
     attr_accessor :root
     def configure(&block)
-      Balloon::Base.configure &block   
+      Balloon::Base.configure &block
     end
 
     def configure_load(config, env)

data/lib/rails/generators/balloon/config/config_generator.rb

@@ -2,7 +2,7 @@ module Balloon
   module Generators
     class ConfigGenerator < Rails::Generators::Base
       desc "create the Balloon configuration at config/balloon.yml"
-      
+
       def self.source_root
         @source_root ||= File.expand_path("../templates", __FILE__)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balloon
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.1
 platform: ruby
 authors:
 - yeeli
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bson_ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bson_ext
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -173,11 +173,17 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - Gemfile
 - README.md
 - README_EN.md
 - Rakefile
 - balloon.gemspec
+- examples/balloon.yml
+- examples/input.gif
+- examples/input.jpg
+- examples/upload.rb
+- examples/upload_gif.rb
 - lib/balloon.rb
 - lib/balloon/base.rb
 - lib/balloon/cache.rb
@@ -220,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Ruby image upload libary