paperclip-compression 0.3.12 → 0.3.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWFjMDJkYzczMGVjOWE1OWFhZDgwMzQyMWU4ZTEyZGNkMDkwMmNjOQ==
+    MGQ1MTkyNjBkZGY5NWY4ZjU3NjBiMmExM2MxY2Y3ZmMyZjJiNjc1Yg==
   data.tar.gz: !binary |-
-    YTJkNzAwZTgzM2I5M2JjZWRiN2VhNjBiZDY4ZjgwOWU4Mjk3ZTY2Mg==
+    ODhmNTRmMjk0MmUzMGYwOTJjMTAyM2YxN2M4YzMyMzIyMTdlNzdkMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjUzMjllZjVlNTBiNzk2ZGM2ZTk2YjQ4ZjEzYjRhOTM4ZGY5ZTQwODQxNWZi
-    MTc0MWJjNDJhNTI1NDYyYjI3ZWYxMjk2MjNkODVmYTZhMjRlMDAzY2M4OGYx
-    MWYwNDVhNmExZTUyNDc5OTFhNDJjNDAyNzg1NmE0MWNlOWRmNmU=
+    NDI5MTkzZjZjNzlmODkzOTk4OTA3YjNlYmRiZDIzZDlmNmU0ZDljODVmYmY4
+    ZDcxNzQ2ODNjNmYxY2E3NjUzZGZiZDk0MTg5MGE3ZGYyZTFlN2Y1M2Y3Y2I4
+    OWE4Y2RmNjlmMTMwNjM0Y2QwNzVmN2IwZTU3MTFhYWVmMzhiNGU=
   data.tar.gz: !binary |-
-    M2Q1ODg3MWJkYzIzMDYzYjUyNzI1MWI1ZGZkZDBhMmFiZjEyZTdlY2U5YTAw
-    MTk1NTA3NzMxM2M0NDQzMmViNjY0NDA0YTM5YWFkYWRiODdmYTBlYTE2MmYx
-    MWExNTNlM2U0ZWEyMzRmNzk5Yzk3MDlkYTcwMTc5OWUwODY2YzM=
+    NjQ4Zjk4MzdmODhlZTg4NzAyZjdmNTE0MzFkZDIzZWJlYjc1NDQ4ZWQzYjJl
+    MDQ0NDM4NjQ4MjQ3ZjEzMTc4YjE2ZDVkYzBmZWUyN2IyNzJlOWVkMGU1NzM0
+    OTUyMjg5YzM2NDA4YTVlMmVkNjU0YmEyN2JmMmJiNzhhODQxZDU=

data/lib/paperclip-compression/base.rb

@@ -1,20 +1,33 @@
 module PaperclipCompression
   class Base
 
-    def initialize(file, options = {})
+    def initialize(file, first_processor, options = {})
       @file             = file
       @options          = options
       @whiny            = options.has_key?(:whiny) ? options[:whiny] : true
       current_extension = File.extname(file.path)
       @basename         = File.basename(file.path, current_extension)
+      @dst              = Paperclip::TempfileFactory.new.generate("#{@basename}.png")
+      @dst_path         = File.expand_path(@dst.path)
+      @src_path         = File.expand_path(@file.path)
+      @first_processor  = first_processor
     end
 
-    def self.make(file, options = {})
-      new(file, options).make
+    def self.make(file, first_processor, options = {})
+      new(file, first_processor, options).make
     end
 
     protected
 
+    def process_file?
+      @cli_opts
+    end
+
+    def unprocessed_tempfile
+      copy_to_tempfile
+      first_processor? ? @dst : @file
+    end
+
     def init_cli_opts(type, default_opts)
       # 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)
@@ -25,7 +38,7 @@ module PaperclipCompression
     def command_path(command)
      folder = if OS.osx?
         'osx'
-      elsif OS.linux? || RUBY_PLATFORM =~ /freebsd/
+      elsif OS.linux?
         File.join('linux', OS.bits.eql?(64) ? 'x64' : 'x86')
       elsif OS.windows?
         OS.bits.eql?(64) ? 'win64' : 'win32'
@@ -36,6 +49,10 @@ module PaperclipCompression
 
     private
 
+    def first_processor?
+      @first_processor
+    end
+
     def init_default_opts(opts, type, default_opts)
       if opts && (compression_opts = opts[:compression])
         if compression_opts.has_key?(type)
@@ -52,5 +69,8 @@ module PaperclipCompression
       end
     end
 
+    def copy_to_tempfile
+      FileUtils.cp(@src_path, @dst_path)
+    end
   end
 end

data/lib/paperclip-compression/jpeg.rb

@@ -3,31 +3,16 @@ module PaperclipCompression
 
     JPEGTRAN_DEFAULT_OPTS = '-copy none -optimize -perfect'
 
-    def initialize(file, options = {})
-      super(file, options)
-
-      @dst = Tempfile.new(@basename)
-      @dst.binmode
-
-      @src_path = File.expand_path(@file.path)
-      @dst_path = File.expand_path(@dst.path)
-
+    def initialize(file, first_processor, options = {})
+      super(file, first_processor, options)
       @cli_opts = init_cli_opts(:jpeg, default_opts)
     end
 
     def make
       begin
-        if @cli_opts
-          #  close dst file, so jpegtran can write it
-          @dst.close
-          Paperclip.run(command_path('jpegtran'), "#{@cli_opts} :src_path > :dst_path", src_path: @src_path, dst_path: @dst_path)
-          @dst.open
-          @dst
-        else
-          @file
-        end
+        process_file? ? process_file : unprocessed_tempfile
       rescue Cocaine::ExitStatusError => e
-        raise Paperclip::Error, "JPEGTRAN : There was an error processing the thumbnail for #{@basename}" if @whiny
+        raise Paperclip::Error, "JPEGTRAN : There was an error processing #{@basename}" if @whiny
       rescue Cocaine::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'jpegtran'. Please install jpegtran.")
       end
@@ -39,5 +24,12 @@ module PaperclipCompression
       JPEGTRAN_DEFAULT_OPTS
     end
 
+    def process_file
+      # close dst file, so jpegtran can write it
+      @dst.close
+      Paperclip.run(command_path('jpegtran'), "#{@cli_opts} :src_path > :dst_path", src_path: @src_path, dst_path: @dst_path)
+      @dst.open
+      @dst
+    end
   end
 end

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

@@ -13,18 +13,21 @@ module Paperclip
 
     private
 
-    def make_jpeg
-      PaperclipCompression::Jpeg.make(@file, @options)
+    def content_type
+      first_processor? ? @file.content_type : Paperclip::ContentTypeDetector.new(@file.path).detect
     end
 
-    def make_png
-      PaperclipCompression::Png.make(@file, @options)
+    def first_processor?
+      @first_processor ||= @file.is_a?(Paperclip::AbstractAdapter)
     end
 
-    def content_type
-      @file.is_a?(Paperclip::AbstractAdapter) ? @file.content_type : Paperclip::ContentTypeDetector.new(@file.path).detect
+    def make_jpeg
+      PaperclipCompression::Jpeg.make(@file, first_processor?, @options)
     end
 
-  end
+    def make_png
+      PaperclipCompression::Png.make(@file, first_processor?, @options)
+    end
 
+  end
 end

data/lib/paperclip-compression/png.rb

@@ -3,18 +3,16 @@ module PaperclipCompression
 
     OPTIPNG_DEFAULT_OPTS  = '-o 5 -quiet'
 
-    def initialize(file, options = {})
-      super(file, options)
-      @src_path = File.expand_path(@file.path)
+    def initialize(file, first_processor, options = {})
+      super(file, first_processor, options)
       @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
+        process_file? ? process_file : unprocessed_tempfile
       rescue Cocaine::ExitStatusError => e
-        raise Paperclip::Error, "OPTIPNG : There was an error processing the thumbnail for #{@basename}" if @whiny
+        raise Paperclip::Error, "OPTIPNG : There was an error processing #{@basename}" if @whiny
       rescue Cocaine::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'optipng'. Please install optipng.")
       end
@@ -26,5 +24,10 @@ module PaperclipCompression
       OPTIPNG_DEFAULT_OPTS
     end
 
+    def process_file
+      Paperclip.run(command_path('optipng'), "#{@cli_opts} -clobber :src_path -out :dst_path", src_path: @src_path, dst_path: @dst_path)
+      @dst
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - İ. Emre Kutlu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-25 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip