paperclip-optimizer 1.0.3 → 2.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9431f29d41af83de62dcace1d3780eeb0c9a295a
-  data.tar.gz: faff5246fab5f3dfff07f17d5a821a3ee64d90d4
+  metadata.gz: c303fcd4e0213be8b4b53d2d6bdcc71df03164a8
+  data.tar.gz: 80a353ec95d63ffd9bad08a797c2812c86a79ff2
 SHA512:
-  metadata.gz: f6a1909c1c7a59f25a6553d536d7733fdefd8d7b7524ea21d1e65967e5d5fb1ab032ff952f3d2b7f1347566cb3654ef48c2068a018797404d178485ea2d1361f
-  data.tar.gz: d73cadc21f5a477abfc6a26268171bd52cd07fd3d48271c3dfb25d72991beb6028a94a4a31729ecbb5303e4477e073373f37b3241791b229034cd9eb63849d8e
+  metadata.gz: 5c360b3f0331e4f3a3dc1ed367e6d530c970dbde08e4af41ec2742d222e60f4baaeb45c7007202c627f82c92cae83c055f15dd0c4b0d2c7b38bfe5615738fc22
+  data.tar.gz: fa8fc637d6c714dfdbe6a4b34bd8cdef0af78acd98f83cd8e4483a183383b5a602d2e03ad4b00522563a62538c01951299d931059901e83e2202e818f4a9cef5

data/.rubocop.yml

@@ -0,0 +1,8 @@
+AllCops:
+  Exclude:
+    - 'spec/schema.rb'
+
+Style/SpaceInsideParens:
+  Enabled: false
+Metrics/LineLength:
+  Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 2.0.0.beta
+
+* **all available optimization libraries are disabled by default**
+
+  Previous versions enabled jpegtran and optipng by default. You will have to 
+  re-enable them manually if you wish to retain that behaviour
+
+* configure PaperclipOptimizer globally, per-attachment and per-style
+
+  Thanks to [danschultzer](https://github.com/danschultzer), [braindeaf](https://github.com/braindeaf) and 
+  [tirdadc](https://github.com/tirdadc) for pull requests, input and reports
+
 ## 1.0.3
 
 * updated tests, compatibility with Paperclip 4 - thanks [Sija](https://github.com/Sija)

data/README.md

@@ -4,8 +4,8 @@
 [![Build Status](https://travis-ci.org/janfoeh/paperclip-optimizer.png)](https://travis-ci.org/janfoeh/paperclip-optimizer)
 [![Dependency Status](https://gemnasium.com/janfoeh/paperclip-optimizer.png)](https://gemnasium.com/janfoeh/paperclip-optimizer)
 
-PaperclipOptimizer is a processor for [Paperclip](https://github.com/thoughtbot/paperclip) that allows 
-you to optimize and minify uploaded JPG, PNG or GIF images.
+PaperclipOptimizer is a [Paperclip](https://github.com/thoughtbot/paperclip) processor for 
+optimizing and minifying uploaded images.
 
 It is just a thin wrapper around [ImageOptim](https://github.com/toy/image_optim), 
 which supports many external optimization libraries like
@@ -13,14 +13,30 @@ which supports many external optimization libraries like
 * [advpng](http://advancemame.sourceforge.net/doc-advpng.html) from 
   [AdvanceCOMP](http://advancemame.sourceforge.net/comp-readme.html)
 * [gifsicle](http://www.lcdf.org/gifsicle/)
+* [jhead](http://www.sentex.net/~mwandel/jhead/)
 * [jpegoptim](http://www.kokkonen.net/tjko/projects.html)
+* [jpeg-recompress](https://github.com/danielgtaylor/jpeg-archive#jpeg-recompress)
 * jpegtran from [Independent JPEG Group's JPEG library](http://www.ijg.org/)
 * [optipng](http://optipng.sourceforge.net/)
 * [pngcrush](http://pmt.sourceforge.net/pngcrush/)
 * [pngout](http://www.advsys.net/ken/util/pngout.htm)
+* [pngquant](http://pngquant.org/)
+* [svgo](https://github.com/svg/svgo)
 
 ### What's new
 
+**2014-10-13 2.0.0.beta released**
+
+* configure PaperclipOptimizer globally, per-attachment and per-style
+
+  Thanks to [danschultzer](https://github.com/danschultzer), [braindeaf](https://github.com/braindeaf) and 
+  [tirdadc](https://github.com/tirdadc) for pull requests, input and reports
+* **all available optimization libraries are disabled by default**
+
+  Previous versions enabled jpegtran and optipng by default. You will have to 
+  re-enable them manually if you wish to retain that behaviour
+* optimizers which are enabled but missing or broken are ignored by default
+
 **2014-05-02 1.0.3 released**
 
 * updated tests, compatibility with Paperclip 4 - thanks [Sija](https://github.com/Sija)
@@ -33,7 +49,7 @@ Read the [CHANGELOG](CHANGELOG.md) for previous changes.
 
 ### Dependencies
 
-PaperclipOptimizer is currently compatible with Paperclip 3.4.0 to 4.1.x.
+PaperclipOptimizer is currently compatible with Paperclip 4.2.x.
 
 ## Installation
 
@@ -44,6 +60,29 @@ Add this line to your application's Gemfile after the Paperclip gem:
 And then execute:
 
     $ bundle
+    
+If you wish to set global configuration settings, run
+
+    $ rails generate paperclip_optimizer:install
+    
+to generate an initializer in config/initializers.
+
+### Caution
+
+image_optim inserts itself into the asset pipeline and tries to compress your applications image assets as well. 
+Since it enables all libraries it supports by default, you might suddenly run into errors if you do not have all 
+of them installed.
+
+Please note: image_optim settings made through PaperclipOptimizer do not apply here.
+
+To disable image_optim in your asset pipeline, add
+
+```ruby
+    # config/application.rb
+    config.assets.image_optim = false
+```
+
+to your config/application.rb.
 
 See [ImageOptims README](https://github.com/toy/image_optim#binaries-location) 
 on how to install the various optimization libraries.
@@ -58,46 +97,93 @@ optimization binaries, compiled and ready for Herokus environment.
 
 ## Usage
 
-Just add ```:paperclip_optimizer``` to Paperclips ```:processors``` - setting:
+Just add `:paperclip_optimizer` to Paperclips' `:processors` - setting:
 
 ```ruby
 class User < ActiveRecord::Base
   attr_accessible :avatar
   has_attached_file :avatar, 
-                    :styles => { :thumb => "100x100>" },
-                    :default_url => "/images/:style/missing.png",
-                    :processors => [:thumbnail, :paperclip_optimizer]
+                    styles: { thumb: "100x100>" },
+                    processors: [:thumbnail, :paperclip_optimizer]
 end
 ```
 
-Remember to include the ```:thumbnail``` processor as well if you want to retain 
+Remember to include the `:thumbnail` processor as well if you want to retain 
 Paperclips geometry functionality.
 
 ### Settings
 
-By default, PaperclipOptimizer only enables _jpegtran_ and _optipng_. You can 
-pass configuration options to ImageOptim through the ```:styles``` hash:
+You can pass configuration options to ImageOptim in three locations: globally, per attachment and per style. 
+Settings are merged, so more specific settings replace less specific ones.
+
+**Global settings**
+
+```ruby
+Paperclip::PaperclipOptimizer.default_options = {
+  skip_missing_workers: false
+}
+```
+
+Run `rails generate paperclip_optimizer:install` to generate an initializer for global settings.
+
+**Per-attachment settings**
 
 ```ruby
 class User < ActiveRecord::Base
   attr_accessible :avatar
-  has_attached_file :avatar, 
-                    :styles => {
-                      :thumb => {
-                        :geometry => "100x100>",
-                        :paperclip_optimizer => {
-                          :pngout => {
-                            :strategy => 1
-                          }
+  has_attached_file :avatar,
+                    processors: [:thumbnail, :paperclip_optimizer],
+                    paperclip_optimizer: {
+                      pngout: { strategy: 1 }
+                    },
+                    styles: {
+                      thumb:  { geometry: "100x100>" },
+                      medium: { geometry: "200x200>" },
+                      large:  { geometry: "300x300>" }
+                    }
+end
+```
+
+Just like Paperclips' `:styles` option, you can pass a lambda to `:paperclip_optimizer` which receives the `attachment` as an argument:
+
+```ruby
+class User < ActiveRecord::Base
+  attr_accessible :avatar
+  has_attached_file :avatar,
+                    processors: [:thumbnail, :paperclip_optimizer],
+                    paperclip_optimizer: ->(attachment) { attachment.instance.my_model_instance_method },
+                    styles: {
+                      thumb:  { geometry: "100x100>" },
+                      medium: { geometry: "200x200>" },
+                      large:  { geometry: "300x300>" }
+                    }
+end
+```
+
+**Per-style settings**
+
+```ruby
+class User < ActiveRecord::Base
+  attr_accessible :avatar
+  has_attached_file :avatar,
+                    processors: [:thumbnail, :paperclip_optimizer],
+                    paperclip_optimizer: {
+                      pngout: { strategy: 1 }
+                    },
+                    styles: {
+                      thumb:  { geometry: "100x100>" },
+                      medium: { geometry: "200x200>" },
+                      large:  {
+                        geometry: "300x300>",
+                        paperclip_optimizer: {
+                          pngout: { strategy: 4 }
                         }
                       }
-                    },
-                    :default_url => "/images/:style/missing.png",
-                    :processors => [:thumbnail, :paperclip_optimizer]
+                    }
 end
 ```
 
-See [ImageOptims options](https://github.com/toy/image_optim#options) for 
+See [ImageOptims options](https://github.com/toy/image_optim#options) or the initializer for 
 all available options.
 
 ## Contributing

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/paperclip-optimizer.rb

@@ -1,15 +1,23 @@
-require "paperclip-optimizer/version"
-require "paperclip-optimizer/processor"
+
+require 'paperclip-optimizer/version'
+require 'paperclip-optimizer/processor'
 
 module PaperclipOptimizer
-  DEFAULT_SETTINGS = {
-    pngcrush: false,
-    pngout: false,
+  DEFAULT_OPTIONS = {
+    skip_missing_workers: true,
     advpng: false,
+    gifsicle: false,
+    jhead: false,
     jpegoptim: false,
-    gifsicle: false
+    jpegrecompress: false,
+    jpegtran: false,
+    optipng: false,
+    pngcrush: false,
+    pngout: false,
+    pngquant: false,
+    svgo: false
   }.freeze
-
+  
   # Helper class for capturing ImageOptims error output and redirecting it
   # to Paperclips logger instance
   class StdErrCapture
@@ -22,7 +30,7 @@ module PaperclipOptimizer
       @logger.send(@log_level, string)
     end
 
-    alias_method "<<", :write
+    alias_method '<<', :write
 
     def flush; end
   end

data/lib/paperclip-optimizer/processor.rb

@@ -1,32 +1,62 @@
-require "paperclip"
-require "image_optim"
+require 'paperclip'
+require 'image_optim'
 
 module Paperclip
-  class PaperclipOptimizer < Processor
-    def make
-      settings = (@options[:paperclip_optimizer] || {}).reverse_merge(::PaperclipOptimizer::DEFAULT_SETTINGS)
+  class PaperclipOptimizer < Processor  
+    def self.default_options
+      @default_options ||= ::PaperclipOptimizer::DEFAULT_OPTIONS
+    end
+
+    def self.default_options=(new_options)
+      @default_options = new_options
+    end
 
+    def make
       src_path = File.expand_path(@file.path)
 
-      if settings[:verbose]
-        Paperclip.logger.info "optimizing #{src_path} with settings: #{settings.inspect}"
+      if optimizer_options[:verbose]
+        Paperclip.logger.info "optimizing #{src_path} with settings: #{optimizer_options.inspect}"
 
         old_stderr  = $stderr
         $stderr     = ::PaperclipOptimizer::StdErrCapture.new(Paperclip.logger)
       end
 
       begin
-        image_optim           = ImageOptim.new(settings)
+        image_optim           = ImageOptim.new(optimizer_options)
         compressed_file_path  = image_optim.optimize_image(src_path)
       ensure
-        $stderr = old_stderr if settings[:verbose]
+        $stderr = old_stderr if optimizer_options[:verbose]
       end
 
-      if compressed_file_path && File.exists?(compressed_file_path)
+      if compressed_file_path && File.exist?(compressed_file_path)
         return File.open(compressed_file_path)
       else
         return @file
       end
     end
+
+      protected
+
+    def optimizer_options
+      optimizer_global_options
+        .deep_merge(optimizer_instance_options)
+        .deep_merge(optimizer_style_options)
+        .delete_if { |_key, value| value.nil? }
+    end
+
+      private
+
+    def optimizer_global_options
+      self.class.default_options
+    end
+
+    def optimizer_instance_options
+      instance_options = @attachment.options.fetch(:paperclip_optimizer, {})
+      instance_options.respond_to?(:call) ? instance_options.call(@attachment) : instance_options
+    end
+
+    def optimizer_style_options
+      @options.fetch(:paperclip_optimizer, {})
+    end
   end
-end
+end

data/lib/paperclip-optimizer/version.rb

@@ -1,3 +1,3 @@
 module PaperclipOptimizer
-  VERSION = "1.0.3"
+  VERSION = '2.0.0.beta'
 end

data/lib/rails/generators/paperclip_optimizer/install/install_generator.rb

@@ -0,0 +1,11 @@
+module PaperclipOptimizer
+  class InstallGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+   
+    desc "creates an initializer file at config/initializers for setting global options"
+   
+    def create_initializer
+      copy_file "initializer.rb", "config/initializers/paperclip_optimizer.rb"
+    end
+  end
+end

data/lib/rails/generators/paperclip_optimizer/install/templates/initializer.rb

@@ -0,0 +1,76 @@
+# Set global optimisation options for all Paperclip models
+
+# By default, image_optim enables all the compression binaries it supports and
+# requires them to be present on your system, failing if one is actually missing.
+
+# We disable everything by default and ignore missing ones with `skip_missing_workers`.
+# This way, should a new version add support for a library we do not yet disable here,
+# things won't suddenly break.
+
+Paperclip::PaperclipOptimizer.default_options = {
+  skip_missing_workers: true,
+  advpng: false,
+  gifsicle: false,
+  jhead: false,
+  jpegoptim: false,
+  jpegrecompress: false,
+  jpegtran: false,
+  optipng: false,
+  pngcrush: false,
+  pngout: false,
+  pngquant: false,
+  svgo: false
+}
+
+# All available image_optim options. See https://github.com/toy/image_optim for more information
+
+# Paperclip::PaperclipOptimizer.default_options = {
+#   skip_missing_workers: false, # Skip workers with missing or problematic binaries (defaults to false)
+#   nice: 10,             # Nice level (defaults to 10)
+#   threads: 1,           # Number of threads or disable (defaults to number of processors)
+#   verbose: false,       # Verbose output (defaults to false)
+#   pack: nil,            # Require image_optim_pack or disable it, by default image_optim_pack will be used if available,
+#                         # will turn on :skip-missing-workers unless explicitly disabled (defaults to nil)
+#   allow_lossy: false,   # Allow lossy workers and optimizations (defaults to false)
+#   advpng: {
+#     leve: 4             # Compression level: 0 - don't compress, 1 - fast, 2 - normal, 3 - extra, 4 - extreme (defaults to 4)
+#   },
+#   gifsicle: {
+#     interlace: true,    # Interlace: true - interlace on, false - interlace off, nil - as is in original image
+#                         # (defaults to running two instances, one with interlace off and one with on)
+#     level: 3,           # Compression level: 1 - light and fast, 2 - normal, 3 - heavy (slower) (defaults to 3)
+#     careful: false      # Avoid bugs with some software (defaults to false)
+#   },
+#   jhead: true,          # no options
+#   jpegoptim: {
+#     strip: :all,        # List of extra markers to strip: :comments, :exif, :iptc, :icc or :all (defaults to :all)
+#     max_quality: 100    # Maximum image quality factor 0..100 (defaults to 100)
+#   },
+#   jpegrecompress: {
+#     quality: 3          # JPEG quality preset: 0 - low, 1 - medium, 2 - high, 3 - veryhigh (defaults to 3)  
+#   },
+#   jpegtran: {
+#     copy_chunks: false, # Copy all chunks (defaults to false)
+#     progressive: true,  # Create progressive JPEG file (defaults to true)
+#     jpegrescan: false   # Use jpegtran through jpegrescan, ignore progressive option (defaults to false) 
+#   },
+#   optipng: {
+#     level: 6,           # Optimization level preset: 0 is least, 7 is best (defaults to 6)
+#     interlace: false    # Interlace: true - interlace on, false - interlace off, nil - as is in original image (defaults to false)
+#   },
+#   pngcrush: {
+#     chunks: :alla,      # List of chunks to remove or :alla - all except tRNS/transparency or
+#                         # :allb - all except tRNS and gAMA/gamma (defaults to :alla)
+#     fix: false,         # Fix otherwise fatal conditions such as bad CRCs (defaults to false)
+#     brute: false        # Brute force try all methods, very time-consuming and generally not worthwhile (defaults to false)
+#   },
+#   pngout: {
+#     copy_chunks: false, # Copy optional chunks (defaults to false)
+#     strategy: 0         # Strategy: 0 - xtreme, 1 - intense, 2 - longest Match, 3 - huffman Only, 4 - uncompressed (defaults to 0)
+#   },
+#   pngquant: {
+#     quality: 100..100,  # min..max - don't save below min, use less colors below max (both in range 0..100; in yaml - !ruby/range 0..100) (defaults to 100..100)
+#     speed: 3            # speed/quality trade-off: 1 - slow, 3 - default, 11 - fast & rough (defaults to 3)
+#   },
+#   svgo: true            # no options
+# }

data/paperclip-optimizer.gemspec

@@ -4,25 +4,57 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'paperclip-optimizer/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "paperclip-optimizer"
+  spec.name          = 'paperclip-optimizer'
   spec.version       = PaperclipOptimizer::VERSION
-  spec.authors       = ["Jan-Christian Föh"]
-  spec.email         = ["jan@programmanstalt.de"]
-  spec.description   = %q{paperclip-optimizer is a processor for Paperclip that allows you to optimize and minify uploaded JPEG and PNG files.}
-  spec.summary       = %q{Minify Paperclip JPEG and PNG attachments}
-  spec.homepage      = "https://github.com/janfoeh/paperclip-optimizer"
-  spec.license       = "MIT"
-
-  spec.add_runtime_dependency "paperclip", ">= 3.4"
-  spec.add_runtime_dependency "image_optim", "~> 0.9"
-
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.1"
-  spec.add_development_dependency 'rspec', "~> 2.13"
-  spec.add_development_dependency 'rails', ">= 3.2.13", "< 4.1.0"
-  spec.add_development_dependency 'sqlite3', "~> 1.3.7"
-
-  spec.files         = `git ls-files`.split($/)
+  spec.authors       = ['Jan-Christian Föh']
+  spec.email         = ['jan@programmanstalt.de']
+  spec.description   = 'paperclip-optimizer is a Paperclip processor for optimizing and minifying uploaded images.'
+  spec.summary       = 'Minify Paperclip image attachments like JPGs, GIFs or PNGs'
+  spec.homepage      = 'https://github.com/janfoeh/paperclip-optimizer'
+  spec.license       = 'MIT'
+
+  spec.add_runtime_dependency 'paperclip', '>= 4.2'
+  spec.add_runtime_dependency 'image_optim', '~> 0.19.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency 'rails', '>= 3.2.20', '<= 4.2.0'
+  spec.add_development_dependency 'sqlite3', '~> 1.3.7'
+  spec.add_development_dependency 'rubocop', '~> 0.26.1'
+
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  
+  spec.post_install_message = %q{
+Initializer
+-----------
+
+run
+
+    rails g paperclip_optimizer:install
+
+to create an initializer for global configuration.
+
+Breaking changes from 1.0.3
+---------------------------
+
+Please note that Paperclip 2 now disables all optimization libraries by default. Re-enable jpegtran
+and optipng manually if you wish to retain the previous behaviour.
+
+See https://github.com/janfoeh/paperclip-optimizer#settings for more information on the new 
+configuration system.
+
+PLEASE NOTE
+-----------
+
+PaperclipOptimizer depends on image_optim, which by default inserts itself into the asset pipeline and 
+tries to compress your application assets. This might fail if you do not have all supported optimization 
+binaries installed. Add
+
+    config.assets.image_optim = false
+    
+to your config/application.rb to disable this.
+}
 end

data/spec/paperclip-optimizer_spec.rb

@@ -1,14 +1,15 @@
-require "spec_helper"
-require "fileutils"
+
+require 'spec_helper'
+require 'fileutils'
 
 describe Paperclip::PaperclipOptimizer do
 
   def stubbed_upload_model(*args)
     stubbed_model = Upload.dup
 
-    # prevent ActiveModel::Validations from blowing up when error messages are 
+    # prevent ActiveModel::Validations from blowing up when error messages are
     # accessed on an anonymous class
-    stubbed_model.stub(:model_name => ActiveModel::Name.new(self, nil, "temp"))
+    stubbed_model.stub( model_name: ActiveModel::Name.new(self, nil, 'temp') )
     stubbed_model.any_instance.stub(*args)
 
     stubbed_model
@@ -18,24 +19,27 @@ describe Paperclip::PaperclipOptimizer do
     tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
 
     Dir.mkdir(tmp_dir) unless File.directory?(tmp_dir)
-    
+
     Dir.entries(tmp_dir).each do |f|
-      next unless f.end_with?(".jpg", ".png")
+      next unless f.end_with?('.jpg', '.png')
 
       FileUtils.remove_entry_secure( File.join(tmp_dir, f) )
     end
+    
+    Paperclip::PaperclipOptimizer.default_options = PaperclipOptimizer::DEFAULT_OPTIONS
   end
 
-  it "creates smaller JPEGs" do
+  it 'creates smaller JPEGs with jpegtran' do
     jpg = get_fixture(:jpg)
-    unoptimized_upload = Upload.new(:image => jpg)
+    unoptimized_upload = Upload.new(image: jpg)
     jpg.close
     unoptimized_upload.save
 
     jpg = get_fixture(:jpg)
     optimized_upload  = stubbed_upload_model(
-                          processor_settings: [:thumbnail, :paperclip_optimizer]
-                        ).new(:image => jpg)
+                          processor_settings: [:thumbnail, :paperclip_optimizer],
+                          instance_settings:  { jpegtran: true }
+                        ).new(image: jpg)
     jpg.close
     optimized_upload.save
 
@@ -45,16 +49,17 @@ describe Paperclip::PaperclipOptimizer do
     expect(optimized_file_size).to be < unoptimized_file_size
   end
 
-  it "creates smaller PNGs" do
+  it 'creates smaller PNGs with optipng' do
     png = get_fixture(:png)
-    unoptimized_upload = Upload.new(:image => png)
+    unoptimized_upload = Upload.new(image: png)
     unoptimized_upload.save
     png.close
 
     png = get_fixture(:png)
     optimized_upload  = stubbed_upload_model(
-                          processor_settings: [:thumbnail, :paperclip_optimizer]
-                        ).new(:image => png)
+                          processor_settings: [:thumbnail, :paperclip_optimizer],
+                          instance_settings:  { optipng: true }
+                        ).new(image: png)
     png.close
     optimized_upload.save
 
@@ -64,24 +69,24 @@ describe Paperclip::PaperclipOptimizer do
     expect(optimized_file_size).to be < unoptimized_file_size
   end
 
-  it "should allow disabled optimization options to be reenabled" do
-    settings  = {
-                  :gifsicle => {:interlace => true}
-                }.reverse_merge(::PaperclipOptimizer::DEFAULT_SETTINGS)
+  it 'merges global, per-model and per-style options' do
+    global_options       = PaperclipOptimizer::DEFAULT_OPTIONS.merge( gifsicle: { interlace: true }, jpegtran: true )
+    final_merged_options = PaperclipOptimizer::DEFAULT_OPTIONS.merge( jpegtran: true, optipng: true )
+    
+    Paperclip::PaperclipOptimizer.default_options = global_options
 
-    ImageOptim.should_receive(:new).with(settings).and_call_original
+    ImageOptim.should_receive(:new).with(final_merged_options).and_call_original
 
     jpg = get_fixture(:jpg)
 
     stubbed_upload_model(
       processor_settings: [:paperclip_optimizer],
-      style_settings: { 
+      instance_settings:  { gifsicle: false },
+      style_settings: {
         medium: {
-          paperclip_optimizer: {
-            gifsicle: {:interlace => true}
-          }
+          paperclip_optimizer: { optipng: true }
         }
       }
-    ).new(:image => jpg)
+    ).new(image: jpg)
   end
-end
+end

data/spec/spec_helper.rb

@@ -6,37 +6,42 @@ require 'paperclip-optimizer'
 require 'rspec'
 require 'rspec/autorun'
 
-require "active_record"
+require 'active_record'
 
 # taken from https://github.com/tienle/docsplit-paperclip-processor/blob/master/spec/spec_helper.rb
 
-ActiveRecord::Base.establish_connection(
-  "adapter" => "sqlite3",
-  "database" => ":memory:"
-)
+ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ':memory:'
 
 ActiveRecord::Base.logger = Logger.new(nil)
+
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
 Paperclip::Railtie.insert
 
 class Upload < ActiveRecord::Base
-  self.table_name = "uploads"
+  self.table_name = 'uploads'
 
   has_attached_file :image,
-      :storage    => :filesystem,
-      :path       => "./spec/tmp/:id.:extension",
-      :url        => "/spec/tmp/:id.:extension",
-      :styles     => lambda { |attachment| attachment.instance.style_settings },
-      :processors => lambda { |instance| instance.processor_settings }
+    storage:              :filesystem,
+    path:                 './spec/tmp/:id.:extension',
+    url:                  '/spec/tmp/:id.:extension',
+    styles:               ->(attachment) { attachment.instance.style_settings },
+    processors:           ->(instance) { instance.processor_settings },
+    paperclip_optimizer:  ->(attachment) { attachment.instance.instance_settings}
 
   if self.respond_to?(:do_not_validate_attachment_file_type)
     do_not_validate_attachment_file_type :image
   end
 
   def style_settings
-    { 
-      medium: { geometry: "500x500>" }
+    {
+      medium: { geometry: '500x500>' }
+    }
+  end
+  
+  def instance_settings
+    {
+
     }
   end
 
@@ -45,9 +50,9 @@ class Upload < ActiveRecord::Base
   end
 end
 
-def get_fixture(file_type = :jpg, valid = "valid")
-  file_name     = "#{valid}.#{file_type.to_s}"
-  fixtures_dir  = File.join(File.dirname(__FILE__), "../fixtures")
+def get_fixture(file_type = :jpg, valid = 'valid')
+  file_name     = "#{valid}.#{file_type}"
+  fixtures_dir  = File.join(File.dirname(__FILE__), '../fixtures')
   fixture_path  = File.join(fixtures_dir, file_name)
 
   File.open(fixture_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-optimizer
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0.beta
 platform: ruby
 authors:
 - Jan-Christian Föh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: image_optim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,20 +86,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - "<"
+        version: 3.2.20
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - "<"
+        version: 3.2.20
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -114,8 +114,22 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.7
-description: paperclip-optimizer is a processor for Paperclip that allows you to optimize
-  and minify uploaded JPEG and PNG files.
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.26.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.26.1
+description: paperclip-optimizer is a Paperclip processor for optimizing and minifying
+  uploaded images.
 email:
 - jan@programmanstalt.de
 executables: []
@@ -124,6 +138,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
@@ -139,6 +154,8 @@ files:
 - lib/paperclip-optimizer.rb
 - lib/paperclip-optimizer/processor.rb
 - lib/paperclip-optimizer/version.rb
+- lib/rails/generators/paperclip_optimizer/install/install_generator.rb
+- lib/rails/generators/paperclip_optimizer/install/templates/initializer.rb
 - paperclip-optimizer.gemspec
 - spec/paperclip-optimizer_spec.rb
 - spec/schema.rb
@@ -147,7 +164,16 @@ homepage: https://github.com/janfoeh/paperclip-optimizer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\nInitializer\n-----------\n\nrun\n\n    rails g paperclip_optimizer:install\n\nto
+  create an initializer for global configuration.\n\nBreaking changes from 1.0.3\n---------------------------\n\nPlease
+  note that Paperclip 2 now disables all optimization libraries by default. Re-enable
+  jpegtran\nand optipng manually if you wish to retain the previous behaviour.\n\nSee
+  https://github.com/janfoeh/paperclip-optimizer#settings for more information on
+  the new \nconfiguration system.\n\nPLEASE NOTE\n-----------\n\nPaperclipOptimizer
+  depends on image_optim, which by default inserts itself into the asset pipeline
+  and \ntries to compress your application assets. This might fail if you do not have
+  all supported optimization \nbinaries installed. Add\n\n    config.assets.image_optim
+  = false\n    \nto your config/application.rb to disable this.\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -158,15 +184,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Minify Paperclip JPEG and PNG attachments
+summary: Minify Paperclip image attachments like JPGs, GIFs or PNGs
 test_files:
 - spec/paperclip-optimizer_spec.rb
 - spec/schema.rb