From 24f2374caede9779b261a8531116f3ca95c86101 Mon Sep 17 00:00:00 2001
From: Espen Antonsen <espen@inspired.no>
Date: Thu, 1 Jul 2010 12:26:03 +0200
Subject: [PATCH] updated readme with info about carrierwave

---
 README                | 22 ++++++++++------------
 app/models/photo.rb   | 11 -----------
 config/environment.rb |  4 +---
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/README b/README
index 064a4c5..52d3ee8 100644
--- a/README
+++ b/README
@@ -2,11 +2,13 @@
 
 Made by Espen Antonsen.
 
+Version 1.1
+
 http://balderapp.com
 
 == Features
 
-* Stores photos to disk in folders
+* Stores photos to disk in folders or on S3
 * Create multiple thumbnails of custom sizes
 * Read and writes EXIF/IPTC title, description and keywords
 * Organize in albums (as events in iPhoto)
@@ -20,26 +22,22 @@ http://balderapp.com
 
 Free for personal use. Contact me for commercial license.
 
-== Todo
-
-* Theme support?
-* Multiple galleries?
-* Support for ImageMagick in addition to FreeImage?
-
 == Requirements
 
 Rails 2.3
 
 Software
-- FreeImage (required for Image_Science)
-- ExifTool (required for Mini_EfixTool)
+- RMagicK (required for Carrierwave resizing). Can also use ImageScience
+Optional:
+	- ExifTool (required for Mini_EfixTool)
 
 Ruby Gems
 - AuthLogic
 - Mime-Types
-- Image_Science
-- RubyInline (required for Image_Science)
-- Mini_ExifTool
+- Carrierwave
+Optional:
+	- AWS/S3 (if saving to Amazon s3)
+	- Mini_Exiftool (to read exif info to database. See photo.rb model)
 
 == Installation
 
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 87524cf..e9373ac 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -1,6 +1,3 @@
-#require "image_science"
-require 'mini_exiftool'
-
 class Photo < ActiveRecord::Base
   belongs_to :album
   has_many :photo_tags, :dependent => :destroy
@@ -53,14 +50,6 @@ class Photo < ActiveRecord::Base
     self.tags = ts
   end
   
-  
-  def exif_info
-    photo = MiniExiftool.new(self.file.path)
-    #photo.tags.sort.each do |tag|
-    #  puts tag.ljust(28) + photo[tag].to_s
-    #end
-  end
-
   protected
 
 
diff --git a/config/environment.rb b/config/environment.rb
index ae086ce..e605a89 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -15,10 +15,8 @@ Rails::Initializer.run do |config|
 
   config.gem "authlogic"
   config.gem 'mime-types', :lib => 'mime/types'
-  #config.gem "image_science"
-  #config.gem "mini_exiftool"
-  # 
   config.gem "carrierwave"
+  #config.gem "mini_exiftool"
   #config.gem "aws-s3", :lib => "aws/s3"
   
   config.load_paths += %W( #{RAILS_ROOT}/app/middleware )