trusty-clipped-extension 1.0.0

data/config/locales/nl.yml

@@ -0,0 +1,107 @@
+---
+nl:
+  assets: 'Bestanden'
+  asset_types:
+    all: 'Alle'
+    documents: 'Documenten'
+    fonts: 'Fonts'
+    images: 'Afbeeldingen'
+    others: 'Andere'
+    audios: 'Audio'
+    flashes: 'Flash'
+    fonts: 'Fonts'
+    videos: 'Video'
+    pdfs: 'PDFs'
+    swfs: 'Flash'
+  
+  activerecord:
+    errors:
+      models:
+        asset:
+          attributes:
+            asset:
+              blank: 'Er werd geen bestand geselecteerd om te uploaden!'
+
+  clipped_extension:
+    actions: Acties
+    all: 'Alle'
+    alt_text_or_title: 'Alt-Tekst of Titel <span class="hint">(optioneel)</span>'
+    asset: 'Bestand'
+    asset_edit_title: 'Bestand aanpassen'
+    asset_errors: 'Sorry. {{errors}}'
+    asset_page_attachment_note: 'Gekoppelde bestanden. Deze kunnen ingevoegd worden d.m.v. "drag & drop" of met de <code>&lt;r:assets:each /&gt;</code> tag.'
+    asset_note: 'Gekoppelde bestanden. '
+    assets: 'Bestanden'
+    assets_explanation: "Bestanden en afbeeldingen kunnen geüpload worden, en daarna gekoppeld of ingevoegd in pagina's pages, snippets en layouts. Klik op de naam van een bestand om het aan te passen."
+    assets_title: 'Bestanden'
+    asset_page_upload_note: 'Bestanden die je hier uploadt, zullen automatisch gekoppeld zijn aan deze pagina.'
+    asset_upload_note: 'Kies hier een bestand dat je wil uploaden. Als je het <code>Titel</code> veld leeg laat, wordt de naam afgeleid van de bestandsnaam. Klik <code>More</code> om een onderschrift toe te voegen.'
+    attached_assets: 'Gekoppelde bestanden'
+    attach: 'Koppelen'
+    attach_asset: 'Bestand koppelen'
+    attach_assets: 'Bestanden koppelen'
+    attach_existing: 'Bestaande bestanden koppelen'
+    attach_to_page: 'Koppelen aan pagina'
+    audio: 'Audio'
+    cancel_attachment: 'Ontkoppelen'
+    copy: 'Kopieren'
+    copy_alt: 'kopieer radius tag naar je klembord'
+    choose_file: 'Kies bestand'
+    documents: 'Documenten'
+    caption: 'Onderschrift'
+    confirm_remove_asset: 'Ben je zeker dat je dit bestand <strong class="warning">permanent</strong> wil verwijderen?'
+    confirm_remove_from_page: 'Ben je zeker dat je dit bestand wilt ontkoppelen van deze pagina?'
+    delete_asset: 'Bestand Verwijderen'
+    detach: 'Ontkoppelen'
+    edit: 'Aanpassen'
+    edit_asset: '{{asset}} aanpassen'
+    filename: 'Bestandsnaam'
+    find_assets: 'Bestanden zoeken'
+    images: 'Afbeeldingen'
+    images_automatically_created: 'afbeeldingen worden automatisch gecreëerd'
+    insert: 'Invoegen'
+    modify: 'Bijwerken'
+    movies: 'Filmpjes'
+    need_to_upload: 'Een afbeelding uploaden?'
+    new_asset: 'Nieuw bestand'
+    no_assets_found: 'Er werden geen bestanden gevonden'
+    no_assets: 'Geen bestanden'
+    no_attached_assets: 'Geen gekoppelde bestanden.'
+    others: 'Andere'
+    regenerate_all_thumbnails: 'Je kunt hier alle thumbnails opnieuw genereren. Hou er rekening mee dat dit even kan duren, en zeer belastend kan zijn voor de server.'
+    regenerate: 'Opnieuw genereren'
+    regenerate_thumbnails: 'Thumbnails opnieuw genereren'
+    remove_asset: 'Bestand verwijderen'
+    remove_from_page: 'Verwijderen van pagina'
+    reorder: 'Herschikken'
+    remove: 'Verwijderen'
+    replace_file: 'Bestand vervangen'
+    save_and_upload: 'Opslaan en uploaden'
+    search_assets: 'Zoek naar bestanden'
+    search: 'Zoek'
+    select: 'Selecteer'
+    thumbnails_refreshed: "Thumbnails successvol vernieuwd."
+    title: 'Titel'
+    type: 'Type'
+    types_to_find: 'Te doorzoeken types'
+    upload: 'Uploaden'
+    upload_asset: 'Bestand Uploaden'
+
+  config:
+    assets:
+      additional_thumbnails: 'Bijkomende thumbnail types'
+      content_types: 'Content Types'
+      create_image_thumbnails?: 'Genereer afbeelding thumbnails'
+      create_pdf_thumbnails?: 'Genereer PDF thumbnails'
+      create_video_thumbnails?: 'Genereer Video thumbnails'
+      display_size: 'Display Size'
+      insertion_size: 'Insertion Size'
+      max_asset_size: 'Max Asset Size'
+      path: 'Pad'
+      s3:
+        bucket: 'Bucket'
+        key: 'Key'
+        secret: 'Secret'
+      skip_filetype_validation: 'Laat alle bestandstypes toe'
+      storage: 'Storage'
+      url: 'Url'

data/config/locales/ru.yml

@@ -0,0 +1,110 @@
+---
+ru:
+  assets: 'Файлы'
+  asset_types:
+    all: 'Все'
+    documents: 'Документы'
+    fonts: 'Шрифты'
+    images: 'Изображения'
+    others: 'Другое'
+    audios: 'Аудио'
+    flashes: 'Flash'
+    fonts: 'Шрифты'
+    videos: 'Видео'
+    pdfs: 'PDF'
+    swfs: 'Flash'
+
+  activerecord:
+    errors:
+      models:
+        asset:
+          attributes:
+            asset:
+              blank: 'Вы должны выбрать файл для загрузки!'
+
+  clipped_extension:
+    actions: Действия
+    all: 'Все'
+    all_thumbnails_refreshed: 'Все превью (thumbnails) файлов обновлены.'
+    alt_text_or_title: 'Alt-Text или Title <span class="hint">(optional)</span>'
+    asset: 'Файл'
+    asset_edit_title: 'Редактировать Файл'
+    asset_errors: 'Извините. {{errors}}'
+    asset_page_attachment_note: 'Прикрепленные файлы. Могут быть вставлены простым перетаскиванием (drag and drop) или показаны с помощью <code>&lt;r:assets:each /&gt;</code> тега.'
+    asset_note: 'Прикрепленные файлы. '
+    assets: 'Файлы'
+    assets_explanation: 'Файлы и изображения могут быть загружены и прикреплены или вставлены в Страницы, Вставки и Макеты. Кликните на названии файла для редактирования или нажмите <code>Remove</code> для удаления.'
+    assets_title: 'Файлы'
+    asset_page_upload_note: 'Файлы, загруженные здесь, будут автоматически связаны с этой страницей.'
+    asset_upload_note: 'Выберите файл для загрузки. Если поле <code>Title</code> будет оставлено пустым, будет автоматически добавлено имя файла (без расширения файла). По нажатию на <code>More</code>, вы также можете добавить заголовок.'
+    attached_assets: 'Прикрепленные Файлы'
+    attach: 'Файл'
+    attach_asset: 'прикрепить файл'
+    attach_assets: 'Прикрепить файлы'
+    attach_existing: 'Прикрепить Существующие Файлы'
+    attach_to_page: 'Прикрепить к странице'
+    audio: 'Аудио'
+    cancel_attachment: 'Отвязать'
+    copy: 'Копировать'
+    copy_alt: 'скопировать radius тег в буфер обмена'
+    choose_file: 'Выбрать Файл'
+    documents: 'Документы'
+    caption: 'Заголовок'
+    confirm_refresh_assets: 'Вы уверены, что хотите перегенерировать превью (thumbnail) каждого файла? Это может занять длительное время и задействовать ресурсы сервера: <strong class="warning">производительность вашего сайта вероятно пострадает</strong> и ваш браузер может длительное время не отвечать до того, как операция завершится. Эта операция рекомендуется только если ваша коллекция файлов мала!'
+    confirm_remove_asset: 'Вы уверены, что хотите <strong class="warning">навсегда удалить</strong> этот файл?'
+    confirm_remove_from_page: 'Вы уверены, что хотите удалить эти файлы со страницы?'
+    delete_asset: 'Удалить Файл'
+    detach: 'Отцепить'
+    edit: 'Редактировать'
+    edit_asset: 'Редактировать {{asset}}'
+    filename: 'Имя файла'
+    find_assets: 'Найти Файлы'
+    images: 'Изображения'
+    images_automatically_created: 'изображения автоматически созданы'
+    insert: 'Вставить'
+    modify: 'Изменить'
+    movies: 'Фильмы'
+    need_to_upload: 'Хотите загрузить?'
+    new_asset: 'Новый Файл'
+    no_assets_found: 'Не найдено ни одного файла'
+    no_assets: 'Нет Файлов'
+    no_attached_assets: 'Нет прикрепленных файлов.'
+    others: 'Другие'
+    refresh_assets: 'Перегенерировать все превью'
+    regenerate: 'Перегенерировать'
+    regenerate_thumbnails: 'Перегенерировать Превью'
+    remove_asset: 'Удалить Файл'
+    remove_from_page: 'Удалить со страницы'
+    reorder: 'Упорядочить'
+    remove: 'Удалить'
+    refresh_assets_rake_task: 'Для лучшего результата пожалуйста войдите на ваш сервер и запустите <code>rake paperclip:refresh class=Asset</code>.'
+    replace_file: 'Заменить Файл'
+    save_and_upload: 'Сохранить и Загрузить'
+    search_assets: 'Найти файлы'
+    search: 'Искать'
+    select: 'Выбрать'
+    thumbnails_refreshed: "Превью обновлены."
+    title: 'Название'
+    type: 'Тип'
+    types_to_find: 'Типы для поиска'
+    upload: 'Загрузить'
+    upload_asset: 'Загрузить Файл'
+
+  config:
+    assets:
+      additional_thumbnails: 'Дополнительные Превью'
+      content_types: 'Content Types'
+      create_image_thumbnails?: 'Превью Изображений'
+      create_pdf_thumbnails?: 'Превью PDF'
+      create_video_thumbnails?: 'Превью Видео'
+      display_size: 'Отображаемый Размер'
+      insertion_size: 'Размер вставки'
+      max_asset_size: 'Максимальный Размер Файла'
+      path: 'Путь'
+      s3:
+        bucket: 'Корзина'
+        key: 'Ключ'
+        secret: 'Секрет'
+      skip_filetype_validation: 'Пропустить валидацию типов файлов'
+      storage: 'Хранилище'
+      url: 'Url'

data/config/routes.rb

@@ -0,0 +1,17 @@
+TrustyCms::Application.routes.draw do
+  namespace :admin do
+    resources :assets do
+      get :remove, on: :member
+      get :refresh, on: :collection
+      post :regenerate, on: :collection
+      put :refresh, on: :member
+    end
+    resources :page_attachments, :only => [:new] do
+      get :remove, on: :member
+    end
+    resources :pages do
+      get :remove, on: :member
+      resources :page_attachments
+    end
+  end
+end

data/cucumber.yml

@@ -0,0 +1 @@
+default: --format progress features --tags ~@proposed,~@in_progress

data/db/migrate/001_create_assets.rb

@@ -0,0 +1,12 @@
+class CreateAssets < ActiveRecord::Migration
+  def self.up
+    create_table :assets do |t|
+      t.string :caption, :title
+    end
+    
+  end
+  
+  def self.down
+    drop_table :assets
+  end
+end

data/db/migrate/002_create_paperclip_attributes.rb

@@ -0,0 +1,13 @@
+class CreatePaperclipAttributes < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :asset_file_name, :string
+    add_column :assets, :asset_content_type, :string
+    add_column :assets, :asset_file_size, :integer
+  end
+  
+  def self.down
+    remove_column :assets, :asset_file_name
+    remove_column :assets, :asset_content_type
+    remove_column :assets, :asset_file_size
+  end
+end

data/db/migrate/003_create_user_observer.rb

@@ -0,0 +1,13 @@
+class CreateUserObserver < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :created_by, :integer
+    add_column :assets, :updated_by, :integer
+    add_column :assets, :created_at, :datetime
+    add_column :assets, :updated_at, :datetime
+  end
+  
+  def self.down
+    remove_column :assets, :created_by
+    remove_column :assets, :updated_by
+  end
+end

data/db/migrate/004_create_page_attachments.rb

@@ -0,0 +1,19 @@
+class CreatePageAttachments < ActiveRecord::Migration
+  def self.up
+    # See if a page_attachments table from the original 'page_attachments' extension already exists
+    # If so, rename the table to old_page_attachments so they can be migrated later
+    if self.connection.tables.include?('page_attachments')
+      rename_table :page_attachments, :old_page_attachments
+    end
+    create_table :page_attachments do |t|
+      t.column :asset_id,     :integer
+      t.column :page_id,      :integer
+      t.column :position,    :integer
+    end
+    
+  end
+  
+  def self.down
+    drop_table :page_attachments
+  end
+end

data/db/migrate/005_rename_users.rb

@@ -0,0 +1,13 @@
+class RenameUsers < ActiveRecord::Migration
+  
+  def self.up
+    rename_column :assets, :created_by, :created_by_id
+    rename_column :assets, :updated_by, :updated_by_id
+  end
+
+  def self.down
+    rename_column :assets, :created_by_id, :created_by
+    rename_column :assets, :updated_by_id, :updated_by
+  end
+  
+end

data/db/migrate/20110513205050_asset_uuid.rb

@@ -0,0 +1,11 @@
+class AssetUuid < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :uuid, :string
+    Asset.reset_column_information
+    Asset.all.each { |a| a.save! }    # triggers assign_uuid
+  end
+
+  def self.down
+    remove_column :assets, :uuid
+  end
+end

data/db/migrate/20110606111250_update_configuration.rb

@@ -0,0 +1,34 @@
+class UpdateConfiguration < ActiveRecord::Migration
+  def self.up
+    if TrustyCms.config.table_exists?
+
+      puts "Importing paperclip configuration"
+      %w{url path skip_filetype_validation storage}.select{|k| !!TrustyCms.config["assets.#{k}"] }.each do |k|
+        begin
+          TrustyCms.config["paperclip.#{k}"] = TrustyCms.config["assets.#{k}"]
+        rescue ActiveRecord::RecordInvalid => e
+          print "Oops! There was trouble setting #{k} to '#{TrustyCms.config["assets.#{k}"]}'"
+          print "\nSetting it to 'fog'. Please see the clipped extension README for more details."
+          TrustyCms.config["paperclip.#{k}"] = 'fog'
+        end
+      end
+
+      puts "Importing s3 storage configuration"
+      %w{bucket key secret host_alias}.select{|k| !!TrustyCms.config["assets.s3.#{k}"] }.each do |k|
+        TrustyCms.config["paperclip.s3.#{k}"] = TrustyCms.config["assets.s3.#{k}"]
+      end
+
+      puts "Importing thumbnail configuration"
+      if thumbnails = TrustyCms.config["assets.additional_thumbnails"]
+        old_styles = thumbnails.to_s.gsub(' ','').split(',').collect{|s| s.split('=')}.inject({}) {|ha, (k, v)| ha[k.to_sym] = v; ha}
+        new_styles = old_styles.map {|k,v| "#{k}:size=#{v}"}
+        TrustyCms.config["assets.thumbnails.image"] = new_styles.join("|")
+        TrustyCms.config["assets.thumbnails.video"] = new_styles.map{|s| "#{s},format=jpg"}.join("|")
+        TrustyCms.config["assets.thumbnails.pdf"] = new_styles.map{|s| "#{s},format=jpg"}.join("|")
+      end
+    end
+  end
+
+  def self.down
+  end
+end

data/db/migrate/20110609101438_dimensions.rb

@@ -0,0 +1,13 @@
+class Dimensions < ActiveRecord::Migration
+  def self.up
+    add_column :assets, :original_width, :integer
+    add_column :assets, :original_height, :integer
+    add_column :assets, :original_extension, :string
+  end
+
+  def self.down
+    remove_column :assets, :original_width
+    remove_column :assets, :original_height
+    remove_column :assets, :original_extension
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,11 @@
+# Sets up the Rails environment for Cucumber
+ENV["RAILS_ENV"] = "test"
+# Extension root
+extension_env = File.expand_path(File.dirname(__FILE__) + '/../../../../../config/environment')
+require extension_env+'.rb'
+
+Dir.glob(File.join(RADIANT_ROOT, "features", "**", "*.rb")).each {|step| require step unless step =~ /datasets_loader\.rb$/}
+
+Cucumber::Rails::World.class_eval do
+  dataset :assets
+end

data/features/support/paths.rb

@@ -0,0 +1,22 @@
+module NavigationHelpers
+
+  # Extend the standard PathMatchers with your own paths
+  # to be used in your features.
+  #
+  # The keys and values here may be used in your standard web steps
+  # Using:
+  #
+  #   When I go to the "assets" admin page
+  #
+  # would direct the request to the path you provide in the value:
+  #
+  #   admin_assets_path
+  #
+  PathMatchers = {} unless defined?(PathMatchers)
+  PathMatchers.merge!({
+    # /assets/i => 'admin_assets_path'
+  })
+
+end
+
+World(NavigationHelpers)

data/lib/asset_tags.rb

@@ -0,0 +1,346 @@
+module AssetTags
+  include TrustyCms::Taggable
+  include ActionView::Helpers::TagHelper
+  include ActionView::Helpers::AssetTagHelper
+  
+  class TagError < StandardError; end
+  
+  %w{top_padding width height caption asset_file_name asset_content_type asset_file_size id filename image flash thumbnail url link extension if_content_type page:title page:url}.each do |name|
+    deprecated_tag "assets:#{name}", :substitute => "asset:#{name}", :deadline => '2.0'
+  end
+  
+  desc %{
+    The namespace for referencing images and assets.
+    
+    *Usage:* 
+    <pre><code><r:asset [name="asset name"]>...</r:asset></code></pre>
+  }    
+  tag 'asset' do |tag|
+    tag.locals.asset = find_asset(tag, tag.attr) unless tag.attr.empty?
+      tag.expand
+  end
+
+  desc %{
+    Cycles through all assets attached to the current page.  
+    This tag does not require the name atttribute, nor do any of its children.
+    Use the @limit@ and @offset@ attribute to render a specific number of assets.
+    Use @by@ and @order@ attributes to control the order of assets.
+    Use @extensions@ attribute to specify which assets to be rendered.
+    
+    *Usage:* 
+    <pre><code><r:assets:each [limit=0] [offset=0] [order="asc|desc"] [by="position|title|..."] [extensions="png|pdf|doc"]>...</r:assets:each></code></pre>
+  }    
+  tag 'assets' do |tag|
+    tag.expand
+  end
+  tag 'assets:each' do |tag|
+    options = tag.attr.dup
+    tag.locals.assets = tag.locals.page.assets.scoped(assets_find_options(tag))
+    tag.render('asset_list', tag.attr.dup, &tag.block)
+  end
+
+  # General purpose paginated asset lister. Very useful dryness.
+  # Tag.locals.assets must be defined but can be empty.
+
+  tag 'asset_list' do |tag|
+    raise TagError, "r:asset_list: no assets to list" unless tag.locals.assets
+    options = tag.attr.symbolize_keys
+    result = ""
+    paging = pagination_find_options(tag)
+    assets = paging ? tag.locals.assets.paginate(paging) : tag.locals.assets.all
+    assets.each do |asset|
+      tag.locals.asset = asset
+      result << tag.expand
+    end
+    if paging && assets.total_pages > 1
+      tag.locals.paginated_list = assets
+      result << tag.render('pagination', tag.attr.dup)
+    end
+    result
+  end
+  
+  desc %{
+    References the first asset attached to the current page.  
+    
+    *Usage:* 
+    <pre><code><r:assets:first>...</r:assets:first></code></pre>
+  }
+  tag 'assets:first' do |tag|
+    if tag.locals.asset = tag.locals.page.assets.first
+      tag.expand
+    end
+  end
+
+  desc %{
+    Renders the contained elements only if the current contextual page has one or
+    more assets. The @min_count@ attribute specifies the minimum number of required
+    assets. You can also filter by extensions with the @extensions@ attribute.
+  
+    *Usage:*
+    <pre><code><r:if_assets [min_count="n"]>...</r:if_assets></code></pre>
+  }
+  tag 'if_assets' do |tag|
+    count = tag.attr['min_count'] && tag.attr['min_count'].to_i || 1
+    assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
+    tag.expand if assets >= count
+  end
+  
+  desc %{
+    The opposite of @<r:if_assets/>@.
+  }
+  tag 'unless_assets' do |tag|
+    count = tag.attr['min_count'] && tag.attr['min_count'].to_i || 1
+    assets = tag.locals.page.assets.count(:conditions => assets_find_options(tag)[:conditions])
+    tag.expand unless assets >= count
+  end
+  
+  # Resets the page Url and title within the asset tag
+  [:title, :url].each do |method|
+    tag "asset:page:#{method.to_s}" do |tag|
+      tag.locals.page.send(method)
+    end
+  end
+
+
+
+
+
+
+
+  desc %{
+    Renders the value for a top padding for a thumbnail. Put the thumbnail in a
+    container with specified height and using this tag you can vertically
+    align the image within its container.
+  
+    *Usage*:
+    <pre><code><r:asset:top_padding container = "140" [size="icon"]/></code></pre>
+  
+    *Working Example*:
+    <pre><code>
+      <ul>
+        <r:asset:each>
+          <li style="height:140px">
+            <img style="padding-top:<r:top_padding size='category' container='140' />px" 
+                 src="<r:url />" alt="<r:title />" />
+          </li>
+        </r:asset:each>
+      </ul>
+    </code></pre>
+  }
+  tag 'asset:top_padding' do |tag|
+    asset, options = asset_and_options(tag)
+    raise TagError, "'container' attribute required" unless options['container']
+    size = options['size'] ? options.delete('size') : 'icon'
+    raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.has_style?(size)
+    container = options.delete('container')
+    ((container.to_i - asset.height(size).to_i)/2).to_s
+  end
+    
+  ['height','width'].each do |dimension|
+    desc %{
+      Renders the #{dimension} of the asset.
+    }
+    tag "asset:#{dimension}" do |tag|
+      asset, options = asset_and_options(tag)
+      unless asset.dimensions_known?
+        raise TagError, "Can't determine #{dimension} for this Asset. It may not be a supported type."
+      end
+      size = options['size'] ? options.delete('size') : 'original'
+      asset.send(dimension, size)
+    end
+  end
+
+  desc %{
+    Returns a string representing the orientation of the asset, which must be imageable. 
+    (ie, it is an image or it has been processed to produce an image). 
+    Can be 'horizontal', 'vertical' or 'square'.
+  }
+  tag 'asset:orientation' do |tag|
+    asset, options = asset_and_options(tag)
+    size = options['size'] ? options.delete('size') : 'original'
+    raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.has_style?(size)
+    asset.orientation(size)
+  end
+
+  desc %{
+    Returns the aspect ratio of the asset, which must be an image.
+  }
+  tag 'asset:aspect' do |tag|
+    asset, options = asset_and_options(tag)
+    size = options['size'] ? options.delete('size') : 'original'
+    raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.has_style?(size)
+    asset.aspect(size)
+  end
+
+  desc %{
+    Renders the containing elements only if the asset's content type matches
+    the regular expression given in the @matches@ attribute. If the
+    @ignore_case@ attribute is set to false, the match is case sensitive. By
+    default, @ignore_case@ is set to true.
+      
+    The @name@ or @id@ attribute is required on the parent tag unless this tag is used in @asset:each@.
+
+    *Usage:* 
+    <pre><code><r:asset:each><r:if_content_type matches="regexp" [ignore_case=true|false"]>...</r:if_content_type></r:asset:each></code></pre>
+  }
+  tag 'asset:if_content_type' do |tag|
+    options = tag.attr.dup
+    # XXX build_regexp_for comes from StandardTags
+    regexp = build_regexp_for(tag,options)
+    asset_content_type = tag.locals.asset.asset_content_type
+    tag.expand unless asset_content_type.match(regexp).nil?
+  end
+  
+  #TODO: could use better docs for Asset#other? case explaining what types it covers
+  
+  [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
+    desc %{
+      Renders the @#{method.to_s}@ attribute of the asset
+    }
+    tag "asset:#{method.to_s}" do |tag|
+      asset, options = asset_and_options(tag)
+      asset.send(method) rescue nil
+    end
+  end
+  
+  tag 'asset:name' do |tag|
+    tag.render('asset:title', tag.attr.dup)
+  end  
+  
+  tag 'asset:filename' do |tag|
+    asset, options = asset_and_options(tag)
+    asset.asset_file_name rescue nil
+  end
+  
+  desc %{
+    Renders an image tag for the asset.
+    
+    Using the optional @size@ attribute, different sizes can be display.
+    "thumbnail" and "icon" sizes are built in, but custom ones can be set
+    by changing `assets.thumbnails.[type]` in the TrustyCms::Config settings.
+    
+    *Usage:* 
+    <pre><code><r:asset:image [name="asset name" or id="asset id"] [size="icon|thumbnail|whatever"]></code></pre>
+  }    
+  tag 'asset:image' do |tag|
+    tag.locals.asset, options = asset_and_options(tag)
+    size = options.delete('size') || 'original'
+    raise TagError, "asset #{tag.locals.asset.title} has no '#{size}' thumbnail" unless tag.locals.asset.has_style?(size)
+    options['alt'] ||= tag.locals.asset.title
+    url = tag.locals.asset.thumbnail(size)
+    ActionController::Base.helpers.image_tag(url, options)
+  end
+  
+  desc %{
+    Embeds a flash-movie in a cross-browser-compatible fashion using only HTML
+    If no width and height attributes are given it will use the intrinsic
+    dimensions of the swf file
+    
+    *Usage:*
+    <pre><code><r:asset:flash [name="asset name" or id="asset id"] [width="100"] [height="100"]>Fallback content</flash></code></pre>
+    
+    *Example with text fallback:*
+    <pre><code><r:asset:flash name="flash_movie">
+        Sorry, you need to have flash installed, <a href="http://adobe.com/flash">get it here</a>
+    </flash></code></pre>
+    
+    *Example with image fallback and explicit dimensions:*
+    <pre><code><r:asset:flash name="flash_movie" width="300" height="200">
+        <r:asset:image name="flash_screenshot" />
+      </flash></code></pre>
+  }
+  tag 'asset:flash' do |tag|
+    asset, options = asset_and_options(tag)
+    if tag.locals.asset.flash?
+      url = asset.thumbnail('original')
+      dimensions = [(tag.attr['width'] || asset.width),(tag.attr['height'] || asset.height)]
+      swf_embed_markup url, dimensions, tag.expand
+    end
+  end
+    
+  desc %{
+    Renders the url for the asset. If the asset is an image, the <code>size</code> attribute can be used to 
+    generate the url for that size. 
+    
+    *Usage:* 
+    <pre><code><r:url [name="asset name" or id="asset id"] [size="icon|thumbnail"]></code></pre>
+  }    
+  tag 'asset:url' do |tag|
+    asset, options = asset_and_options(tag)
+    size = options['size'] ? options.delete('size') : 'original'
+    asset.thumbnail(size) rescue nil
+  end
+  
+  desc %{
+    Renders a link to the asset. If the asset is an image, the <code>size</code> attribute can be used to 
+    generate a link to that size. 
+    
+    *Usage:* 
+    <pre><code><r:asset:link [name="asset name" or id="asset id"] [size="icon|thumbnail"] /></code></pre>
+  }
+  tag 'asset:link' do |tag|
+    asset, options = asset_and_options(tag)
+    size = options['size'] ? options.delete('size') : 'original'
+    text = options['text'] || asset.title
+    anchor = options['anchor'] ? "##{options.delete('anchor')}" : ''
+    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+    attributes = " #{attributes}" unless attributes.empty?
+    text = tag.double? ? tag.expand : text
+    url = asset.thumbnail(size)
+    %{<a href="#{url  }#{anchor}"#{attributes}>#{text}</a>} rescue nil
+  end
+    
+private
+  def asset_and_options(tag)
+    options = tag.attr.dup
+    [find_asset(tag, options), options]
+  end
+  
+  def find_asset(tag, options)
+    tag.locals.asset ||= if title = (options.delete('name') || options.delete('title'))
+      Asset.find_by_title(title)
+    elsif id = options.delete('id')
+      Asset.find_by_id(id)
+    end
+    tag.locals.asset || raise(TagError, "Asset not found.")
+  end
+  
+  def assets_find_options(tag)
+    attr = tag.attr.symbolize_keys
+    extensions = attr[:extensions] && attr[:extensions].split('|') || []
+    conditions = unless extensions.blank?
+      # this is soon to be removed in favour of asset types
+      [ extensions.map { |ext| "assets.asset_file_name LIKE ?"}.join(' OR '), 
+        *extensions.map { |ext| "%.#{ext}" } ]
+    else
+      nil
+    end
+    
+    by = attr[:by] || 'page_attachments.position'
+    order = attr[:order] || 'asc'
+    
+    options = {
+      :order => "#{by} #{order}",
+      :limit => attr[:limit] || nil,
+      :offset => attr[:offset] || nil,
+      :conditions => conditions
+    }
+  end
+  
+  def swf_embed_markup(url, dimensions, fallback_content)
+    width, height = dimensions
+    %{<!--[if !IE]> -->
+      <object type="application/x-shockwave-flash" data="#{url}" width="#{width}" height="#{height}">
+    <!-- <![endif]-->
+    <!--[if IE]>
+      <object width="#{width}" height="#{height}"
+        classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
+        codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0">
+        <param name="movie" value="#{url}" />
+    <!-->
+    #{fallback_content}
+      </object>
+    <!-- <![endif]-->}
+  end
+end
+