radiant-clipped-extension 1.0.4 → 1.0.5

data/config/initializers/processors.rb

@@ -4,8 +4,8 @@ if Radiant.config.table_exists?
   if Radiant.config['assets.create_image_thumbnails?']
     # Check that we can run convert
     begin
-      output = Paperclip.run('convert', '-version').to_a.first
-      Rails.logger.info "Using image thumbnailer: #{output.sub(/Version: /i, '')}"
+      output = Paperclip.run('convert', '-version')
+      Rails.logger.info %{[Clipped] Using image thumbnailer: #{output.split("\n").first.sub(/^Version: /i, '')}}
     rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_image_thumbnails?'] = false
       Radiant.config['assets.create_pdf_thumbnails?'] = false
@@ -19,7 +19,7 @@ if Radiant.config.table_exists?
     # Check that we can run ghostscript
     begin
      output = Paperclip.run('gs', '-v')
-     Rails.logger.info "Using PDF thumbnailer: #{output}".to_a.first
+     Rails.logger.info %{[Clipped] Using PDF thumbnailer: #{output.split("\n").first}}
     rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_pdf_thumbnails?'] = false
       Rails.logger.warn "Ghostscript 'gs' executable not found: pdf thumbnailing disabled."
@@ -31,8 +31,8 @@ if Radiant.config.table_exists?
   if Radiant.config['assets.create_video_thumbnails?']
     # Check that we can run ffmpeg
     begin
-      output = Paperclip.run('ffmpeg', '-version').to_a.first
-      Rails.logger.info "Using video frame grabber: #{output}"
+      output = Paperclip.run('ffmpeg', '-version 2> /dev/null')
+      Rails.logger.info %{[Clipped] Using video frame grabber: #{output.split("\n").first}}
     rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_video_thumbnails?'] = false
       Rails.logger.warn "FFmpeg executable not found: video thumbnailing disabled."

data/lib/asset_tags.rb

@@ -113,7 +113,7 @@ module AssetTags
   desc %{
     Renders the value for a top padding for the image. Put the image in a
     container with specified height and using this tag you can vertically
-    align the image within it's container.
+    align the image within its container.
   
     *Usage*:
     <pre><code><r:asset:top_padding container = "140" [size="icon"]/></code></pre>
@@ -136,8 +136,7 @@ module AssetTags
     raise TagError, "'container' attribute required" unless options['container']
     size = options['size'] ? options.delete('size') : 'icon'
     container = options.delete('container')
-    img_height = asset.height(size)
-    (container.to_i - img_height.to_i)/2
+    (container.to_i - asset.height(size).to_i)/2
   end
     
   ['height','width'].each do |dimension|

data/lib/radiant-clipped-extension.rb

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

data/spec/lib/asset_tags_spec.rb

@@ -25,6 +25,10 @@ describe AssetTags do
   end  
   
   context "rendering tag" do
+    before do
+      Radiant.config['assets.create_image_thumbnails?'] = true
+    end
+    
     it "assets:each" do
       page.should render('<r:assets:each><r:asset:id />,</r:assets:each>').as( "#{asset_id(:test2)},#{asset_id(:test1)}," )
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-14 00:00:00 +01:00
+date: 2011-08-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,7 +205,7 @@ has_rdoc: true
 homepage: http://radiantcms.org
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.4'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.5'\n  "
 rdoc_options: []
 
 require_paths: