radiant-clipped-extension 1.0.3 → 1.0.4

data/clipped_extension.rb

@@ -11,7 +11,7 @@ class ClippedExtension < Radiant::Extension
 
   extension_config do |config|
     config.gem "acts_as_list", :version => "~> 0.1.2"
-    config.gem "paperclip",    :version => "~> 2.3.11"
+    config.gem "paperclip",    :version => "~> 2.3.16"
     config.gem "uuidtools",    :version => "~> 2.1.2"
   end
 

data/config/initializers/processors.rb

@@ -6,11 +6,11 @@ if Radiant.config.table_exists?
     begin
       output = Paperclip.run('convert', '-version').to_a.first
       Rails.logger.info "Using image thumbnailer: #{output.sub(/Version: /i, '')}"
-    rescue Paperclip::CommandNotFoundError
+    rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_image_thumbnails?'] = false
       Radiant.config['assets.create_pdf_thumbnails?'] = false
       Rails.logger.warn "ImageMagick 'convert' executable not found: image and pdf thumbnailing disabled."
-    rescue Paperclip::PaperclipCommandLineError => e
+    rescue Cocaine::ExitStatusError => e
       Rails.logger.warn "ImageMagick is present but calling 'convert -version' returns an error: #{e}"
     end
   end
@@ -20,10 +20,10 @@ if Radiant.config.table_exists?
     begin
      output = Paperclip.run('gs', '-v')
      Rails.logger.info "Using PDF thumbnailer: #{output}".to_a.first
-    rescue Paperclip::CommandNotFoundError
+    rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_pdf_thumbnails?'] = false
       Rails.logger.warn "Ghostscript 'gs' executable not found: pdf thumbnailing disabled."
-    rescue Paperclip::PaperclipCommandLineError => e
+    rescue Cocaine::ExitStatusError => e
       Rails.logger.warn "Ghostscript is present but calling 'gs -v' returns an error: #{e}"
     end
   end
@@ -33,10 +33,10 @@ if Radiant.config.table_exists?
     begin
       output = Paperclip.run('ffmpeg', '-version').to_a.first
       Rails.logger.info "Using video frame grabber: #{output}"
-    rescue Paperclip::CommandNotFoundError
+    rescue Cocaine::CommandNotFoundError
       Radiant.config['assets.create_video_thumbnails?'] = false
       Rails.logger.warn "FFmpeg executable not found: video thumbnailing disabled."
-    rescue Paperclip::PaperclipCommandLineError => e
+    rescue Cocaine::ExitStatusError => e
       Rails.logger.warn "FFmpeg is present but calling 'ffmpeg -L' returns an error: #{e}"
     end
   end

data/lib/radiant-clipped-extension.rb

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

data/radiant-clipped-extension.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = RadiantClippedExtension::DESCRIPTION
 
   s.add_dependency 'acts_as_list', "~> 0.1.2"
-  s.add_dependency 'paperclip', "~> 2.3.11"
+  s.add_dependency 'paperclip', "~> 2.3.16"
   s.add_dependency 'uuidtools', "~> 2.1.2"
 
   ignores = if File.exist?('.gitignore')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-clipped-extension
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Keith Bingman
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-11 00:00:00 +01:00
+date: 2011-08-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 35
         segments: 
         - 2
         - 3
-        - 11
-        version: 2.3.11
+        - 16
+        version: 2.3.16
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -125,7 +125,6 @@ files:
 - db/migrate/003_create_user_observer.rb
 - db/migrate/004_create_page_attachments.rb
 - db/migrate/005_rename_users.rb
-- db/migrate/20090316132151_disable_file_types.rb
 - db/migrate/20110513205050_asset_uuid.rb
 - db/migrate/20110606111250_update_configuration.rb
 - db/migrate/20110609101438_dimensions.rb
@@ -206,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.3'\n  "
+post_install_message: "\n  Add this to your radiant project with:\n    config.gem 'radiant-clipped-extension', :version => '~>1.0.4'\n  "
 rdoc_options: []
 
 require_paths: 

data/db/migrate/20090316132151_disable_file_types.rb

@@ -1,20 +0,0 @@
-class DisableFileTypes < ActiveRecord::Migration
-  def self.up
-    if defined? SettingsExtension && Radiant::Config.column_names.include?('description')
-      puts "-- Adding Settings Extension descriptions for assets.skip_filetype_validations"
-
-      Radiant::Config.find(:all).each do |c|
-       description = case c.key
-         when 'assets.skip_filetype_validations'
-           'When set to true, disables the filetype validations. Set to false to enable them.'
-         else
-           c.description
-       end
-       c.update_attribute :description, description
-      end
-    end
-  end
-
-  def self.down
-  end
-end