mugshot 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/mugshot/application.rb

@@ -12,10 +12,13 @@ class Mugshot::Application < Sinatra::Base
   end
   
   get '/:size/:id.:ext' do |size, id, ext|      
-    size = size.split("x")
     image = @storage.read(id)
     halt 404 if image.nil?
-    image.resize! size[0].to_i, size[1].to_i
+    
+    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.to_blob
   end
   
@@ -25,6 +28,11 @@ 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

@@ -0,0 +1,25 @@
+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)
+  end
+
+  def to_s
+    "#{@width}x#{@height}"
+  end
+  
+  def size
+    return @width, @height
+  end
+  
+  def will_keep_aspect?
+    (@width == 0) || (@height == 0)
+  end
+  
+  def initialize (width, height)
+    @width = width
+    @height = height 
+  end
+end

data/lib/mugshot/image.rb

@@ -1,14 +1,18 @@
 class Mugshot::Image
-  def resize!(width, height)
+  def resize!(width, height = nil)
+    height ||= width 
     @image.resize! width, height
   end
+  
+  def resize_to_fit!(width, height = nil)
+    @image.resize_to_fit!(width)
+  end
 
   def to_blob
     @image.to_blob
   end
 
   protected
-
   def initialize(file)
     @image = Magick::Image.read(file).first
   end

data/lib/mugshot.rb

@@ -12,7 +12,9 @@ require 'RMagick'
 module Mugshot
 end
 
+require 'mugshot/dimension'    
 require 'mugshot/image'    
 require 'mugshot/storage'
 require 'mugshot/fs_storage'
 require 'mugshot/application'
+

data/mugshot.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mugshot}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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"]
@@ -35,11 +35,14 @@ Gem::Specification.new do |s|
      "gems_dev.yml",
      "lib/mugshot.rb",
      "lib/mugshot/application.rb",
+     "lib/mugshot/dimension.rb",
      "lib/mugshot/fs_storage.rb",
      "lib/mugshot/image.rb",
      "lib/mugshot/storage.rb",
+     "mugshot.gemspec",
      "spec/files/test.jpg",
      "spec/mugshot/application_spec.rb",
+     "spec/mugshot/dimension_spec.rb",
      "spec/mugshot/fs_storage_spec.rb",
      "spec/mugshot/image_spec.rb",
      "spec/spec.opts",
@@ -53,6 +56,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Image server}
   s.test_files = [
     "spec/mugshot/application_spec.rb",
+     "spec/mugshot/dimension_spec.rb",
      "spec/mugshot/fs_storage_spec.rb",
      "spec/mugshot/image_spec.rb",
      "spec/spec_helper.rb"

data/spec/mugshot/application_spec.rb

@@ -8,6 +8,12 @@ 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

data/spec/mugshot/dimension_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mugshot::Dimension do
+  it "should parse a double size value" do
+    Mugshot::Dimension.parse!("100x100").size.should == [100,100]
+  end
+
+  it "should parse a single left value" do
+    Mugshot::Dimension.parse!("100x").size.should == [100, 0]
+  end
+  
+  it "should parse a single right value" do
+    Mugshot::Dimension.parse!("x100").size.should == [0, 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    
+  end
+  
+  it "should parse and convert" do
+    Mugshot::Dimension.parse!("100x100").to_s.should == "100x100"
+  end
+end
+

data/spec/mugshot/image_spec.rb

@@ -11,7 +11,6 @@ describe Mugshot::Image do
   it 'should return image as a blob' do
     blob_data = 'blob data'
     @magick_image.stub!(:to_blob).and_return(blob_data)
-
     @image.to_blob.should == blob_data
   end
 
@@ -19,7 +18,18 @@ describe Mugshot::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)        
+    dim = Mugshot::Dimension.parse!("300x200")
+    @image.resize! *dim.size
+  end
+
+  it "should resize image fixed dimension" do
+    @magick_image.should_receive(:resize_to_fit!).with(300)        
+    dim = Mugshot::Dimension.parse!("300x")
+    @image.resize_to_fit! *dim.size
+  end    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mugshot
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - "Cain\xC3\xA3 Nunes"
@@ -139,12 +139,14 @@ files:
 - gems_dev.yml
 - lib/mugshot.rb
 - lib/mugshot/application.rb
+- lib/mugshot/dimension.rb
 - lib/mugshot/fs_storage.rb
 - lib/mugshot/image.rb
 - lib/mugshot/storage.rb
 - mugshot.gemspec
 - spec/files/test.jpg
 - spec/mugshot/application_spec.rb
+- spec/mugshot/dimension_spec.rb
 - spec/mugshot/fs_storage_spec.rb
 - spec/mugshot/image_spec.rb
 - spec/spec.opts
@@ -180,6 +182,7 @@ specification_version: 3
 summary: Image server
 test_files: 
 - spec/mugshot/application_spec.rb
+- spec/mugshot/dimension_spec.rb
 - spec/mugshot/fs_storage_spec.rb
 - spec/mugshot/image_spec.rb
 - spec/spec_helper.rb