paperclip-compression 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 02a81c110df8dafcfc26ab4001e1cae33e0726d5
-  data.tar.gz: 0c02d5b5ac7fb8b114a9bb63f9bc9be88faf52b5
+SHA256:
+  metadata.gz: e9d963957eb471dbb25da7fd0a1dcf0c01e57da9eefc6d2581d6d7f2716c68f1
+  data.tar.gz: a04ab3ab329f5f793ea1b10cbb1c6e587c003274bf1c81b49d696096bbe787f3
 SHA512:
-  metadata.gz: '089b87628388b3da6db1c48bd5feb72ecaef07e98689238ef405c685778df26461ab15600c8ee18a96de96f53f8b078f9bc92c9d67be8c851e16c95e3513a47e'
-  data.tar.gz: 1da2739aa067ceca413c040f99f2e56a59ea02071949c09b2e49ef1b09ca7dc0da30ae6e8c22c27a80fc30b762dc7db56efb47d450db56a38eafd025031f2608
+  metadata.gz: c9b6a88b4521f370d6ca62c7a9b1d1916b21a114bf8ff892dbd5ba9e42ff8863484be20d94d727d57ee912850d06140cf88581e3512e0d7718c75a504e359db6
+  data.tar.gz: effaba8dc2079b942383ffcc0c057f3e68f716f92321f87fdceab2abc60a3c2a7efda8e14628a851d45496a9ab6d843f72c733275cb6315156ba9c410b7a7d8e

data/lib/paperclip-compression/base.rb

@@ -1,11 +1,15 @@
 module PaperclipCompression
+
+  ExitStatusError = defined?(Cocaine) ? Cocaine::ExitStatusError : Terrapin::ExitStatusError
+  CommandNotFoundError = defined?(Cocaine) ? Cocaine::CommandNotFoundError : Terrapin::CommandNotFoundError
+
   class Base
 
     def initialize(file, first_processor)
       @file             = file
       current_extension = File.extname(file.path)
       @basename         = File.basename(file.path, current_extension)
-      @dst              = Paperclip::TempfileFactory.new.generate("#{@basename}.png")
+      @dst              = Paperclip::TempfileFactory.new.generate(@basename)
       @dst_path         = File.expand_path(@dst.path)
       @src_path         = File.expand_path(@file.path)
       @first_processor  = first_processor
@@ -45,7 +49,7 @@ module PaperclipCompression
 
     def command_path(command)
      folder = if OS.osx?
-        'osx'
+        File.join('osx', catalina? ? '64bit' : '32bit')
       elsif OS.linux?
         File.join('linux', OS.bits.eql?(64) ? 'x64' : 'x86')
       elsif OS.windows?
@@ -69,6 +73,11 @@ module PaperclipCompression
     def copy_to_tempfile
       FileUtils.cp(@src_path, @dst_path)
     end
+
+    def catalina?
+      major = OS.host_os.match(/darwin(\d+)/)[1].to_i
+      major >= 19
+    end
   end
 
   # Informs developers when a method is intended to be defined in # sub-classes.

data/lib/paperclip-compression/jpeg.rb

@@ -12,9 +12,9 @@ module PaperclipCompression
     def make
       begin
         @config.process_file? ? process_file : unprocessed_tempfile
-      rescue Cocaine::ExitStatusError => e
+      rescue ExitStatusError
         raise Paperclip::Error, "JPEGTRAN : There was an error processing #{@basename}" if @config.whiny
-      rescue Cocaine::CommandNotFoundError => e
+      rescue CommandNotFoundError
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'jpegtran'. Please install jpegtran.")
       end
     end

data/lib/paperclip-compression/png.rb

@@ -12,9 +12,9 @@ module PaperclipCompression
     def make
       begin
         @config.process_file? ? process_file : unprocessed_tempfile
-      rescue Cocaine::ExitStatusError => e
+      rescue ExitStatusError
         raise Paperclip::Error, "OPTIPNG : There was an error processing #{@basename}" if @config.whiny
-      rescue Cocaine::CommandNotFoundError => e
+      rescue CommandNotFoundError
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'optipng'. Please install optipng.")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - İ. Emre Kutlu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2021-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.6
+        version: 5.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.6
+        version: 5.2.1
 - !ruby/object:Gem::Dependency
   name: os
   requirement: !ruby/object:Gem::Requirement
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +104,10 @@ files:
 - bin/linux/x64/optipng
 - bin/linux/x86/jpegtran
 - bin/linux/x86/optipng
-- bin/osx/jpegtran
-- bin/osx/optipng
+- bin/osx/32bit/jpegtran
+- bin/osx/32bit/optipng
+- bin/osx/64bit/jpegtran
+- bin/osx/64bit/optipng
 - bin/win32/jpegtran.exe
 - bin/win32/libjpeg-62.dll
 - bin/win32/optipng.exe
@@ -136,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Image compression for Paperclip