radiant-assets-extension 0.0.3 → 0.0.4

data/README

@@ -3,6 +3,8 @@
 Provides simple image handling, incl. on-the-fly resizing. Intended as a
 replacement for paperclipped in the long run, but very barebones right now.
 
+Supports uploading of images as well as other files.
+
 == Radius Tags
 
 <r:images size="300x" />
@@ -14,6 +16,5 @@ request.
 
 == Todo
 
-- Handling of non-image uploads
 - Attaching Assets to Pages
 - Easy/Automatic migration from paperclipped

data/app/controllers/admin/assets_controller.rb

@@ -1,5 +1,4 @@
 class Admin::AssetsController < Admin::ResourceController
-  model_class Image
   paginate_models
   helper :assets
 end

data/app/helpers/assets_helper.rb

@@ -1,16 +1,21 @@
 module AssetsHelper
-  def image_listing(image)
-    square_thumb(image) +
-    content_tag(:span, image_link(image), :class=>'title')
+  def asset_listing(asset)
+    icon(asset) +
+    content_tag(:span, asset.to_s, :class=>'title')
   end
   
-  def square_thumb(image, size=30)
-    src = image.upload.thumb("#{size}x#{size}#").url
-    image_tag(src, :width=>size, :height => size)
+  def icon(asset, size=30)
+    asset.image? ? square_thumb(asset, size) : text_icon(asset, size)
+  end
+  
+  def text_icon(asset, size=30)
+    css = "width:#{size}px;height:#{size}px;line-height:#{size}px"
+    content_tag(:span, asset.format, :class => "icon #{asset.format}", :style => css)
   end
   
-  def image_link(image)
-    link_to image.upload_uid, edit_admin_asset_path(image)
+  def square_thumb(image, size=30)
+    src = image.upload.thumb("#{size}x#{size}#").url
+    image_tag(src, :width=>size, :height => size, :class => "thumbnail #{image.format}")
   end
   
   def image_tag(*args)
@@ -21,4 +26,42 @@ module AssetsHelper
       super(*args)
     end
   end
+  
+  def display(asset)
+    if @asset.image?
+      content_tag :div, image_tag(@asset), :class => "image frame #{@asset.format}"
+    elsif @asset.audio?
+      audio_player(@asset)
+    elsif @asset.video?
+      video_player(@asset)
+    elsif @asset.format == :pdf
+      content_tag :iframe, '', :src => @asset.upload.url, :class => "pdf frame"
+    end
+  end
+  
+  def video_player(asset)
+    content_tag :video, :controls => 'controls' do
+      content_tag :source, '', :src => @asset.upload.url, :type => @asset.upload.mime_type
+    end
+  end
+  
+  def audio_player(asset)
+    %Q{<audio src="#{asset.upload.url}" type="#{asset.upload.mime_type}" controls="controls">}
+  end
+  
+  def link_to_remove(asset)
+    link_to 'Remove', remove_admin_asset_path(asset), :class => 'action remove', :title => 'Remove Asset'
+  end
+  
+  def list_view?
+    params[:view] == 'list'
+  end
+  
+  def view_toggle
+    if list_view?
+      link_to 'Grid view', admin_assets_path(:view => 'grid')
+     else
+      link_to 'List view', admin_assets_path(:view => 'list')
+    end
+  end
 end

data/app/models/asset.rb

@@ -0,0 +1,37 @@
+class Asset < ActiveRecord::Base
+  # HACK: incomplete
+  AUDIO_FORMATS = [:wav, :mp3, :m4a, :ogg]
+  VIDEO_FORMATS = [:mp4, :avi]
+  
+  image_accessor :upload
+  validates_presence_of :upload
+  
+  def format
+     # HACK: relying on extension instead of using analyser and upload.format
+     # analyser can throw us into very long loop when trying to identify
+     # non-image files like word docs
+     upload.ext.to_sym
+  rescue UnableToHandle
+    :generic
+  end
+  
+  def image?
+    # PDF is listed as supported by imagemagick but thumbnailing etc. doesn't
+    # work reliably so we treat it as a non-image
+    return false if format == :pdf
+    image_formats = Dragonfly::Encoding::ImageMagickEncoder.new.supported_formats
+    image_formats.include?(format)
+  end
+  
+  def audio?
+    AUDIO_FORMATS.include?(format)
+  end
+  
+  def video?
+    VIDEO_FORMATS.include?(format)
+  end
+  
+  def to_s
+    caption || upload.name
+  end
+end

data/app/models/asset_tags.rb

@@ -28,7 +28,7 @@ module AssetTags
   # resizing proportionally
   tag 'image' do |tag|
     assert_id_given(tag)
-    image = find_image(tag)
+    image = find_asset(tag)
     %{<img src="#{image.url}" width="#{image.width}" height="#{image.height}">}
   end
   
@@ -42,7 +42,7 @@ module AssetTags
   }
   tag 'asset' do |tag|
     assert_id_given(tag)
-    tag.locals.asset = find_image(tag)
+    tag.locals.asset = find_asset(tag)
     tag.expand
   end
   
@@ -51,15 +51,29 @@ module AssetTags
       Renders the #{attribute} of the current asset
     }
     tag "asset:#{attribute}" do |tag|
-      tag.locals.asset && tag.locals.asset.send(attribute.to_sym)
+      tag.locals.asset.send(attribute.to_sym)
     end
   end
   
   desc %{
-    Renders the caption of the current
+    Renders the caption of the current asset
   }
   tag 'asset:caption' do |tag|
-    tag.locals.asset && tag.locals.asset.caption
+    tag.locals.asset.caption
+  end
+  
+  desc %{
+    Renders contents if the current asset is an image
+  }
+  tag 'asset:if_image' do |tag|
+    tag.expand if tag.locals.asset.image?
+  end
+
+  desc %{
+    Renders contents if the current asset isn't an image
+  }
+  tag 'asset:unless_image' do |tag|
+    tag.expand unless tag.locals.asset.image?
   end
   
   %w[landscape portrait].each do |orientation|
@@ -83,12 +97,12 @@ private
     raise TagError, 'Please supply an id attribute' unless tag.attr['id']
   end
 
-  def find_image(tag)
-    image = Image.find(tag.attr['id'])
+  def find_asset(tag)
+    asset = Asset.find(tag.attr['id'])
     if(tag.attr['size'])
-      image.upload.process(:resize, tag.attr['size'])
+      asset.upload.process(:resize, tag.attr['size'])
     else
-      image.upload
+      asset.upload
     end
   end
 end

data/app/views/admin/assets/_grid.html.erb

@@ -0,0 +1,16 @@
+<ul id="assets">
+  <% unless @assets.empty? %>
+    <% @assets.each do |asset| %>
+      <li>
+        <% link_to edit_admin_asset_path(asset) do %>
+          <%= icon(asset, 120) %>
+          <span class="id">ID: <%= asset.id %></span>
+          <span class="caption"><%= asset %></span>
+        <% end %>
+        <%= link_to_remove(asset) %>
+      </li>
+    <% end %>
+  <% else %>
+  <li class='empty'>No Assets</li>
+  <% end %>
+</ul>

data/app/views/admin/assets/_list.html.erb

@@ -0,0 +1,22 @@
+<table class="index" id="assets">
+  <thead>
+    <th class="name">Name</th>
+    <th class="format">Type</th>
+    <th class="size">Size</th>
+    <th class="actions">Modify</th>
+  </thead>
+  <tbody>
+    <% unless @assets.empty? %>
+      <% @assets.each do |asset| %>
+      <tr>
+        <td class="name"><%= asset_listing(asset) %></td>
+        <td class="format"><%= asset.format.to_s.mb_chars.upcase %></td>
+        <td class="size"><%= number_to_human_size(asset.upload.size) %></td>
+        <td class="actions"><%= link_to_remove(asset)  %></td>
+      </tr>
+      <% end %>
+    <% else %>
+    <tr><td class="empty" colspan="3"></td></tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/admin/assets/edit.html.erb

@@ -2,27 +2,27 @@
 
 <h1>Edit Asset</h1>
 
-<% form_for @image, :url => admin_asset_path(@image), :html => {'data-onsubmit_status' => onsubmit_status(@image)} do |f| %>
+<% form_for [:admin, @asset], :html => {'data-onsubmit_status' => onsubmit_status(@asset)} do |f| %>
   <div class="form_area">
     <p class="title">
       Caption: <%= f.text_field :caption %>
     </p>
     <table>
       <tbody>
-        <tr><th>Name</th><td><%= @image.upload_uid %></td></tr>
-        <tr><th>Width</th><td><%= @image.upload.width %></td></tr>
-        <tr><th>Height</th><td><%= @image.upload.height %></td></tr>
+        <tr><th>Name</th><td><%= @asset.upload.name %></td></tr>
+        <% if @asset.image? %>
+        <tr><th>Width</th><td><%= @asset.upload.width %></td></tr>
+        <tr><th>Height</th><td><%= @asset.upload.height %></td></tr>
+        <% end %>
       </tbody>
     </table>
     <!-- FIXME: doesn't work at the moment -->
     <!-- <%= f.file_field :upload %> -->
-    <div class="frame">
-      <%= image_tag @image %>
-    </div>
+    <%= display(@asset) %>
   </div>
   <p class="buttons">
-    <%= save_model_button(@image) %>
-    <%= save_model_and_continue_editing_button(@image) %>
+    <%= save_model_button(@asset) %>
+    <%= save_model_and_continue_editing_button(@asset) %>
     or <%= link_to 'Cancel', admin_assets_url %>
   </p>
 <% end %>

data/app/views/admin/assets/index.html.erb

@@ -1,27 +1,13 @@
 <% include_stylesheet 'admin/extensions/assets/assets' %>
 
 <div class="outset">
-  <ul id="assets">
-    <% unless @images.empty? %>
-      <% @images.each do |image| %>
-        <li>
-          <% link_to edit_admin_asset_path(image) do %>
-            <%= square_thumb(image, 120) %>
-            <span class="id">ID: <%= image.id %></span>
-            <span class="caption"><%= image.caption %></span>
-          <% end %>
-          <%= link_to 'Remove', remove_admin_asset_path(image), :class => 'action remove', :title => 'Remove Asset' %>
-        </li>
-      <% end %>
-    <% else %>
-    <li class='empty'>No Assets</li>
-    <% end %>
-  </ul>
+  <%= render :partial => list_view? ? 'list' : 'grid' %>
 </div>
 
 <div id="actions">
-  <%= pagination_for(@images) %>
+  <%= pagination_for(@assets) %>
   <ul>
     <li class="new"><%= link_to 'Upload New Asset', new_admin_asset_path %></li>
+    <li><%= view_toggle %></li>
   </ul>
 </div>

data/app/views/admin/assets/new.html.erb

@@ -1,5 +1,5 @@
 <h1>Upload New Asset</h1>
-<% form_for @image, :url => admin_assets_path, :html => {:multipart => true, 'data-onsubmit_status'=>'Uploading Asset&#8230;'} do |f| %>
+<% form_for [:admin, @asset], :html => {:multipart => true, 'data-onsubmit_status'=>'Uploading Asset&#8230;'} do |f| %>
   <%= f.file_field :upload %>
   <p class="buttons">
     <%= f.submit 'Upload Asset', :class=>'button' %>

data/app/views/admin/assets/remove.html.erb

@@ -1,3 +1,5 @@
+<% include_stylesheet 'admin/extensions/assets/assets' %>
+
 <h1>Remove Asset</h1>
 <p> 
   Are you sure you want to <strong class="warning">permanently remove</strong>
@@ -5,10 +7,10 @@
 </p>
 
 <table class="index" id="assets">
-  <tr><td class="name"><%= image_listing(@image) %></td></tr>
+  <tr><td class="name"><%= asset_listing(@asset) %></td></tr>
 </table>
 
-<% form_for @image, :url => admin_asset_path(@image), :html => {:method => :delete, 'data-onsubmit_status'=>'Removing asset&#8230;'} do |f| %>
+<% form_for [:admin, @asset], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing asset&#8230;'} do |f| %>
   <p class="buttons">
     <%= f.submit 'Delete asset', :class=>'button' %>
     or <%= link_to 'Cancel', admin_assets_path %>

data/db/migrate/20110225023017_rename_model_class.rb

@@ -0,0 +1,9 @@
+class RenameModelClass < ActiveRecord::Migration
+  def self.up
+    rename_table :images, :assets
+  end
+
+  def self.down
+    rename_table :assets, :images
+  end
+end

data/lib/radiant-assets-extension/version.rb

@@ -1,3 +1,3 @@
 module RadiantAssetsExtension
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/public/stylesheets/admin/extensions/assets/assets.css

@@ -3,6 +3,41 @@
   overflow: auto;
 }
 
+.pdf.frame {
+  width: 100%;
+  height: 30em;
+}
+
+.index th.size {
+  min-width: 5em;
+}
+
+table.index .size {
+  text-align: right;
+  padding-right: 5px;
+}
+
+#assets .icon {
+  display: block;
+  float: left;
+  text-align: center;
+  background: #ccc;
+  text-transform: uppercase;
+}
+
+table#assets .icon {
+  display: block;
+  float: left;
+}
+
+table#assets .icon, table#assets .thumbnail {
+  margin-right: 5px;
+}
+
+table#assets .icon {
+  font-size: 75%;
+}
+
 #assets, #assets li {
   display: block;
   list-style: none;
@@ -15,6 +50,12 @@
   margin-right: 1px;
   margin-bottom: 1px;
   position: relative;
+  overflow: hidden;
+}
+
+#assets li a {
+  color: inherit;
+  text-decoration: none;
 }
 
 #assets li .id,
@@ -44,23 +85,31 @@
   font-weight: bold;
 }
 
+#assets li .remove,
+table#assets .remove::before {
+  background: url('/images/admin/minus.png') no-repeat top left;  
+}
+
 #assets li .remove {
   right: 2px;
-  background: url('/images/admin/minus.png') no-repeat top left;
   width: 12px;
   height: 12px;
   text-indent: -1000em;
   overflow: hidden;
 }
 
+table#assets .remove::before,
 #actions .new a::before {
   content: '';
   width: 12px;
   height: 12px;
   padding-right: 3px;
-  position: relative;
+  position: relative;  
   top: 2px;
   display: block;
   display: inline-block;
+}
+
+#actions .new a::before {
   background: url('/images/admin/plus.png') no-repeat left bottom;
 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-assets-extension
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Gerrit Kaiser
@@ -66,8 +66,10 @@ files:
 - Rakefile
 - app/controllers/admin/assets_controller.rb
 - app/helpers/assets_helper.rb
+- app/models/asset.rb
 - app/models/asset_tags.rb
-- app/models/image.rb
+- app/views/admin/assets/_grid.html.erb
+- app/views/admin/assets/_list.html.erb
 - app/views/admin/assets/edit.html.erb
 - app/views/admin/assets/index.html.erb
 - app/views/admin/assets/new.html.erb
@@ -79,6 +81,7 @@ files:
 - cucumber.yml
 - db/migrate/20110224001246_add_images_table.rb
 - db/migrate/20110225021327_add_caption.rb
+- db/migrate/20110225023017_rename_model_class.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-assets-extension.rb
@@ -93,7 +96,7 @@ has_rdoc: true
 homepage: http://ext.radiantcms.org/extensions/269-assets
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.3'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.4'\n  "
 rdoc_options: []
 
 require_paths: 

data/app/models/image.rb

@@ -1,4 +0,0 @@
-class Image < ActiveRecord::Base
-  image_accessor :upload
-  validates_presence_of :upload
-end