@@ -198,14 +198,8 @@ module HoptoadNotifier !development_environments.include?(environment_name) end - protected - def port - @port ||= if secure? - 443 - else - 80 - end + @port || default_port end def protocol @@ -215,5 +209,17 @@ module HoptoadNotifier 'http' end end + + private + + def default_port + if secure? + 443 + else + 80 + end + end + end + end lib/hoptoad_notifier/configuration.rb @@ -32,15 +32,23 @@ class ConfigurationTest < Test::Unit::TestCase should "provide default values for secure connections" do config = HoptoadNotifier::Configuration.new config.secure = true - assert_config_default :port, 443, config - assert_config_default :protocol, 'https', config + assert_equal 443, config.port + assert_equal 'https', config.protocol end should "provide default values for insecure connections" do config = HoptoadNotifier::Configuration.new config.secure = false - assert_config_default :port, 80, config - assert_config_default :protocol, 'http', config + assert_equal 80, config.port + assert_equal 'http', config.protocol + end + + should "not cache inferred ports" do + config = HoptoadNotifier::Configuration.new + config.secure = false + config.port + config.secure = true + assert_equal 443, config.port end should "allow values to be overwritten" do test/configuration_test.rb bbcdc1207f414de1ba17ebce6f23945b1c1fcb8d Joe Ferris jferris@metaphor.local http://github.com/thoughtbot/hoptoad_notifier/commit/c4959a1af85b4492752c5ca082ca4954bd0f36e9 c4959a1af85b4492752c5ca082ca4954bd0f36e9 2009-11-06T08:31:11-08:00 2009-11-06T08:30:00-08:00 Fixed port being set incorrectly for SSL c48f94fed59b64eb7594a0b1bd6668c28ed1f52f Joe Ferris jferris@metaphor.local