mugshot 0.1.1 → 0.1.2

data/Rakefile

@@ -14,13 +14,13 @@ begin
       gem.homepage = "http://github.com/timebeta/mugshot"
       gem.authors = ["Cainã Nunes", "Fabrício Lopes", "Fernando Meyer", "Guilherme Cirne", "José Peleteiro"]
 
-      ## depedencies
+      ## dependencies
       gems = YAML.load_file 'gems.yml'
       gems.each do |depgem|
         gem.add_dependency(depgem[:name], depgem[:version])
       end
 
-      ## developments depedencies
+      ## developments dependencies
       gems = YAML.load_file 'gems_dev.yml'
       gems.each do |depgem|
         gem.add_development_dependency(depgem[:name], depgem[:version])

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/features/retrieve_resized_image.feature

@@ -2,11 +2,11 @@ Feature: Retrieve resized image
 
   Scenario: Successful retrieval of resized image
     When I upload an image
-    And I ask for the resized image
+    And I ask for the 200x200 resized image
 
-    Then I should get the resized image
+    Then I should get the 200x200 resized image
 
   Scenario: Image doesn't exist
-    When I ask for a resized image that 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

@@ -0,0 +1,22 @@
+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/features/step_definitions/general_steps.rb

@@ -3,6 +3,15 @@ When /^I upload an image$/ do
   @image_id = last_response.body
 end
 
+When /^I ask for the (.*) resized image$/ do |size|
+  get "/#{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"
+end
+
 Then /^I should get a (\d+) response$/ do |response_code|
   last_response.status.should == response_code.to_i
 end

data/features/step_definitions/retrieve_resized_image_keeping_aspect_ratio_steps.rb

@@ -0,0 +1,10 @@
+Then /^I should get the (.*) resized image keeping the aspect ratio$/ do |size|
+  dimension = Mugshot::Dimension.parse!(size)
+
+  image = Magick::Image.read('features/support/files/test.jpg').first
+  image.resize_to_fit!(*dimension.size)
+  resized_image = image.to_blob
+
+  @retrieved_image.should == resized_image
+  last_response.status.should == 200
+end

data/features/step_definitions/retrieve_resized_image_steps.rb

@@ -1,14 +1,10 @@
-When /^I ask for the resized image$/ do
-  get "/200x200/#{@image_id}.jpg"
-  @retrieved_image = last_response.body
-end
+Then /^I should get the (.*) resized image$/ do |size|
+  dimension = Mugshot::Dimension.parse!(size)
 
-When /^I ask for a resized image that doesn't exist$/ do
-  get '/200x200/nonexistant.jpg'
-end
+  image = Magick::Image.read('features/support/files/test.jpg').first
+  image.resize!(*dimension.size)
+  resized_image = image.to_blob
 
-Then /^I should get the resized image$/ do
-  resized_image = Magick::Image.read('features/support/files/test.jpg').first.resize!(200, 200).to_blob
   @retrieved_image.should == resized_image
   last_response.status.should == 200
 end

data/gems.yml

@@ -1,5 +1,5 @@
 - :name: activesupport
-  :version: = 2.3.4
+  :version: = 2.3.5
 
 - :name: rmagick
   :version: = 2.12.2

data/gems_dev.yml

@@ -1,14 +1,11 @@
-- :name: activesupport
-  :version: = 2.3.4
-  
 - :name: rspec
   :version: = 1.2.9
   
 - :name: cucumber
-  :version: = 0.4.3
+  :version: = 0.4.4
 
 - :name: rack-test
-  :version: = 0.5.0
+  :version: = 0.5.1
 
 - :name: yard
   :version: >= 0

data/lib/mugshot/application.rb

@@ -2,6 +2,9 @@ require 'sinatra/base'
 
 class Mugshot::Application < Sinatra::Base
   
+  set :static, true
+  set :public, ::File.expand_path(::File.join(::File.dirname(__FILE__), "public"))
+
   before do 
     content_type :jpg    
   end
@@ -13,12 +16,11 @@ class Mugshot::Application < Sinatra::Base
   
   get '/:size/:id.:ext' do |size, id, ext|      
     image = @storage.read(id)
+    
     halt 404 if image.nil?
     
     dimm = Mugshot::Dimension.parse!(size)
-    
-    image.resize_to_fit! *dimm.size if dimm.will_keep_aspect?
-    image.resize!  *dimm.size unless dimm.will_keep_aspect?
+    image.resize! dimm
     image.to_blob
   end
   
@@ -28,11 +30,6 @@ class Mugshot::Application < Sinatra::Base
     image.to_blob
   end
   
-  get '/_status' do
-    content_type :html
-    "OK"
-  end
-  
   protected
 
   def initialize(storage)

data/lib/mugshot/dimension.rb

@@ -1,9 +1,11 @@
 class Mugshot::Dimension
   attr_reader :width, :height
   
-  def self.parse!(str)
-    data = /(\d*)x(\d*)/.match(str)
-		new(data[1].to_i,data[2].to_i)
+  def self.parse!(size)
+    size = /(\d*)x(\d*)/.match(size)
+    width = size[1].to_i if size[1].present?
+    height = size[2].to_i if size[2].present?
+		new(width, height)
   end
 
   def to_s
@@ -15,7 +17,7 @@ class Mugshot::Dimension
   end
   
   def will_keep_aspect?
-    (@width == 0) || (@height == 0)
+    (@width == nil) || (@height == nil)
   end
   
   def initialize (width, height)

data/lib/mugshot/image.rb

@@ -1,11 +1,7 @@
 class Mugshot::Image
-  def resize!(width, height = nil)
-    height ||= width 
-    @image.resize! width, height
-  end
-  
-  def resize_to_fit!(width, height = nil)
-    @image.resize_to_fit!(width)
+  def resize!(dimension)
+    return @image.resize_to_fit! *dimension.size if dimension.will_keep_aspect?
+    @image.resize! dimension.width, dimension.height
   end
 
   def to_blob
@@ -13,7 +9,8 @@ class Mugshot::Image
   end
 
   protected
+  
   def initialize(file)
     @image = Magick::Image.read(file).first
   end
-end
+end

data/lib/mugshot/public/crossdomain.xml

@@ -0,0 +1,4 @@
+<?xml version=”1.0″?>
+<cross-domain-policy>
+    <allow-access-from domain=”*” />
+</cross-domain-policy>

