lib/active_wrapper/mail.rb in winton-active_wrapper-0.1.7 vs lib/active_wrapper/mail.rb in winton-active_wrapper-0.1.8

- old
+ new

@@ -11,11 +11,11 @@ path = "#{base}/config/mail.yml" if @env == 'test' ActionMailer::Base.delivery_method = :test else - @config[:smtp] = options[:smtp] - @config[:imap] = options[:imap] + @config[:smtp] = options[:smtp] || {} + @config[:imap] = options[:imap] || {} if File.exists?(path) yaml = YAML::load(File.open(path)) if yaml && yaml = yaml[@env].to_options @config[:imap] = yaml[:imap].to_options unless @config[:imap] @config[:smtp] = yaml[:smtp].to_options unless @config[:smtp] \ No newline at end of file