balloon 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513f681f29ad8f149a8c543f2843aae6c5ea763e90550729f01a86653dc0d48c
-  data.tar.gz: 93d672f3a2c4946ec738687da5eee0b2b27eea03d09ea6394dfc14f5132cb0c3
+  metadata.gz: bba5d24f211be4448d34dd84ffbe355ea56a50fd6c5ac712ceb3237b662ed595
+  data.tar.gz: 2cc2eae99f948e15c60aa54a40439e341c53d5a15d5b9028e4bddc4bd2d8536c
 SHA512:
-  metadata.gz: 621761e559cfcf174ffca5d268e865e496e2b991a40b250718e90bf227a8f9c8dc011b8f27698c1c6c3854f7cd7f210f190828f8ac46f20ea61ecf0651f536e8
-  data.tar.gz: 9a31eb83c7edebeb11e936df355047bd4c5a293a9ebd840ddcb2b24247047a2b4e64ec7480b3cb9a23e7cde4a721264f942c5b3a050ec67a485abfdfdf26b245
+  metadata.gz: 5f7a60fec492313632bebe0e2f0aff94793eb7be842345e3ac0d167eeccb5affaf756f8c6e94daa75b0a03298d0347c2d1f09a9c86d659964f1cb578c1674728
+  data.tar.gz: 3f58fca77193677d5b14e9c8902f918e9993ab2eeb7bdfbbb77545234d666c871d4daca443498aa31f6b232399c06ad812b58e703790e44a399492f90f39c534

data/balloon.gemspec

@@ -23,12 +23,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'faraday'
   spec.add_dependency 'mime-types'
   spec.add_dependency 'mini_magick'
 
   # Development dependency
 
+  spec.add_development_dependency 'faraday'
   spec.add_development_dependency 'activerecord'
   spec.add_development_dependency 'bson_ext'
   spec.add_development_dependency 'mongoid'

data/lib/balloon/file_extension.rb

@@ -29,6 +29,13 @@ module Balloon
       ["\xff\xd8\xff\xe1(.*){2}Exif", "image/jpeg"]
     ]
 
+    IMAGE_TYPE_LIST = {
+      "GIF" => "image/gif",
+      "JPEG" => "image/jpeg",
+      "PNG" => "image/png",
+      "WEBP" => "image/webp"
+    }
+
     IMAGE_EXT_LIST = { 
       "image/gif" => "gif",
       "image/jpeg" => "jpg",
@@ -134,6 +141,11 @@ module Balloon
       end
     end
 
+    def self.get_mime_type(type)
+      return type if type =~ /.+\/.+/
+      IMAGE_TYPE_LIST[type]
+    end
+
     def self.get_extension(mime_type)
       IMAGE_EXT_LIST[mime_type]
     end

data/lib/balloon/http/client.rb

@@ -45,7 +45,7 @@ module Balloon
       def connection
         @connection ||= begin
                           conn = Faraday.new(url: url)
-                          conn.basic_auth(login, pass) if login
+                          conn.request(:authorization, :basic, login, pass) if login
                           conn.build do |b|
                             conn_build.call(b)
                           end if conn_build

data/lib/balloon/processing.rb

@@ -18,7 +18,7 @@ module Balloon
       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
+      mime_type = FileExtension.get_mime_type(processed_img.type)
       extension = FileExtension.get_extension(mime_type)
       filename = "#{image.basename}.#{extension}"
 
@@ -36,7 +36,7 @@ module Balloon
 
     def handle_original(file, ext)
       original_image =  MiniMagick::Image.open(file.path)
-      convert = MiniMagick::Tool::Convert.new
+      convert = MiniMagick.convert
       convert << file.path
 
       auto_orient!(original_image, convert)
@@ -58,7 +58,7 @@ module Balloon
         img = MiniMagick::Image.open(file.path)
         raise ProcessError, "process error" unless img
 
-        convert = MiniMagick::Tool::Convert.new
+        convert = MiniMagick.convert
         convert << file.path
 
         auto_orient!(img, convert)

data/lib/balloon/uploader.rb

@@ -26,7 +26,7 @@ module Balloon
         uploader_file = down_url(up_file)
       end
 
-      if up_file.is_a?(ActionDispatch::Http::UploadedFile)
+      if up_file.is_a?(::ActionDispatch::Http::UploadedFile)
         upload_data[:original_filename] = up_file.original_filename
       end
 

data/lib/balloon/version.rb

@@ -1,3 +1,3 @@
 module Balloon
-  VERSION = "1.1.5"
+  VERSION = "1.1.7"
 end

data/lib/balloon.rb

@@ -1,6 +1,7 @@
 require 'balloon/version'
 require 'active_support'
 require 'active_support/core_ext'
+require 'action_dispatch'
 
 # Balloon
 module Balloon

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: balloon
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - yeeli
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-01 00:00:00.000000000 Z
+date: 2024-09-25 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: faraday
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.14
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Ruby image upload libary