data/mugshot.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cain\303\243 Nunes", "Fabr\303\255cio Lopes", "Fernando Meyer", "Guilherme Cirne", "Jos\303\251 Peleteiro"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2009-11-30}
   s.description = %q{Image server}
   s.email = ["cainanunes@gmail.com", "fabriciolopesvital@gmail.com", "fmcamargo@gmail.com", "gcirne@gmail.com", "jose@peleteiro.net"]
   s.extra_rdoc_files = [
@@ -26,8 +26,10 @@ Gem::Specification.new do |s|
      "config.ru",
      "features/retrieve_original_image.feature",
      "features/retrieve_resized_image.feature",
+     "features/retrieve_resized_image_keeping_aspect_ratio.feature",
      "features/step_definitions/general_steps.rb",
      "features/step_definitions/retrieve_original_image_steps.rb",
+     "features/step_definitions/retrieve_resized_image_keeping_aspect_ratio_steps.rb",
      "features/step_definitions/retrieve_resized_image_steps.rb",
      "features/support/env.rb",
      "features/support/files/test.jpg",
@@ -40,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/mugshot/image.rb",
      "lib/mugshot/storage.rb",
      "mugshot.gemspec",
+     "public/crossdomain.xml",
      "spec/files/test.jpg",
      "spec/mugshot/application_spec.rb",
      "spec/mugshot/dimension_spec.rb",
@@ -67,35 +70,32 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.4"])
+      s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_runtime_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_runtime_dependency(%q<sinatra>, ["= 0.9.4"])
       s.add_runtime_dependency(%q<uuid>, ["= 2.0.2"])
-      s.add_development_dependency(%q<activesupport>, ["= 2.3.4"])
       s.add_development_dependency(%q<rspec>, ["= 1.2.9"])
-      s.add_development_dependency(%q<cucumber>, ["= 0.4.3"])
-      s.add_development_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_development_dependency(%q<cucumber>, ["= 0.4.4"])
+      s.add_development_dependency(%q<rack-test>, ["= 0.5.1"])
       s.add_development_dependency(%q<yard>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, ["= 2.3.4"])
+      s.add_dependency(%q<activesupport>, ["= 2.3.5"])
       s.add_dependency(%q<rmagick>, ["= 2.12.2"])
       s.add_dependency(%q<sinatra>, ["= 0.9.4"])
       s.add_dependency(%q<uuid>, ["= 2.0.2"])
-      s.add_dependency(%q<activesupport>, ["= 2.3.4"])
       s.add_dependency(%q<rspec>, ["= 1.2.9"])
-      s.add_dependency(%q<cucumber>, ["= 0.4.3"])
-      s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+      s.add_dependency(%q<cucumber>, ["= 0.4.4"])
+      s.add_dependency(%q<rack-test>, ["= 0.5.1"])
       s.add_dependency(%q<yard>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, ["= 2.3.4"])
+    s.add_dependency(%q<activesupport>, ["= 2.3.5"])
     s.add_dependency(%q<rmagick>, ["= 2.12.2"])
     s.add_dependency(%q<sinatra>, ["= 0.9.4"])
     s.add_dependency(%q<uuid>, ["= 2.0.2"])
-    s.add_dependency(%q<activesupport>, ["= 2.3.4"])
     s.add_dependency(%q<rspec>, ["= 1.2.9"])
-    s.add_dependency(%q<cucumber>, ["= 0.4.3"])
-    s.add_dependency(%q<rack-test>, ["= 0.5.0"])
+    s.add_dependency(%q<cucumber>, ["= 0.4.4"])
+    s.add_dependency(%q<rack-test>, ["= 0.5.1"])
     s.add_dependency(%q<yard>, [">= 0"])
   end
 end

data/spec/mugshot/application_spec.rb

@@ -8,12 +8,6 @@ describe Mugshot::Application do
     end
   end
   
-  describe 'GET /_status' do
-    get '/_status'
-    last_response.status.should == 200
-    last_response.body.should == 'OK'
-  end
-  
   describe 'POST /' do
     it "should create image" do
       file_read = nil
@@ -36,9 +30,12 @@ describe Mugshot::Application do
 
   describe 'GET /:size/:id.:ext' do
     it 'should return resized image' do
-      image = mock('image')
+      dimension = mock(Mugshot::Dimension)
+      Mugshot::Dimension.stub!(:parse!).with('200x200').and_return(dimension)
+
+      image = mock(Mugshot::Image)
       image.stub!(:to_blob).and_return('image data')
-      image.should_receive(:resize!).with(200, 200)
+      image.should_receive(:resize!).with(dimension)
       @storage.stub!(:read).with('batata').and_return(image)
 
       get '/200x200/batata.jpg'
@@ -60,7 +57,7 @@ describe Mugshot::Application do
   
   describe "GET /:id" do
     it "should return original image" do
-      image = mock('image')
+      image = mock(Mugshot::Image)
       image.stub!(:to_blob).and_return('image data')
       @storage.stub!(:read).with('batata').and_return(image)
       

data/spec/mugshot/dimension_spec.rb

@@ -6,16 +6,16 @@ describe Mugshot::Dimension do
   end
 
   it "should parse a single left value" do
-    Mugshot::Dimension.parse!("100x").size.should == [100, 0]
+    Mugshot::Dimension.parse!("100x").size.should == [100, nil]
   end
   
   it "should parse a single right value" do
-    Mugshot::Dimension.parse!("x100").size.should == [0, 100]
+    Mugshot::Dimension.parse!("x100").size.should == [nil, 100]
   end
   
   it "should keep aspect" do
-    Mugshot::Dimension.parse!("x100").will_keep_aspect?.should == true
-    Mugshot::Dimension.parse!("100x").will_keep_aspect?.should == true    
+    Mugshot::Dimension.parse!("x100").will_keep_aspect?.should be_true
+    Mugshot::Dimension.parse!("100x").will_keep_aspect?.should be_true
   end
   
   it "should parse and convert" do

data/spec/mugshot/image_spec.rb

@@ -13,23 +13,22 @@ describe Mugshot::Image do
     @magick_image.stub!(:to_blob).and_return(blob_data)
     @image.to_blob.should == blob_data
   end
-
-  it 'should resize image' do
-    width = 300
-    height = 200
-    @magick_image.should_receive(:resize!).with(width, height)
-    @image.resize! width, height
-  end
   
-  it "should resize image with dimension" do
-    @magick_image.should_receive(:resize!).with(300, 200)        
+  it "should resize image to given width and height" do
+    @magick_image.should_receive(:resize!).with(300, 200)
     dim = Mugshot::Dimension.parse!("300x200")
-    @image.resize! *dim.size
+    @image.resize! dim
   end
 
-  it "should resize image fixed dimension" do
-    @magick_image.should_receive(:resize_to_fit!).with(300)        
+  it 'should resize image to fit given width' do
+    @magick_image.should_receive(:resize_to_fit!).with(300, nil)
     dim = Mugshot::Dimension.parse!("300x")
-    @image.resize_to_fit! *dim.size
-  end    
+    @image.resize! dim
+  end
+
+  it 'should resize image to fit given height' do
+    @magick_image.should_receive(:resize_to_fit!).with(nil, 200)
+    dim = Mugshot::Dimension.parse!("x200")
+    @image.resize! dim
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mugshot
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - "Cain\xC3\xA3 Nunes"
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -02:00
+date: 2009-12-04 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.4
+        version: 2.3.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
@@ -56,16 +56,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.3.4
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -84,7 +74,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.4.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack-test
@@ -94,7 +84,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.5.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -130,8 +120,10 @@ files:
 - config.ru
 - features/retrieve_original_image.feature
 - features/retrieve_resized_image.feature
+- features/retrieve_resized_image_keeping_aspect_ratio.feature
 - features/step_definitions/general_steps.rb
 - features/step_definitions/retrieve_original_image_steps.rb
+- features/step_definitions/retrieve_resized_image_keeping_aspect_ratio_steps.rb
 - features/step_definitions/retrieve_resized_image_steps.rb
 - features/support/env.rb
 - features/support/files/test.jpg
@@ -142,6 +134,7 @@ files:
 - lib/mugshot/dimension.rb
 - lib/mugshot/fs_storage.rb
 - lib/mugshot/image.rb
+- lib/mugshot/public/crossdomain.xml
 - lib/mugshot/storage.rb
 - mugshot.gemspec
 - spec/files/test.jpg