radiant-assets-extension 0.0.2 → 0.0.3

data/app/controllers/admin/assets_controller.rb

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

data/app/models/asset_tags.rb

@@ -1,36 +1,94 @@
 module AssetTags
   include Radiant::Taggable
   
+  class TagError < StandardError;end
+  
   desc %{
     Renders an image tag
     
-    Examples of possible values for the size attribute
+    Examples of possible values for the @size@ attribute
     
-    '400x300'            # resize, maintain aspect ratio
-    '400x300!'           # force resize, don't maintain aspect ratio
-    '400x'               # resize width, maintain aspect ratio
-    'x300'               # resize height, maintain aspect ratio
-    '400x300>'           # resize only if the image is larger than this
-    '400x300<'           # resize only if the image is smaller than this
-    '50x50%'             # resize width and height to 50%
-    '400x300^'           # resize width, height to minimum 400,300, maintain aspect ratio
-    '2000@'              # resize so max area in pixels is 2000
-    '400x300#'           # resize, crop if necessary to maintain aspect ratio (centre gravity)
-    '400x300#ne'         # as above, north-east gravity
-    '400x300se'          # crop, with south-east gravity
-    '400x300+50+100'     # crop from the point 50,100 with width, height 400,300
+    '400x300'            resize, maintain aspect ratio
+    '400x300!'           force resize, don't maintain aspect ratio
+    '400x'               resize width, maintain aspect ratio
+    'x300'               resize height, maintain aspect ratio
+    '400x300>'           resize only if the image is larger than this
+    '400x300<'           resize only if the image is smaller than this
+    '50x50%'             resize width and height to 50%
+    '400x300^'           resize width, height to minimum 400,300, maintain aspect ratio
+    '2000@'              resize so max area in pixels is 2000
+    '400x300#'           resize, crop if necessary to maintain aspect ratio (centre gravity)
+    '400x300#ne'         as above, north-east gravity
+    '400x300se'          crop, with south-east gravity
+    '400x300+50+100'     crop from the point 50,100 with width, height 400,300
     
     <r:image id="2" [size="400x200"] />
   }
   # TODO: accept width/height attributes and do something sensible like
   # resizing proportionally
   tag 'image' do |tag|
+    assert_id_given(tag)
+    image = find_image(tag)
+    %{<img src="#{image.url}" width="#{image.width}" height="#{image.height}">}
+  end
+  
+  desc %{
+    Selects an asset. Does not render anything itself but gives access to the
+    asset's attributes such as size
+    
+    Accepts optional @size@ attribute, see documentation for r:image
+    
+    <r:asset id="22" [size="200"]><r:url /></r:asset>
+  }
+  tag 'asset' do |tag|
+    assert_id_given(tag)
+    tag.locals.asset = find_image(tag)
+    tag.expand
+  end
+  
+  %w[url width height].each do |attribute|
+    desc %{
+      Renders the #{attribute} of the current asset
+    }
+    tag "asset:#{attribute}" do |tag|
+      tag.locals.asset && tag.locals.asset.send(attribute.to_sym)
+    end
+  end
+  
+  desc %{
+    Renders the caption of the current
+  }
+  tag 'asset:caption' do |tag|
+    tag.locals.asset && tag.locals.asset.caption
+  end
+  
+  %w[landscape portrait].each do |orientation|
+    desc %{
+      Renders contents if the current image is in #{orientation} orientation
+    }
+    tag "asset:if_#{orientation}" do |tag|
+      tag.expand if tag.locals.asset.send "#{orientation}?".to_sym
+    end
+    
+    desc %{
+      Renders contents if the current image isn't in #{orientation} orientation
+    }
+    tag "asset:unless_#{orientation}" do |tag|
+      tag.expand unless tag.locals.asset.send "#{orientation}?".to_sym
+    end
+  end
+  
+private
+  def assert_id_given(tag)
+    raise TagError, 'Please supply an id attribute' unless tag.attr['id']
+  end
+
+  def find_image(tag)
     image = Image.find(tag.attr['id'])
-    job = if(tag.attr['size'])
+    if(tag.attr['size'])
       image.upload.process(:resize, tag.attr['size'])
     else
       image.upload
     end
-    %{<img src="#{job.url}" width="#{job.width}" height="#{job.height}">}
   end
 end

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

@@ -5,14 +5,17 @@
 <% form_for @image, :url => admin_asset_path(@image), :html => {'data-onsubmit_status' => onsubmit_status(@image)} do |f| %>
   <div class="form_area">
     <p class="title">
-      Name: <%= @image.upload_uid %>
+      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>
       </tbody>
     </table>
+    <!-- FIXME: doesn't work at the moment -->
+    <!-- <%= f.file_field :upload %> -->
     <div class="frame">
       <%= image_tag @image %>
     </div>

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

@@ -1,27 +1,27 @@
+<% include_stylesheet 'admin/extensions/assets/assets' %>
+
 <div class="outset">
-  <table class="index" id="assets"> 
-    <thead> 
-      <tr> 
-        <th class="name">Asset</th> 
-        <th class="actions">Modify</th> 
-      </tr> 
-    </thead> 
-    <tbody>
-      <% unless @images.empty? %>
-        <% @images.each do |image| %>
-          <tr>
-            <td class="name"><%= image_listing(image) %></td>
-            <td class="actions"><%= link_to 'Remove', remove_admin_asset_path(image), :class => 'action remove' %></td>
-          </tr>
-        <% end %>
-      <% else %>
-      <tr><td class='empty' colspan='2'>No Assets</td></tr>
+  <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 %>
-    </tbody> 
-  </table> 
+    <% else %>
+    <li class='empty'>No Assets</li>
+    <% end %>
+  </ul>
 </div>
+
 <div id="actions">
+  <%= pagination_for(@images) %>
   <ul>
-    <li><%= link_to 'Upload New Asset', new_admin_asset_path %></li>
+    <li class="new"><%= link_to 'Upload New Asset', new_admin_asset_path %></li>
   </ul>
 </div>

data/db/migrate/20110225021327_add_caption.rb

@@ -0,0 +1,9 @@
+class AddCaption < ActiveRecord::Migration
+  def self.up
+    add_column :images, :caption, :string
+  end
+
+  def self.down
+    remove_column :images, :caption
+  end
+end

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

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

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

@@ -2,3 +2,65 @@
   max-width: 100%;
   overflow: auto;
 }
+
+#assets, #assets li {
+  display: block;
+  list-style: none;
+  margin: 0;
+  padding: 0;
+}
+
+#assets li {
+  float: left;
+  margin-right: 1px;
+  margin-bottom: 1px;
+  position: relative;
+}
+
+#assets li .id,
+#assets li .caption,
+#assets li .action {
+  position: absolute;
+  top: 2px;
+  display: none;
+}
+
+#assets li:hover .id,
+#assets li:hover .caption,
+#assets li:hover .action {
+  display: block;
+}
+
+#assets li .caption {
+  top: auto;
+  bottom: 0;
+  color: white;
+  background: black;
+}
+
+#assets li .id {
+  left: 2px;
+  color: white;
+  font-weight: bold;
+}
+
+#assets li .remove {
+  right: 2px;
+  background: url('/images/admin/minus.png') no-repeat top left;
+  width: 12px;
+  height: 12px;
+  text-indent: -1000em;
+  overflow: hidden;
+}
+
+#actions .new a::before {
+  content: '';
+  width: 12px;
+  height: 12px;
+  padding-right: 3px;
+  position: relative;
+  top: 2px;
+  display: block;
+  display: inline-block;
+  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: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Gerrit Kaiser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +00:00
+date: 2011-02-25 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,7 @@ files:
 - config/routes.rb
 - cucumber.yml
 - db/migrate/20110224001246_add_images_table.rb
+- db/migrate/20110225021327_add_caption.rb
 - features/support/env.rb
 - features/support/paths.rb
 - lib/radiant-assets-extension.rb
@@ -92,7 +93,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.2'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-assets-extension', :version => '0.0.3'\n  "
 rdoc_options: []
 
 require_paths: