mugshot 0.3.1 → 0.4.0

data/features/convert_image_format.feature

@@ -0,0 +1,22 @@
+Feature: Convert Image Format
+
+  Scenario: Convert image to gif
+    Given an image
+
+    When I ask for it with format gif
+
+    Then I should get it with format gif
+
+  Scenario: Convert image to jpg
+    Given an image
+
+    When I ask for it with format jpg
+
+    Then I should get it with format jpg
+
+  Scenario: Convert image to png
+    Given an image
+
+    When I ask for it with format png
+
+    Then I should get it with format png

data/features/crop_image.feature

@@ -1,8 +1,8 @@
 Feature: Crop image
 
-  Scenario: Crop image with known aspect ratio
-    When I upload an image
+  Scenario: Crop image
+    Given an image
+    
+    When I ask for it cropped to 300x200
 
-    And I ask for the 300x200 cropped image
-
-    Then I should get the 300x200 cropped image
+    Then I should get it cropped to 300x200

data/features/define_image_quality.feature

@@ -0,0 +1,8 @@
+Feature: Define image quality
+
+  Scenario: Define compression ratio
+    Given an image
+
+    When I ask for it with 75% of compression
+
+    Then I should get it with 75% of compression

data/features/resize_image.feature

@@ -0,0 +1,22 @@
+Feature: Resize image
+
+  Scenario: Resize image
+    Given an image
+
+    When I ask for it resized to 200x200
+
+    Then I should get it resized to 200x200
+
+  Scenario: Resize image giving only width
+    Given an image
+
+    When I ask for it resized to 200x
+
+    Then I should get it resized to 200x
+
+  Scenario: Resized image giving only height
+    Given an image
+
+    When I ask for it resized to x200
+
+    Then I should get it resized to x200

data/features/retrieve_image_with_any_name.feature

@@ -0,0 +1,9 @@
+Feature: Retrieve image with any name
+
+  Scenario: Retrieve image with any name
+    Given an image
+
+    When I ask for it with the name "any_name"
+    And I ask for it with the name "42"
+
+    Then all of them should be the same

data/features/set_background.feature

@@ -0,0 +1,7 @@
+Feature: Set Background
+
+  Scenario: Set background for a png image with alpha channel
+    Given a png image with alpha channel
+    When I ask for it with a red background
+    Then I should get it with a red background
+    

data/features/step_definitions/all_steps.rb

@@ -1,35 +1,86 @@
 # -*- encoding: utf-8 -*-
+Given /^(a|an) (.*)Storage$/ do |_, storage_name|
+  case storage_name
+  when 'FS' then CucumberWorld.storage = Mugshot::FSStorage.new('/tmp/mugshot/cucumber')
+  when 'HTTP' then CucumberWorld.storage = Mugshot::HTTPStorage.new
+  end
+end
+
+Given /^an image$/ do
+  Given "a jpg image test"
+end
+
+Given /^a (.*) image (.*)$/ do |ext, name|
+  @image = {
+    :name => name,
+    :ext => ext,
+    :filename => "#{name.gsub(' ', '_')}.#{ext}"}
+
+  @image[:id] = write_image(@image[:filename])
+end
+
 When /^I upload an image$/ do
   post '/', "file" => Rack::Test::UploadedFile.new("features/support/files/test.jpg", "image/jpeg")
   @image_id = last_response.body
 end
 
-When /^I ask for the (.*) resized image$/ do |size|
-  get "/resize/#{size}/#{@image_id}.jpg"
-  @retrieved_image = last_response.body
+When /^I ask for it$/ do
+  get "/#{@image_id}/any_name.jpg"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
+end
+
+When /^I ask for an image that doesn't exist$/ do
+  get "/nonexistant_id/any_name.jpg"
+end
+
+When /^I ask for it resized to (.*)$/ do |size|
+  get "/resize/#{size}/#{@image[:id]}/any_name.jpg"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
+end
+
+When /^I ask for it cropped to (.*)$/ do |size|
+  get "/crop/#{size}/#{@image[:id]}/any_name.jpg"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
+end
+
+When /^I ask for it with (\d*)% of compression$/ do |compression|
+  get "/quality/#{compression}/#{@image[:id]}/any_name.jpg"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
+end
+
+When /^I ask for it with format (.*)$/ do |format|
+  get "/#{@image[:id]}/any_name.#{format}"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
+end
+
+When /^I ask for it with the name "(.*)"$/ do |name|
+  get "/#{@image[:id]}/#{name}.jpg"
+  @images_by_name[name] = Magick::Image.from_blob(last_response.body).first
 end
 
-When /^I ask for a (.*) resized image that doesn't exist$/ do |size|
-  get "/resize/#{size}/nonexistant.jpg"
+When /^I ask for it with a (.*) background$/ do |color|
+  get "/background/#{color}/#{@image[:id]}/img.jpg"
+  @retrieved_image = Magick::Image.from_blob(last_response.body).first
 end
 
-When /^I ask for the (.*) cropped image$/ do |size|
-  get "/crop/#{size}/#{@image_id}.jpg"
-  @retrieved_image = last_response.body
+Then /^I should get it$/ do
+  @retrieved_image.should be_same_image_as("test.jpg")
 end
 
 Then /^I should get a (\d+) response$/ do |response_code|
   last_response.status.should == response_code.to_i
 end
 
-Then /^I should get the (.*) resized image$/ do |size|
-  @retrieved_image.should be_same_image_as("test.#{size}.jpg")
+Then /^I should get it with format (.*)$/ do |expected_format|
+  @retrieved_image.should be_same_image_as("test.#{expected_format}")
 end
 
-Then /^I should get the (.*) resized image keeping the aspect ratio$/ do |size|
-  @retrieved_image.should be_same_image_as("test.#{size}.jpg")
+Then /^I should get it (.*)$/ do |name|
+  @retrieved_image.should be_same_image_as("#{@image[:name].gsub(' ', '_')}-#{name.underscore.gsub(' ', '_')}.jpg")
 end
 
-Then /^I should get the (.*) cropped image$/ do |size|
-  @retrieved_image.should be_same_image_as("test.crop.#{size}.jpg")
+Then /^all of them should be the same$/ do
+  @images_by_name.values.each do |img|
+    img.should be_same_image_as("test.jpg")
+  end
 end

data/features/support/env.rb

@@ -1,32 +1,49 @@
 # -*- encoding: utf-8 -*-
+require "rubygems"
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 require 'mugshot'
 
 require 'rack/test'
-require 'spec/expectations'
-
+require 'rspec/expectations'
 require 'pp'
 
+require 'RMagick'
+
 module CucumberWorld
+  include Rspec::Matchers
   include Rack::Test::Methods
+  
+  mattr_accessor :storage
 
   def app
-    Mugshot::Application.new(Mugshot::FSStorage.new('/tmp/mugshot/cucumber'))
+    Mugshot::Application.new(storage)
+  end
+
+  def write_image(filename)
+    Mugshot::FSStorage.new('/tmp/mugshot/cucumber').
+      write(IO.read(File.expand_path(filename, "features/support/files/")))
   end
 end
 World(CucumberWorld)
 
+Before do
+  @images_by_name = HashWithIndifferentAccess.new
+  CucumberWorld.storage = Mugshot::FSStorage.new('/tmp/mugshot/cucumber')
+end
+
 After do
   require 'fileutils'
   FileUtils.rm_rf("/tmp/mugshot/cucumber")
 end
 
-Spec::Matchers.define :be_same_image_as do |expected_filename|
-  match do |actual_blob|
-    actual = Magick::Image.from_blob(actual_blob).first
-    expected = Magick::Image.read(File.expand_path(__FILE__ + "/../files/#{expected_filename}")).first
+Rspec::Matchers.define :be_same_image_as do |expected|
+  match do |actual|
+    expected = Magick::Image.read(File.expand_path(__FILE__ + "/../files/#{expected}")).first if expected.is_a?(String)
 
     actual.columns == expected.columns &&
     actual.rows == expected.rows &&
     actual.difference(expected)[1] < 0.01
   end
 end
+

data/features/upload_image.feature

@@ -0,0 +1,21 @@
+Feature: Upload Image
+
+  Scenario: Filesystem storage
+    Given an FSStorage
+
+    When I upload an image
+    And I ask for it
+
+    Then I should get it
+
+  Scenario: HTTP storage
+    Given an HTTPStorage
+
+    When I upload an image
+
+    Then I should get a 405 response
+
+  Scenario: Image wasn't uploaded
+    When I ask for an image that doesn't exist
+
+    Then I should get a 404 response

data/lib/mugshot/application.rb

@@ -3,6 +3,8 @@ require 'sinatra/base'
 
 class Mugshot::Application < Sinatra::Base
 
+  VALID_OPERATIONS = %w[background crop resize quality]
+
   set :static, true
   set :public, ::File.expand_path(::File.join(::File.dirname(__FILE__), "public"))
 
@@ -15,28 +17,18 @@ class Mugshot::Application < Sinatra::Base
   end
 
   post '/?' do
-    @storage.write(params['file'][:tempfile].read)
-  end
-
-  get '/:size/:id.:format' do |size, id, format|
-    image = @storage.read(id)
-    halt 404 if image.blank?
-
-    image.resize!(size)
-
-    begin
-      send_image(image, format.to_sym)
-    ensure
-      image.destroy!
-    end
+    id = @storage.write(params['file'][:tempfile].read)
+    halt 405 if id.blank?
+    id
   end
 
-  get '/*/:id.:format' do |splat, id, format|
+  get '/*/?:id/:name.:format' do |splat, id, _, format|
     image = @storage.read(id)
     halt 404 if image.blank?
 
     begin
-      process_operations(image, splat)
+      process_operations(image, @default_operations)
+      process_operations(image, operations_from_splat(splat))
       send_image(image, format.to_sym)
     ensure
       image.destroy!
@@ -45,23 +37,37 @@ class Mugshot::Application < Sinatra::Base
 
   protected
 
-  def initialize(storage)
-    @storage = storage
+  def initialize(opts)
+    opts = {:storage => opts} if opts.kind_of?(Mugshot::Storage)
+    opts.to_options!
+    
+    @storage = opts.delete(:storage)
+
+    @default_operations = opts
   end
 
   private
 
-  def process_operations(image, splat)
-    operations = Hash[*splat.split('/')]
-    operations.assert_valid_keys('crop', 'resize') rescue halt 404
-    operations.each do |op, op_params|
-      image.send("#{op}!", op_params)
+  def operations_from_splat(splat)
+    operations = []
+    begin
+      operations = Hash[*splat.split('/')]
+      operations.assert_valid_keys(VALID_OPERATIONS)
+    rescue
+      halt 404
     end
+    operations
   end
 
+  def process_operations(image, operations)
+    operations.each do |op, op_params|
+      image.send("#{op}!", op_params.to_s)
+    end
+  end
+  
   def send_image(image, format)
     content_type format
     response['Content-Disposition'] = 'inline'
-    image.to_blob
+    image.to_blob(:format => format)
   end
 end

data/lib/mugshot/fs_storage.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require 'fileutils'
 class Mugshot::FSStorage < Mugshot::Storage
   def write(bin)
     returning asset_id do |id|

data/lib/mugshot/http_storage.rb

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+
+require 'fileutils'
+require 'net/http'
+
+class Mugshot::HTTPStorage < Mugshot::Storage
+  def write(bin)
+    nil
+  end
+
+  def read(id)
+    url = URI.parse(@url_resolver.call(id))
+    res = Net::HTTP.start(url.host, url.port) {|http| http.get(url.path)}
+
+    return nil unless res.code.to_i == 200
+
+    Mugshot::Image.new(res.body)
+  end
+
+  protected
+
+  def initialize(&block)
+    @url_resolver = block
+  end
+end

data/lib/mugshot/image.rb

@@ -1,17 +1,13 @@
 # -*- encoding: utf-8 -*-
+require 'RMagick'
 class Mugshot::Image
 
-  def width
-    @image.columns
-  end
-
-  def height
-    @image.rows
+  def background!(color)
+    @background_color = color
   end
 
   def resize!(size)
     w, h = parse_size(size)
-
     if [w, h].include?(nil)
       @image.resize_to_fit! w, h
     else
@@ -27,28 +23,48 @@ class Mugshot::Image
     self
   end
 
+  def quality!(quality)
+    @quality = quality.to_i
+    self
+  end
+
   def destroy!
     @image.destroy!
     self
   end
 
   def to_blob(opts = {})
+    opts.merge!(:quality => @quality)
+
+    set_background(@background_color) if !!@background_color
+
     @image.strip!
     @image.to_blob do
-      self.format = opts[:format].to_s if opts[:format].present?
+      self.format = opts[:format].to_s if opts.include?(:format)
       self.quality = opts[:quality] if opts[:quality].present?
     end
   end
 
   protected
-
-  def initialize(file)
-    @image = Magick::Image.read(file).first
+  def initialize(file_or_blob)
+    if file_or_blob.is_a?(File)
+      @image = Magick::Image.read(file_or_blob).first
+    else
+      @image = Magick::Image.from_blob(file_or_blob).first
+    end
+    
+    # initialize attrs
+    @background_color = @quality = nil
   end
 
   private
-
   def parse_size(size)
     size.to_s.split("x").map{|i| i.blank? ? nil : i.to_i}
   end
+
+  def set_background(color)
+    @image = Mugshot::MagickFactory.
+      create_canvas(@image.columns, @image.rows, color).
+      composite(@image, Magick::NorthWestGravity, Magick::OverCompositeOp)
+  end
 end

data/lib/mugshot/magick_factory.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'RMagick'
+
+class Mugshot::MagickFactory
+  class << self
+
+    def create_canvas(columns, rows, color)
+      Magick::Image.new(columns, rows){ self.background_color = color }
+    end
+
+  end
+end

data/lib/mugshot/storage.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+require 'uuid'
 class Mugshot::Storage
   protected
   def asset_id

data/lib/mugshot.rb

@@ -1,15 +1,11 @@
 # -*- encoding: utf-8 -*-
-require 'rubygems'
-require 'fileutils'
-require 'uuid'
-require 'active_support'
-require 'RMagick'
+require "active_support/core_ext"
 
 module Mugshot
+  autoload :Image, "mugshot/image"
+  autoload :Storage, "mugshot/storage"
+  autoload :FSStorage, "mugshot/fs_storage"
+  autoload :Application, "mugshot/application"
+  autoload :HTTPStorage, "mugshot/http_storage"
+  autoload :MagickFactory, "mugshot/magick_factory"
 end
-
-require 'mugshot/image'
-require 'mugshot/storage'
-require 'mugshot/fs_storage'
-require 'mugshot/application'
-require 'mugshot/proxy'

data/spec/mugshot/application_spec.rb

@@ -3,17 +3,42 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Mugshot::Application do
   before :each do
-    @storage = mock(Mugshot::Storage)
+    @storage = stub(Mugshot::Storage, :null_object => true)
+    @image = stub(Mugshot::Image, :null_object => true)
+    @storage.stub!(:read).with("image_id").and_return(@image)
+
     def app
       Mugshot::Application.new(@storage)
     end
   end
 
+  describe "default values" do
+    it "should accept default value for quality" do
+      def app
+        Mugshot::Application.new(:storage => @storage, :quality => 42)
+      end
+
+      @image.should_receive(:quality!).with("42")
+
+      get "/image_id/any_name.jpg"
+    end
+    
+    it "should accept default value for background" do
+      def app
+        Mugshot::Application.new(:storage => @storage, :background => :blue)
+      end
+
+      @image.should_receive(:background!).with("blue")
+
+      get "/image_id/any_name.jpg"
+    end
+  end
+  
   describe "POST /" do
     it "should create image" do
       file_read = nil
       File.open("spec/files/test.jpg") {|f| file_read = f.read}
-      @storage.should_receive(:write).with(file_read)
+      @storage.should_receive(:write).with(file_read).and_return("batata")
 
       post "/", "file" => Rack::Test::UploadedFile.new("spec/files/test.jpg", "image/jpeg")
 
@@ -27,71 +52,63 @@ describe Mugshot::Application do
 
       last_response.body.should == "batata"
     end
-  end
 
-  shared_examples_for 'any GET image' do
-    before :each do
-       @image = mock(Mugshot::Image, :null_object => true)
-       @storage.stub!(:read).with("image_id").and_return(@image)
-    end
+    it "should halt 405 when storage doesn't allow writing to" do
+      @storage.stub!(:write).and_return(nil)
 
-    it "should destroy image" do
-      @image.should_receive(:destroy!)
+      post "/", "file" => Rack::Test::UploadedFile.new("spec/files/test.jpg", "image/jpeg")
+
+      last_response.status.should == 405
+    end
+  end
+  
+  describe "GET /:ops/:ops_params/:id/:name.:format" do
+    it "should perform operations on image" do
+      @image.should_receive(:resize!).with("140x140")
+      @image.should_receive(:crop!).with("140x105")
+      @image.should_receive(:quality!).with("70")
+      @image.should_receive(:background!).with("red")
 
-      perform_get
+      get "/background/red/resize/140x140/crop/140x105/quality/70/image_id/any_name.jpg"
     end
 
     it "should return image" do
       @image.stub!(:to_blob).and_return("image data")
 
-      perform_get
+      get "/crop/140x105/image_id/any_name.jpg"
 
       last_response.should be_ok
       last_response.body.should == "image data"
     end
 
+    it "should destroy image" do
+      @image.should_receive(:destroy!)
+      get "/image_id/any_name.jpg"
+    end
+
     it "should halt 404 when image doesn't exist" do
       @storage.stub!(:read).with("image_id").and_return(nil)
 
-      perform_get
+      get "/crop/140x105/image_id/any_name.jpg"
 
       last_response.should be_not_found
       last_response.body.should be_empty
     end
-  end
-
-  describe "GET /:size/:id.:format" do
-    def perform_get
-      get "/200x200/image_id.jpg"
-    end
-
-    it_should_behave_like 'any GET image'
-
-    it "should resize image" do
-      @image.should_receive(:resize!).with("200x200")
-
-      perform_get
-    end
-  end
-
-  describe "GET /:ops/:ops_params/:id.:format" do
-    def perform_get
-      get "/crop/140x105/image_id.jpg"
-    end
 
-    it_should_behave_like 'any GET image'
+    it "should halt 404 on operations that are not allowed" do
+      @image.should_not_receive(:operation!)
 
-    it "should perform operations on image" do
-      @image.should_receive(:resize!).with("140x140")
-      @image.should_receive(:crop!).with("140x105")
+      get "/operation/140x105/image_id/any_name.jpg"
 
-      get "/resize/140x140/crop/140x105/image_id.jpg"
+      last_response.should be_not_found
+      last_response.body.should be_empty
     end
+    
+    it "should halt 404 on URL with invalid operation/param pair" do
+      get "/140x105/image_id/any_name.jpg"
 
-    it "should halt 404 on operations that are not allowed" do
-      @image.should_not_receive(:operation!)
-
-      get "/operation/140x105/image_id.jpg"
+      last_response.should be_not_found
+      last_response.body.should be_empty
     end
   end
   

data/spec/mugshot/http_storage_spec.rb

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require 'fakeweb'
+
+describe Mugshot::HTTPStorage do
+  before :each do
+    @storage = Mugshot::HTTPStorage.new{|id| "http://foo.com:123/any/#{id}/abc.jpg"}
+  end
+
+  describe 'reading' do
+    before :each do
+      FakeWeb.register_uri(:get, 'http://foo.com:123/any/image_id/abc.jpg', :body => "blob")
+      FakeWeb.register_uri(:get, 'http://foo.com:123/any/does_not_exist/abc.jpg', :status => 404)
+    end
+
+    it "should return image" do
+      Mugshot::Image.should_receive(:new).with("blob").and_return("image")
+
+      @storage.read("image_id").should == "image"
+    end
+
+    it "should return nil if image does not exist in the other mugshot" do
+      @storage.read("does_not_exist").should be_nil
+    end
+  end
+
+  describe 'writing' do
+    it "should return nil" do
+      @storage.write('').should be_nil
+    end
+  end
+end

data/spec/mugshot/image_spec.rb

@@ -3,59 +3,51 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mugshot::Image do
   before :each do
-    @magick_image = mock(Magick::Image)
-    Magick::Image.stub!(:read).and_return([@magick_image])
+    @magick_image = mock(Magick::Image, :null_object => true, :columns => 100, :rows => 100)
+    @magick_image.instance_eval do # TODO: Explain it
+      def to_blob(&block)
+        block.call if block.present?
+        return 'blob_data'
+      end
+    end
 
+    Magick::Image.stub!(:read).and_return([@magick_image])
+    
     @image = Mugshot::Image.new(File.open("spec/files/test.jpg"))
   end
-
-  it 'should return image width and height' do
-    @magick_image.stub!(:columns).and_return(100)
-    @magick_image.stub!(:rows).and_return(200)
-
-    @image.width.should == 100
-    @image.height.should == 200
+  
+  it 'can be initialized with blob' do
+    Magick::Image.should_receive(:from_blob).and_return([@magick_image])
+    Mugshot::Image.new("blob")
   end
 
   describe "to blob" do
