paperclip-compression 0.1.1 → 0.2.0

data/lib/paperclip-compression.rb

@@ -1,19 +1,60 @@
-require "paperclip"
+require 'paperclip'
 
 module Paperclip
   # Compresses the JPEG and PNG files
   class Compression < Processor
 
-    attr_accessor :format
+    JPEGTRAN_DEFAULT_OPTS = '-copy none -optimize -perfect'
+    OPTIPNG_DEFAULT_OPTS  = '-o 5'
+
+    attr_accessor :format, :jpegtran_opts, :optipng_opts
 
     def initialize(file, options = {}, attachment = nil)
       super
       @format         = options[:format]
       @current_format = File.extname(@file.path)
       @basename       = File.basename(@file.path, @current_format)
+
+      if @options[:processor_options] && (compression_opts = @options[:processor_options][:compression])
+
+        @jpegtran_opts = if compression_opts.has_key?(:jpeg)
+          if (jpeg_opts = compression_opts[:jpeg])
+            jpeg_opts.kind_of?(String) ? jpeg_opts : JPEGTRAN_DEFAULT_OPTS
+          else
+            false
+          end
+        else
+          JPEGTRAN_DEFAULT_OPTS
+        end
+
+        @optipng_opts = if compression_opts.has_key?(:png)
+          if (png_opts = compression_opts[:png])
+            png_opts.kind_of?(String) ? png_opts : OPTIPNG_DEFAULT_OPTS
+          else
+            false
+          end
+        else
+          OPTIPNG_DEFAULT_OPTS
+        end
+
+      else
+        @jpegtran_opts  = JPEGTRAN_DEFAULT_OPTS
+        @optipng_opts   = OPTIPNG_DEFAULT_OPTS
+      end
     end
 
     def make
+      case @attachment.content_type
+      when 'image/jpeg' then process_jpegtran
+      when 'image/png'  then process_optipgn
+      else
+        @file
+      end
+    end
+
+    private
+
+    def process_jpegtran
       src = @file
       dst = Tempfile.new([@basename, @format ? ".#{@format}" : ''])
       dst.binmode
@@ -22,18 +63,31 @@ module Paperclip
       dst_path = File.expand_path(dst.path)
 
       begin
-        if @attachment.content_type.eql?("image/jpeg")
-          Paperclip.run("jpegtran", "-copy none -optimize -perfect #{src_path} > #{dst_path}")
-        elsif @attachment.content_type.eql?("image/png")
-          Paperclip.run("optipng", "-o 5 #{src_path}")
-          return src
+        if @jpegtran_opts
+          Paperclip.run('jpegtran', "#{@jpegtran_opts} #{src_path} > #{dst_path}")
+          dst
         else
-          return src
+          src
         end
-      rescue
-        # TODO
+      rescue Cocaine::ExitStatusError => e
+        raise Paperclip::Error, "JPEGTRAN : There was an error processing the thumbnail for #{@basename}" if @whiny
+      rescue Cocaine::CommandNotFoundError => e
+        raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'jpegtran'.Please install jpegtran.")
+      end
+    end
+
+    def process_optipgn
+      src = @file
+      src_path = File.expand_path(src.path)
+
+      begin
+        Paperclip.run('optipng', "#{@optipng_opts} #{src_path}") if @optipng_opts
+        src
+      rescue Cocaine::ExitStatusError => e
+        raise Paperclip::Error, "OPTIPNG : There was an error processing the thumbnail for #{@basename}" if @whiny
+      rescue Cocaine::CommandNotFoundError => e
+        raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'optipng'.Please install optipng.")
       end
-      dst
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000Z
+date: 2011-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &77593450 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *77593450
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: JPEG and PNG compression for Paperclip gem
 email: emrekutlu@gmail.com
 executables: []
@@ -29,7 +34,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/paperclip-compression.rb
-homepage: http://github.com/dakick/paperclip-compression
+homepage: http://github.com/emrekutlu/paperclip-compression
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -51,7 +56,7 @@ requirements:
 - jpegtran for JPEG compression
 - optipng for PNG compression
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Image compression for Paperclip