@@ -13,19 +13,25 @@ module Reek # for other values in the current smell detector's configuration. OVERRIDES_KEY = 'overrides' - attr_reader :hash - def initialize(hash) - @hash = hash + @options = hash + end + + def adopt!(options) + @options.adopt!(options) + end + + def deep_copy + @options.deep_copy # SMELL: Open Secret -- returns a Hash end # SMELL: Getter def enabled? - @hash[ENABLED_KEY] + @options[ENABLED_KEY] end def overrides_for(context) - Overrides.new(@hash.fetch(OVERRIDES_KEY, {})).for_context(context) + Overrides.new(@options.fetch(OVERRIDES_KEY, {})).for_context(context) end # Retrieves the value, if any, for the given +key+. @@ -34,7 +40,7 @@ module Reek # def value(key, context, fall_back) overrides_for(context).each { |conf| return conf[key] if conf.has_key?(key) } - return @hash.fetch(key, fall_back) + return @options.fetch(key, fall_back) end end lib/reek/configuration.rb @@ -70,11 +70,11 @@ module Reek end def configure_with(config) - @config.hash.adopt!(config) + @config.adopt!(config) end def copy - self.class.new(@config.hash.deep_copy) + self.class.new(@config.deep_copy) end def supersede_with(config) lib/reek/smells/smell_detector.rb @@ -72,7 +72,7 @@ describe 'Reek source code' do ['lib', 'spec/reek'].should_not flay(40) end it 'has no textual duplication' do - ['lib'].should_not simian(3) + ['lib'].should_not simian(2) end it 'has no textual duplication in the tests' do ['spec/reek'].should_not simian(8) quality/reek_source_spec.rb dffecfc428004bf3431c7434b087ca2189a31325 Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/018aca2bb19059e2e7b9f9d6c29e2deb1e4fdec7 018aca2bb19059e2e7b9f9d6c29e2deb1e4fdec7 2009-10-28T09:32:37-07:00 2009-10-28T09:32:37-07:00 Removed a public attribute from Config 656f62a670c10012d8e3a21d8cf008f0e9344f19 Kevin Rutherford kevin@rutherford-software.com