@@ -11,4 +11,4 @@ ActionMailer::Base.smtp_settings = { :address => "localhost", :port => 25, :domain => 'clockingit.com' -} \ No newline at end of file +} config/environment.local.rb @@ -116,7 +116,7 @@ ActionController::Base.session_options[:session_expires]= Time.local(2015,"jan") require File.join(File.dirname(__FILE__), '../lib/rails_extensions') local_env = File.join(File.dirname(__FILE__), 'environment.local.rb') -# load(local_env) if File.exists?(local_env) +load(local_env) if File.exists?(local_env) require File.join(File.dirname(__FILE__), '../lib/misc.rb') @@ -131,3 +131,48 @@ begin rescue # puts $! end + +# If a value is set for ENV[env_name], sets hash[name] +# to that value. If not, leaves hash[name] untouched +def load_from_env(env_name, name, hash, &block) + if ENV[env_name].present? + if block_given? + hash[name] = yield(ENV[env_name]) + else + hash[name] = ENV[env_name] + end + end +end + + + +require "pp" + +# Load any action mailer settings from ENV +ActionMailer::Base.smtp_settings ||= {} +load_from_env("SMTP_HOSTNAME", :address, ActionMailer::Base.smtp_settings) +load_from_env("SMTP_PORT", :port, ActionMailer::Base.smtp_settings) { |p| p.to_i } +load_from_env("SMTP_DOMAIN", :domain, ActionMailer::Base.smtp_settings) +load_from_env("SMTP_USER", :user_name, ActionMailer::Base.smtp_settings) +load_from_env("SMTP_PASSWORD", :password, ActionMailer::Base.smtp_settings) +load_from_env("SMTP_AUTHENTICATION", :authentication, ActionMailer::Base.smtp_settings) + +# Just for debugging while we get this working: +puts "ActionMailer Settings:" +pp ActionMailer::Base.smtp_settings +puts "\n" + +# Load any $CONFIG settings from ENV +$CONFIG ||= {} +load_from_env("DOMAIN", :domain, $CONFIG) +load_from_env("REPLYTO", :replyto, $CONFIG) +load_from_env("FROM", :from, $CONFIG) +load_from_env("PREFIX", :prefix, $CONFIG) +load_from_env("PRODUCT_NAME", :productName, $CONFIG) +load_from_env("USE_SSL", :SSL, $CONFIG) { |s| s == "true" } + +# Just for debugging while we get this working: +puts "$CONFIG:" +pp $CONFIG +puts "\n" + config/environment.rb @@ -12,6 +12,7 @@ class NotificationsTest < ActiveRecord::TestCase # need to hard code these configs because the fixtured have hard coded values $CONFIG[:domain] = "clockingit.com" $CONFIG[:email_domain] = $CONFIG[:domain].gsub(/:\d+/, '') + $CONFIG[:productName] = "ClockingIT" @expected = TMail::Mail.new @expected.set_content_type "text", "plain", { "charset" => CHARSET } test/unit/notifications_test.rb @@ -10,9 +10,9 @@ def self.config if File.exists?(file) @config = YAML::load_file(file) else - port = ENV["PUSH_PORT"] - domain = ENV["PUSH_DOMAIN"] - secret = ENV["PUSH_SECRET"] + port = ENV["PUSH_PORT"] || 443 + domain = ENV["PUSH_DOMAIN"] || "localhost" + secret = ENV["PUSH_SECRET"] || "not_very_secret" @config = { "PUSH_PORT" => port, vendor/plugins/juggernaut/lib/juggernaut.rb 25ef9bd6bdb756a0eee08a0e7a799dc9355514e2 Brad Wilson brad@lucky-dip.net http://github.com/bradx3/clockingit/commit/2c4917397a6b101e002daf6cc53abd7ed601035c 2c4917397a6b101e002daf6cc53abd7ed601035c 2009-10-27T04:19:48-07:00 2009-10-27T04:19:48-07:00 added support to load product settings and mail settings from ENV variables (see config/environment.rb for list) dc3da6ae839742e1358d848a7c9fc2a3b0d4a59c Brad Wilson brad@lucky-dip.net