-    before(:each) do
-      @magick_image.stub!(:strip!)
-      @magick_image.instance_eval do
-        def to_blob(&block)
-          block.call if block.present?
-          return 'blob_data'
-        end
-      end
-    end
-
     it 'should return image as a blob using default options' do
       @image.to_blob.should == 'blob_data'
     end
 
-    it 'should return image as a blob using quality' do
-      @image.should_receive(:quality=).with(75)
-      @magick_image.instance_eval do
-        def to_blob(&block)
-          yield
-          return 'blob_data'
-        end
-      end
-
-      @image.to_blob(:quality => 75).should == 'blob_data'
-    end
-
     it 'should return image as a blob using format' do
       @image.should_receive(:format=).with('png')
-      @magick_image.instance_eval do
-        def to_blob(&block)
-          yield
-          return 'blob_data'
-        end
-      end
-
       @image.to_blob(:format => :png).should == 'blob_data'
     end
+  end
+
+  it 'should return image as a blob using quality' do
+    @image.should_receive(:quality=).with(75)
 
+    @image.quality!("75")
+    @image.to_blob
+  end
+  
+  it 'should set background for transparent images' do
+    canvas = mock(Magick::Image)
+    Mugshot::MagickFactory.stub!(:create_canvas).and_return(canvas)
+    canvas.should_receive(:composite).
+      with(@magick_image, Magick::NorthWestGravity, Magick::OverCompositeOp).
+      and_return(@magick_image)
+
+    @image.background!("gray")
+    @image.to_blob
   end
 
   it "should resize image to given width and height" do
@@ -84,3 +76,4 @@ describe Mugshot::Image do
   end
 
 end
+

data/spec/mugshot/magick_factory_spec.rb

@@ -0,0 +1,13 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mugshot::MagickFactory do
+
+  it "should create a canvas given columns, rows and background color" do
+    canvas = Mugshot::MagickFactory.create_canvas(100, 200, 'red')
+    canvas.columns.should == 100
+    canvas.rows.should == 200
+    canvas.background_color == 'red'
+  end
+
+end

data/spec/spec.opts

@@ -1,5 +1,2 @@
 --color
---format nested
---loadby mtime
---reverse
---backtrace
+--format progress

data/spec/spec_helper.rb

@@ -1,17 +1,29 @@
 # -*- encoding: utf-8 -*-
+require "rubygems"
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
 require 'mugshot'
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'rack/test'
 require 'pp'
 
-Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS << /\/Library\//
+def in_editor?
+  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
+end
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
+  require 'rspec/expectations'
+  config.include Rspec::Matchers
   config.include Rack::Test::Methods
+
+  config.mock_framework = :rspec
+  config.filter_run :focused => true
+  config.run_all_when_everything_filtered = true
+  config.color_enabled = !in_editor?
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: mugshot
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Cain\xC3\xA3 Nunes"
@@ -12,79 +17,137 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-04 00:00:00 -02:00
+date: 2010-03-01 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 5
+        version: 2.3.5
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rmagick
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 12
+        - 2
         version: 2.12.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: uuid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 2
         version: 2.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: blankslate
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 1
+        - 2
+        - 3
+        version: 2.1.2.3
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - a8
+        version: 2.0.0.a8
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
-    version: 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 2
         version: 0.6.2
-    version: 
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-    version: 
+  type: :development
+  version_requirements: *id009
 description: Dead simple image server
 email: 
 - cainanunes@gmail.com
@@ -102,8 +165,9 @@ files:
 - lib/mugshot.rb
 - lib/mugshot/application.rb
 - lib/mugshot/fs_storage.rb
+- lib/mugshot/http_storage.rb
 - lib/mugshot/image.rb
-- lib/mugshot/proxy.rb
+- lib/mugshot/magick_factory.rb
 - lib/mugshot/public/crossdomain.xml
 - lib/mugshot/storage.rb
 - LICENSE
@@ -121,37 +185,51 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Dead simple image server
 test_files: 
-- spec/test.html
+- 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/proxy_spec.rb
+- spec/mugshot/http_storage_spec.rb
 - spec/mugshot/image_spec.rb
-- spec/mugshot/application_spec.rb
-- spec/spec_helper.rb
-- spec/files/test.jpg
+- spec/mugshot/magick_factory_spec.rb
 - spec/spec.opts
-- features/retrieve_resized_image.feature
+- spec/spec_helper.rb
+- spec/test.html
+- features/convert_image_format.feature
 - features/crop_image.feature
-- features/retrieve_resized_image_keeping_aspect_ratio.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.200x200.jpg
-- features/support/files/test.crop.300x200.jpg
-- features/support/files/test.x200.jpg
+- 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.200x.jpg
-- features/step_definitions/all_steps.rb
+- 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

data/features/retrieve_resized_image.feature

@@ -1,10 +0,0 @@
-Feature: Retrieve resized image
-
-  Scenario: Successful retrieval of resized image
-    When I upload an image
-    And I ask for the 200x200 resized image
-    Then I should get the 200x200 resized image
-
-  Scenario: Image doesn't exist
-    When I ask for a 200x200 resized image that doesn't exist
-    Then I should get a 404 response

data/features/retrieve_resized_image_keeping_aspect_ratio.feature

@@ -1,22 +0,0 @@
-Feature: Retrieve resized image keeping aspect ratio
-
-  Scenario: Successful retrieval of resized image from given width
-    When I upload an image
-    And I ask for the 200x resized image
-
-    Then I should get the 200x resized image keeping the aspect ratio
-
-  Scenario: Successful retrieval of resized image from given height
-    When I upload an image
-    And I ask for the x200 resized image
-
-    Then I should get the x200 resized image keeping the aspect ratio
-
-  Scenario: Image doesn't exist
-    When I ask for a 200x resized image that doesn't exist
-
-    Then I should get a 404 response
-
-    When I ask for a x200 resized image that doesn't exist
-
-    Then I should get a 404 response

data/lib/mugshot/proxy.rb

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-require 'sinatra/base'
-require 'net/http'
-
-class Mugshot::Proxy < Sinatra::Base
-  get '/*' do
-    url = URI.parse "#{@host}/#{params[:splat]}"
-    res = Net::HTTP.start(url.host, url.port) {|http|
-      http.get(url.path)
-    }
-
-    status res.code.to_i
-
-    headers_hash = {}
-    res.each_header do |k,v|
-      headers_hash[k] = v unless k.to_s =~ /status/i
-    end
-    headers headers_hash
-
-    res.body
-  end
-
-  before do
-    halt 405 unless request.get?
-  end
-
-  protected
-
-  def initialize(host)
-    @host = host
-  end
-end

data/spec/mugshot/proxy_spec.rb

@@ -1,67 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
-
-describe Mugshot::Proxy do
-  before :each do
-    def app
-      Mugshot::Proxy.new("http://localhost:9292")
-    end
-  end
-
-  describe 'GET /*' do
-    before :each do
-      @http = stub(Net::HTTP, :null_object => true)
-      @res = stub(Net::HTTPResponse, :null_object => true)
-      @http.stub!(:get).with('/request/path').and_return(@res)
-      Net::HTTP.stub!(:start).with("localhost", 9292).and_yield(@http)
-    end
-
-    it 'should proxy the request to configured host' do
-      @res.stub!(:body).and_return('body')
-
-      get '/request/path'
-
-      last_response.body.should == 'body'
-    end
-
-    it 'should return original response headers' do
-      @res.stub!(:each_header)\
-        .and_yield('content-type', 'image/jpg')\
-        .and_yield('cache-control', 'public, max-age=31557600')
-
-      get '/request/path'
-
-      last_response.headers['content-type'].should == 'image/jpg'
-      last_response.headers['cache-control'].should == 'public, max-age=31557600'
-    end
-
-    it 'should return original status' do
-      @res.stub!(:code).and_return('404')
-
-      get '/request/path'
-
-      last_response.status.should == 404
-    end
-
-    it 'should not return status header' do
-      @res.stub!(:each_header).and_yield('status', '200')
-
-      get '/request/path'
-
-      last_response.headers.should_not include('status')
-    end
-  end
-
-  describe 'other methods' do
-    it 'should not be allowed' do
-      post '/request/path'
-      last_response.status.should == 405
-
-      put '/request/path'
-      last_response.status.should == 405
-
-      delete '/request/path'
-      last_response.status.should == 405
-    end
-  end
-end