balloon 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 909d8652d1b69823ed4a0a65e8802e5adf41fe37183111ad6d0f9e4035e7e882
-  data.tar.gz: 23e566f565e83f05d92740761ad7b9d1c6b851e73e038d23d9cac833ae09f483
+  metadata.gz: 89bc6b2f3af3d0f77235b2ca38bc17851f0a3850a4742d14dfb462d5d32fb11d
+  data.tar.gz: f110eedc9a0e2ba8dde12785401755c0b4f5e264c707a4184dd35ca1a0e88aee
 SHA512:
-  metadata.gz: 99174822071a213f398c7fcec40c40f232852dce889f095241df9a7225099040cef5834104b878a1a41398231fad1624b29e286ca5b8063f5629cec017249459
-  data.tar.gz: 4c12e055ccc06b235e951b3edeb0f5adad4d04f58a2ff9a282827302199c1422bcb8f481884313143e9c32046e9599117e24fa6a9c4f6e6d8c92ceaf19d64b18
+  metadata.gz: 1228ab4477df6a100db7046cffb4436775e8f851db17009fdb18b90a645b4eeb2e7cdfc48cb6cdfaff32af44dc73f4c6ae33a4968b8cd0f583a622d715662097
+  data.tar.gz: 60473bbaf1ab5804eb39e23d6f2577fd475c445d82486605696e34b43026a67c5f5c7ab7cd05c04e1c646c51b9594daf28576b94d2336006bcda4c90d9477fd4

data/lib/balloon/processing.rb

@@ -15,8 +15,8 @@ module Balloon
       processed_img = handle_original(image, ext)
       data[:original] = get_image_data(processed_img)
 
-      resized_img = handle_resize(image, ext)
-      data.merge!(resized_img)
+      total_size = handle_resize(image, ext, data)
+      data[:total_size] = processed_img.size.to_i + total_size.to_i
 
       mime_type = processed_img.mime_type
       extension = FileExtension.get_extension(mime_type)
@@ -45,14 +45,14 @@ module Balloon
       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 = {}
+    def handle_resize(file, ext, data)
+      return unless self.respond_to?(:uploader_size)
+      return if store_storage.to_s == "upyun" && upyun_is_image
+      total_size = 0
 
       uploader_size.each do |size, o|
         img = MiniMagick::Image.open(file.path)
@@ -71,13 +71,14 @@ module Balloon
 
         processed_img = MiniMagick::Image.open(cache_file)
         data[size] = get_image_data(processed_img)
+        total_size += processed_img.size
       end
 
-      return data
+      return total_size
     end
 
     def resize(convert, image, size)
-      width, height, symbol = size[:width], size[:height], size[:symbol]     
+      width, height, symbol = size[:width], size[:height], size[:symbol]
 
       if !symbol.empty? || width.match(/\%/) || height.match(/\%/)
         if width == height
@@ -114,7 +115,7 @@ module Balloon
         shave_off = ((w - h) / 2).round
         convert.shave "#{shave_off}x0"
         return
-      end 
+      end
 
       shave_off = ((h - w) / 2).round
       convert.shave "0x#{shave_off}"

data/lib/balloon/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: balloon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - yeeli