paperclip_utils 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b464cca28bcdb7e338e3509a619538875bf64800
-  data.tar.gz: 5f3d3912f8de2d97e7a5d27d9e2d3ea3652da952
+  metadata.gz: 1a56dbe7fd83b32d54e8e6a1d27c290c18bce57b
+  data.tar.gz: d458ec5792f1be88c377c635e91d9555ec1488fb
 SHA512:
-  metadata.gz: 83372f0cb5eb6aca65858cbf77953066cd9827c518cd6d4f37284780dd8d49e0180bbe6c4ca41a09cd23af67bc535ddcdf1ae1d6fdc834fa754ba864d9a3b8b5
-  data.tar.gz: 47b1f673cbe8fbac22ee40b768e3d43fa760a03a660ec296412d6c019631fa661c74fb22786649f4494d536228395dd0efdb6c89006444e1e3f66f60abed2347
+  metadata.gz: 93ab00047ac3dfa0c37887325be198c924640037ec221c752e6ab92c5a43000d9a3e7f6657a5841b7fe042ae44329072bd664f50bc1fceb032aa2ec2100c2f9d
+  data.tar.gz: 5013432814851cab2c89dde719a355e0155b1a54d683aadb9a22fa6a67a8acbc9978037f840deb6c91a5509e3bb0522f916347f7fdf5521d95e5c40204bc54e3

data/lib/paperclip_utils/version.rb

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

data/lib/paperclip_utils.rb

@@ -17,11 +17,13 @@ module Paperclip
       return (allowed_content_types.include?(content_type) ? processors : fallback_processors)
     end
 
-    def self.get_styles(content_type, to_styles=nil, fallback_styles={}, allowed_content_types=ALLOWED_CONTENT_TYPES)
+    def self.get_styles(content_type, options={to_styles: nil, fallback_styles: {}, allowed_content_types: ALLOWED_CONTENT_TYPES})
+      to_styles = options[:to_styles]
+
       if to_styles
-        if ['application/pdf','image/tiff','image/tif','image/x-tiff'].include?(content_type) && to_styles.any?{|k,v| v.is_a?(String)}
+        if ['application/pdf','image/tiff','image/tif','image/x-tiff'].include?(content_type)
           to_styles.each do |k,v|
-            to_styles[k] = [v, :jpg]
+            to_styles[k] = [(v.is_a?(String) ? v : v[0]), :jpg]
           end
         end
       else
@@ -31,7 +33,7 @@ module Paperclip
           to_styles = {preview: "800x600>", thumb: "100x100>"}
         end
       end
-      return (allowed_content_types.include?(content_type) ? to_styles : fallback_styles)
+      return (options[:allowed_content_types].include?(content_type) ? to_styles : options[: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']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_utils
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Weston Ganger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip