app/models/album_art_image.rb db/migrate/005_add_table_album_art_images.rb db/migrate/006_add_album_art_id_to_album_art_image.rb db/migrate/007_create_album_art_image_from_file_column.rb test/fixtures/album_art_images.yml test/unit/album_art_image_test.rb @@ -47,6 +47,10 @@ class AlbumArtsController < ApplicationController respond_to do |format| if @album_art.save + #Here comes the important bit! + if !params[:album_art_image][:uploaded_data].blank? + @album_art.album_art_image = AlbumArtImage.create(params[:album_art_image]) + end flash[:notice] = 'AlbumArt was successfully created.' format.html { redirect_to(@album_art) } format.xml { render :xml => @album_art, :status => :created, :location => @album_art } @@ -64,6 +68,13 @@ class AlbumArtsController < ApplicationController respond_to do |format| if @album_art.update_attributes(params[:album_art]) + # Heres the important bit! + if !params[:album_art_image][:uploaded_data].blank? + #find current image + @album_art_image = @album_art.album_art_image ||= AlbumArtImage.new + @album_art_image = @album_art.album_art_image.build(params[:album_art_image]) + @album_art_image.save + end flash[:notice] = 'AlbumArt was successfully updated.' format.html { redirect_to(@album_art) } format.xml { head :ok } app/controllers/album_arts_controller.rb @@ -1,13 +1,14 @@ class AlbumArt < ActiveRecord::Base belongs_to :user - before_save :set_image_filesize, :set_image_size + has_one :album_art_image + # before_save :set_image_filesize, :set_image_size - validates_presence_of :user_id, :album_name, :artist_name, :image, :message => "deve ser preenchido" + validates_presence_of :user_id, :album_name, :artist_name, :message => "deve ser preenchido" - file_column :image, :magick => { - :versions => { "thumbnail" => "150x150", "standard" => "300x300>" } - } +# file_column :image, :magick => { +# :versions => { "thumbnail" => "150x150", "standard" => "300x300>" } +# } def set_image_filesize self.image_filesize = File.size(self.image("standard")).to_s app/models/album_art.rb @@ -1,6 +1,7 @@ <% for album_art in @album_arts %> + <%if !album_art.album_art_image.blank?%> <div class="album_art"> - <%= link_to image_tag(url_for_file_column(album_art,"image","thumbnail"), :id => "album_art_#{album_art.id}"), album_art %> + <%= link_to image_tag(album_art.album_art_image.public_filename(:thumb), :id => "album_art_#{album_art.id}"), album_art %> <dl> <dt>Usuário:</dt> <dd><%=h album_art.user.login %></dd> @@ -9,14 +10,14 @@ <dt>Artista:</dt> <dd><%=h album_art.artist_name %></dd> <dt>Dimensões:</dt> - <dd><%=h album_art.image_size %></dd> - <dt>Arquivo:</dt><dd><%=h number_to_human_size(album_art.image_filesize) %></dd> + <dd><%=h "#{album_art.album_art_image.width}x#{album_art.album_art_image.height}" %></dd> + <dt>Arquivo:</dt><dd><%=h number_to_human_size(album_art.album_art_image.size) %></dd> <dt>Nota:</dt><dd><%=h album_art.score %></dd> <dt>Criado em:</dt><dd><%= format_datetime(album_art.created_at) %></dd> </dl> <p><%= link_to 'Editar', edit_album_art_path(album_art) %>, <%= link_to 'Apagar', album_art, :confirm => 'Are you sure?', :method => :delete %></p> - </div> + <% end %> <% end %> app/views/album_arts/index.html.erb @@ -16,7 +16,7 @@ <p> <b>Imagem</b><br /> - <%= file_column_field "album_art", :image %> + <%= file_field "album_art_image", "uploaded_data" %> </p> <p> app/views/album_arts/new.html.erb @@ -15,17 +15,17 @@ <p> <b>Image:</b> - <%= image_tag url_for_file_column(@album_art, "image", "standard") %> + <%= image_tag @album_art.album_art_image.public_filename %> </p> <p> <b>Image size:</b> - <%=h @album_art.image_size %> + <%=h "#{@album_art.album_art_image.width}x#{@album_art.album_art_image.height}" %> </p> <p> <b>Image filesize:</b> - <%= number_to_human_size(@album_art.image_filesize) %> + <%= number_to_human_size(@album_art.album_art_image.size) %> </p> <p> app/views/album_arts/show.html.erb @@ -1,3 +1,5 @@ +require 'mime/types' + module Technoweenie # :nodoc: module AttachmentFu # :nodoc: @@default_processors = %w(ImageScience Rmagick MiniMagick) @@ -176,6 +178,10 @@ module Technoweenie # :nodoc: tmp.close end end + + def mime_type_from_extension(extension) + MIME::Types.type_for(extension).first.simplified + end end module InstanceMethods @@ -322,6 +328,14 @@ module Technoweenie # :nodoc: self.class.with_image(temp_path, &block) end + def set_from_file(source_file) + source_file_extension = File.extname(source_file.path).reverse.chomp('.').reverse + source_file_name = File.basename(source_file.path) + self.content_type = self.class.mime_type_from_extension(source_file_extension) + self.filename = source_file_name + self.temp_data = source_file.read + end + protected # Generates a unique filename for a Tempfile. def random_tempfile_filename @@ -405,6 +419,7 @@ module Technoweenie # :nodoc: def destroy_thumbnails self.thumbnails.each { |thumbnail| thumbnail.destroy } if thumbnailable? end + end end end vendor/plugins/attachment_fu/lib/technoweenie/attachment_fu.rb b6053a3096f58e56edc241c4e6c80e9841af8506 shadowma shadowma@d798d9e0-5e21-0410-a9a4-a952c4db9e3f http://github.com/shadow11/cd-covers/commit/a89d44df1035d9fecbe329779e57d33e8519eb36 a89d44df1035d9fecbe329779e57d33e8519eb36 2008-02-21T17:53:26-08:00 2008-02-21T17:53:26-08:00 Replaced file_column with attachment_fu - need to work on some specs git-svn-id: svn+ssh://shadowmaru.org/home/shadowma/my_svn/cdcovers@105 d798d9e0-5e21-0410-a9a4-a952c4db9e3f bae7d916748b507e03f67106d3c2efc64695f7b2 shadowma shadowma@d798d9e0-5e21-0410-a9a4-a952c4db9e3f