mugshot 0.2.0 → 0.3.0

data/README.md

@@ -25,7 +25,7 @@ For production use, don't even think about using Mugshot without something like
 Varnish or Squid sitting in front.
 
 
-Supported Operations
+Supported operations
 --------------------
 
 ### Resize

data/features/crop_image.feature

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

data/features/step_definitions/all_steps.rb

@@ -1,15 +1,21 @@
+# -*- encoding: utf-8 -*-
 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 "/#{size}/#{@image_id}.jpg"
+  get "/resize/#{size}/#{@image_id}.jpg"
   @retrieved_image = last_response.body
 end
 
 When /^I ask for a (.*) resized image that doesn't exist$/ do |size|
-  get "/#{size}/nonexistant.jpg"
+  get "/resize/#{size}/nonexistant.jpg"
+end
+
+When /^I ask for the (.*) cropped image$/ do |size|
+  get "/crop/#{size}/#{@image_id}.jpg"
+  @retrieved_image = last_response.body
 end
 
 Then /^I should get a (\d+) response$/ do |response_code|
@@ -23,3 +29,7 @@ end
 Then /^I should get the (.*) resized image keeping the aspect ratio$/ do |size|
   @retrieved_image.should be_same_image_as("test.#{size}.jpg")
 end
+
+Then /^I should get the (.*) cropped image$/ do |size|
+  @retrieved_image.should be_same_image_as("test.crop.#{size}.jpg")
+end

data/features/support/env.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'mugshot'
 
 require 'rack/test'
@@ -22,7 +23,10 @@ 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("features/support/files/#{expected_filename}").first
-    actual.get_pixels(0, 0, actual.columns, actual.rows) == expected.get_pixels(0, 0, expected.columns, expected.rows)
+    expected = Magick::Image.read(File.expand_path(__FILE__ + "/../files/#{expected_filename}")).first
+
+    actual.columns == expected.columns &&
+    actual.rows == expected.rows &&
+    actual.difference(expected)[1] < 0.01
   end
 end

data/lib/mugshot.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require 'rubygems'
 require 'fileutils'
 require 'uuid'
@@ -11,4 +12,4 @@ require 'mugshot/image'
 require 'mugshot/storage'
 require 'mugshot/fs_storage'
 require 'mugshot/application'
-
+require 'mugshot/proxy'

data/lib/mugshot/application.rb

@@ -1,4 +1,6 @@
+# -*- encoding: utf-8 -*-
 require 'sinatra/base'
+
 class Mugshot::Application < Sinatra::Base
 
   set :static, true
@@ -6,16 +8,13 @@ class Mugshot::Application < Sinatra::Base
 
   before do
     response['Cache-Control'] = "public, max-age=#{1.year.to_i}"
-    content_type :jpg    
   end
-  
+
   get '/?' do
-    content_type :html
     'ok'
   end
 
   post '/?' do
-    content_type :html
     @storage.write(params['file'][:tempfile].read)
   end
 
@@ -23,8 +22,21 @@ class Mugshot::Application < Sinatra::Base
     image = @storage.read(id)
     halt 404 if image.blank?
 
+    image.resize!(size)
+
     begin
-      resize(image, size)
+      send_image(image, format.to_sym)
+    ensure
+      image.destroy!
+    end
+  end
+
+  get '/*/:id.:format' do |splat, id, format|
+    image = @storage.read(id)
+    halt 404 if image.blank?
+
+    begin
+      process_operations(image, splat)
       send_image(image, format.to_sym)
     ensure
       image.destroy!
@@ -32,12 +44,19 @@ class Mugshot::Application < Sinatra::Base
   end
 
   protected
+
   def initialize(storage)
     @storage = storage
   end
-  
-  def resize(image, size)
-    image.resize!(size)
+
+  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)
+    end
   end
 
   def send_image(image, format)

data/lib/mugshot/fs_storage.rb

@@ -1,20 +1,21 @@
+# -*- encoding: utf-8 -*-
 class Mugshot::FSStorage < Mugshot::Storage
   def write(bin)
     returning asset_id do |id|
-      File.open(File.join(@root_path, id), "w") do |fw| 
+      File.open(File.join(@root_path, id), "w") do |fw|
         fw.write(bin)
       end
     end
   end
-  
+
   def read(id)
     file = File.join(@root_path, id)
     return nil unless File.exist? file
     Mugshot::Image.new File.open(file)
   end
-  
+
   protected
-  
+
   def initialize(root_path)
     @root_path = root_path
     FileUtils.mkdir_p(root_path)

data/lib/mugshot/image.rb

@@ -1,6 +1,6 @@
-
+# -*- encoding: utf-8 -*-
 class Mugshot::Image
-  
+
   def width
     @image.columns
   end
@@ -10,8 +10,8 @@ class Mugshot::Image
   end
 
   def resize!(size)
-    w, h = size.to_s.split("x").map{|i| i.blank? ? nil : i.to_i}
-    
+    w, h = parse_size(size)
+
     if [w, h].include?(nil)
       @image.resize_to_fit! w, h
     else
@@ -21,6 +21,12 @@ class Mugshot::Image
     self
   end
 
+  def crop!(size)
+    w, h = parse_size(size)
+    @image.resize_to_fill! w, h
+    self
+  end
+
   def destroy!
     @image.destroy!
     self
@@ -40,4 +46,9 @@ class Mugshot::Image
     @image = Magick::Image.read(file).first
   end
 
+  private
+
+  def parse_size(size)
+    size.to_s.split("x").map{|i| i.blank? ? nil : i.to_i}
+  end
 end

data/lib/mugshot/proxy.rb

@@ -0,0 +1,32 @@
+# -*- 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/lib/mugshot/storage.rb

@@ -1,7 +1,6 @@
+# -*- encoding: utf-8 -*-
 class Mugshot::Storage
-  
   protected
-  
   def asset_id
     UUID.generate :compact
   end

data/spec/mugshot/application_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Mugshot::Application do
@@ -7,7 +8,7 @@ describe Mugshot::Application do
       Mugshot::Application.new(@storage)
     end
   end
-  
+
   describe "POST /" do
     it "should create image" do
       file_read = nil
@@ -18,46 +19,93 @@ describe Mugshot::Application do
 
       last_response.status.should == 200
     end
-    
+
     it "should return image id" do
       @storage.stub!(:write).and_return("batata")
 
       post "/", "file" => Rack::Test::UploadedFile.new("spec/files/test.jpg", "image/jpeg")
-      
+
       last_response.body.should == "batata"
     end
   end
 
-  describe "GET /:size/:id.:ext" do
-    it "should return resized image" do
-      image = mock(Mugshot::Image)
-      image.stub!(:to_blob).and_return("image data")
-      image.should_receive(:resize!).with("200x200")
-      image.should_receive(:destroy!)
-      @storage.stub!(:read).with("batata").and_return(image)
-
-      get "/200x200/batata.jpg"
+  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
 
-      last_response.status.should == 200
+    it "should convert image to format" do
+      @image.should_receive(:to_blob).with(:format => :jpg)
+      perform_get
       last_response.content_type == "image/jpg"
+    end
+
+    it "should destroy image" do
+      @image.should_receive(:destroy!)
+
+      perform_get
+    end
+
+    it "should return image" do
+      @image.stub!(:to_blob).and_return("image data")
+
+      perform_get
+
+      last_response.should be_ok
       last_response.body.should == "image data"
     end
 
     it "should halt 404 when image doesn't exist" do
-      @storage.stub!(:read).with("batata").and_return(nil)
+      @storage.stub!(:read).with("image_id").and_return(nil)
 
-      get "/200x200/batata.jpg"
+      perform_get
 
-      last_response.status.should == 404
+      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 perform operations on image" do
+      @image.should_receive(:resize!).with("140x140")
+      @image.should_receive(:crop!).with("140x105")
+
+      get "/resize/140x140/crop/140x105/image_id.jpg"
+    end
+
+    it "should halt 404 on operations that are not allowed" do
+      @image.should_not_receive(:operation!)
+
+      get "/operation/140x105/image_id.jpg"
+    end
+  end
   
   describe "GET /" do
     it "should return ok as healthcheck" do
       get "/"
       
-      last_response.status.should == 200
+      last_response.should be_ok
       last_response.body.should == "ok"
     end
   end

data/spec/mugshot/fs_storage_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mugshot::FSStorage do
@@ -9,19 +10,19 @@ describe Mugshot::FSStorage do
     require 'fileutils'
     FileUtils.rm_rf("/tmp/mugshot/spec")
   end
-  
+
   it "should write an image to the filesystem and read it back" do
     bin = File.open("spec/files/test.jpg").read
-    
+
     image = Mugshot::Image.new File.open("spec/files/test.jpg")
     Mugshot::Image.stub!(:new).and_return(image)
 
     id = @fs.write(bin)
     image2 = @fs.read(id)
-    
+
     image2.should == image
-  end  
-  
+  end
+
   it "should return nil when an image with the given id doesn't exist on the filesystem" do
     @fs.read('nonexistant-id').should be_nil
   end

data/spec/mugshot/image_spec.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Mugshot::Image do
@@ -7,7 +8,7 @@ describe Mugshot::Image do
 
     @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)
@@ -56,7 +57,7 @@ describe Mugshot::Image do
     end
 
   end
-  
+
   it "should resize image to given width and height" do
     @magick_image.should_receive(:resize!).with(300, 200)
     @image.resize! "300x200"
@@ -71,10 +72,15 @@ describe Mugshot::Image do
     @magick_image.should_receive(:resize_to_fit!).with(nil, 200)
     @image.resize! "x200"
   end
-  
+
+  it "should crop image to given width and height" do
+    @magick_image.should_receive(:resize_to_fill!).with(140, 105)
+    @image.crop! "140x105"
+  end
+
   it 'should destroy image' do
     @magick_image.should_receive(:'destroy!')
     @image.destroy!
   end
-  
+
 end

data/spec/mugshot/proxy_spec.rb

@@ -0,0 +1,67 @@
+# -*- 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

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mugshot
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Cain\xC3\xA3 Nunes"
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-29 00:00:00 -02:00
+date: 2010-02-03 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - lib/mugshot/application.rb
 - lib/mugshot/fs_storage.rb
 - lib/mugshot/image.rb
+- lib/mugshot/proxy.rb
 - lib/mugshot/public/crossdomain.xml
 - lib/mugshot/storage.rb
 - LICENSE
@@ -140,14 +141,17 @@ test_files:
 - spec/mugshot/application_spec.rb
 - spec/mugshot/fs_storage_spec.rb
 - spec/mugshot/image_spec.rb
+- spec/mugshot/proxy_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/test.html
+- features/crop_image.feature
 - features/retrieve_resized_image.feature
 - features/retrieve_resized_image_keeping_aspect_ratio.feature
 - features/step_definitions/all_steps.rb
 - features/support/env.rb
 - features/support/files/test.200x.jpg
 - features/support/files/test.200x200.jpg
+- features/support/files/test.crop.300x200.jpg
 - features/support/files/test.jpg
 - features/support/files/test.x200.jpg