From 55e08ac480f36aacd24f696512de5b4bb2428aac Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Tue, 21 Sep 2010 21:27:38 +0200
Subject: [PATCH] stuff

---
 .gitignore                     |  5 +++--
 Gemfile                        | 13 ++++++++++++-
 Gemfile.lock                   |  6 ++++--
 app/uploaders/file_uploader.rb |  4 ++--
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4278caf..8409915 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .bundle
 db/*.sqlite3
 log/*.log
-tmp/**/*
+tmp
 .DS_Store
 doc/api
 doc/app
@@ -12,4 +12,5 @@ config/deploy
 Capfile
 photos
 public/thumbs
-public/uploads
\ No newline at end of file
+public/uploads
+vendor/cache
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index d6e4253..b17b4a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,6 +5,17 @@ gem 'rails', '3.0.0'
 gem "authlogic"
 gem 'mime-types', :require => 'mime/types'
 gem "carrierwave", :git => 'git://github.com/jnicklas/carrierwave.git' 
+# MySQL:
 gem "mysql2"
+# PostgreSQL:
 #gem 'pg'
-gem "rmagick", :require => 'RMagick'
\ No newline at end of file
+
+# ImageMagick:
+#gem "rmagick", :require => 'RMagick'
+
+# FreeImage:
+#gem "image_science", :git => 'git://github.com/perezd/image_science.git'
+#gem "RubyInline"
+
+# MiniMagick
+gem "mini_magick"
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 0715e6b..83090a6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -48,6 +48,8 @@ GEM
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
+    mini_magick (2.1)
+      subexec (~> 0.0.4)
     pg (0.9.0)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -69,7 +71,7 @@ GEM
       rake (>= 0.8.4)
       thor (~> 0.14.0)
     rake (0.8.7)
-    rmagick (2.13.1)
+    subexec (0.0.4)
     thor (0.14.1)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
@@ -82,6 +84,6 @@ DEPENDENCIES
   authlogic
   carrierwave!
   mime-types
+  mini_magick
   pg
   rails (= 3.0.0)
-  rmagick
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index f4ca3aa..581d111 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -3,9 +3,9 @@
 class FileUploader < CarrierWave::Uploader::Base
 
   # Include RMagick or ImageScience support
-       include CarrierWave::RMagick
+  #     include CarrierWave::RMagick
   #     include CarrierWave::ImageScience
-
+       include CarrierWave::MiniMagick
   # Choose what kind of storage to use for this uploader
   #storage :file
   if ENV['S3_KEY']