From 5cacdd906def4ac0e23e34b131c7ae934ca8d3ff Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 16 Jan 2014 17:08:44 +0800
Subject: [PATCH] resize img

---
 Gemfile                              | 1 +
 Gemfile.lock                         | 2 ++
 app/controllers/avatar_controller.rb | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index dd19b4435..acdc0b4f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gem "coderay", "~> 1.0.6"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
 gem "builder", "3.0.0"
 gem 'acts-as-taggable-on'
+gem 'rmagick'
 
 # Optional gem for LDAP authentication
 group :ldap do
diff --git a/Gemfile.lock b/Gemfile.lock
index d60847b17..ae2bd947e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,6 +78,7 @@ GEM
     rake (10.0.4)
     rdoc (3.12.2)
       json (~> 1.4)
+    rmagick (2.13.2)
     ruby-openid (2.1.8)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -108,4 +109,5 @@ DEPENDENCIES
   rack-openid
   rails (= 3.2.13)
   rdoc (>= 2.4.2)
+  rmagick
   ruby-openid (~> 2.1.4)
diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index 90d5b0837..f691cafb5 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -55,11 +55,12 @@ class AvatarController < ApplicationController
    # saved = @avatar.save
    begin
      f = Magick::ImageList.new(diskfile)
-     f.scale!(100,100)
+     proportion = (200.0/f[0].columns)
+     f.resize_to_fill!(200,200)
      #f.scale!(50,50)
      f.write(diskfile)
    rescue Exception => e
-     logger.error "[avatar] Error : avatar_cntroller#upload ===> #{e}"
+     logger.error "[Error] avatar : avatar_controller#upload ===> #{e}"
    end