neofiles 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27974bef2a62fcb3d25b9e8ac9601652db64d4e5
-  data.tar.gz: d64f07dafc39d6e299d0bbc5e599380deccdc9fb
+  metadata.gz: 6e96aa097e34ac97047248c698a3aeb9b64bc9ab
+  data.tar.gz: 66851a10940c7c14edd2eef83354815c857328e2
 SHA512:
-  metadata.gz: a08c5998c6085d959aca8683c55d481082cce84a2926c9c811f77bb6dfbe95349178367671414dfedb37d9978bb6e6b573c000906e43516bdd3c3fb7f09528a3
-  data.tar.gz: e14f40913afe907ded71b6c8eedfd76cd67e2adfbfd8c640e7de1adb6d46053bf0b5043eecfc7087ce73eab033c1ef85ee0bff34a6e8e75a27f5c397d57ff03d
+  metadata.gz: d1d781c8139d2f9618f10a5b32f13b195053c722e3a3c5c4b38068870a780ecffe10dc801f63f73f26d6b532c96bd7f6273e350f8ba4f97d30c992aa9f197825
+  data.tar.gz: 348b856a3802607b95ab7f0df75b1ed4ed2270e1c82965969134417d3cbf03dd49f6cd99a7ddb6925a64fc2c1a021dcf841824efaad085dc5c0c99eb741aa373

data/app/controllers/neofiles/images_controller.rb

@@ -54,21 +54,25 @@ class Neofiles::ImagesController < ActionController::Metal
       raise Mongoid::Errors::DocumentNotFound unless width.between?(1, CROP_MAX_WIDTH) and height.between?(1, CROP_MAX_HEIGHT)
     end
 
-    crop_requested = Neofiles.crop_requested? params
-    need_resize_without_crop = width && height && (image_file.width > width || image_file.height > height)
+    crop_requested            = Neofiles.crop_requested? params
+    resizing                  = width && height
+    need_resize_without_crop  = resizing && (image_file.width > width || image_file.height > height)
 
-    image.combine_options do |mogrify|
-      resize_image(mogrify, width, height, crop_requested, need_resize_without_crop) if width && height
-      compress_image(mogrify, quality) if quality
+    image.combine_options('convert') do |convert|
+      resize_image convert, width, height, crop_requested, need_resize_without_crop if resizing
+
+      unless nowm?(image_file)
+        wm_width, wm_height = Neofiles::resized_image_dimensions image_file, width, height, params
+        add_watermark convert, image, wm_width, wm_height if wm_width && wm_height
+      end
+
+      compress_image convert, quality if quality || resizing
     end
 
-    # use pngquant when quality less than 75
+    # use pngquant when quality is less than 75
     ::PngQuantizator::Image.new(image.path).quantize! if options[:type] == 'image/png' && quality && quality < 75
 
-    # set watermark
-    width, height = image_file.width, image_file.height if !crop_requested && !need_resize_without_crop
-
-    data = set_watermark(image, image_file, width, height)
+    data = image.to_blob
 
     # stream image headers & bytes
     send_file_headers! options
@@ -80,6 +84,8 @@ class Neofiles::ImagesController < ActionController::Metal
     self.response_body = I18n.t 'neofiles.403_access_denied'
     self.content_type = 'text/plain; charset=utf-8'
     self.status = 403
+  ensure
+    image.try :destroy! #delete mini_magick tempfile
   end
 
 
@@ -100,42 +106,37 @@ class Neofiles::ImagesController < ActionController::Metal
     end
   end
 
-  # Fill mogrify command pipe with resize commands
-  def resize_image(mogrify, width, height, crop_requested, need_resize_without_crop)
+  # Fill convert command pipe with resize commands
+  def resize_image(convert, width, height, crop_requested, need_resize_without_crop)
     if crop_requested
-      mogrify.resize "#{width}x#{height}^"
-      mogrify.gravity 'center'
-      mogrify.extent "#{width}x#{height}"
+      convert.resize "#{width}x#{height}^"
+      convert.gravity 'center'
+      convert.extent "#{width}x#{height}"
     elsif need_resize_without_crop
-      mogrify.resize "#{width}x#{height}"
+      convert.resize "#{width}x#{height}"
     end
   end
 
-  # Fill mogrify command pipe with compression commands for JPEG and PNG
+  # Fill convert command pipe with compression commands for JPEG and PNG
   # More information: https://www.smashingmagazine.com/2015/06/efficient-image-resizing-with-imagemagick/
-  def compress_image(mogrify, quality)
-    mogrify.quality "#{quality}"
-    mogrify << '-unsharp' << '0.25x0.25+8+0.065'
-    mogrify << '-dither' << 'None'
-    #mogrify << '-posterize' << '136' # posterize slows down imagamagick extremely in some env due to buggy libgomp1
-    mogrify << '-define' << 'jpeg:fancy-upsampling=off'
-    mogrify << '-define' << 'png:compression-filter=5'
-    mogrify << '-define' << 'png:compression-level=9'
-    mogrify << '-define' << 'png:compression-strategy=1'
-    mogrify << '-define' << 'png:exclude-chunk=all'
-    mogrify << '-interlace' << 'none'
-    mogrify << '-colorspace' << 'sRGB'
-    mogrify.strip
+  def compress_image(convert, quality)
+    convert.quality "#{quality}" if quality
+    convert << '-unsharp' << '0.25x0.25+8+0.065'
+    convert << '-dither' << 'None'
+    #convert << '-posterize' << '136' # posterize slows down imagamagick extremely in some env due to buggy libgomp1
+    convert << '-define' << 'jpeg:fancy-upsampling=off'
+    convert << '-define' << 'png:compression-filter=5'
+    convert << '-define' << 'png:compression-level=9'
+    convert << '-define' << 'png:compression-strategy=1'
+    convert << '-define' << 'png:exclude-chunk=all'
+    convert << '-interlace' << 'none'
+    convert << '-colorspace' << 'sRGB'
+    convert.strip
   end
 
-  # Place watermark on the image, if needed
-  def set_watermark(image, image_file, width, height)
-    Rails.application.config.neofiles.watermarker.(
-      image,
-      no_watermark: nowm?(image_file),
-      watermark_width: width,
-      watermark_height: height
-    )
+  # Add watermarks command to a command pipe, if watermarker is present
+  def add_watermark(convert, image, width, height)
+    Rails.application.config.neofiles.watermarker.try :call, convert, image, width, height
   end
 
 end

data/app/models/neofiles/image.rb

@@ -94,6 +94,9 @@ class Neofiles::Image < Neofiles::File
       tempfile.close
       tempfile.unlink
     end
+
+  ensure
+    image.try :destroy! #delete mini_magick tempfile
   end
 
   # Return array with width & height decorated with singleton function to_s returning 'WxH' string.

data/lib/neofiles.rb

@@ -52,8 +52,12 @@ module Neofiles
       image_file_height = image_file[:height]
     end
 
+    # no input, terminate
     return if image_file_width.blank? || image_file_height.blank?
 
+    # image fits into requested dimensions, no resizing will occur
+    return image_file_width, image_file_height if image_file_width <= width && image_file_height <= height
+
     # ... construct request ...
     command = MiniMagick::CommandBuilder.new(:convert)            # convert input file...
     command.size([image_file_width, image_file_height].join 'x')  # with the given dimensions...

data/lib/neofiles/version.rb

@@ -1,3 +1,3 @@
 module Neofiles
-  VERSION = '1.0.6'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neofiles
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Konanykhin Ilya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails