paperclip-compression 0.3.16 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b4944af7c4aa3cfa0a0b3b3c46f9ec47653f5c7
-  data.tar.gz: e6e9d67da008304ec80183edde840479ddc18662
+  metadata.gz: 02a81c110df8dafcfc26ab4001e1cae33e0726d5
+  data.tar.gz: 0c02d5b5ac7fb8b114a9bb63f9bc9be88faf52b5
 SHA512:
-  metadata.gz: c15645c4729be903286c3d6d4e8b838e5c2fd89b548546850de84e845c0b77153a186d47c16a15ef4d81fb974fadd2d94266b8d9f886fb0ac10965f4c13f89e6
-  data.tar.gz: cdae34b6fad210d4acb4f2a43428bcca2b5fe523ed36af3beec4e004d24422f06c129801a205ca28ead6dbc77aff7114dc2acc63679d2cec716a6da9fbb1d62c
+  metadata.gz: '089b87628388b3da6db1c48bd5feb72ecaef07e98689238ef405c685778df26461ab15600c8ee18a96de96f53f8b078f9bc92c9d67be8c851e16c95e3513a47e'
+  data.tar.gz: 1da2739aa067ceca413c040f99f2e56a59ea02071949c09b2e49ef1b09ca7dc0da30ae6e8c22c27a80fc30b762dc7db56efb47d450db56a38eafd025031f2608

data/lib/paperclip-compression.rb

@@ -2,6 +2,7 @@ require 'paperclip'
 require 'os'
 require 'paperclip-compression/paperclip/compression'
 require 'paperclip-compression/base'
+require 'paperclip-compression/config'
 require 'paperclip-compression/jpeg'
 require 'paperclip-compression/png'
 

data/lib/paperclip-compression/base.rb

@@ -1,10 +1,8 @@
 module PaperclipCompression
   class Base
 
-    def initialize(file, first_processor, options = {})
+    def initialize(file, first_processor)
       @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")
@@ -45,13 +43,6 @@ module PaperclipCompression
       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)
-      # use processor_options if exists, otherwise use defaults.
-      init_default_opts(@options[:processor_options], type, default_opts)
-    end
-
     def command_path(command)
      folder = if OS.osx?
         'osx'
@@ -75,22 +66,6 @@ module PaperclipCompression
       @first_processor
     end
 
-    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
-
     def copy_to_tempfile
       FileUtils.cp(@src_path, @dst_path)
     end

data/lib/paperclip-compression/config.rb

@@ -0,0 +1,85 @@
+module PaperclipCompression
+  class Config
+
+    PROCESSOR_OPTIONS_KEY = :processor_options
+    KEY = :compression
+
+    def self.create_with_fallbacks(style_options, type_key, gem_defaults)
+      gem_config = new({ KEY => { type_key => gem_defaults } }, type_key, nil, nil)
+      defaults_config = new(Paperclip::Attachment.default_options, type_key, gem_config, Paperclip::Attachment.default_options[:whiny])
+      new(style_options[PROCESSOR_OPTIONS_KEY], type_key, defaults_config, style_options[:whiny])
+    end
+
+    def initialize(options, type_key, fallback, whiny)
+      @whiny = whiny
+      @fallback = fallback
+      parse_options(options, type_key)
+    end
+
+    def process_file?
+      if defined?(@process_file)
+        @process_file
+      elsif @fallback
+        @fallback.process_file?
+      else
+        raise('options or fallback should have attributes')
+      end
+    end
+
+    def command
+      if defined?(@command)
+        @command
+      elsif @fallback
+        @fallback.command
+      else
+        raise("options or fallback should have 'command'")
+      end
+    end
+
+    def options
+      if defined?(@options)
+        @options
+      elsif @fallback
+        @fallback.options
+      else
+        raise("options or fallback should have 'options'")
+      end
+    end
+
+    def whiny
+      @whiny
+    end
+
+    private
+
+    def parse_options(options, type_key)
+      if options && options.has_key?(KEY)
+        compression_opts = options[KEY]
+
+        if compression_opts.eql?(true)
+          @process_file = true
+        elsif compression_opts.eql?(false) || compression_opts.eql?(nil)
+          @process_file = false
+        elsif compression_opts.is_a?(Hash) && compression_opts.has_key?(type_key)
+          parse_type_options(compression_opts[type_key])
+        end
+      end
+    end
+
+    def parse_type_options(type_opts)
+      if type_opts
+        @process_file = true
+
+        if type_opts.is_a?(String)
+          @options = type_opts
+        elsif type_opts.is_a?(Hash)
+          @command = type_opts[:command] if type_opts.has_key?(:command)
+          @options = type_opts[:options] if type_opts.has_key?(:options)
+        end
+      else
+        @process_file = false
+      end
+    end
+
+  end
+end

data/lib/paperclip-compression/jpeg.rb

@@ -1,18 +1,19 @@
 module PaperclipCompression
   class Jpeg < Base
 
+    KEY = :jpeg
     JPEGTRAN_DEFAULT_OPTS = '-copy none -optimize -perfect'
 
     def initialize(file, first_processor, options = {})
-      super(file, first_processor, options)
-      @cli_opts = init_cli_opts(:jpeg, default_opts)
+      super(file, first_processor)
+      @config = PaperclipCompression::Config.create_with_fallbacks(options, KEY, gem_defaults)
     end
 
     def make
       begin
-        process_file? ? process_file : unprocessed_tempfile
+        @config.process_file? ? process_file : unprocessed_tempfile
       rescue Cocaine::ExitStatusError => e
-        raise Paperclip::Error, "JPEGTRAN : There was an error processing #{@basename}" if @whiny
+        raise Paperclip::Error, "JPEGTRAN : There was an error processing #{@basename}" if @config.whiny
       rescue Cocaine::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'jpegtran'. Please install jpegtran.")
       end
@@ -20,14 +21,19 @@ module PaperclipCompression
 
     private
 
-    def default_opts
-      JPEGTRAN_DEFAULT_OPTS
+    def gem_defaults
+      {
+        command: command_path('jpegtran'),
+        options: JPEGTRAN_DEFAULT_OPTS
+      }
     end
 
     def compress
-      Paperclip.run(command_path('jpegtran'),
-                    "#{@cli_opts} :src_path > :dst_path",
-                    src_path: @src_path, dst_path: @dst_path)
+      Paperclip.run(
+        @config.command,
+        "#{@config.options} :src_path > :dst_path",
+        src_path: @src_path, dst_path: @dst_path
+      )
     end
   end
 end

data/lib/paperclip-compression/png.rb

@@ -1,18 +1,19 @@
 module PaperclipCompression
   class Png < Base
 
-    OPTIPNG_DEFAULT_OPTS  = '-o 5 -quiet'
+    KEY = :png
+    OPTIPNG_DEFAULT_OPTS = '-o 5 -quiet'
 
     def initialize(file, first_processor, options = {})
-      super(file, first_processor, options)
-      @cli_opts = init_cli_opts(:png, default_opts)
+      super(file, first_processor)
+      @config = PaperclipCompression::Config.create_with_fallbacks(options, KEY, gem_defaults)
     end
 
     def make
       begin
-        process_file? ? process_file : unprocessed_tempfile
+        @config.process_file? ? process_file : unprocessed_tempfile
       rescue Cocaine::ExitStatusError => e
-        raise Paperclip::Error, "OPTIPNG : There was an error processing #{@basename}" if @whiny
+        raise Paperclip::Error, "OPTIPNG : There was an error processing #{@basename}" if @config.whiny
       rescue Cocaine::CommandNotFoundError => e
         raise Paperclip::Errors::CommandNotFoundError.new("Could not run 'optipng'. Please install optipng.")
       end
@@ -20,14 +21,19 @@ module PaperclipCompression
 
     private
 
-    def default_opts
-      OPTIPNG_DEFAULT_OPTS
+    def gem_defaults
+      {
+        command: command_path('optipng'),
+        options: OPTIPNG_DEFAULT_OPTS
+      }
     end
 
     def compress
-      Paperclip.run(command_path('optipng'),
-                    "#{@cli_opts} -clobber :src_path -out :dst_path",
-                    src_path: @src_path, dst_path: @dst_path)
+      Paperclip.run(
+        @config.command,
+        "#{@config.options} -clobber :src_path -out :dst_path",
+        src_path: @src_path, dst_path: @dst_path
+      )
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-compression
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 1.0.0
 platform: ruby
 authors:
-- "İ. Emre Kutlu"
+- İ. Emre Kutlu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.7.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 4.7.3
 description: JPEG and PNG compression for Paperclip gem
 email: emrekutlu@gmail.com
 executables: []
@@ -99,6 +113,7 @@ files:
 - bin/win64/libjpeg-62.dll
 - lib/paperclip-compression.rb
 - lib/paperclip-compression/base.rb
+- lib/paperclip-compression/config.rb
 - lib/paperclip-compression/jpeg.rb
 - lib/paperclip-compression/paperclip/compression.rb
 - lib/paperclip-compression/png.rb
@@ -122,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Image compression for Paperclip