rack_resize 0.1.3 → 0.1.6

data/lib/rack_resize/processors/sips.rb

@@ -1,20 +1,32 @@
 require "open3"
+require "tempfile"
 
 class RackResize::Processors::Sips
 
-  def resize(source_file:, target_width:, target_height:, target_file: nil)
+  def resize(source_file:, target_width:, target_height:, target_file: nil, fit: nil, format: nil, quality: nil, bg_color: nil)
+    quality ||= RackResize.config.default_quality
+    cover = (fit == 'cover' || fit == 'crop') && target_width && target_height
+
     args = %w[sips --deleteColorManagementProperties]
-    args += ["-s", "formatOptions", RackResize.config.default_quality.to_s]
+    args += ["-s", "format", sips_format(format)] if format
+    args += ["-s", "formatOptions", quality.to_s]
 
     if target_width && target_height
-      info, status = Open3.capture2("sips", "-g", "pixelWidth", "-g", "pixelHeight", source_file.to_s)
-      raise "sips failed to read dimensions for #{source_file}" unless status.success?
-      src_w = info[/pixelWidth: (\d+)/, 1]&.to_f
-      src_h = info[/pixelHeight: (\d+)/, 1]&.to_f
-      if src_w && src_h && (target_width.to_f / src_w) <= (target_height.to_f / src_h)
-        args += ["--resampleWidth", target_width.to_i.to_s]
-      else
-        args += ["--resampleHeight", target_height.to_i.to_s]
+      src_w, src_h = sips_dimensions(source_file)
+      if cover
+        if src_w.nil? || src_h.nil?
+          args += ["--resampleWidth", target_width.to_i.to_s]
+        elsif target_width.to_f / src_w >= target_height.to_f / src_h
+          args += ["--resampleWidth", target_width.to_i.to_s]
+        else
+          args += ["--resampleHeight", target_height.to_i.to_s]
+        end
+      elsif src_w && src_h
+        if (target_width.to_f / src_w) <= (target_height.to_f / src_h)
+          args += ["--resampleWidth", target_width.to_i.to_s]
+        else
+          args += ["--resampleHeight", target_height.to_i.to_s]
+        end
       end
     else
       args += ["--resampleWidth",  target_width.to_i.to_s]  if target_width
@@ -22,20 +34,40 @@ class RackResize::Processors::Sips
     end
 
     if target_file
-      _, status = Open3.capture2(*args, "-o", target_file.to_s, source_file.to_s)
-      raise "sips failed (exit #{status.exitstatus}) for #{source_file}" unless status.success?
-      return nil
+      run_sips(*args, "-o", target_file.to_s, source_file.to_s)
+      sips_crop!(target_file.to_s, target_width, target_height) if cover
+      nil
+    else
+      tmp = Tempfile.new(["result", File.extname(source_file)])
+      begin
+        run_sips(*args, "-o", tmp.path, source_file.to_s)
+        sips_crop!(tmp.path, target_width, target_height) if cover
+        File.binread(tmp.path)
+      ensure
+        tmp.close
+        tmp.unlink
+      end
     end
+  end
 
-    tmp = Tempfile.new(["result", File.extname(source_file)])
-    tmp_path = tmp.path || raise("tempfile has no path")
-    begin
-      _, status = Open3.capture2(*args, "-o", tmp_path, source_file.to_s)
-      raise "sips failed (exit #{status.exitstatus}) for #{source_file}" unless status.success?
-      File.binread(tmp_path)
-    ensure
-      tmp.close
-      tmp.unlink
-    end
+  private
+
+  def sips_dimensions(source_file)
+    info, status = Open3.capture2("sips", "-g", "pixelWidth", "-g", "pixelHeight", source_file.to_s)
+    raise "sips failed to read dimensions for #{source_file}" unless status.success?
+    [info[/pixelWidth: (\d+)/, 1]&.to_f, info[/pixelHeight: (\d+)/, 1]&.to_f]
+  end
+
+  def run_sips(*args)
+    _, status = Open3.capture2(*args)
+    raise "sips failed (exit #{status.exitstatus}): #{args.join(' ')}" unless status.success?
+  end
+
+  def sips_crop!(path, width, height)
+    run_sips("sips", "--cropToHeightWidth", height.to_i.to_s, width.to_i.to_s, path)
+  end
+
+  def sips_format(format)
+    format.to_s.downcase == 'jpg' ? 'jpeg' : format.to_s.downcase
   end
 end

data/lib/rack_resize/processors/vips.rb

@@ -6,13 +6,28 @@ end
 
 class RackResize::Processors::Vips
 
-  def resize(source_file:, target_file:, target_width:, target_height:)
+  def resize(source_file:, target_file:, target_width:, target_height:, fit: nil, format: nil, quality: nil, bg_color: nil)
+    quality ||= RackResize.config.default_quality
+    cover = (fit == 'cover' || fit == 'crop') && target_width && target_height
+
     image = ImageProcessing::Vips.source(source_file)
-    image = image.resize_to_limit(target_width, target_height) if target_width || target_height
-    image = image.saver(quality: RackResize.config.default_quality)
+    image = image.convert(format) if format
+
+    if target_width || target_height
+      image = cover ? image.resize_to_fill(target_width, target_height)
+                    : image.resize_to_limit(target_width, target_height)
+    end
+
+    if bg_color
+      r, g, b, _a = bg_color
+      image = image.flatten(background: [r, g, b])
+    end
+
+    image = image.saver(quality: quality)
 
     if target_file
       image.call(destination: target_file)
+      nil
     else
       begin
         tmp_file = image.call

data/lib/rack_resize/rack_app.rb

@@ -18,8 +18,10 @@ class RackResize::RackApp
     request = Rack::Request.new(env)
     fullpath = request.path_info
 
-    RackResize::InputParsers::Cloudflare.parse_input(fullpath, cf_path_prefix: @cf_path_prefix) =>
-      {route_matched:, req_params:, asset_path:}
+    result = RackResize::InputParsers::Cloudflare.parse_input(fullpath, cf_path_prefix: @cf_path_prefix)
+    result = RackResize::InputParsers::QueryString.parse_input(fullpath, request.query_string) unless result[:route_matched]
+    result = RackResize::InputParsers::Imgproxy.parse_input(fullpath) unless result[:route_matched]
+    result => {route_matched:, req_params:, asset_path:}
 
     return @app.call(env) unless route_matched
     return error_resp("can't parse file path") unless asset_path
@@ -31,7 +33,7 @@ class RackResize::RackApp
     config.assets_folders.each do |prefix, folder|
       if asset_path.start_with?(prefix)
         asset_file = folder.join(asset_path.delete_prefix(prefix + (prefix.end_with?("/") ? "" : "/")))
-        if asset_file.expand_path.to_s.start_with?(folder.to_s)
+        if asset_file.expand_path.to_s.start_with?(folder.expand_path.to_s)
           has_matched = true
         end
         break
@@ -47,20 +49,22 @@ class RackResize::RackApp
       return error_resp("invalid file path")
     end
     unless asset_file.exist?
-      @processing.logger.info("RackResize::RackApp - File path fond #{asset_path} => #{asset_file}")
+      @processing.logger.info("RackResize::RackApp - File path not found #{asset_path} => #{asset_file}")
       return error_resp("file not exists on a server")
     end
 
     file_content = @processing.process!(source_file: asset_file, req_params:)
-    return send_file(asset_file:, file_content:)
+    output_format = req_params[:format].then { |f| (f && f != 'auto') ? f : nil }
+    return send_file(asset_file:, file_content:, output_format:)
   end
 
   def error_resp(message, http_code: 404)
     [http_code, {}, [message]]
   end
 
-  def send_file(asset_file:, file_content: nil)
-    content_type = Rack::Mime.mime_type(File.extname(asset_file), "application/octet-stream")
+  def send_file(asset_file:, file_content: nil, output_format: nil)
+    ext = (output_format && output_format != 'auto') ? ".#{output_format}" : File.extname(asset_file)
+    content_type = Rack::Mime.mime_type(ext, "application/octet-stream")
 
     [
       200,

data/lib/rack_resize.rb

@@ -2,17 +2,20 @@ module RackResize
   autoload :Configuration, "#{__dir__}/rack_resize/configuration"
   autoload :RackApp,       "#{__dir__}/rack_resize/rack_app"
   autoload :Processing,    "#{__dir__}/rack_resize/processing"
-  # autoload :ImageController,    "#{__dir__}/rack_resize/image_controller"
+  autoload :ColorUtils,    "#{__dir__}/rack_resize/color_utils"
 
   module Processors
-    autoload :Sips,      "#{__dir__}/rack_resize/processors/sips"
-    autoload :Vips,      "#{__dir__}/rack_resize/processors/vips"
+    autoload :Sips,       "#{__dir__}/rack_resize/processors/sips"
+    autoload :Vips,       "#{__dir__}/rack_resize/processors/vips"
     autoload :MiniMagick, "#{__dir__}/rack_resize/processors/mini_magick"
-    autoload :Imlib2,    "#{__dir__}/rack_resize/processors/imlib2"
+    autoload :Imlib2,     "#{__dir__}/rack_resize/processors/imlib2"
+    autoload :BunImage,   "#{__dir__}/rack_resize/processors/bun_image"
   end
 
   module InputParsers
-    autoload :Cloudflare, "#{__dir__}/rack_resize/input_parsers/cloudflare"
+    autoload :Cloudflare,  "#{__dir__}/rack_resize/input_parsers/cloudflare"
+    autoload :QueryString, "#{__dir__}/rack_resize/input_parsers/query_string"
+    autoload :Imgproxy,    "#{__dir__}/rack_resize/input_parsers/imgproxy"
   end
 
   class << self

data/rack_resize.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "rack_resize"
-  s.version     = "0.1.3"
+  s.version     = "0.1.6"
   s.author      = ["Pavel Evstigneev"]
   s.email       = ["pavel.evst@gmail.com"]
   s.homepage    = "https://github.com/paxa/rack_resize"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack_resize
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.6
 platform: ruby
 authors:
 - Pavel Evstigneev
@@ -41,11 +41,18 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- benchmark/http_benchmark.rb
+- benchmark/processor_benchmark.rb
 - config.ru
 - lib/rack_resize.rb
+- lib/rack_resize/color_utils.rb
 - lib/rack_resize/configuration.rb
 - lib/rack_resize/input_parsers/cloudflare.rb
+- lib/rack_resize/input_parsers/imgproxy.rb
+- lib/rack_resize/input_parsers/query_string.rb
 - lib/rack_resize/processing.rb
+- lib/rack_resize/processors/bun_image.js
+- lib/rack_resize/processors/bun_image.rb
 - lib/rack_resize/processors/imlib2.rb
 - lib/rack_resize/processors/mini_magick.rb
 - lib/rack_resize/processors/sips.rb
@@ -71,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Image resizing on a fly
 test_files: []