@@ -6,14 +6,21 @@ module D2S3 def self.load_config filename = "#{RAILS_ROOT}/config/amazon_s3.yml" - file = File.open(filename) - config = YAML.load(file) + config = YAML.load_file(filename) + + unless config + raise "Config object from #{filename} is nil" + end + + unless config[RAILS_ENV] + raise "No environment #{RAILS_ENV} found in #{filename}" + end @@access_key_id = config[RAILS_ENV]['access_key_id'] @@secret_access_key = config[RAILS_ENV]['secret_access_key'] @@bucket = config[RAILS_ENV]['bucket_name'] - unless @@access_key_id && @@secret_access_key + unless @@access_key_id && @@secret_access_key && @@bucket raise "Please configure your S3 settings in #{filename}." end end lib/d2s3/s3_config.rb 2be4340b501ef933c36ae8c7a1ac8afe8afe7567 Anthony Eden anthonyeden@gmail.com http://github.com/mwilliams/d2s3/commit/7c70d46fa47cf2da967c29de2d2c5a27a241c429 7c70d46fa47cf2da967c29de2d2c5a27a241c429 2009-05-08T10:47:34-07:00 2009-05-08T10:47:34-07:00 improve error messages 4e3106c384b39de07ab0e4a909bbf404b0808df4 Anthony Eden anthonyeden@gmail.com