balloon 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc46fceeceeb3953a4fb862908220119cc1948b056abc8cbe1e8ad4fa8092780
-  data.tar.gz: 15eb52b4210ccb0498ecdaa1711cf6b5b4ae0198245d4cf45a2fe63d36c00ea0
+  metadata.gz: 909d8652d1b69823ed4a0a65e8802e5adf41fe37183111ad6d0f9e4035e7e882
+  data.tar.gz: 23e566f565e83f05d92740761ad7b9d1c6b851e73e038d23d9cac833ae09f483
 SHA512:
-  metadata.gz: 9d72137b38be30a8258aff896766de9e24aac3462cb3d760975a1eab78ba4c6251776416619201915238d9f0185439432a2fd6de124d8314a508d96505f29374
-  data.tar.gz: f9046e55e3387ecd448b0b5caaf3f38e41decf4e41f50d9f5d70545e93c46f89c62f7295353bbb362b45c16cf0e2eb9b4013162a5c3ff86f23cefbc7dae949f1
+  metadata.gz: 99174822071a213f398c7fcec40c40f232852dce889f095241df9a7225099040cef5834104b878a1a41398231fad1624b29e286ca5b8063f5629cec017249459
+  data.tar.gz: 4c12e055ccc06b235e951b3edeb0f5adad4d04f58a2ff9a282827302199c1422bcb8f481884313143e9c32046e9599117e24fa6a9c4f6e6d8c92ceaf19d64b18

data/README.md

@@ -145,9 +145,14 @@ class CreateImages < ActiveRecord::Migration
       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

data/examples/upload.rb

@@ -10,7 +10,7 @@ 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_name_format name: 'output', format: 'upcase'
   uploader_type_format 'webp'
   uploader_size thumb: '200x', small: '600x>', large: '800x>'
 end

data/lib/balloon/processing.rb

@@ -5,6 +5,7 @@ module Balloon
     extend ActiveSupport::Concern
 
     def image_processing(image)
+      data = {}
       ext = image.extension
 
       if respond_to?(:uploader_type_format)
@@ -12,8 +13,10 @@ module Balloon
       end
 
       processed_img = handle_original(image, ext)
+      data[:original] = get_image_data(processed_img)
 
-      handle_resize(image, ext)
+      resized_img = handle_resize(image, ext)
+      data.merge!(resized_img)
 
       mime_type = processed_img.mime_type
       extension = FileExtension.get_extension(mime_type)
@@ -26,7 +29,8 @@ module Balloon
         size: processed_img.size,
         filename: filename,
         mime_type: mime_type,
-        extension: extension
+        extension: extension,
+        data: data
       }
     end
 
@@ -46,8 +50,9 @@ module Balloon
     end
 
     def handle_resize(file, ext)
-      return unless self.respond_to?(:uploader_size)
-      return if store_storage.to_s == "upyun" && upyun_is_image
+      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)
@@ -64,8 +69,11 @@ module Balloon
         convert << cache_file
         convert.call
 
-        # img.write File.join(cache_path, "#{file.basename}_#{size}.#{ext}")
+        processed_img = MiniMagick::Image.open(cache_file)
+        data[size] = get_image_data(processed_img)
       end
+
+      return data
     end
 
     def resize(convert, image, size)
@@ -78,7 +86,6 @@ module Balloon
         else
           convert.resize "#{width}x#{height}#{symbol}"
         end
-
         return
       end
 
@@ -86,19 +93,18 @@ module Balloon
         shave(convert, image)
         value = (width.to_f / image[:width].to_f) * 100
         convert.resize "#{value}%"
-      else
-        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
-          convert.resize "#{width}x#{height}"
-        end
+        return
       end
 
-      return
+      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
+        convert.resize "#{width}x#{height}"
+      end
     end
 
     def shave(convert, image)
@@ -107,10 +113,11 @@ module Balloon
       if w > h
         shave_off = ((w - h) / 2).round
         convert.shave "#{shave_off}x0"
-      else
-        shave_off = ((h - w) / 2).round
-        convert.shave "0x#{shave_off}"
+        return
       end 
+
+      shave_off = ((h - w) / 2).round
+      convert.shave "0x#{shave_off}"
     end
 
     def auto_orient!(img, covert)
@@ -119,6 +126,14 @@ module Balloon
       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/up.rb

@@ -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
 
@@ -74,6 +76,9 @@ module Balloon
             self.storage = store_storage.to_s
             self.width = meta[:width]
             self.height = meta[:height]
+            if self.respond_to?(:metadata)
+              self.metadata = meta[:data]
+            end
           end
 
           def url(size_name = nil)

data/lib/balloon/uploader.rb

@@ -24,13 +24,13 @@ 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
       end
-      
+
       if self.respond_to?(:uploader_mimetype_black)
-        if !uploader_mimetype_black.include?(file_mime_type)          
+        if !uploader_mimetype_black.include?(file_mime_type)
           raise Balloon::DownloadError, I18n.translate(:"errors.messages.down_mime_error")
         end
       end
@@ -43,7 +43,8 @@ module Balloon
         height: @cache_meta[:height],
         size: @cache_meta[:size],
         mime_type: @cache_meta[:mime_type],
-        extension: @cache_meta[:extension]
+        extension: @cache_meta[:extension],
+        data: @cache_meta[:data]
       }
     end
 
@@ -70,7 +71,7 @@ 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

data/lib/balloon/version.rb

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

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.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - yeeli
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-07 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport