spec/controllers/assets_controller_spec.rb @@ -23,7 +23,13 @@ class Vrame::AssetsController < Vrame::VrameController # no new action def create - @asset = Asset.create_from_file(params[:Filedata]) + #TODO Gucken ob vorhanden und eingaben absichern + params[:vrame_styles] = JsonObject::Types::Asset.styles_for(params[:schema]) + params[:file] = params.delete(:Filedata) if params[:Filedata] + params[:user] = @current_user + + @asset = Asset.factory(params) + # Build response hash response = { :id => @asset.id } app/controllers/vrame/assets_controller.rb @@ -6,6 +6,8 @@ class Asset < ActiveRecord::Base belongs_to :user belongs_to :assetable, :polymorphic => true + attr_accessor :vrame_styles + has_attached_file :file, :path => ":rails_root/public/system/assets/:class/:id/:style.:extension", :url => "/system/assets/:class/:id/:style.:extension" @@ -14,22 +16,12 @@ class Asset < ActiveRecord::Base file.url end - def self.create_from_file(file) - # Basic attributes - attributes = { - :file => file, - :user => @current_user - } - - # Is the file an image? + def self.factory(attributes) + file = attributes[:file] filename = file.respond_to?(:original_filename) ? file.original_filename : file.basename is_image = Paperclip::Attachment.is_image?(filename) - - # Create an Image instance or a generic Asset klass = is_image ? Image : Asset - - # Create asset record and return it - klass.create(attributes) + klass.create(:file => file, :user => attributes[:user], :vrame_styles => attributes[:vrame_styles]) end def initialize_collection(collection_id = nil, parent_type = nil, parent_id = nil) app/models/asset.rb @@ -1,21 +1,24 @@ class Image < Asset belongs_to :collection + DEFAULT_STYLES = { + :vrame_backend => "100x50", + :thumbnail => "100x140", + :thumbnail_square => "100x100#", + :full => "300x250", + :bg_thumb => "392x272" + } + has_attached_file :file, :path => ":rails_root/public/system/assets/:class/:id/:style.:extension", :url => "/system/assets/:class/:id/:style.:extension", - :styles => { - :menucarddesign_thumb => "85x57", - :qbus_large => ["x506", :jpg], - :qbus_medium => ["294x166#", :jpg], - :qbus_thumb => ["x124", :jpg], - :qbus_backend => ["x57", :jpg], - :vrame_backend => "100x50", - :thumbnail => "100x140", - :thumbnail_square => "100x100#", - :full => "300x250", - :bg_thumb => "392x272" - }, + :styles => lambda { |attachment| + if attachment.instance.vrame_styles.is_a? Hash + Image::DEFAULT_STYLES.merge(attachment.instance.vrame_styles) + else + Image::DEFAULT_STYLES + end + }, :convert_options => { :all => "-quality 80 -colorspace RGB -strip" } end \ No newline at end of file app/models/image.rb @@ -43,6 +43,7 @@ <%= render :partial => 'vrame/shared/file_upload', :locals => { :field_name => field_name, + :uid => field.uid, :asset => value, :parent => document } %> app/views/vrame/documents/_meta_field.html.erb @@ -17,6 +17,12 @@ end %> data-parent-id = "<%= parent.id %>" data-parent-type = "<%= parent_name %>" data-upload-type = "<%= type %>" + <% if defined?(uid) %> <%# TODO Dirty Hack %> + data-schema-class = "Category" + data-schema-id = "<%= parent.category.id %>" + data-schema-attr = "schema" + data-schema-uid = "<%= uid %>" + <% end %> <% if type == 'collection' and id -%> data-collection-id = "<%= id %>" <%- end %> app/views/vrame/shared/_file_upload.html.erb @@ -40,8 +40,15 @@ function Upload (containerEl) { assetIdInput : c.find('input.asset-id'), /* Form field(s) for the new collection id (jQuery collection) */ - collectionIdInput : c.find('input.collection-id') - + collectionIdInput : c.find('input.collection-id'), + + // Information needed for the asset controller to determine the correct styles + schema : { + class: c.attr('data-schema-class'), + id: c.attr('data-schema-id'), + attribute: c.attr('data-schema-attr'), + uid: c.attr('data-schema-uid') + } }; //console.log('new Upload', o); @@ -73,11 +80,15 @@ function Upload (containerEl) { /* POST parameters with authentication and relation ids */ post_params : { - user_credentials : o.token, - upload_type : o.uploadType, - parent_id : o.parentId, - parent_type : o.parentType, - collection_id : o.collectionId + 'user_credentials' : o.token, + 'upload_type' : o.uploadType, + 'parent_id' : o.parentId, + 'parent_type' : o.parentType, + 'collection_id' : o.collectionId, + 'schema[class]' : o.schema.class, + 'schema[id]' : o.schema.id, + 'schema[attribute]' : o.schema.attribute, + 'schema[uid]' : o.schema.uid }, /* Pass our settings */ public/vrame/javascripts/upload.js 40c24d8e199d082b163761fe7fe42f4b3a076f22 Jan Varwig jan@varwig.org http://github.com/sebastiandeutsch/vrame/commit/400a5e89656df156bfa66d639a1a10a49f3e99e8 400a5e89656df156bfa66d639a1a10a49f3e99e8 2009-11-03T09:58:17-08:00 2009-11-03T09:56:52-08:00 Rebuilt Assets to support dynamic styles f497621dbfcc4097d4ab0c2c5747f3fa67314459 Jan Varwig jan@varwig.org