@@ -15,9 +15,7 @@ def file_path( *paths ) File.expand_path(File.join('..', *paths), File.dirname(__FILE__)) end -CarrierWave.configure do |config| - config.root = file_path('public') -end +CarrierWave.root = file_path('public') After do FileUtils.rm_rf(file_path("public")) features/support/env.rb @@ -10,6 +10,8 @@ module CarrierWave VERSION = "0.4.0" class << self + attr_accessor :root + def configure(&block) CarrierWave::Uploader::Base.configure(&block) end @@ -60,23 +62,23 @@ module CarrierWave end if defined?(Merb) - CarrierWave.configure do |config| - config.root = Merb.dir_for(:public) - end + + CarrierWave.root = Merb.dir_for(:public) Merb::BootLoader.before_app_loads do # Setup path for uploaders and load all of them before classes are loaded Merb.push_path(:uploaders, Merb.root / 'app' / 'uploaders', '*.rb') Dir.glob(File.join(Merb.load_paths[:uploaders])).each {|f| require f } end + elsif defined?(Rails) - CarrierWave.configure do |config| - config.root = File.join(Rails.root, 'public') - end + + CarrierWave.root = File.join(Rails.root, 'public') ActiveSupport::Dependencies.load_paths << File.join(Rails.root, "app", "uploaders") + elsif defined?(Sinatra) - CarrierWave.configure do |config| - config.root = Sinatra::Application.public - end + + CarrierWave.root = Sinatra::Application.public + end lib/carrierwave.rb @@ -41,6 +41,7 @@ module CarrierWave config.ignore_processing_errors = true config.validate_integrity = true config.validate_processing = true + config.root = CarrierWave.root end end lib/carrierwave/uploader/configuration.rb @@ -32,9 +32,7 @@ def public_path( *paths ) File.expand_path(File.join(File.dirname(__FILE__), 'public', *paths)) end -CarrierWave.configure do |config| - config.root = public_path -end +CarrierWave.root = public_path module CarrierWave module Test spec/spec_helper.rb 1b99bad55cd3be82e261128a8ef97d03b482aa07 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/jnicklas/carrierwave/commit/b1a28b3e609cc39840669e7146aa0254daa7fc69 b1a28b3e609cc39840669e7146aa0254daa7fc69 2009-10-24T01:00:09-07:00 2009-10-24T01:00:09-07:00 Add root accessor Again, to prevent eager loading. 65c0d5b01a2578d7c399dcdea128095535fd24c4 Jonas Nicklas jonas.nicklas@gmail.com