mugshot 0.6.3 → 1.0.0.rc1

data/lib/mugshot.rb

@@ -2,10 +2,13 @@
 require "active_support/core_ext"
 
 module Mugshot
+  autoload :MagickFactory, "mugshot/magick_factory"
   autoload :Image, "mugshot/image"
+
   autoload :Storage, "mugshot/storage"
   autoload :FSStorage, "mugshot/fs_storage"
-  autoload :Application, "mugshot/application"
+  autoload :S3Storage, "mugshot/s3_storage"
   autoload :HTTPStorage, "mugshot/http_storage"
-  autoload :MagickFactory, "mugshot/magick_factory"
+
+  autoload :Application, "mugshot/application"
 end

data/lib/mugshot/fs_storage.rb

@@ -18,19 +18,12 @@ class Mugshot::FSStorage < Mugshot::Storage
     Mugshot::Image.new File.open(file)
   end
 
-  protected
+protected
 
   def initialize(root_path)
     @root_path = root_path
     FileUtils.mkdir_p(root_path)
   end
 
-  def id_to_path(id)
-    path = id.to_s.clone
-    4.times do |i|
-      path = path.insert(3 + (i * 3) + i, '/')
-    end
-    path
-  end
 end
 

data/lib/mugshot/s3_storage.rb

@@ -0,0 +1,36 @@
+# -*- encoding: utf-8 -*-
+require 'fog'
+
+class Mugshot::S3Storage < Mugshot::Storage
+
+  HEADERS = {'x-amz-acl' => 'public-read'}
+
+  def write(bin)
+    id = asset_id
+    path = id_to_path(id)
+    @storage.put_object(@bucket_name, path, bin, HEADERS)
+    id
+  end
+
+  def read(id)
+    path = id_to_path(id)
+    Mugshot::Image.new(@storage.get_object(@bucket_name, path).body)
+  rescue Excon::Errors::NotFound
+    nil
+  end
+
+protected
+
+  def initialize(opts)
+    opts.to_options!
+    opts.assert_valid_keys(:bucket_name, :access_key_id, :secret_access_key)
+
+    @bucket_name = opts[:bucket_name]
+
+    @storage = Fog::Storage.new(:provider => 'AWS', :aws_access_key_id => opts[:access_key_id], :aws_secret_access_key => opts[:secret_access_key])
+    @storage.put_bucket(@bucket_name)
+  end
+
+end
+
+

data/lib/mugshot/storage.rb

@@ -12,4 +12,12 @@ protected
     UUID.generate :compact
   end
 
-end
+  def id_to_path(id)
+    path = id.to_s.clone
+    14.times do |i|
+      path = path.insert(2 + (i * 2) + i, '/')
+    end
+    path
+  end
+
+end

data/lib/mugshot/version.rb

@@ -1,4 +1,4 @@
 module Mugshot
-  VERSION = "0.6.3"
+  VERSION = "1.0.0.rc1"
 end
 

data/spec/mugshot/application_spec.rb

@@ -22,7 +22,7 @@ describe Mugshot::Application do
 
       get "/image_id/any_name.jpg"
     end
-    
+
     it "should accept default value for background" do
       def app
         Mugshot::Application.new(:storage => @storage, :background => :blue)
@@ -33,7 +33,7 @@ describe Mugshot::Application do
       get "/image_id/any_name.jpg"
     end
   end
-  
+
   describe "POST /" do
     it "should create image" do
       file_read = nil
@@ -60,7 +60,7 @@ describe Mugshot::Application do
       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")
@@ -102,7 +102,7 @@ describe Mugshot::Application do
       last_response.status.should == 400
       last_response.body.should be_empty
     end
-    
+
     it "should halt 400 on URL with invalid operation/param pair" do
       get "/140x105/image_id/any_name.jpg"
 
@@ -110,23 +110,24 @@ describe Mugshot::Application do
       last_response.body.should be_empty
     end
   end
-  
+
   describe "GET /" do
     it "should return ok as healthcheck" do
       get "/"
-      
+
       last_response.should be_ok
       last_response.body.should == "ok"
     end
   end
 
-  describe "before" do
+  describe "cache" do
     it "should cache response with max age of 1 day" do
-      get "/"
+      @image.stub!(:to_blob).and_return("image data")
+      get "/crop/140x105/image_id/any_name.jpg"
       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
@@ -134,11 +135,12 @@ describe Mugshot::Application do
           Mugshot::Application.new(:storage => @storage, :cache_duration => 3.days.to_i)
         end
 
-        get "/"
+        @image.stub!(:to_blob).and_return("image data")
+        get "/crop/140x105/image_id/any_name.jpg"
         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
@@ -146,12 +148,12 @@ describe Mugshot::Application do
         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"])
@@ -161,7 +163,7 @@ describe Mugshot::Application do
         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
@@ -169,24 +171,24 @@ describe Mugshot::Application do
         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)
@@ -194,17 +196,17 @@ describe Mugshot::Application do
 
         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
@@ -212,28 +214,28 @@ describe Mugshot::Application do
           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)
@@ -241,13 +243,13 @@ describe Mugshot::Application do
 
           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
@@ -255,22 +257,22 @@ describe Mugshot::Application do
         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"])
@@ -280,7 +282,7 @@ describe Mugshot::Application do
         last_response.status.should == 400
       end
     end
-    
+
     describe "allowed names" do
       it "should allow valid names" do
         def app
@@ -288,22 +290,22 @@ describe Mugshot::Application do
         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"])

data/spec/mugshot/fs_storage_spec.rb

@@ -6,11 +6,6 @@ describe Mugshot::FSStorage do
     @fs = Mugshot::FSStorage.new("/tmp/mugshot/spec")
   end
 
-  after :each 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
 
@@ -26,8 +21,4 @@ describe Mugshot::FSStorage do
   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
-
-  it "should convert an id to path with 4r levels of directories" do
-    @fs.send(:id_to_path, "a9657a30c7df012c736512313b021ce1").should == "a96/57a/30c/7df/012c736512313b021ce1"
-  end
 end

data/spec/mugshot/s3_storage_spec.rb

@@ -0,0 +1,25 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'fog'
+
+describe Mugshot::S3Storage do
+  before :each do
+    Fog.mock!
+    @fs = Mugshot::S3Storage.new(:bucket_name => 'bucket_name', :access_key_id => 'access_key_id', :secret_access_key => 'secret_access_key')
+    @bin = File.open("spec/files/test.jpg").read
+  end
+
+  it "should write an image to the filesystem and read it back" do
+    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
+
+  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
+end

data/spec/mugshot/storage_spec.rb

@@ -0,0 +1,9 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Mugshot::Storage do
+  it "should convert an id to path with 6 levels of directories" do
+    @fs = Mugshot::Storage.new
+    @fs.send(:id_to_path, "a9657a30c7df012c736512313b021ce1").should == "a9/65/7a/30/c7/df/012c736512313b021ce1"
+  end
+end

metadata

@@ -1,17 +1,12 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mugshot
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 3
-  version: 0.6.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0.rc1
+  prerelease: 6
 platform: ruby
-authors: 
-- "Cain\xC3\xA3 Nunes"
-- "Fabr\xC3\xADcio Lopes"
+authors:
+- Cainã Nunes
+- Fabrício Lopes
 - Guilherme Cirne
 - Jose Peleteiro
 - Vicente Mundim
@@ -19,171 +14,135 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-25 00:00:00 -03:00
+date: 2011-04-25 00:00:00.000000000 -03:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70305760270860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 3
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70305760270860
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70305760270340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 0
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70305760270340
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: &70305766710800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 2
-        - 12
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.12.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: uuid
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766710800
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: &70305766710320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: blankslate
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766710320
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  requirement: &70305766709840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 105
-        segments: 
-        - 2
-        - 1
-        - 2
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.2.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766709840
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70305766709360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766709360
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: &70305766708880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70305766708880
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70305766708400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766708400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70305766707920 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766707920
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70305766707440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 6
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70305766707440
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &70305766706960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.1
   type: :development
-  version_requirements: *id010
-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: 
+  prerelease: false
+  version_requirements: *70305766706960
+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
@@ -191,13 +150,11 @@ email:
 - vicente.mundim@gmail.com
 - me@anselmoalves.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - lib/mugshot.rb
 - lib/mugshot/application.rb
 - lib/mugshot/fs_storage.rb
@@ -205,6 +162,7 @@ files:
 - lib/mugshot/image.rb
 - lib/mugshot/magick_factory.rb
 - lib/mugshot/public/crossdomain.xml
+- lib/mugshot/s3_storage.rb
 - lib/mugshot/storage.rb
 - lib/mugshot/version.rb
 - LICENSE
@@ -237,43 +195,37 @@ files:
 - spec/mugshot/http_storage_spec.rb
 - spec/mugshot/image_spec.rb
 - spec/mugshot/magick_factory_spec.rb
+- spec/mugshot/s3_storage_spec.rb
+- spec/mugshot/storage_spec.rb
 - spec/spec_helper.rb
 - spec/test.html
 has_rdoc: true
 homepage: http://mugshot.ws
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: mugshot
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Dead simple image server
-test_files: 
+test_files:
 - features/convert_image_format.feature
 - features/crop_image.feature
 - features/define_image_quality.feature
@@ -302,5 +254,7 @@ test_files:
 - spec/mugshot/http_storage_spec.rb
 - spec/mugshot/image_spec.rb
 - spec/mugshot/magick_factory_spec.rb
+- spec/mugshot/s3_storage_spec.rb
+- spec/mugshot/storage_spec.rb
 - spec/spec_helper.rb
 - spec/test.html