piet 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16621256456a706ddf5849744e2dda16c4fdf4a4
-  data.tar.gz: 505853c685fc0f265e2b56b83c13d4a38566e3b8
+  metadata.gz: f156bb74824772e7b12d94c41f0a6e16cddc35de
+  data.tar.gz: d621ebeb34ec00912b4691dbc135de77fd5f54bc
 SHA512:
-  metadata.gz: de96325761b35d3a471406db191a4031c6bd71e47b5fd863beab5b692529952c363828519a1c7f8a1eb423f089797ecdefeab30bcb6316e6c4b04de68a2b73c0
-  data.tar.gz: 9b1f84be78683f9d12c322024de53ecf9163d145ec67c2643a7549a9ec466ba04264361e457735b1105630c89e35bbbf9e570a3dd7955ca4e57d553b26178b30
+  metadata.gz: 434517ed09c979627074dc10dc16d7834ca53eb90f26e9f26971c9688ccfbe83637c2937c8ca638002212e4878c7ebf68d76090dbd916c9d3f940f3697e86ca1
+  data.tar.gz: 36592b89e4613eca1f2a6a79dbb956c40fa97c59e6d8cc78834ffaf657fd31080a618a05ed055d4b2f0829dc645d3ba07e48c4c0b2ca6a62d4564b3a00482f6a

data/.gitignore

@@ -1 +1,8 @@
 pkg/*
+
+# Carrierwave uploads
+uploads
+
+# RVM configuration files
+.ruby-gemset
+.ruby-version

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.5"

data/Gemfile.lock

@@ -1,28 +1,59 @@
 PATH
   remote: .
   specs:
-    piet (0.1.3)
+    piet (0.2.0)
       png_quantizator
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
-    diff-lcs (1.1.3)
+    ZenTest (4.10.0)
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    builder (3.2.2)
+    carrierwave (0.10.0)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    json (1.8.1)
+    mime-types (2.2)
+    mini_magick (3.7.0)
+      subexec (~> 0.2.1)
+    minitest (5.3.3)
     png_quantizator (0.1.0)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
+    rake (10.3.2)
+    rmagick (2.13.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    subexec (0.2.3)
+    thread_safe (0.3.3)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ZenTest
+  carrierwave
+  mini_magick
   piet!
+  rake
+  rmagick
   rspec

data/README.md

@@ -1,6 +1,8 @@
 Piet
 ======
 
+[![Build Status](https://secure.travis-ci.org/albertbellonch/piet.png)](http://travis-ci.org/albertbellonch/piet)
+
 Description
 -----------
 
@@ -62,12 +64,16 @@ and then call the **optimize** method:
 Piet.optimize(path, opts)
 ```
 
+Not that this will work not by just using the file extension, but by
+MIME type detection, which should be more reliable.
+
 The options are:
 
 * **verbose**: Whether you want to get the output of the command or not. It is interpreted as a Boolean value. Default: false.
 
-* **quality**: If you wanna add a compression, adjust the quality parameter. Valid values are any integer between 0 and 100 (100 means no compression and highest quality). Default: 100
+* **quality**: Adjust the output compression for JPEGs. Valid values are any integer between 0 and 100 (100 means no compression and highest quality). Default: 100
 
+* **level**: Adjust the optimization level for PNGs. Valid values are any integer between 0 and 7 (7 means highest compression and longest processing time). Default: 7
 
 CarrierWave integration
 -----------------------
@@ -133,7 +139,7 @@ would optimize those PNG, GIF and JPEG files but ouput nothing.
 Piet.optimize('/my/wonderful/pics/piggy.png', :verbose => true)
 ```
 
-would optimize that PNG/GIF file and ouput something similar to this one:
+would optimize that PNG/GIF file and output something similar to this one:
 
     ** Processing: piggy.png
     340x340 pixels, 4x8 bits/pixel, RGB+alpha
@@ -182,8 +188,10 @@ TODO
 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).
-* v.0.1.2 Fixed some problems with missing processing, thanks to @lentg.
+* v.0.2.1 More reliable file type detection, by not using the extension but the MIME type. Thanks to @jewlofthelotus! Also, the Carrierwave
+extension is now compatible with RMagick thanks to @YoranBrondsema.
+* v.0.2.0 Users of the gem can now use piet-binary gem, and bug with filenames containing spaces, parentheses and some other characters is solved too, thanks to @loureirorg. Requiring png_quantizator when it's due, thanks to @jayzes. Finally, specifying the gem version due to @jigfox interest.
 * v.0.1.3 Use png_quantizator gem instead of the own implementation.
-* v.0.2.0 Users of the gem can now use piet-binary gem thanks to @PikachuEXE. Fix bug with filenames containing spaces, parentheses and some other characters. Requiring png_quantizator when it's due, thanks to @jayzes. Finally, specifying the gem version due to @jigfox interest.
+* v.0.1.2 Fixed some problems with missing processing, thanks to @lentg.
+* 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).
+* v.0.1.0 Optimization of PNGs and JPEGs, including an integration with Carrierwave

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/piet.rb

@@ -3,8 +3,6 @@ require 'piet/carrierwave_extension'
 
 module Piet
   class << self
-    VALID_EXTS = %w{ png gif jpg jpeg }
-
     def optimize(path, opts={})
       output = optimize_for(path, opts)
       puts output if opts[:verbose]
@@ -18,20 +16,21 @@ module Piet
     private
 
     def optimize_for(path, opts)
-      case extension(path)
+      case mimetype(path)
         when "png", "gif" then optimize_png(path, opts)
-        when "jpg", "jpeg" then optimize_jpg(path, opts)
+        when "jpeg" then optimize_jpg(path, opts)
       end
     end
 
-    def extension(path)
-      path.split(".").last.downcase
+    def mimetype(path)
+      IO.popen(['file', '--brief', '--mime-type', path], in: :close, err: :close).read.chomp.sub(/image\//, '')
     end
 
     def optimize_png(path, opts)
+      level = (0..7).include?(opts[:level]) ? opts[:level] : 7
       vo = opts[:verbose] ? "-v" : "-quiet"
       path.gsub!(/([\(\)\[\]\{\}\*\?\\])/, '\\\\\1')
-      `#{command_path("optipng")} -o7 #{opts[:command_options]} #{vo} #{path}`
+      `#{command_path("optipng")} -o#{level} #{opts[:command_options]} #{vo} #{path}`
     end
 
     def optimize_jpg(path, opts)

data/lib/piet/carrierwave_extension.rb

@@ -1,17 +1,11 @@
 module Piet
   module CarrierWaveExtension
-    def optimize(opts={})
-      manipulate! do |img|
-        Piet.optimize(img.path, opts)
-        img
-      end
+    def optimize(opts = {})
+      ::Piet.optimize(current_path, opts)
     end
 
     def pngquant
-      manipulate! do |img|
-        Piet.pngquant(current_path)
-        img
-      end
+      ::Piet.pngquant(current_path)
     end
   end
 end

data/lib/piet/version.rb

@@ -1,3 +1,3 @@
 module Piet
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/piet.gemspec

@@ -21,4 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency "png_quantizator"
   s.add_development_dependency "rspec"
   s.add_development_dependency "ZenTest"
+  s.add_development_dependency "carrierwave"
+  s.add_development_dependency "mini_magick"
+  s.add_development_dependency "rmagick"
+  s.add_development_dependency "rake"
 end

data/spec/integration/piet_spec.rb

@@ -1 +1,96 @@
 require 'spec_helper'
+
+class RMagickUploader < CarrierWave::Uploader::Base
+  include CarrierWave::RMagick
+  include Piet::CarrierWaveExtension
+end
+
+class MiniMagickUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
+  include Piet::CarrierWaveExtension
+end
+
+describe Piet do
+  describe Piet::CarrierWaveExtension do
+    describe ".optimize" do
+      let(:real_jpg_path) { File.join('spec', 'assets', 'jpg-real.jpg') }
+      let(:real_jpg_image) { File.open(real_jpg_path) }
+
+      let(:fake_jpg_path) { File.join('spec', 'assets', 'jpg-fake.jpg') }
+      let(:fake_jpg_image) { File.open(fake_jpg_path) }
+
+      let(:real_png_path) { File.join('spec', 'assets', 'png-real.png') }
+      let(:real_png_image) { File.open(real_png_path) }
+
+      let(:fake_png_path) { File.join('spec', 'assets', 'png-fake.png') }
+      let(:fake_png_image) { File.open(fake_png_path) }
+
+      def upload_file(uploader, image)
+        uploader.store!(image)
+        uploader.manipulate! do |img|
+          img
+        end
+      end
+
+      it "calls the uploader's `current_path` when MiniMagick is used" do
+        uploader = MiniMagickUploader.new
+
+        upload_file(uploader, real_jpg_image)
+
+        expect(Piet).to receive(:optimize).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+
+      it "calls the uploader's `current_path` when RMagick is used" do
+        uploader = RMagickUploader.new
+
+        upload_file(uploader, real_jpg_image)
+
+        expect(Piet).to receive(:optimize).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+
+      it "calls `optimize_png` if the .png files MIME type is that of a PNG" do
+        uploader = MiniMagickUploader.new
+
+        upload_file(uploader, real_png_image)
+
+        expect(Piet).to receive(:optimize_png).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+
+      it "calls `optimize_jpg` if the .png files MIME type is that of a JPEG" do
+        uploader = MiniMagickUploader.new
+
+        upload_file(uploader, fake_png_image)
+
+        expect(Piet).to receive(:optimize_jpg).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+
+      it "calls `optimize_png` if the .jpg files MIME type is that of a PNG" do
+        uploader = MiniMagickUploader.new
+
+        upload_file(uploader, fake_jpg_image)
+
+        expect(Piet).to receive(:optimize_png).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+
+      it "calls `optimize_jpg` if the .jpg files MIME type is that of a JPEG" do
+        uploader = MiniMagickUploader.new
+
+        upload_file(uploader, real_jpg_image)
+
+        expect(Piet).to receive(:optimize_jpg).with(uploader.current_path, {})
+
+        uploader.optimize
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1 +1,2 @@
 require 'piet'
+require 'carrierwave'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Albert Bellonch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: png_quantizator
@@ -52,6 +52,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "-"
 email:
 - albert@itnig.net
@@ -60,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -68,6 +125,10 @@ files:
 - lib/piet/carrierwave_extension.rb
 - lib/piet/version.rb
 - piet.gemspec
+- spec/assets/jpg-fake.jpg
+- spec/assets/jpg-real.jpg
+- spec/assets/png-fake.png
+- spec/assets/png-real.png
 - spec/integration/piet_spec.rb
 - spec/spec_helper.rb
 homepage: http://itnig.net
@@ -95,5 +156,9 @@ signing_key:
 specification_version: 4
 summary: An image optimizer
 test_files:
+- spec/assets/jpg-fake.jpg
+- spec/assets/jpg-real.jpg
+- spec/assets/png-fake.png
+- spec/assets/png-real.png
 - spec/integration/piet_spec.rb
 - spec/spec_helper.rb