paperclip_utils 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a56dbe7fd83b32d54e8e6a1d27c290c18bce57b
-  data.tar.gz: d458ec5792f1be88c377c635e91d9555ec1488fb
+  metadata.gz: fc2d7df880cd7513a2e1c9c4f9c4fc4f1c3ad8f0
+  data.tar.gz: aaba3534a035c91068611bb136237b60fef2002f
 SHA512:
-  metadata.gz: 93ab00047ac3dfa0c37887325be198c924640037ec221c752e6ab92c5a43000d9a3e7f6657a5841b7fe042ae44329072bd664f50bc1fceb032aa2ec2100c2f9d
-  data.tar.gz: 5013432814851cab2c89dde719a355e0155b1a54d683aadb9a22fa6a67a8acbc9978037f840deb6c91a5509e3bb0522f916347f7fdf5521d95e5c40204bc54e3
+  metadata.gz: 80067787d5af63a54e44df1bf3077b27cad12e20f882d314f22808478c96e1a3f10a178f8c395d809f0261a892334280c349fcef212730a2e9db3c7610826049
+  data.tar.gz: 6b2e4e1a481186e4ab6a4bcbc20283b1c740ceb087a75e4ff1e75dd520e5d1225b93b3c4e8b6de0a4d5c248dbc851f51cf020e9f1ac722277b13309d4b5c2974

data/lib/paperclip_utils/version.rb

@@ -1,3 +1,3 @@
 module PaperclipUtils
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/lib/paperclip_utils.rb

@@ -3,15 +3,29 @@ require 'paperclip_processors/ghostscript.rb'
 
 module Paperclip
   class Utils
-    def self.get_processors(content_type, to_processors=nil, fallback_processors=[], allowed_content_types=ALLOWED_CONTENT_TYPES)
-      if to_processors && to_processors.is_a?(Array)
-        processors = to_processors
-      end
+    def self.get_processors(content_type, options={to_processors: [:thumbnail], fallback_processors: [], allowed_content_types: ALLOWED_CONTENT_TYPES})
+      if options[:to_processors]
+        if options[:to_processors].is_a?(Array)
+          processors = options[:to_processors]
 
-      if content_type == 'application/pdf'
-        processors ||= [:ghostscript, :thumbnail]
-      else
-        processors ||= [:thumbnail]
+          if processors.include?(:thumbnail) && content_type == 'application/pdf' && !processors.include?(:ghostscript)
+            processors.unshift(:ghostscript)
+          end
+        elsif options[:to_processors].is_a?(Symbol)
+          processors = [options[:to_processors]]
+        else
+          processors = []
+        end
+      end
+      
+      if options[:fallback_processors] != []
+        if options[:fallback_processors].is_a?(Array)
+          fallback_processors = options[:fallback_processors]
+        elsif options[:fallback_processors].is_a?(Symbol)
+          fallback_processors = [options[:fallback_processors]]
+        else
+          fallback_processors = []
+        end
       end
       
       return (allowed_content_types.include?(content_type) ? processors : fallback_processors)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_utils
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Weston Ganger