v07

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

diff --git a/config/application.rb b/config/application.rb
index 17af8a0..b82accd 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -4,7 +4,6 @@ require File.expand_path('../boot', __FILE__)
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 require 'digest/md5'
@@ -17,7 +16,7 @@ if defined?(Bundler)
 end
 
 module Pettanr
-  VERSION = '0.6.2'
+  VERSION = '0.7.0'
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -65,11 +64,12 @@ end
 y = YAML.load(open(Rails.root + 'config/picture_io.yml').read)
 require y[Rails.env]["adapter"]
 pio = PictureIO.const_get y[Rails.env]["io"]
+host_dir = y[Rails.env]["host_dir"]
 PictureIO.setup do |config|
-  config.original_picture_io = pio.new y[Rails.env]["original_picture"]
-  config.resource_picture_io = pio.new y[Rails.env]["resource_picture"]
-  config.picture_io = pio.new y[Rails.env]["picture"]
-  config.system_picture_io = pio.new y[Rails.env]["system_picture"]
+  config.original_picture_io = pio.new host_dir, y[Rails.env]["original_picture"]
+  config.resource_picture_io = pio.new host_dir, y[Rails.env]["resource_picture"]
+  config.picture_io = pio.new host_dir, y[Rails.env]["picture"]
+  config.system_picture_io = pio.new host_dir, y[Rails.env]["system_picture"]
 end
 module ActiveRecord
   class Forbidden < ActiveRecordError