scottmotte-amazonavatar 0.1.1 → 0.1.2

data/README.rdoc

@@ -4,9 +4,10 @@ Upload avatars to amazonS3 on a User (or other) model. Simple and opinionated.
 
 == Notes
 
+* rdoc is at: http://rdoc.info/projects/scottmotte/amazonavatar
 * I'm using it with merb and mongomapper.
 * Does resizing using minimagick
-* Uploads the images to your s3 account at /avatars/user_id/[original.png,thumb.png,mini.png]
+* Uploads the images to your s3 account at / avatars / user_id / [original.png,thumb.png,mini.png]
 * Resizes a thumb to 48x48, and mini to 24x24. I told you it was opinionated.
 
 == Dependencies
@@ -36,7 +37,7 @@ On your computer
   
 Or for bundling
 
-  dependency 'scottmotte-amazonavatar'
+  dependency 'scottmotte-amazonavatar', :require_as => 'amazonavatar'
 
 == Configuration
 

data/VERSION

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

data/amazonavatar.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amazonavatar}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["scottmotte"]
-  s.date = %q{2009-07-12}
+  s.date = %q{2009-07-21}
   s.email = %q{scott@scottmotte.com}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/amazonavatar.rb

@@ -31,7 +31,7 @@ module AmazonAvatar
   
   # Defin connection using RightAws
   def self.connection
-    @@connection ||= RightAws::S3.new(access_key_id, secret_access_key)
+    @@connection ||= RightAws::S3.new(access_key_id, secret_access_key, {:multi_thread => true})
   end
   
   # AmazonAvatar.bucket = "bucket_name"
@@ -75,35 +75,36 @@ module AmazonAvatar
       def put_avatar(avatar)        
         # Original
         key1 = bucket.key("avatars/#{id}/#{@@avatars[:original][:filename]}")
-        key1.put(avatar[:tempfile].read, 'public-read')
+        key1.put(avatar[:tempfile].read, 'public-read', {'Content-Type'=>'image/png','Cache-Control' => 'public,max-age=31536000'})
         
-        # data
-        data = MiniMagick::Image.from_file(avatar[:tempfile].path)
-        # thumb
-        key2 = bucket.key("avatars/#{id}/#{@@avatars[:thumb][:filename]}")
-        key2.put(resize_and_crop(data, @@avatars[:thumb][:dimensions]).to_blob, 'public-read')
-        # mini
-        key3 = bucket.key("avatars/#{id}/#{@@avatars[:mini][:filename]}")
-        key3.put(resize_and_crop(data, @@avatars[:mini][:dimensions]).to_blob, 'public-read')
+        # image
+        image = MiniMagick::Image.from_file(avatar[:tempfile].path)
+        # resized
+        put_resized(bucket,id,image)
       end
     
       # upload default start avatars. this needs to be replaced with a default image somehow
       def generate_default_avatar        
         # Original
         key1 = bucket.key("avatars/#{id}/#{@@avatars[:original][:filename]}")
-        key1.put(File.new("#{AmazonAvatar.dir}/default.png").read, 'public-read')
+        key1.put(File.new("#{AmazonAvatar.dir}/default.png").read, 'public-read', {'Content-Type'=>'image/png','Cache-Control' => 'public,max-age=31536000'})
         
         # image
         image = MiniMagick::Image.from_file("#{AmazonAvatar.dir}/default.png")
+        # resized
+        put_resized(bucket,id,image)
+      end
+      
+    private
+      def put_resized(bucket,id,image)
         # thumb
         key2 = bucket.key("avatars/#{id}/#{@@avatars[:thumb][:filename]}")
-        key2.put(resize_and_crop(image, @@avatars[:thumb][:dimensions]).to_blob, 'public-read')
+        key2.put(resize_and_crop(image, @@avatars[:thumb][:dimensions]).to_blob, 'public-read', {'Content-Type'=>'image/png','Cache-Control' => 'public,max-age=31536000'})
         # mini
         key3 = bucket.key("avatars/#{id}/#{@@avatars[:mini][:filename]}")
-        key3.put(resize_and_crop(image, @@avatars[:mini][:dimensions]).to_blob, 'public-read')
+        key3.put(resize_and_crop(image, @@avatars[:mini][:dimensions]).to_blob, 'public-read', {'Content-Type'=>'image/png','Cache-Control' => 'public,max-age=31536000'})
       end
   
-  
       def resize_and_crop(image, size)
         if image[:width] < image[:height]
           remove = ((image[:height] - image[:width])/2).round

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-amazonavatar
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - scottmotte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-12 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency