paperclip-compression 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2M2ODg1OWIwNGQ1MDk2Mzg2YmYwNTgxNzA1ZDA4ZDA2NzNjMmQ3Yw==
+    MGNmZDUxNjczYWNmZTU0ODY2ZGJhY2FlMTFkODdmYjgxYzFjZDBjZQ==
   data.tar.gz: !binary |-
-    MjZiNmI5YjcyMWFlMTFiZDg2ODZiY2M2MTU4Mzg3MTUyNWE5MDAyMg==
+    NDc5YWNhYmQ0NjEyNjFlOTdmMzc4MmFmZjkzNjk4MjE3NDIxYzRiNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWFmNTJlNzliN2Y0OTc3NDU4ODgzNjdiMjFkMjE3NTkxOGNkOWRmNmM0ZTQy
-    YTNiMTQxYTI0NzVhMDAwNmJjZjliZDI2MjQxODk5NDMxZjdjNTBjMzVhZTg1
-    NmFhNmQ3ODc4ZTIyYWEwYWYyYjliZjNkOWQzZGRmNjMxNDNkNDA=
+    MGQ2NDg4MzY0NTQzYTUyMDc0ZTEyZDU1ZTQ4MjY0OGFjYzcyNmVkNGM2YmIy
+    MWM2ZjBlOGNjZjQ1YjA2MzE3OTEwYjQxNWEyMDdlYWUyNmYyMTc5MmUxZTI1
+    ZmRiODA3M2YwMTMxYjY0NzQ0NzU5MzlhODE3ZmM1ZmU4ZjYyOTU=
   data.tar.gz: !binary |-
-    OTY2NzAwZTk5YzBkMWU1MDVjNTc3OWY4YjEyMDZhMzA3OWM4YTE0ZGZjODI3
-    YjMzNzJkNjQ1Yjc3M2RmODZkNDg2YjMzNjkzNzFiMjcxMzJjZmIzMzlkMmY4
-    MTFkNzg5OTQzMjAyNjk2ZTA5ZjlhMmZlNzg3OWM1ZDQxOWI5MGI=
+    MTZiNjE4MDVjYjczNTgyMjdkOWZkODg4YjQ5Mjc1YWJlNWYzMzdjYWZjNjM4
+    MmU4Yzg3M2Q4OGZkNzNjMGY0MDQ5NzM1YWJjMTBhOWFmZmQzM2FkNzM5NmMw
+    MzI5ZDk5MDBiZjEyMGFkNDI4ZTE1NmIyNDg1NDVhMWE1MDYzZDg=

data/lib/paperclip-compression/base.rb

@@ -16,20 +16,10 @@ module PaperclipCompression
     protected
 
     def init_cli_opts(type, default_opts)
-      processor_opts = @options[:processor_options]
-      if processor_opts && (compression_opts = processor_opts[:compression])
-        if compression_opts.has_key?(type)
-          if (type_opts = compression_opts[type])
-            type_opts.kind_of?(String) ? type_opts : default_opts
-          else
-            false
-          end
-        else
-          default_opts
-        end
-      else
-        default_opts
-      end
+      # use default options in the papeclip config if exists, otherwise use gem defaults.
+      default_opts = init_default_opts(Paperclip::Attachment.default_options, type, default_opts)
+      # use processor_options if exists, otherwise use defaults.
+      init_default_opts(@options[:processor_options], type, default_opts)
     end
 
     def command_path(command)
@@ -44,5 +34,23 @@ module PaperclipCompression
       File.join(PaperclipCompression.root, 'bin', folder, command)
     end
 
+    private
+
+    def init_default_opts(opts, type, default_opts)
+      if opts && (compression_opts = opts[:compression])
+        if compression_opts.has_key?(type)
+          if (type_opts = compression_opts[type])
+            type_opts.kind_of?(String) ? type_opts : default_opts
+          else
+            false
+          end
+        else
+          default_opts
+        end
+      else
+        default_opts
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - İ. Emre Kutlu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip