mugshot 0.4.2 → 0.5.1

data/README.md

@@ -7,36 +7,129 @@ Mugshot
 Overview
 --------
 
-The basic idea of Mugshot is that you upload the largest/highest quality images
-possible. When retrieving the images you apply different operations to it such
-as: resizing, rounded corners, transparency and anything else we can think of!
+The basic idea of Mugshot is that you upload the largest/highest quality images possible. When retrieving the images you apply different operations to it such as: resizing, rounded corners, transparency and anything else we can think of!
 
-Only the original image is stored on the server. All operations are performed
-dynamically, which is why caching is so important (see below).
+Only the original image is stored on the server. All operations are performed dynamically, which is why caching is so important (see below).
 
 
 Caching
 -------
 
-Mugshot doesn't cache anything by itself but is designed to play nice with
-standard HTTP caching.
+Mugshot doesn't cache anything by itself but is designed to play nice with standard HTTP caching.
 
-For production use, don't even think about using Mugshot without something like
-Varnish or Squid sitting in front.
+For production use, don't even think about using Mugshot without something like Varnish or Squid sitting in front.
 
 
+Using
+-----
+
+Mugshot provides you with a Sinatra application. You can create a **config.ru** file with these contents to start using Mugshot:
+
+<pre>
+  # -*- encoding: utf-8 -*-
+  require "rubygems"
+  require "mugshot"
+
+  run Mugshot::Application.new(:storage => Mugshot::FSStorage.new("/tmp/mugshot"))
+</pre>
+
+Then you can run it with:
+
+<pre>
+  $ rackup config.ru
+</pre>
+
+And access in your browser:
+
+<pre>
+  http://localhost:9292/myimg/some-name.jpg
+</pre>
+
+This would simply return the image located at /tmp/mugshot/myimg, converting it to a JPEG. Additionaly you can pass some operations to be performed over the image:
+
+<pre>
+  http://localhost:9292/resize/100x100/myimg/some-name.jpg   # resizing to 100x100 pixels
+  http://localhost:9292/resize/100x/myimg/some-name.jpg   # resizing to 100 pixels in width maintaining aspect ratio
+  http://localhost:9292/resize/x100/myimg/some-name.jpg   # resizing to 100 pixels in height maintaining aspect ratio
+  http://localhost:9292/crop/200x150/myimg/some-name.jpg   # resize and crop image to 200x150
+  http://localhost:9292/quality/70/crop/200x150/myimg/some-name.jpg   # convert it to JPEG with quality of 70% and resize and crop image to 200x150
+  http://localhost:9292/background/red/crop/200x150/myimg/some-name.jpg   # convert it to JPEG with red background and resize and crop image to 200x150
+</pre>
+
 Supported operations
 --------------------
 
 ### Resize
 
-/widthxheight/id.jpg (ex: http://mugshot.ws/200x100/test.jpg)
+<pre>
+  /resize/WIDTHxHEIGHT/id/name.jpg (ex: http://mugshot.ws/resize/200x100/myid/thumb.jpg)
+</pre>
 
 ### Resize keeping aspect ratio
 
-/widthx/id.jpg (ex.: http://mugshot.ws/200x/test.jpg)
+<pre>
+  /resize/WIDTHx/id/name.jpg (ex: http://mugshot.ws/resize/200x/myid/thumb.jpg)
+
+  /resize/xHEIGHT/id/name.jpg (ex: http://mugshot.ws/resize/x100/myid/thumb.jpg)
+</pre>
+
+### Crop
+
+<pre>
+  /crop/WIDTHxHEIGHT/id/name.jpg (ex: http://mugshot.ws/crop/200x100/myid/thumb.jpg)
+</pre>
+
+### Quality
+
+<pre>
+  /quality/QUALITY/id/name.jpg (ex: http://mugshot.ws/quality/70/myid/thumb.jpg)
+</pre>
+
+### Background
+
+<pre>
+  /background/COLOR/id/name.jpg (ex: http://mugshot.ws/background/red/myid/thumb.jpg)
+</pre>
+
+
+Configuration
+-------------
+
+You can further configure your Mugshot::Application when creating it, like so:
+
+<pre>
+  # -*- encoding: utf-8 -*-
+  require "rubygems"
+  require "mugshot"
+
+  run Mugshot::Application.new(
+    :storage => Mugshot::FSStorage.new("/tmp/mugshot"),
+    :cache_duration => 7.days.to_i,                       # duration set in cache header (in seconds)
+    :allowed_sizes => ['640x360', '480x360', '320x240'],  # an array with valid sizes for resize and crop operations
+    :allowed_formats => [:jpg, :png],                     # an array with the allowed formats
+    :allowed_names => ['thumb', 'img'],                   # an array with the allowed names in the URL
+    :quality_range => 1..100,                             # the range of allowed values for quality operations
+    :valid_operations => [:crop, :resize, :quality]       # an array with the valid operations
+  )
+</pre>
+
+When using the restrictive configurations any value other than the ones allowed will result in a 400 status code being returned. If no restriction is set then any value can be given, which can lead to DOS attacks. Be careful!
+
+Development
+-----------
+
+Clone the repository and run:
+
+<pre>
+  $ bundle install
+</pre>
+
+This will install all dependencies for you. Then you can run the specs and features:
 
-/xheight/id.jpg (ex.: http://mugshot.ws/x100/test.jpg)
+<pre>
+  $ rake spec
+  $ rake cucumber
+</pre>
 
 
 Who's using

data/features/support/env.rb

@@ -11,7 +11,7 @@ require 'pp'
 require 'RMagick'
 
 module CucumberWorld
-  include Rspec::Matchers
+  include RSpec::Matchers
   include Rack::Test::Methods
   
   mattr_accessor :storage

data/lib/mugshot/application.rb

@@ -3,15 +3,15 @@ require 'sinatra/base'
 
 class Mugshot::Application < Sinatra::Base
 
-  VALID_OPERATIONS = %w[background crop resize quality]
+  DEFAULT_VALID_OPERATIONS = %w[background crop resize quality]
 
   set :static, true
   set :public, ::File.expand_path(::File.join(::File.dirname(__FILE__), "public"))
 
   before do
-    response['Cache-Control'] = "public, max-age=#{1.year.to_i}"
+    response['Cache-Control'] = "public, max-age=#{@cache_duration}"
   end
-
+  
   get '/?' do
     'ok'
   end
@@ -22,13 +22,20 @@ class Mugshot::Application < Sinatra::Base
     id
   end
 
+  before '/*/?:id/:name.:format' do |splat, id, name, format|
+    @operations = operations_from_splat(splat)
+    check_format(format)
+    check_name(name)
+    check_operations
+  end
+  
   get '/*/?:id/:name.:format' do |splat, id, _, format|
     image = @storage.read(id)
     halt 404 if image.blank?
 
     begin
       process_operations(image, @default_operations)
-      process_operations(image, operations_from_splat(splat))
+      process_operations(image, @operations)
       send_image(image, format.to_sym)
     ensure
       image.destroy!
@@ -40,8 +47,14 @@ class Mugshot::Application < Sinatra::Base
   def initialize(opts)
     opts = {:storage => opts} if opts.kind_of?(Mugshot::Storage)
     opts.to_options!
-    
+
     @storage = opts.delete(:storage)
+    @cache_duration = opts.delete(:cache_duration) || 1.year.to_i
+    @valid_operations = (opts.delete(:valid_operations) || DEFAULT_VALID_OPERATIONS).map(&:to_s)
+    @quality_range = opts.delete(:quality_range)
+    @allowed_sizes = opts.delete(:allowed_sizes)
+    @allowed_formats = opts.delete(:allowed_formats)
+    @allowed_names = opts.delete(:allowed_names)
 
     @default_operations = opts
     
@@ -54,12 +67,48 @@ class Mugshot::Application < Sinatra::Base
     operations = []
     begin
       operations = Hash[*splat.split('/')]
-      operations.assert_valid_keys(VALID_OPERATIONS)
+      operations.assert_valid_keys(@valid_operations)
     rescue
-      halt 404
+      halt 400
     end
     operations
   end
+  
+  def check_format(format)
+    halt 400 unless valid_format?(format)
+  end
+  
+  def valid_format?(format)
+    @allowed_formats.blank? || @allowed_formats.map(&:to_s).include?(format)
+  end
+  
+  def check_name(name)
+    halt 400 unless valid_name?(name)
+  end
+  
+  def valid_name?(name)
+    @allowed_names.blank? || @allowed_names.map(&:to_s).include?(name)
+  end
+
+  def check_operations
+    halt 400 unless valid_quality_operation? && valid_resize_operation? && valid_crop_operation?
+  end
+  
+  def valid_quality_operation?
+    !@operations.has_key?("quality") || @quality_range.blank? || @quality_range.include?(@operations["quality"].to_i)
+  end
+  
+  def valid_resize_operation?
+    valid_operation?("resize", @allowed_sizes)
+  end
+  
+  def valid_crop_operation?
+    valid_operation?("crop", @allowed_sizes)
+  end
+  
+  def valid_operation?(operation, range_or_array)
+    !@operations.has_key?(operation) || range_or_array.blank? || range_or_array.include?(@operations[operation])
+  end
 
   def process_operations(image, operations)
     operations.each do |op, op_params|

data/lib/mugshot/fs_storage.rb

@@ -2,7 +2,7 @@
 require 'fileutils'
 class Mugshot::FSStorage < Mugshot::Storage
   def write(bin)
-    returning asset_id do |id|
+    asset_id.tap do |id|
       File.open(File.join(@root_path, id), "w") do |fw|
         fw.write(bin)
       end

data/lib/mugshot/version.rb

@@ -0,0 +1,3 @@
+module Mugshot
+  VERSION = "0.5.1"
+end

data/spec/mugshot/application_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Mugshot::Application do
   before :each do
-    @storage = stub(Mugshot::Storage, :null_object => true)
-    @image = stub(Mugshot::Image, :null_object => true)
+    @storage = stub(Mugshot::Storage, :kind_of? => true).as_null_object
+    @image = stub(Mugshot::Image, :blank? => false).as_null_object
     @storage.stub!(:read).with("image_id").and_return(@image)
 
     def app
@@ -95,19 +95,19 @@ describe Mugshot::Application do
       last_response.body.should be_empty
     end
 
-    it "should halt 404 on operations that are not allowed" do
+    it "should halt 400 on operations that are not allowed" do
       @image.should_not_receive(:operation!)
 
       get "/operation/140x105/image_id/any_name.jpg"
 
-      last_response.should be_not_found
+      last_response.status.should == 400
       last_response.body.should be_empty
     end
     
-    it "should halt 404 on URL with invalid operation/param pair" do
+    it "should halt 400 on URL with invalid operation/param pair" do
       get "/140x105/image_id/any_name.jpg"
 
-      last_response.should be_not_found
+      last_response.status.should == 400
       last_response.body.should be_empty
     end
   end
@@ -127,4 +127,192 @@ describe Mugshot::Application do
       last_response.headers["Cache-Control"].should == "public, max-age=31557600"
     end
   end
+  
+  describe "configuration" do
+    describe "cache duration" do
+      it "should use the configured cache duration" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :cache_duration => 3.days.to_i)
+        end
+
+        get "/"
+        last_response.headers["Cache-Control"].should == "public, max-age=#{3.days.to_i}"
+      end
+    end
+    
+    describe "valid operations" do
+      it "should allow a valid operation" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :valid_operations => ["crop", "resize"])
+        end
+
+        @image.stub!(:to_blob).and_return("image data")
+        
+        get "/resize/200x100/image_id/any_name.jpg"
+        last_response.should be_ok
+        last_response.body.should == "image data"
+      end
+      
+      it "should halt with a 400 (Bad Request) when an invalid operation is given" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :valid_operations => ["crop", "resize"])
+        end
+
+        get "/quality/50/image_id/any_name.jpg"
+        last_response.status.should == 400
+      end
+    end
+    
+    describe "quality range" do
+      it "should allow quality operations with values in the configured range" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :quality_range => 1..200)
+        end
+
+        @image.stub!(:to_blob).and_return("image data")
+        
+        1.upto(200) do |quality|
+          get "/quality/#{quality}/image_id/any_name.jpg"
+          last_response.should be_ok
+          last_response.body.should == "image data"
+        end
+      end
+      
+      it "should allow quality operations when no range is configured" do
+        @image.stub!(:to_blob).and_return("image data")
+        
+        1.upto(300) do |quality|
+          get "/quality/#{quality}/image_id/any_name.jpg"
+          last_response.should be_ok
+          last_response.body.should == "image data"
+        end
+      end
+      
+      it "should halt with a 400 (Bad Request) quality operations with values outside the configured range" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :quality_range => 1..200)
+        end
+
+        get "/quality/0/image_id/any_name.jpg"
+        last_response.status.should == 400
+        
+        get "/quality/201/image_id/any_name.jpg"
+        last_response.status.should == 400
+      end
+    end
+    
+    describe "allowed sizes" do
+      def allowed_sizes
+        ['640x480', '640x360', '480x360', '320x240']
+      end
+      
+      %w{resize crop}.each do |operation|
+        it "should allow #{operation} operations for configured values" do
+          def app
+            Mugshot::Application.new(:storage => @storage, :allowed_sizes => allowed_sizes)
+          end
+
+          @image.stub!(:to_blob).and_return("image data")
+        
+          allowed_sizes.each do |size|
+            get "/#{operation}/#{size}/image_id/any_name.jpg"
+            last_response.should be_ok
+            last_response.body.should == "image data"
+          end
+        end
+      
+        it "should allow #{operation} operations when allowed sizes is not configured" do
+          def app
+            Mugshot::Application.new(:storage => @storage)
+          end
+
+          @image.stub!(:to_blob).and_return("image data")
+        
+          ['300x200', '400x250'].each do |size|
+            get "/#{operation}/#{size}/image_id/any_name.jpg"
+            last_response.should be_ok
+            last_response.body.should == "image data"
+          end
+        end
+      
+        it "should halt with a 400 (Bad Request) #{operation} operations with a not allowed size" do
+          def app
+            Mugshot::Application.new(:storage => @storage, :allowed_sizes => allowed_sizes)
+          end
+
+          get "/#{operation}/300x200/image_id/any_name.jpg"
+          last_response.status.should == 400
+        
+          get "/#{operation}/480x300/image_id/any_name.jpg"
+          last_response.status.should == 400
+        end
+      end
+    end
+    
+    describe "allowed formats" do
+      it "should allow valid formats" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :allowed_formats => ["jpg", "png"])
+        end
+
+        @image.stub!(:to_blob).and_return("image data")
+        
+        ["jpg", "png"].each do |format|
+          get "/image_id/any_name.#{format}"
+          last_response.should be_ok
+          last_response.body.should == "image data"
+        end
+      end
+      
+      it "should allow any format when no allowed format is configured" do
+        @image.stub!(:to_blob).and_return("image data")
+        
+        get "/image_id/any_name.tiff"
+        last_response.should be_ok
+        last_response.body.should == "image data"
+      end
+      
+      it "should halt with a 400 (Bad Request) when an invalid format is given" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :allowed_formats => ["jpg", "png"])
+        end
+
+        get "image_id/any_name.tiff"
+        last_response.status.should == 400
+      end
+    end
+    
+    describe "allowed names" do
+      it "should allow valid names" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :allowed_names => ["some_name", "some_other_name"])
+        end
+
+        @image.stub!(:to_blob).and_return("image data")
+        
+        ["some_name", "some_other_name"].each do |name|
+          get "/image_id/#{name}.jpg"
+          last_response.should be_ok
+          last_response.body.should == "image data"
+        end
+      end
+      
+      it "should allow any name when no allowed name is configured" do
+        @image.stub!(:to_blob).and_return("image data")
+        
+        get "/image_id/any_name.tiff"
+        last_response.should be_ok
+        last_response.body.should == "image data"
+      end
+      
+      it "should halt with a 400 (Bad Request) when an invalid name is given" do
+        def app
+          Mugshot::Application.new(:storage => @storage, :allowed_names => ["some_name", "some_other_name"])
+        end
+
+        get "image_id/any_name.tiff"
+        last_response.status.should == 400
+      end
+    end
+  end
 end

data/spec/mugshot/image_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mugshot::Image do
   before :each do
-    @magick_image = mock(Magick::Image, :null_object => true, :columns => 100, :rows => 100)
+    @magick_image = mock(Magick::Image, :columns => 100, :rows => 100).as_null_object
     @magick_image.instance_eval do # TODO: Explain it
       def to_blob(&block)
         block.call if block.present?

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification 
 name: mugshot
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - "Cain\xC3\xA3 Nunes"
 - "Fabr\xC3\xADcio Lopes"
 - Guilherme Cirne
 - Jose Peleteiro
+- Vicente Mundim
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-13 00:00:00 -03:00
+date: 2010-12-28 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -35,69 +39,79 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rmagick
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
+        - 2
+        - 12
+        - 2
+        version: 2.12.2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: uuid
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
-        - 12
+        - 0
         - 2
-        version: 2.12.2
+        version: 2.0.2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: uuid
+  name: blankslate
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 105
         segments: 
         - 2
-        - 0
+        - 1
         - 2
-        version: 2.0.2
+        - 3
+        version: 2.1.2.3
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: blankslate
+  name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
-        - 2
-        - 1
-        - 2
-        - 3
-        version: 2.1.2.3
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -107,25 +121,27 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
+        - 3
         - 0
-        - 0
-        - beta
-        - 8
-        version: 2.0.0.beta.8
+        version: 2.3.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -137,9 +153,11 @@ dependencies:
   name: cucumber
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 6
@@ -151,9 +169,11 @@ dependencies:
   name: rack-test
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 5
@@ -161,12 +181,13 @@ dependencies:
         version: 0.5.1
   type: :development
   version_requirements: *id010
-description: Dead simple image server
+description: "The basic idea of Mugshot is that you upload the largest/highest quality images possible. When retrieving the images you apply different operations to it such as: resizing, rounded corners, transparency and anything else we can think of!"
 email: 
 - cainanunes@gmail.com
 - fabriciolopesvital@gmail.com
 - gcirne@gmail.com
 - jose@peleteiro.net
+- vicente.mundim@gmail.com
 executables: []
 
 extensions: []
@@ -183,8 +204,38 @@ files:
 - lib/mugshot/magick_factory.rb
 - lib/mugshot/public/crossdomain.xml
 - lib/mugshot/storage.rb
+- lib/mugshot/version.rb
 - LICENSE
 - README.md
+- features/convert_image_format.feature
+- features/crop_image.feature
+- features/define_image_quality.feature
+- features/resize_image.feature
+- features/retrieve_image_with_any_name.feature
+- features/set_background.feature
+- features/step_definitions/all_steps.rb
+- features/support/env.rb
+- features/support/files/test-cropped_to_300x200.jpg
+- features/support/files/test-resized_to_200x.jpg
+- features/support/files/test-resized_to_200x200.jpg
+- features/support/files/test-resized_to_x200.jpg
+- features/support/files/test-with_75%_of_compression.jpg
+- features/support/files/test.gif
+- features/support/files/test.jpg
+- features/support/files/test.png
+- features/support/files/with_alpha_channel-with_a_red_background.jpg
+- features/support/files/with_alpha_channel.png
+- features/upload_image.feature
+- spec/files/firefox_png.png
+- spec/files/test.jpg
+- spec/files/test_png.png
+- spec/mugshot/application_spec.rb
+- spec/mugshot/fs_storage_spec.rb
+- spec/mugshot/http_storage_spec.rb
+- spec/mugshot/image_spec.rb
+- spec/mugshot/magick_factory_spec.rb
+- spec/spec_helper.rb
+- spec/test.html
 has_rdoc: true
 homepage: http://mugshot.ws
 licenses: []
@@ -195,37 +246,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.6
+rubyforge_project: mugshot
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Dead simple image server
 test_files: 
-- spec/files/firefox_png.png
-- spec/files/test.jpg
-- spec/files/test_png.png
-- spec/mugshot/application_spec.rb
-- spec/mugshot/fs_storage_spec.rb
-- spec/mugshot/http_storage_spec.rb
-- spec/mugshot/image_spec.rb
-- spec/mugshot/magick_factory_spec.rb
-- spec/spec_helper.rb
-- spec/test.html
 - features/convert_image_format.feature
 - features/crop_image.feature
 - features/define_image_quality.feature
@@ -245,3 +290,13 @@ test_files:
 - features/support/files/with_alpha_channel-with_a_red_background.jpg
 - features/support/files/with_alpha_channel.png
 - features/upload_image.feature
+- spec/files/firefox_png.png
+- spec/files/test.jpg
+- spec/files/test_png.png
+- spec/mugshot/application_spec.rb
+- spec/mugshot/fs_storage_spec.rb
+- spec/mugshot/http_storage_spec.rb
+- spec/mugshot/image_spec.rb
+- spec/mugshot/magick_factory_spec.rb
+- spec/spec_helper.rb
+- spec/test.html