paperclip-compression 0.2.3 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    Y2M2ODg1OWIwNGQ1MDk2Mzg2YmYwNTgxNzA1ZDA4ZDA2NzNjMmQ3Yw==
+  data.tar.gz: !binary |-
+    MjZiNmI5YjcyMWFlMTFiZDg2ODZiY2M2MTU4Mzg3MTUyNWE5MDAyMg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZWFmNTJlNzliN2Y0OTc3NDU4ODgzNjdiMjFkMjE3NTkxOGNkOWRmNmM0ZTQy
+    YTNiMTQxYTI0NzVhMDAwNmJjZjliZDI2MjQxODk5NDMxZjdjNTBjMzVhZTg1
+    NmFhNmQ3ODc4ZTIyYWEwYWYyYjliZjNkOWQzZGRmNjMxNDNkNDA=
+  data.tar.gz: !binary |-
+    OTY2NzAwZTk5YzBkMWU1MDVjNTc3OWY4YjEyMDZhMzA3OWM4YTE0ZGZjODI3
+    YjMzNzJkNjQ1Yjc3M2RmODZkNDg2YjMzNjkzNzFiMjcxMzJjZmIzMzlkMmY4
+    MTFkNzg5OTQzMjAyNjk2ZTA5ZjlhMmZlNzg3OWM1ZDQxOWI5MGI=

data/lib/paperclip-compression/base.rb

@@ -0,0 +1,48 @@
+module PaperclipCompression
+  class Base
+
+    def initialize(file, options = {})
+      @file          = file
+      @options       = options
+      @whiny         = options.has_key?(:whiny) ? options[:whiny] : true
+      current_format = File.extname(file.path)
+      @basename      = File.basename(file.path, current_format)
+    end
+
+    def self.make(file, options = {})
+      new(file, options).make
+    end
+
+    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
+    end
+
+    def command_path(command)
+     folder = if OS.osx?
+        'osx'
+      elsif OS.linux?
+        File.join('linux', OS.bits.eql?(64) ? 'x64' : 'x86')
+      elsif OS.windows?
+        OS.bits.eql?(64) ? 'win64' : 'win32'
+      end
+
+      File.join(PaperclipCompression.root, 'bin', folder, command)
+    end
+
+  end
+end

data/lib/paperclip-compression/jpeg.rb

@@ -0,0 +1,41 @@
+module PaperclipCompression
+  class Jpeg < Base
+
+    JPEGTRAN_DEFAULT_OPTS = '-copy none -optimize -perfect'
+
+    def initialize(file, options = {})
+      super(file, options)
+
+      format = options[:format]
+      @dst = Tempfile.new([@basename, format ? ".#{format}" : ''])
+      @dst.binmode
+
+      @src_path = File.expand_path(@file.path)
+      @dst_path = File.expand_path(@dst.path)
+
+      @cli_opts = init_cli_opts(:jpeg, default_opts)
+    end
+
+    def make
+      begin
+        if @cli_opts
+          Paperclip.run(command_path('jpegtran'), "#{@cli_opts} :src_path > :dst_path", src_path: @src_path, dst_path: @dst_path)
+          @dst
+        else
+          @file
+        end
+      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
+
+    private
+
+    def default_opts
+      JPEGTRAN_DEFAULT_OPTS
+    end
+
+  end
+end

data/lib/paperclip-compression/paperclip/compression.rb

@@ -0,0 +1,26 @@
+module Paperclip
+  # Compresses the JPEG and PNG files
+  class Compression < Processor
+
+    def make
+      case @attachment.content_type
+      when 'image/jpeg' then make_jpeg
+      when 'image/png'  then make_png
+      else
+        @file
+      end
+    end
+
+    private
+
+    def make_jpeg
+      PaperclipCompression::Jpeg.make(@file, @options)
+    end
+
+    def make_png
+      PaperclipCompression::Png.make(@file, @options)
+    end
+
+  end
+
+end

data/lib/paperclip-compression/png.rb

@@ -0,0 +1,30 @@
+module PaperclipCompression
+  class Png < Base
+
+    OPTIPNG_DEFAULT_OPTS  = '-o 5'
+
+    def initialize(file, options = {})
+      super(file, options)
+      @src_path = File.expand_path(@file.path)
+      @cli_opts = init_cli_opts(:png, default_opts)
+    end
+
+    def make
+      begin
+        Paperclip.run(command_path('optipng'), "#{@cli_opts} :src_path", src_path: @src_path) if @cli_opts
+        @file
+      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
+    end
+
+    private
+
+    def default_opts
+      OPTIPNG_DEFAULT_OPTS
+    end
+
+  end
+end

data/lib/paperclip-compression.rb

@@ -1,95 +1,12 @@
 require 'paperclip'
-
-module Paperclip
-  # Compresses the JPEG and PNG files
-  class Compression < Processor
-
-    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
-
-      src_path = File.expand_path(src.path)
-      dst_path = File.expand_path(dst.path)
-
-      begin
-        if @jpegtran_opts
-          Paperclip.run('jpegtran', "#{@jpegtran_opts} '#{src_path}' > '#{dst_path}'")
-          dst
-        else
-          src
-        end
-      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
-    end
-
+require 'os'
+require 'paperclip-compression/paperclip/compression'
+require 'paperclip-compression/base'
+require 'paperclip-compression/jpeg'
+require 'paperclip-compression/png'
+
+module PaperclipCompression
+  def self.root
+    Gem::Specification.find_by_name('paperclip-compression').gem_dir
   end
-
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - İ. Emre Kutlu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,42 +20,67 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 description: JPEG and PNG compression for Paperclip gem
 email: emrekutlu@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/paperclip-compression/base.rb
+- lib/paperclip-compression/jpeg.rb
+- lib/paperclip-compression/paperclip/compression.rb
+- lib/paperclip-compression/png.rb
 - lib/paperclip-compression.rb
+- bin/linux/x64/jpegtran
+- bin/linux/x64/optipng
+- bin/linux/x86/jpegtran
+- bin/linux/x86/optipng
+- bin/osx/jpegtran
+- bin/osx/optipng
+- bin/win32/jpegtran.exe
+- bin/win32/libjpeg-62.dll
+- bin/win32/optipng.exe
+- bin/win64/jpegtran.exe
+- bin/win64/libjpeg-62.dll
 homepage: http://github.com/emrekutlu/paperclip-compression
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- jpegtran for JPEG compression
-- optipng for PNG compression
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Image compression for Paperclip
 test_files: []