danbarber/danbarberphoto
1
0
Fork 0
mirror of https://github.com/danbee/danbarberphoto synced 2025-03-04 08:49:07 +00:00
Code Issues Releases Wiki Activity

Removed dependence on mini_exiftool. We'll need to write a paperclip

Browse Source 
processor that uses Imagemagick to get the appropriate details.
This commit is contained in:
Dan Barber 2011-10-31 18:23:25 +00:00
parent f638aeac35
commit 8da575ba41
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -46,7 +46,7 @@ gem 'pg'
gem 'devise' gem 'devise'
gem 'formtastic' gem 'formtastic'
gem 'squeel' gem 'squeel'
gem 'mini_exiftool' #gem 'mini_exiftool'
gem 'will_paginate' gem 'will_paginate'
gem 'rdiscount' gem 'rdiscount'
gem 'paperclip' gem 'paperclip'

2
Gemfile.lock
View File

@ -79,7 +79,6 @@ GEM
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.17.2) mime-types (1.17.2)
mini_exiftool (1.3.1)
multi_json (1.0.3) multi_json (1.0.3)
orm_adapter (0.0.5) orm_adapter (0.0.5)
paperclip (2.4.5) paperclip (2.4.5)
@ -171,7 +170,6 @@ DEPENDENCIES
haml haml
hpricot hpricot
jquery-rails jquery-rails
mini_exiftool
paperclip paperclip
pg pg
powder powder

20
app/models/photo.rb
View File

@ -1,5 +1,3 @@
require 'mini_exiftool'
class Photo < ActiveRecord::Base class Photo < ActiveRecord::Base
has_and_belongs_to_many :categories has_and_belongs_to_many :categories
@ -17,7 +15,7 @@ class Photo < ActiveRecord::Base
:bucket => 'danbarberphoto', :bucket => 'danbarberphoto',
:url => ":s3_eu_url" :url => ":s3_eu_url"
after_create :get_exif #after_create :get_exif
@@per_page = 11 @@per_page = 11
@ -45,12 +43,12 @@ class Photo < ActiveRecord::Base
self.save self.save
end end
private #private
def get_exif #def get_exif
exif = MiniExiftool.new photo.queued_for_write[:original].path # exif = MiniExiftool.new photo.queued_for_write[:original].path
self.title = exif.title if self.title.empty? # self.title = exif.title if self.title.empty?
self.description = exif.description if self.description.empty? # self.description = exif.description if self.description.empty?
self.taken_at = exif.date_time_original # self.taken_at = exif.date_time_original
self.save # self.save
end #end
end end