mini_magick.rb in carrierwave-0.8.0

- old
+ new

@@ -1,9 +1,7 @@
 # encoding: utf-8
 
-require 'mini_magick'
-
 module CarrierWave
 
   ##
   # This module simplifies manipulation with MiniMagick by providing a set
   # of convenient helper methods. If you want to use them, you'll need to
@@ -49,14 +47,23 @@
   #
   # You can find more information here:
   #
   # http://mini_magick.rubyforge.org/
   # and
-  # http://github.com/probablycorey/mini_magick/
+  # https://github.com/minimagic/minimagick/
   #
   #
   module MiniMagick
     extend ActiveSupport::Concern
+
+    included do
+      begin
+        require "mini_magick"
+      rescue LoadError => e
+        e.message << " (You may need to install the mini_magick gem)"
+        raise e
+      end
+    end
 
     module ClassMethods
       def convert(format)
         process :convert => format
       end