@@ -11,8 +11,7 @@ class MemcachedConfig # Creates a new MemcachedConfig object. append_rails_env controls wether the current # RAILS_ENV should be appended to the configured namespace def initialize(append_rails_env = true) - @options = MemcachedConfig.read_yaml - @append_rails_env = append_rails_env + @options = MemcachedConfig.read_yaml(append_rails_env) end def disabled? @@ -21,7 +20,7 @@ class MemcachedConfig private - def self.read_yaml + def self.read_yaml(append_rails_env) memcached_config_file = File.join(RAILS_ROOT, 'config', 'memcached.yml') raise("cannot read #{memcached_config_file}") unless File.exists? memcached_config_file @@ -32,7 +31,7 @@ class MemcachedConfig memcached_env_config = memcached_config['defaults'] || {} memcached_env_config.merge!(memcached_config[RAILS_ENV]) if memcached_config[RAILS_ENV].is_a?(Hash) memcached_env_config.symbolize_keys! - memcached_env_config[:namespace] << "-#{RAILS_ENV}" if memcached_env_config.has_key?(:namespace) && @append_rails_env + memcached_env_config[:namespace] << "-#{RAILS_ENV}" if memcached_env_config.has_key?(:namespace) && append_rails_env return memcached_env_config end memcached_config.rb a6f86641cd4cbdaf536cf35a98d69501221648b0 Colin Surprenant colin@colin-surprenants-macbook-pro-15.local http://github.com/colinsurprenant/memcached-config/commit/a9f50f843a6727a8e01705e45a0dedfa1489d5e9 a9f50f843a6727a8e01705e45a0dedfa1489d5e9 2009-06-12T14:09:59-07:00 2009-06-12T14:09:59-07:00 fix namespace RAILS_ENV appending 66c4912d9786c54575a6f31364b7afd69ffe46dd Colin Surprenant colin@colin-surprenants-macbook-pro-15.local