dragonfly_libvips 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0aa118b1df8a61604fe2240b1cc118c4d50d7c8
-  data.tar.gz: 9461fa176a4e3784426cd2a7df903eafcff4b868
+  metadata.gz: 8676f2cb2dbae9583ffe2af14c66af041f6e8f64
+  data.tar.gz: 54e568e8da1281466154cd4231aba259bd6740f1
 SHA512:
-  metadata.gz: e4e70d8c380126264bb0019ab0417b7ed988a94a94b763766f74f162c7267fb7a65d9a20e1e439032263db19a665e8c64858b475222b61ad0fd99156bbe4faa2
-  data.tar.gz: 85bdba42807a5200dc6448ccf64136624f56b9ef47c7e22e7d0c4412e7e054fb512afb1377f2c3b3984bcf3b7ff41f91f0eac3e0efef7d64320b3aae054ab856
+  metadata.gz: 313db91c7c616aacca3cc5b8bb6d1b689d3fcd513ab9b3a47b90fe1676f7688f08d77bd7803f192a03512068411ea84a18ec48bae65f114d7f12d71d6e926a14
+  data.tar.gz: 9b07b4d96eaa40c32c06d86f089b4b90cfe9756ffb9b3ba17df7866758d23f6430dd11263662beadbf050062029cc68ba6b77626a3c2007481440d730ff764a7

data/README.md

@@ -109,9 +109,16 @@ image.vipsthumbnail('--size=100x100', { 'input_args' => 'page=2', 'output_args'
 corresponds to the command-line
 
 ```
-vipsthumbnail  <original_path>[page=2] --size=100x100 -o <new-path>[Q=50]
+vipsthumbnail  <original_path>[page=2] --size=100x100 -o <new-path>[Q=50]  --eprofile=./vendor/sRGB_v4_ICC_preference.icc
 ```
 
+Please note that unless specified a default sRGB profile is added (required for conversion from CMYK, for example). It can be overridden by specifying alternative on in the processors args:
+
+```ruby
+image.vipsthumbnail('--size=100x100 --eprofile=./my_custom_profile.icc')
+```
+
+
 ### Analysers
 
 The following methods are provided

data/lib/dragonfly_libvips.rb

@@ -1,3 +1,8 @@
 require 'dragonfly'
+require 'dragonfly_libvips/dimensions'
 require 'dragonfly_libvips/plugin'
 require 'dragonfly_libvips/version'
+
+module DragonflyLibvips
+  EPROFILE_PATH = File.expand_path('../vendor/sRGB_v4_ICC_preference.icc', __dir__)
+end

data/lib/dragonfly_libvips/dimensions.rb

@@ -0,0 +1,65 @@
+module DragonflyLibvips
+  class Dimensions < Struct.new(:geometry, :orig_w, :orig_h)
+    def self.call(*args)
+      new(*args).call
+    end
+
+    def call
+      return OpenStruct.new(width: orig_w, height: orig_h) if do_not_resize_if_image_smaller_than_requested? || do_not_resize_if_image_larger_than_requested?
+      OpenStruct.new(width: width, height: height)
+    end
+
+    private
+
+    def width
+      if landscape?
+        dimensions_specified_by_width? ? dimensions.width : dimensions.height / aspect_ratio
+      else
+        dimensions_specified_by_height? ? dimensions.height / aspect_ratio : dimensions.width
+      end
+    end
+
+    def height
+      if landscape?
+        dimensions_specified_by_width? ? dimensions.width * aspect_ratio : dimensions.height
+      else
+        dimensions_specified_by_height? ? dimensions.height : dimensions.width * aspect_ratio
+      end
+    end
+
+    def dimensions
+      w, h = geometry.scan(/\A(\d*)x(\d*)/).flatten.map(&:to_f)
+      OpenStruct.new(width: w, height: h)
+    end
+
+    def aspect_ratio
+      orig_h.to_f / orig_w
+    end
+
+    def dimensions_specified_by_width?
+      dimensions.width > 0
+    end
+
+    def dimensions_specified_by_height?
+      dimensions.height > 0
+    end
+
+    def landscape?
+      aspect_ratio <= 1.0
+    end
+
+    def portrait?
+      !landscape?
+    end
+
+    def do_not_resize_if_image_smaller_than_requested?
+      return false unless geometry.include? '>'
+      orig_w < width && orig_h < height
+    end
+
+    def do_not_resize_if_image_larger_than_requested?
+      return false unless geometry.include? '<'
+      orig_w > width && orig_h > height
+    end
+  end
+end

data/lib/dragonfly_libvips/processors/thumb.rb

@@ -15,6 +15,8 @@ module DragonflyLibvips
         url_attributes.ext = format if format
       end
 
+      private
+
       def args_for_geometry(geometry, image_properties)
         case geometry
         when RESIZE_GEOMETRY then resize_args(geometry, image_properties)
@@ -22,32 +24,9 @@ module DragonflyLibvips
         end
       end
 
-      private
-
       def resize_args(geometry, image_properties)
-        w = image_properties['width']
-        h = image_properties['height']
-        ratio = w.to_f / h.to_f
-        is_landscape = ratio > 1.0
-
-        width, height = geometry.scan(/\A(\d*)x(\d*)/).flatten.map(&:to_i)
-
-        case geometry
-        when /\Ax\d+[#{OPERATORS}]?/
-          width = is_landscape ? (ratio * height).round : height
-        when /\A\d+x[#{OPERATORS}]?\z/
-          height = is_landscape ? width : (width / ratio).round
-        end
-
-        case geometry
-        when />\z/
-          width, height = w, h if width >= w || height >= h
-        when /<\z/
-          width, height = w, h if width <= w && height <= h
-        end
-
-        dimensions = "#{width}x#{height}"
-        "-s #{dimensions}"
+        res = Dimensions.call(geometry, image_properties['width'], image_properties['height'])
+        "-s #{res.width.round}x#{res.height.round}"
       end
     end
   end

data/lib/dragonfly_libvips/processors/vipsthumbnail.rb

@@ -13,6 +13,8 @@ module DragonflyLibvips
           output_args = "[#{output_args}]"
         end
 
+        args = [args, "--eprofile=#{EPROFILE_PATH}"].compact.join(' ') unless args.include?('eprofile')
+
         content.shell_update ext: format do |old_path, new_path|
           "#{vipsthumbnail_command} #{old_path}#{input_args} -o #{new_path}#{output_args} #{args}"
         end

data/lib/dragonfly_libvips/version.rb

@@ -1,3 +1,3 @@
 module DragonflyLibvips
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dragonfly_libvips
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-20 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dragonfly
@@ -114,6 +114,7 @@ files:
 - dragonfly_libvips.gemspec
 - lib/dragonfly_libvips.rb
 - lib/dragonfly_libvips/analysers/image_properties.rb
+- lib/dragonfly_libvips/dimensions.rb
 - lib/dragonfly_libvips/plugin.rb
 - lib/dragonfly_libvips/processors/encode.rb
 - lib/dragonfly_libvips/processors/thumb.rb
@@ -124,6 +125,7 @@ files:
 - samples/landscape_beach.png
 - samples/memo.pdf
 - samples/white pixel.png
+- vendor/sRGB_v4_ICC_preference.icc
 homepage: https://github.com/tomasc/dragonfly_libvips
 licenses:
 - MIT