paperclip-vips 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee434152fdb78f28ebf9c7c284947f5f1ead3341b419b518f3ba546f4c32578
-  data.tar.gz: 72a3e1263f7c165ec096cec5111bab762693992507bc769678cd5f1ad7a0e42e
+  metadata.gz: 7ae2f6d67f0b4f56d5fe0a24af01b01c424d54a16ddc0b9e7d0b8abef95e3bfe
+  data.tar.gz: 8db36f72a48bea6b6e071fb65daf65112a67d5bf46d641f45c9bb2538a25aa82
 SHA512:
-  metadata.gz: 5c505d092254d9dc6ad9170cf7fc1a1b6ed45302e9a6eb77feb7d7be2d1f8950688ea1d1aa86698f0dd392a59e29cb3cc52cf0b299ea0a861195934d2a9daa60
-  data.tar.gz: 3ee2067929f1bf42765f52c3e7986254cce4dbe52d83393f7a1743c5589a9854a08970fc12afafb88a50f05e89ba984719098d4455731fcb6356e272c23d3afd
+  metadata.gz: 1a9b022534d9463681394514795cc6966d85798c0c28da2fae5dc4f7f9f2d3d8ab6341c6f99fcd80c745413b7e85edf39105b45819e271b375420d32b4d4c388
+  data.tar.gz: 0d282b14f4ca78798509ef4ddfee89803cca46647e99c0c893879b4ae66a8603adb565d3557c64657d773a0374ea1dd3205dab73c54a22b364492bcf26f9f35d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.2.2] - 2022-04-13
+
+- Add support for `auto_orient` option
+
 ## [1.2.1] - 2022-01-31
 
 - Update dev dependencies

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperclip-vips (1.2.1)
+    paperclip-vips (1.2.2)
       paperclip (>= 5.0.0)
       ruby-vips (~> 2.1)
 

data/lib/paperclip-vips/paperclip/vips.rb

@@ -1,7 +1,7 @@
 module Paperclip
   class Vips < Processor
-    attr_accessor :current_geometry, :target_geometry, :format, :whiny, :convert_options,
-                  :source_file_options, :auto_orient
+    attr_accessor :auto_orient, :convert_options, :current_geometry, :format, :source_file_options,
+                  :target_geometry, :whiny
 
     def initialize(file, options = {}, attachment = nil)
       super
@@ -11,7 +11,10 @@ module Paperclip
       @target_geometry = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
       @current_geometry = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
       @whiny = options.fetch(:whiny, true)
-      
+
+      @auto_orient = options.fetch(:auto_orient, true)
+      @convert_options = options[:convert_options]
+
       @current_format = current_format(file).downcase
       @format = options[:format] || @current_format
 
@@ -67,8 +70,8 @@ module Paperclip
       end
       
       def process_convert_options(image)
-        if image && @options[:convert_options].present?
-          commands = JSON.parse(@options[:convert_options], symbolize_names: true)
+        if image
+          commands = parsed_convert_commands(@convert_options)
           commands.each do |cmd|
             image = ::Vips::Operation.call(cmd[:cmd], [image, *cmd[:args]], cmd[:optional] || {})
           end
@@ -77,6 +80,20 @@ module Paperclip
         return image
       end
 
+      def parsed_convert_commands(convert_options)
+        begin
+          commands = JSON.parse(convert_options, symbolize_names: true)
+        rescue
+          commands = []
+        end
+
+        if @auto_orient && commands.exclude?({ cmd: "autorot" })
+          commands.unshift({ cmd: "autorot" })
+        end
+
+        return commands
+      end
+
       def save_thumbnail(thumbnail, path)
         case @current_format
         when ".jpeg", ".jpg"

data/lib/paperclip-vips/version.rb

@@ -1,3 +1,3 @@
 module PaperclipVips
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-vips
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Ken Greeff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-31 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip