balloon 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 909d8652d1b69823ed4a0a65e8802e5adf41fe37183111ad6d0f9e4035e7e882
-  data.tar.gz: 23e566f565e83f05d92740761ad7b9d1c6b851e73e038d23d9cac833ae09f483
+  metadata.gz: 93ee09077783f74ff932ed5552a56e6bfff56c32761cfe9e3a56c71e29a3420f
+  data.tar.gz: b3a4618315f7344436e4338f37080409f7c1664535d8e3a060688105eb9286e1
 SHA512:
-  metadata.gz: 99174822071a213f398c7fcec40c40f232852dce889f095241df9a7225099040cef5834104b878a1a41398231fad1624b29e286ca5b8063f5629cec017249459
-  data.tar.gz: 4c12e055ccc06b235e951b3edeb0f5adad4d04f58a2ff9a282827302199c1422bcb8f481884313143e9c32046e9599117e24fa6a9c4f6e6d8c92ceaf19d64b18
+  metadata.gz: 3df6102dcf37884530d91c9eb42876089db2b898c88199635e18ad0c7097dd3d809fcd60e8144185906dbd50f385c1a33d2056863eece3a7d9f5509457384be2
+  data.tar.gz: 4596fd7f51c8fad31481b3b1fba27b8c068c8c28f4266f0d9a9804e119d20298445e61f3726259a3f9a928e5944b28951abf93e58879e74780cf57586836ad7e

data/examples/upload.rb

@@ -16,4 +16,7 @@ class Upload < Balloon::Base
 end
 
 upload = Upload.new("input.jpg")
-upload.upload_store
+p upload.upload_store
+p upload.from_store
+p upload.path
+p upload.local_path

data/lib/balloon/base.rb

@@ -40,6 +40,14 @@ module Balloon
       storage_engine.retrieve!(size_name)
     end
 
+    def path(size_name = nil)
+      storage_engine.path!(size_name)
+    end
+
+    def local_path(size_name = nil)
+      storage_engine.local_path!(size_name)
+    end
+
     def upload_delete
       storage_engine.delete!
     end

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/storage/file.rb

@@ -31,11 +31,21 @@ module Balloon
         return { filename: original_file, basename: store_name}
       end
 
-      def retrieve!(size_name = nil)
+      def path!(size_name = nil)
         return "" if !upload_file
         path = ::File.join upload_dir, store_filename(size_name)
-        return "/" + path if @uploader.asset_host.nil?
-        @uploader.asset_host + "/" + path
+        return "/#{path}"
+      end
+
+      def local_path!(size_name = nil)
+        path = ::File.join @uploader.store_dir, path!(size_name)
+        return ::File.expand_path(::File.join(@uploader.root, path))
+      end
+
+      def retrieve!(size_name = nil)
+        path = path!(size_name)
+        return path if @uploader.asset_host.nil?
+        return "#{@uploader.asset_host}#{path}"
       end
 
       def delete!

data/lib/balloon/up.rb

@@ -90,6 +90,24 @@ module Balloon
            storage_engine.retrieve!(size_name)
           end
 
+          def path(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,}$",'')
+           @meta = { basename: basename, extension: extension.to_s }
+           set_storage_engine
+           storage_engine.path!(size_name)
+          end
+
+          def local_path(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,}$",'')
+           @meta = { basename: basename, extension: extension.to_s }
+           set_storage_engine
+           storage_engine.local_path!(size_name)
+          end
+
           def uploader_delete
            return if !respond_to?(:file_name) || file_name.nil?
            extension = self.file_name.to_s.match(%r"(?!\\.{1})\\w{2,}$")

data/lib/balloon/uploader.rb

@@ -18,7 +18,17 @@ module Balloon
     end
 
     def save_to_cache(up_file)
-      uploader_file = up_file.is_a?(String) && up_file.include?("://") ? down_url(up_file) : up_file
+      upload_data = {}
+      uploader_file = up_file
+
+      if up_file.is_a?(String) && up_file.include?("://")
+        upload_data[:remote_url] = up_file
+        uploader_file = down_url(up_file)
+      end
+
+      if up_file.is_a?(ActionDispatch::Http::UploadedFile)
+        upload_data[:original_filename] = up_file.original_filename
+      end
 
       uploader_file_ext = Balloon::FileExtension.new(uploader_file)
       file_mime_type = uploader_file_ext.mime_type
@@ -44,7 +54,8 @@ module Balloon
         size: @cache_meta[:size],
         mime_type: @cache_meta[:mime_type],
         extension: @cache_meta[:extension],
-        data: @cache_meta[:data]
+        upload_data: upload_data,
+        data: upload_data.merge(@cache_meta[:data])
       }
     end
 

data/lib/balloon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balloon
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - yeeli
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport