paperclip_utils 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2d7df880cd7513a2e1c9c4f9c4fc4f1c3ad8f0
-  data.tar.gz: aaba3534a035c91068611bb136237b60fef2002f
+  metadata.gz: 43be69395250e10d0d52dc24580b9c9f3d6ff4f3
+  data.tar.gz: 63318882fbdeaedeece02d331a36597431823670
 SHA512:
-  metadata.gz: 80067787d5af63a54e44df1bf3077b27cad12e20f882d314f22808478c96e1a3f10a178f8c395d809f0261a892334280c349fcef212730a2e9db3c7610826049
-  data.tar.gz: 6b2e4e1a481186e4ab6a4bcbc20283b1c740ceb087a75e4ff1e75dd520e5d1225b93b3c4e8b6de0a4d5c248dbc851f51cf020e9f1ac722277b13309d4b5c2974
+  metadata.gz: 9df486426f658553cd33b7dd12d93684f689908b98eab73e22998da5f362a98d75c540d178110e9f122bf8f6035dc2550c448f840b9f3100bff3604bf568400d
+  data.tar.gz: db3976453fb9d532accd13698a61e8c78a706f29ede4c3726c44a2bad5d7a926023b24abc6b682413bb744c5475a31c82a1af9bb7dbcf43786e7d500d6023e81

data/lib/paperclip_utils.rb

@@ -3,26 +3,26 @@ require 'paperclip_processors/ghostscript.rb'
 
 module Paperclip
   class Utils
-    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]
+    def self.get_processors(content_type, to_processors: [:thumbnail], fallback_processors: [], allowed_content_types: ALLOWED_CONTENT_TYPES)
+      if to_processors
+        if to_processors.is_a?(Array)
+          processors = to_processors
 
           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]]
+        elsif to_processors.is_a?(Symbol)
+          processors = [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]]
+      if fallback_processors != []
+        if fallback_processors.is_a?(Array)
+          fallback_processors = fallback_processors
+        elsif fallback_processors.is_a?(Symbol)
+          fallback_processors = [fallback_processors]
         else
           fallback_processors = []
         end
@@ -31,9 +31,7 @@ module Paperclip
       return (allowed_content_types.include?(content_type) ? processors : fallback_processors)
     end
 
-    def self.get_styles(content_type, options={to_styles: nil, fallback_styles: {}, allowed_content_types: ALLOWED_CONTENT_TYPES})
-      to_styles = options[:to_styles]
-
+    def self.get_styles(content_type, to_styles: {preview: "800x600>", thumb: "100x100>"}, fallback_styles: {}, allowed_content_types: ALLOWED_CONTENT_TYPES)
       if to_styles
         if ['application/pdf','image/tiff','image/tif','image/x-tiff'].include?(content_type)
           to_styles.each do |k,v|
@@ -41,13 +39,9 @@ module Paperclip
           end
         end
       else
-        if ['application/pdf','image/tiff','image/tif','image/x-tiff'].include?(content_type)
-          to_styles = {preview: ["800x600>", :jpg], thumb: ["100x100>", :jpg]}
-        else
-          to_styles = {preview: "800x600>", thumb: "100x100>"}
-        end
+        to_styles = []
       end
-      return (options[:allowed_content_types].include?(content_type) ? to_styles : options[:fallback_styles])
+      return (allowed_content_types.include?(content_type) ? to_styles : fallback_styles)
     end
 
     ALLOWED_CONTENT_TYPES = ['application/pdf', 'image/png', 'image/x-png', 'image/gif', 'image/jpeg', 'image/pjpeg', 'image/jpg', 'image/tif', 'image/tiff', 'image/x-tiff']

data/lib/paperclip_utils/version.rb

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

metadata

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