rails upgrade to 4

[pettanr/pettanr.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index a32bd2f..4c91c76 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,11 +1,24 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
-begin
-  require 'RMagick'
-rescue LoadError
-  require 'DMagick'
-end
+require 'open-uri'
+require 'RMagick'
+require 'rest_client'
 
+require 'picture_io'
+require 'pettan_imager'
+require 'operator'
+require 'import_result'
+require 'common'
+# define Peta::Item before load model.
+require_dependency 'peta'
+# load Manifest(SystemResource.engine_resource) before config route
+require_dependency 'manifest'
 # Initialize the rails application
+Manifest.manifest.init
 Pettanr::Application.initialize!
-require 'picture_io'
+require_dependency 'local_manifest'
+require_dependency 'locmare'
+require_dependency 'editor'
+LocalManifest.manifest.init
+Manifest.manifest.init_after_load_manifest
+Manifest.manifest.load_models_manifest