radiant-clipped-extension 1.0.9 → 1.0.10

data/app/models/asset.rb

@@ -71,8 +71,8 @@ class Asset < ActiveRecord::Base
     return asset_type.icon(style_name)
   end
 
-  def has_style?(style_name)
-    paperclip_styles.keys.include?(style_name.to_sym)
+  def has_style?(style_name='original')
+    style_name == 'original' || paperclip_styles.keys.include?(style_name.to_sym)
   end
 
   def basename
@@ -102,49 +102,57 @@ class Asset < ActiveRecord::Base
   end
   
   def geometry(style_name='original')
+    raise Paperclip::StyleError, "Requested style #{style_name} is not defined for this asset." unless has_style?(style_name)
     @geometry ||= {}
-    @geometry[style_name] ||= if style_name.to_s == 'original'
-      original_geometry
-    elsif style = self.asset.styles[style_name.to_sym]   # self.asset.styles holds Style objects, where self.paperclip_styles is still just rule hashes
-      original_geometry.transformed_by(style.geometry)
-    else
-      raise PaperclipError, "Requested style #{style_name} is not defined."
+    begin
+      @geometry[style_name] ||= if style_name.to_s == 'original'
+        original_geometry
+      else
+        style = self.asset.styles[style_name.to_sym]
+        original_geometry.transformed_by(style.geometry)    # this can return dimensions for fully specified style sizes but not for relative sizes when there are no original dimensions
+      end
+    rescue Paperclip::TransformationError => e
+      Rails.logger.warn "geometry transformation error: #{e}"
+      original_geometry                                     # returns a blank geometry if the real geometry cannot be calculated
     end
   end
 
   def aspect(style_name='original')
-    image? && geometry(style_name).aspect
+    geometry(style_name).aspect
   end
 
   def orientation(style_name='original')
-    if image?
-      this_aspect = aspect(style_name)
-      case 
-        when this_aspect < 1.0 then 'vertical'
-        when this_aspect > 1.0 then 'horizontal'
-        else 'square'
-      end
+    a = aspect(style_name)
+    case
+    when a == nil?
+      'unknown'
+    when a < 1.0 
+      'vertical'
+    when a > 1.0 
+      'horizontal'
+    else
+      'square'
     end
   end
 
   def width(style_name='original')
-    image? ? geometry(style_name).width.to_i : 0
+    geometry(style_name).width.to_i
   end
 
   def height(style_name='original')
-    image? ? geometry(style_name).height.to_i : 0
+    geometry(style_name).height.to_i
   end
 
   def square?(style_name='original')
-    image? && geometry(style_name).square?
+    geometry(style_name).square?
   end
 
   def vertical?(style_name='original')
-    image? && geometry(style_name).vertical?
+    geometry(style_name).vertical?
   end
 
   def horizontal?(style_name='original')
-    image? && geometry(style_name).horizontal?
+    geometry(style_name).horizontal?
   end
   
   def dimensions_known?

data/app/models/asset_type.rb

@@ -37,7 +37,7 @@ class AssetType
     Asset.send :named_scope, plural.to_sym, :conditions => condition
     Asset.send :named_scope, "not_#{plural}".to_sym, :conditions => non_condition
     
-    # Page.define_radius_tags_for_asset_type self     #TODO discuss interface
+    self.define_radius_tags
     @@types.push self
     @@type_lookup[@name] = self
   end
@@ -164,6 +164,18 @@ class AssetType
     end
   end
   
+  def define_radius_tags
+    type = self.name
+    Page.class_eval {
+      tag "asset:if_#{type}" do |tag|
+        tag.expand if find_asset(tag, tag.attr.dup).send("#{type}?".to_sym)
+      end
+      tag "asset:unless_#{type}" do |tag|
+        tag.expand unless find_asset(tag, tag.attr.dup).send("#{type}?".to_sym)
+      end
+    }
+  end
+  
   # class methods
   
   def self.for(attachment)

data/lib/asset_tags.rb

@@ -7,11 +7,6 @@ module AssetTags
     deprecated_tag "assets:#{name}", :substitute => "asset:#{name}", :deadline => '2.0'
   end
   
-  Asset.known_types.each do |known_type|
-    deprecated_tag "assets:if_#{known_type}", :substitute => "asset:if_#{known_type}", :deadline => '2.0'
-    deprecated_tag "assets:unless_#{known_type}", :substitute => "asset:unless_#{known_type}", :deadline => '2.0'
-  end
-  
   desc %{
     The namespace for referencing images and assets.
     
@@ -20,7 +15,12 @@ module AssetTags
   }    
   tag 'asset' do |tag|
     tag.locals.asset = find_asset unless tag.attr.empty?
-    tag.expand
+    begin
+      tag.expand
+    rescue Paperclip::StyleError => e
+      Rails.logger.warn "style processing error with asset ##{tag.locals.asset.id}: #{e}"
+      raise TagError, e
+    end
   end
 
   desc %{
@@ -111,7 +111,7 @@ module AssetTags
 
 
   desc %{
-    Renders the value for a top padding for the image. Put the image in a
+    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.
   
@@ -132,9 +132,9 @@ module AssetTags
   }
   tag 'asset:top_padding' do |tag|
     asset, options = asset_and_options(tag)
-    raise TagError, 'Asset is not an image' unless asset.image?
     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
@@ -154,12 +154,14 @@ module AssetTags
   end
 
   desc %{
-    Returns a string representing the orientation of the asset, which must be an image. Can be 'horizontal', 'vertical' or 'square'.
+    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)
-    raise TagError, 'Asset is not an image' unless asset.image?
     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
 
@@ -168,8 +170,8 @@ module AssetTags
   }
   tag 'asset:aspect' do |tag|
     asset, options = asset_and_options(tag)
-    raise TagError, 'Asset is not an image' unless asset.image?
     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
 
@@ -193,21 +195,6 @@ module AssetTags
   end
   
   #TODO: could use better docs for Asset#other? case explaining what types it covers
-  Asset.known_types.each do |known_type|
-    desc %{
-      Renders the contents only of the asset is of the type #{known_type}
-    }
-    tag "asset:if_#{known_type}" do |tag|
-      tag.expand if find_asset(tag, tag.attr.dup).send("#{known_type}?".to_sym)
-    end
-
-    desc %{
-      Renders the contents only of the asset is not of the type #{known_type}
-    }
-    tag "asset:unless_#{known_type}" do |tag|
-      tag.expand unless find_asset(tag, tag.attr.dup).send("#{known_type}?".to_sym)
-    end
-  end
   
   [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
     desc %{
@@ -233,22 +220,19 @@ module AssetTags
     
     Using the optional @size@ attribute, different sizes can be display.
     "thumbnail" and "icon" sizes are built in, but custom ones can be set
-    using by changing assets.addition_thumbnails in the Radiant::Config
-    settings.
+    by changing `assets.thumbnails.[type]` in the Radiant::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)
-    if tag.locals.asset.image?
-      size = options['size'] ? options.delete('size') : 'original'
-      alt = "alt='#{tag.locals.asset.title}'" unless tag.attr['alt']
-      attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
-      attributes << alt unless alt.nil?
-      url = tag.locals.asset.thumbnail(size)
-      %{<img src="#{url}" #{attributes unless attributes.empty?} />} rescue nil
-    end
+    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
+    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
+    url = tag.locals.asset.thumbnail(size)
+    %{<img src="#{url}" #{attributes} />} rescue nil
   end
   
   desc %{

data/lib/paperclip/geometry_transformation.rb

@@ -1,7 +1,7 @@
 module Paperclip
 
-  class TransformationError < PaperclipError
-  end
+  class TransformationError < PaperclipError; end
+  class StyleError < PaperclipError; end
   
   class Geometry
     
@@ -17,13 +17,14 @@ module Paperclip
     # This saves us having to go back to the file, which is expensive with S3.
     # We understand all the Imagemagick geometry arguments described at http://www.imagemagick.org/script/command-line-processing.php#geometry
     # including both '^' and paperclip's own '#' modifier.
+    #
     def transformed_by (other)
-      raise TransformationError, "geometry is not transformable without both width and height" if self.height == 0 or self.width == 0
       other = Geometry.parse(other) unless other.is_a? Geometry
-      return other.without_modifier if self =~ other
+      # if the two geometries are similar, or the destination geometry is a fixed size, the resulting dimensions are fixed
+      return other.without_modifier if self =~ other || ['#', '!', '^'].include?(other.modifier)
+      # otherwise, we apply the transformation
+      raise TransformationError, "geometry is not transformable without both width and height" if self.height == 0 or self.width == 0
       case other.modifier
-      when '#', '!', '^'
-        other.without_modifier
       when '>'
         (other.width < self.width || other.height < self.height) ? scaled_to_fit(other) : self
       when '<'

data/lib/radiant-clipped-extension.rb

@@ -1,5 +1,5 @@
 module RadiantClippedExtension
-  VERSION     = "1.0.9"
+  VERSION     = "1.0.10"
   SUMMARY     = %q{Assets for Radiant CMS}
   DESCRIPTION = %q{Asset-management derived from Keith Bingman's Paperclipped extension.}
   URL         = "http://radiantcms.org"

data/public/javascripts/admin/assets.js

@@ -90,6 +90,7 @@ Asset.Insert = Behavior.create({
   onclick: function(e) {
     if (e) e.stop();
     var part_name = TabControlBehavior.instances[0].controller.selected.caption;
+    if (part_name.indexOf(' ')) part_name = part_name.replace(' ', '-'); 
     var textbox = $('part_' + part_name + '_content');
     var tag_parts = this.element.getAttribute('rel').split('_');
     var tag_name = tag_parts[0];

data/public/stylesheets/sass/admin/assets.sass

@@ -54,6 +54,10 @@ p.asset
         width: 180px
         padding: 2px 8px 2px 20px
 
+  #assets_table.assets
+    overflow: auto
+
+
 #upload_holders
   display: none
 
@@ -174,15 +178,13 @@ p.asset
 
 #assets_table.assets
   position: relative
-  overflow: auto
+  font-size: 75%
   p
     padding: 40px
       top: 45px
     color: silver
     text-align: center
-    font:
-      size: 75%
-      style: oblique
+    font-style: oblique
   ul
     clear: both
     li.asset
@@ -194,7 +196,7 @@ p.asset
     clear: left
     width: 100%
     height: 3em
-    padding: 0.5em
+    padding: 0.5em 0
     span, a
       display: block
       float: left

data/spec/lib/asset_tags_spec.rb

@@ -61,8 +61,8 @@ describe AssetTags do
     end
     
     it "asset:image" do
-      page.should render(%{<r:asset:image id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail}" alt='#{asset.title}' />} )
-      page.should render(%{<r:asset:image size="icon" id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail('icon')}" alt='#{asset.title}' />} )
+      page.should render(%{<r:asset:image id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail}" alt="#{asset.title}" />} )
+      page.should render(%{<r:asset:image size="icon" id="#{asset_id(:test1)}" />}).as( %{<img src="#{asset.thumbnail('icon')}" alt="#{asset.title}" />} )
     end
 
     it "asset:caption" do
@@ -96,6 +96,11 @@ describe AssetTags do
       page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" />}).as( 2.to_f.to_s )
       page.should render(%{<r:asset:aspect id="#{asset_id(:test1)}" size="icon" />}).as( 1.to_f.to_s )
     end
+
+    it "asset:if_image" do
+      page.should render(%{<r:asset:if_image name="test1">foo</r:asset:if_image>}).as( "foo" )
+      page.should render(%{<r:asset:if_image name="video">foo</r:asset:if_image>}).as( "" )
+    end
     
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-10 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: acts_as_list