papermill.rb in papermill-2.1.0

- old
+ new

@@ -1,13 +1,10 @@
 require "rbconfig"
-require "acts_as_list"
-begin
-  require "mime/types"
-  MIME_TYPE_LOADED = true
-rescue
-  MIME_TYPE_LOADED = false
-end
+require "mime/types"
+require "rubygems"
+gem "paperclip", "2.3.1.1"
+require "paperclip"
 
 I18n.load_path = [File.join(File.dirname(__FILE__), "../config/locales/papermill.yml")] + I18n.load_path
 require 'papermill/extensions'
 require 'papermill/flash_session_cookie_middleware.rb'
 
@@ -20,10 +17,9 @@
 require 'papermill/papermill_options.rb'
 begin
   require File.join(RAILS_ROOT, "config/initializers/papermill.rb") 
 rescue LoadError, MissingSourceFile
 end
-require 'paperclip' unless defined?(Paperclip)
 require 'papermill/papermill_paperclip_processor'
 require 'papermill/papermill'
 require 'papermill/papermill_association'
 require 'papermill/papermill_asset'
 require 'papermill/form_builder'