piet 0.1.0 → 0.1.1

data/.gitignore

@@ -0,0 +1 @@
+pkg/*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piet (0.1.0)
+    piet (0.1.1)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -7,9 +7,7 @@ Description
 Piet is a gem that optimizes an image stored in a file, and it has
 integration with CarrierWave uploaders.
 
-This gem is named after the minimal Dutch painter Piet Mondrian.
-
-[![Build Status](https://secure.travis-ci.org/albertbellonch/piet.png)](http://travis-ci.org/albertbellonch/piet)
+This gem is named after the minimalist Dutch painter [Piet Mondrian](http://en.wikipedia.org/wiki/Piet_Mondrian).
 
 Installation
 ------------
@@ -46,24 +44,59 @@ CarrierWave integration
 -----------------------
 
 As stated before, Piet can be integrated into CarrierWave uploaders.
-This way, you can optimize the original image or a version
+This way, you can optimize the original image or a version.
+
+In order to do that, firstly add **piet** to your Gemfile:
+
+    gem 'piet'
+
+Then go to your CarrierWave uploader and include Piet's extension:
+
+    class ImageUploader < CarrierWave::Uploader::Base
+      ...
+      include Piet::CarrierWaveExtension
+      ...
+    end
+
+And finally use Piet! For all the images:
+
+    class ImageUploader < CarrierWave::Uploader::Base
+      ...
+      process :optimize
+      ...
+    end
+
+Or only for a version:
+
+    class ImageUploader < CarrierWave::Uploader::Base
+      ...
+      version :normal do
+        ...
+        process :optimize
+      end
+      ...
+    end
 
 Examples
 --------
 
 * Simply Optimizing
 
+    ```
     Piet.optimize('/my/wonderful/pics/piggy.png')
 
     Piet.optimize('/my/wonderful/pics/pony.jpg')
+    ```
 
-would optimize those PNG and JPEG files but ouput nothing.
+would optimize those PNG, GIF and JPEG files but ouput nothing.
 
-* Optimizing PNG and getting feedback
+* Optimizing PNG/GIF and getting feedback
 
+    ```
     Piet.optimize('/my/wonderful/pics/piggy.png', :verbose => true)
+    ```
 
-would optimize that PNG file and ouput something similar to this one:
+would optimize that PNG/GIF file and ouput something similar to this one:
 
     ** Processing: piggy.png
     340x340 pixels, 4x8 bits/pixel, RGB+alpha
@@ -82,7 +115,9 @@ would optimize that PNG file and ouput something similar to this one:
 
 * Optimizing JPEG and getting feedback
 
+    ```
     Piet.optimize('/my/wonderful/pics/pony.jpg', :verbose => true)
+    ```
 
 would optimize that JPEG file and ouput similar to this one:
 
@@ -91,6 +126,11 @@ would optimize that JPEG file and ouput similar to this one:
 TODO
 ----
 
-* Support for GIFs
 * Binary tool for optimizing a file
 * Add some testing!
+
+Changelog
+---------
+
+* v.0.1.0 Optimization of PNGs and JPEGs, including an integration with Carrierwave
+* v.0.1.1 Added support for GIFs. Added an extra option to use pngquant (thanks @rogercampos). Solved problems with Carrierwave >= 0.6 (thanks @mllocs and @huacnlee).

data/lib/piet/carrierwave_extension.rb

@@ -2,7 +2,14 @@ module Piet
   module CarrierWaveExtension
     def optimize
       manipulate! do |img|
-        Piet.optimize(img.path)
+        Piet.optimize(current_path)
+        img
+      end
+    end
+
+    def pngquant
+      manipulate! do |img|
+        Piet.pngquant(current_path)
         img
       end
     end

data/lib/piet/version.rb

@@ -1,3 +1,3 @@
 module Piet
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/piet.rb

@@ -2,19 +2,25 @@ require 'piet/carrierwave_extension'
 
 module Piet
   class << self
-    VALID_EXTS = %w{ png jpg jpeg }
+    VALID_EXTS = %w{ png gif jpg jpeg }
 
-    def optimize(path, opts={})
+    def optimize(path, opts= {} )
       output = optimize_for(path, opts)
       puts output if opts[:verbose]
       true
     end
 
+    def pngquant(path, opts = {})
+      output = pngquant_for(path, opts)
+      puts output if opts[:verbose]
+      true
+    end
+
     private
 
     def optimize_for(path, opts)
       case extension(path)
-        when "png" then optimize_png(path, opts)
+        when "png", "gif" then optimize_png(path, opts)
         when "jpg", "jpeg" then optimize_jpg(path, opts)
       end
     end
@@ -32,5 +38,19 @@ module Piet
       vo = opts[:verbose] ? "-v" : "-q"
       `jpegoptim -f --strip-all #{vo} #{path}`
     end
+
+    def pngquant_for(path, opts)
+      opts.merge!({:force => true})
+      vo = if opts.any?
+             opts.keys.map{|x| "-#{x}"}.join(" ")
+           else
+             ""
+           end
+      out = `pngquant #{vo} 256 #{path}`
+      blobs = path.split(".")
+      new_path = "#{blobs[0..-2].join(".")}-fs8.#{blobs[-1]}"
+      `mv #{new_path} #{path}`
+      out
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piet
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360654319140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360654319140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70360654318340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360654318340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! '-'
 email:
 - albert@itnig.net
@@ -40,6 +50,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -70,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: piet
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: An image optimizer