@@ -4,6 +4,11 @@ TODO Flexitypes ---------- +- Posterframe + - Editieren vom File in neuem Fenster + - "Zurück" in Assets sollte richtig zurück, nicht zur Asset-Liste, sondern + zum Dokument + - Security for uploading assets - Ensure the proper transmission of styles for assets - Sane behavior in case of error TODOS @@ -7,6 +7,14 @@ class Asset < ActiveRecord::Base belongs_to :assetable, :polymorphic => true attr_accessor :vrame_styles + + 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", @@ -16,23 +24,12 @@ class Asset < ActiveRecord::Base :path => ":rails_root/public/system/assets/:class/:id/posterframe_:style.:extension", :url => "/system/assets/:class/:id/posterframe_:style.:extension", :styles => lambda { |attachment| - # @TODO - # create configuration - # which is controlable from env.rb - # with mere hook - { - :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" - } - } + returning(HashWithIndifferentAccess.new) do |styles| + styles.merge!(attachment.instance.vrame_styles) if attachment.instance.vrame_styles.is_a? Hash + styles.merge!(Vrame.configuration.posterframe_styles) + styles.merge!(Asset::DEFAULT_STYLES) + end + } def serialize file.url app/models/asset.rb @@ -1,22 +1,14 @@ 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 => lambda { |attachment| - if attachment.instance.vrame_styles.is_a? Hash - Image::DEFAULT_STYLES.merge(attachment.instance.vrame_styles) - else - Image::DEFAULT_STYLES + returning(HashWithIndifferentAccess.new) do |styles| + styles.merge!(attachment.instance.vrame_styles) if attachment.instance.vrame_styles.is_a? Hash + styles.merge!(Vrame.configuration.image_styles) + styles.merge!(Asset::DEFAULT_STYLES) end }, :convert_options => { :all => "-quality 80 -colorspace RGB -strip" } app/models/image.rb 33332f616c3d12f6b096775f594538867c525eb6 Jan Varwig jan@varwig.org http://github.com/sebastiandeutsch/vrame/commit/20ecaf752a3019ca212a4b1fd49515f0ce588a66 20ecaf752a3019ca212a4b1fd49515f0ce588a66 2009-11-06T08:43:01-08:00 2009-11-06T08:42:56-08:00 Styles configurable in Vrame config 8985761cb06e99ff2c06b56bdcf7ba6e3b58d114 Jan Varwig jan@varwig.org