kevinrutherford-reek 1.1.3.13 → 1.1.3.14

data/lib/reek/smells/smell_detector.rb

@@ -1,3 +1,5 @@
+require 'reek/configuration'
+
 class Class
   def name_words
     class_name = name.split(/::/)[-1]
@@ -15,37 +17,39 @@ module Reek
       # smell that should ignore this code element.
       EXCLUDE_KEY = 'exclude'
 
-      # The name fo the config field that specifies whether a smell is
-      # enabled. Set to +true+ or +false+.
-      ENABLED_KEY = 'enabled'
-      
-      def self.class_name
-        self.name.split(/::/)[-1]
-      end
+      # The default value for the +EXCLUDE_KEY+ if it isn't specified
+      # in any configuration file.
+      DEFAULT_EXCLUDE_SET = []
 
-      def self.contexts      # :nodoc:
-        [:defn, :defs]
-      end
-      
-      def self.default_config
-        {
-          ENABLED_KEY => true,
-          EXCLUDE_KEY => []
-        }
-      end
+      class << self
+        def class_name
+          self.name.split(/::/)[-1]
+        end
 
-      def self.create(config)
-        new(config[class_name])
-      end
+        def contexts      # :nodoc:
+          [:defn, :defs]
+        end
+
+        def default_config
+          {
+            SmellConfiguration::ENABLED_KEY => true,
+            EXCLUDE_KEY => DEFAULT_EXCLUDE_SET
+          }
+        end
 
-      def self.listen(hooks, config)
-        detector = create(config)
-        detector.listen_to(hooks)
-        detector
+        def create(config)
+          new(config[class_name])
+        end
+
+        def listen(hooks, config)
+          detector = create(config)
+          detector.listen_to(hooks)
+          detector
+        end
       end
 
       def initialize(config = SmellDetector.default_config)
-        @config = config
+        @config = SmellConfiguration.new(config)
         @smells_found = Set.new
         @masked = false
       end
@@ -54,16 +58,9 @@ module Reek
         self.class.contexts.each { |ctx| hooks[ctx] << self }
       end
 
-      def be_masked
-        @masked = true
-      end
-
-      def masked?
-        @masked
-      end
-
+      # SMELL: Getter (only used in 1 test)
       def enabled?
-        @config[ENABLED_KEY]
+        @config.enabled?
       end
 
       def configure(config)
@@ -73,16 +70,23 @@ module Reek
       end
 
       def configure_with(config)
-        @config.adopt!(config)
+        @config.hash.adopt!(config)
       end
 
       def copy
-        self.class.new(@config.deep_copy)
+        self.class.new(@config.hash.deep_copy)
+      end
+
+      def supersede_with(config)
+        clone = self.copy
+        @masked = true
+        clone.configure_with(config)
+        clone
       end
 
       def examine(context)
         before = @smells_found.size
-        examine_context(context) if enabled? and !exception?(context)
+        examine_context(context) if @config.enabled? and !exception?(context)
         @smells_found.length > before
       end
 
@@ -90,29 +94,23 @@ module Reek
       end
       
       def exception?(context)
-        context.matches?(@config[EXCLUDE_KEY])
+        context.matches?(value(EXCLUDE_KEY, context, DEFAULT_EXCLUDE_SET))
       end
 
       def found(scope, warning)
-        smell = SmellWarning.new(self, scope, warning)
+        smell = SmellWarning.new(self, scope, warning, @masked)
         @smells_found << smell
         smell
       end
 
-    def has_smell?(patterns)
-      return false if @masked
-      @smells_found.each { |warning| return true if warning.contains_all?(patterns) }
-      false
-    end
+      def has_smell?(patterns)
+        return false if @masked
+        @smells_found.each { |warning| return true if warning.contains_all?(patterns) }
+        false
+      end
 
       def report_on(report)
-        @smells_found.each do |smell|
-          if @masked
-            report.record_masked_smell(smell)
-          else
-            report << smell
-          end
-        end
+        @smells_found.each { |smell| smell.report_on(report) }
       end
 
       def num_smells
@@ -126,6 +124,10 @@ module Reek
       def smell_name
         self.class.name_words.join(' ')
       end
+
+      def value(key, ctx, fall_back)
+        @config.value(key, ctx, fall_back)
+      end
     end
   end
 end

data/lib/reek/smells/uncommunicative_name.rb

@@ -15,23 +15,27 @@ module Reek
     #
     # Currently +UncommunicativeName+ checks for
     # * 1-character names
-    # * names consisting of a single character followed by a number
+    # * names ending with a number
     #
     class UncommunicativeName < SmellDetector
 
       # The name of the config field that lists the regexps of
       # smelly names to be reported.
       REJECT_KEY = 'reject'
+
+      DEFAULT_REJECT_SET = [/^.$/, /[0-9]$/]
       
       # The name of the config field that lists the specific names that are
       # to be treated as exceptions; these names will not be reported as
       # uncommunicative.
       ACCEPT_KEY = 'accept'
 
+      DEFAULT_ACCEPT_SET = ['Inline::C']
+
       def self.default_config
         super.adopt(
-          REJECT_KEY => [/^.[0-9]*$/],
-          ACCEPT_KEY => ['Inline::C']
+          REJECT_KEY => DEFAULT_REJECT_SET,
+          ACCEPT_KEY => DEFAULT_ACCEPT_SET
         )
       end
 
@@ -54,22 +58,22 @@ module Reek
 
       def consider_variables(context) # :nodoc:
         context.variable_names.each do |name|
-          next unless is_bad_name?(name)
+          next unless is_bad_name?(name, context)
           found(context, "has the variable name '#{name}'")
         end
       end
 
       def consider_name(context)  # :nodoc:
         name = context.name
-        return false if @config[ACCEPT_KEY].include?(context.to_s)  # TODO: fq_name() ?
-        return false unless is_bad_name?(name)
+        return false if value(ACCEPT_KEY, context, DEFAULT_ACCEPT_SET).include?(context.to_s)  # TODO: fq_name() ?
+        return false unless is_bad_name?(name, context)
         found(context, "has the name '#{name}'")
       end
 
-      def is_bad_name?(name)  # :nodoc:
+      def is_bad_name?(name, context)  # :nodoc:
         var = name.effective_name
-        return false if var == '*' or @config[ACCEPT_KEY].include?(var)
-        @config[REJECT_KEY].detect {|patt| patt === var}
+        return false if var == '*' or value(ACCEPT_KEY, context, DEFAULT_ACCEPT_SET).include?(var)
+        value(REJECT_KEY, context, DEFAULT_REJECT_SET).detect {|patt| patt === var}
       end
     end
   end

data/lib/reek/sniffer.rb

@@ -1,4 +1,6 @@
 require 'reek/detector_stack'
+
+# SMELL: Duplication -- all these should be found automagically
 require 'reek/smells/control_couple'
 require 'reek/smells/duplication'
 require 'reek/smells/feature_envy'
@@ -7,6 +9,7 @@ require 'reek/smells/long_method'
 require 'reek/smells/long_parameter_list'
 require 'reek/smells/long_yield_list'
 require 'reek/smells/nested_iterators'
+require 'reek/smells/simulated_polymorphism'
 require 'reek/smells/uncommunicative_name'
 require 'reek/smells/utility_function'
 require 'reek/code_parser'
@@ -52,6 +55,7 @@ module Reek
       Smells::LongParameterList,
       Smells::LongYieldList,
       Smells::NestedIterators,
+      Smells::SimulatedPolymorphism,
       Smells::UncommunicativeName,
       Smells::UtilityFunction,
     ]

data/lib/reek.rb

@@ -1,5 +1,5 @@
 $:.unshift File.dirname(__FILE__)
 
 module Reek # :doc:
-  VERSION = '1.1.3.13'
+  VERSION = '1.1.3.14'
 end

data/reek.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.1.3.13"
+  s.version = "1.1.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-07-26}
+  s.date = %q{2009-08-20}
   s.default_executable = %q{reek}
   s.description = %q{Code smell detector for Ruby}
   s.email = ["kevin@rutherford-software.com"]
   s.executables = ["reek"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "README.txt"]
-  s.files = ["History.txt", "License.txt", "README.txt", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "lib/reek.rb", "lib/reek/adapters/application.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.rb", "lib/reek/adapters/object_source.rb", "lib/reek/adapters/rake_task.rb", "lib/reek/adapters/report.rb", "lib/reek/adapters/source.rb", "lib/reek/adapters/spec.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/command_line.rb", "lib/reek/detector_stack.rb", "lib/reek/exceptions.reek", "lib/reek/if_context.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/large_class.rb", "lib/reek/smells/long_method.rb", "lib/reek/smells/long_parameter_list.rb", "lib/reek/smells/long_yield_list.rb", "lib/reek/smells/nested_iterators.rb", "lib/reek/smells/smell_detector.rb", "lib/reek/smells/uncommunicative_name.rb", "lib/reek/smells/utility_function.rb", "lib/reek/sniffer.rb", "lib/reek/stop_context.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "spec/quality/reek_source_spec.rb", "spec/reek/adapters/report_spec.rb", "spec/reek/adapters/should_reek_of_spec.rb", "spec/reek/adapters/should_reek_only_of_spec.rb", "spec/reek/adapters/should_reek_spec.rb", "spec/reek/block_context_spec.rb", "spec/reek/class_context_spec.rb", "spec/reek/code_context_spec.rb", "spec/reek/code_parser_spec.rb", "spec/reek/config_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/method_context_spec.rb", "spec/reek/module_context_spec.rb", "spec/reek/name_spec.rb", "spec/reek/object_refs_spec.rb", "spec/reek/object_source_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/large_class_spec.rb", "spec/reek/smells/long_method_spec.rb", "spec/reek/smells/long_parameter_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/smell_detector_spec.rb", "spec/reek/smells/uncommunicative_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/sniffer_spec.rb", "spec/samples/all_but_one_masked/clean_one.rb", "spec/samples/all_but_one_masked/dirty.rb", "spec/samples/all_but_one_masked/masked.reek", "spec/samples/clean_due_to_masking/clean_one.rb", "spec/samples/clean_due_to_masking/clean_three.rb", "spec/samples/clean_due_to_masking/clean_two.rb", "spec/samples/clean_due_to_masking/dirty_one.rb", "spec/samples/clean_due_to_masking/dirty_two.rb", "spec/samples/clean_due_to_masking/masked.reek", "spec/samples/corrupt_config_file/corrupt.reek", "spec/samples/corrupt_config_file/dirty.rb", "spec/samples/empty_config_file/dirty.rb", "spec/samples/empty_config_file/empty.reek", "spec/samples/inline.rb", "spec/samples/masked/dirty.rb", "spec/samples/masked/masked.reek", "spec/samples/mixed_results/clean_one.rb", "spec/samples/mixed_results/clean_three.rb", "spec/samples/mixed_results/clean_two.rb", "spec/samples/mixed_results/dirty_one.rb", "spec/samples/mixed_results/dirty_two.rb", "spec/samples/not_quite_masked/dirty.rb", "spec/samples/not_quite_masked/masked.reek", "spec/samples/optparse.rb", "spec/samples/redcloth.rb", "spec/samples/three_clean_files/clean_one.rb", "spec/samples/three_clean_files/clean_three.rb", "spec/samples/three_clean_files/clean_two.rb", "spec/samples/two_smelly_files/dirty_one.rb", "spec/samples/two_smelly_files/dirty_two.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/reek.rake", "tasks/test.rake"]
+  s.files = ["History.txt", "License.txt", "README.txt", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "lib/reek.rb", "lib/reek/adapters/application.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.rb", "lib/reek/adapters/object_source.rb", "lib/reek/adapters/rake_task.rb", "lib/reek/adapters/report.rb", "lib/reek/adapters/source.rb", "lib/reek/adapters/spec.rb", "lib/reek/block_context.rb", "lib/reek/class_context.rb", "lib/reek/code_context.rb", "lib/reek/code_parser.rb", "lib/reek/command_line.rb", "lib/reek/configuration.rb", "lib/reek/detector_stack.rb", "lib/reek/exceptions.reek", "lib/reek/if_context.rb", "lib/reek/method_context.rb", "lib/reek/module_context.rb", "lib/reek/name.rb", "lib/reek/object_refs.rb", "lib/reek/sexp_formatter.rb", "lib/reek/singleton_method_context.rb", "lib/reek/smell_warning.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/large_class.rb", "lib/reek/smells/long_method.rb", "lib/reek/smells/long_parameter_list.rb", "lib/reek/smells/long_yield_list.rb", "lib/reek/smells/nested_iterators.rb", "lib/reek/smells/simulated_polymorphism.rb", "lib/reek/smells/smell_detector.rb", "lib/reek/smells/uncommunicative_name.rb", "lib/reek/smells/utility_function.rb", "lib/reek/sniffer.rb", "lib/reek/stop_context.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "spec/quality/reek_source_spec.rb", "spec/reek/adapters/report_spec.rb", "spec/reek/adapters/should_reek_of_spec.rb", "spec/reek/adapters/should_reek_only_of_spec.rb", "spec/reek/adapters/should_reek_spec.rb", "spec/reek/block_context_spec.rb", "spec/reek/class_context_spec.rb", "spec/reek/code_context_spec.rb", "spec/reek/code_parser_spec.rb", "spec/reek/config_spec.rb", "spec/reek/configuration_spec.rb", "spec/reek/if_context_spec.rb", "spec/reek/method_context_spec.rb", "spec/reek/module_context_spec.rb", "spec/reek/name_spec.rb", "spec/reek/object_refs_spec.rb", "spec/reek/object_source_spec.rb", "spec/reek/singleton_method_context_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/large_class_spec.rb", "spec/reek/smells/long_method_spec.rb", "spec/reek/smells/long_parameter_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/simulated_polymorphism_spec.rb", "spec/reek/smells/smell_detector_spec.rb", "spec/reek/smells/uncommunicative_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/sniffer_spec.rb", "spec/samples/all_but_one_masked/clean_one.rb", "spec/samples/all_but_one_masked/dirty.rb", "spec/samples/all_but_one_masked/masked.reek", "spec/samples/clean_due_to_masking/clean_one.rb", "spec/samples/clean_due_to_masking/clean_three.rb", "spec/samples/clean_due_to_masking/clean_two.rb", "spec/samples/clean_due_to_masking/dirty_one.rb", "spec/samples/clean_due_to_masking/dirty_two.rb", "spec/samples/clean_due_to_masking/masked.reek", "spec/samples/corrupt_config_file/corrupt.reek", "spec/samples/corrupt_config_file/dirty.rb", "spec/samples/empty_config_file/dirty.rb", "spec/samples/empty_config_file/empty.reek", "spec/samples/exceptions.reek", "spec/samples/inline.rb", "spec/samples/masked/dirty.rb", "spec/samples/masked/masked.reek", "spec/samples/mixed_results/clean_one.rb", "spec/samples/mixed_results/clean_three.rb", "spec/samples/mixed_results/clean_two.rb", "spec/samples/mixed_results/dirty_one.rb", "spec/samples/mixed_results/dirty_two.rb", "spec/samples/not_quite_masked/dirty.rb", "spec/samples/not_quite_masked/masked.reek", "spec/samples/optparse.rb", "spec/samples/overrides/masked/dirty.rb", "spec/samples/overrides/masked/lower.reek", "spec/samples/overrides/upper.reek", "spec/samples/redcloth.rb", "spec/samples/three_clean_files/clean_one.rb", "spec/samples/three_clean_files/clean_three.rb", "spec/samples/three_clean_files/clean_two.rb", "spec/samples/two_smelly_files/dirty_one.rb", "spec/samples/two_smelly_files/dirty_two.rb", "spec/spec.opts", "spec/spec_helper.rb", "tasks/reek.rake", "tasks/test.rake"]
   s.homepage = %q{http://wiki.github.com/kevinrutherford/reek}
   s.post_install_message = %q{
 For more information on reek, see http://wiki.github.com/kevinrutherford/reek

data/spec/reek/adapters/report_spec.rb

@@ -33,16 +33,17 @@ end
 describe ReportSection, " as a SortedSet" do
   it 'should only add a smell once' do
     rpt = ReportSection.new(''.sniff)
-    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!')
-    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!')
+    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
+    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
     lines = rpt.smell_list.split("\n")
     lines.should have(1).lines
   end
 
   it 'should not count an identical masked smell' do
     rpt = ReportSection.new(''.sniff)
-    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!')
-    rpt.record_masked_smell(SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!'))
+    # SMELL: Duplication -- the SmellWarning knows whether to call << or record_masked_smell
+    rpt << SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', false)
+    rpt.record_masked_smell(SmellWarning.new(Smells::FeatureEnvy.new, "self", 'too many!', true))
     rpt.header.should == 'string -- 1 warning'
   end
 end

data/spec/reek/class_context_spec.rb

@@ -168,4 +168,25 @@ describe ClassContext do
     element = ClassContext.create(StopContext.new, [:colon2, [:colon2, [:const, :Treetop], :Runtime], :SyntaxNode])
     element.num_methods.should == 0
   end
+
+  it 'counts conditionals correctly' do
+    src = <<EOS
+class Scrunch
+  def first
+    return @field == :sym ? 0 : 3;
+  end
+  def second
+    if @field == :sym
+      @other += " quarts"
+    end
+  end
+  def third
+    raise 'flu!' unless @field == :sym
+  end
+end
+EOS
+
+    ctx = ClassContext.from_s(src)
+    ctx.conditionals.length.should == 3
+  end
 end

data/spec/reek/configuration_spec.rb

@@ -0,0 +1,12 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+require 'reek/configuration'
+
+include Reek
+
+describe SmellConfiguration do
+  it 'returns the default value when key not found' do
+    cf = SmellConfiguration.new({})
+    cf.value('fred', nil, 27).should == 27
+  end
+end

data/spec/reek/smell_warning_spec.rb

@@ -7,8 +7,8 @@ include Reek
 
 describe SmellWarning, 'equality' do
   before :each do
-    @first = SmellWarning.new(Smells::FeatureEnvy.new, "self", "self")
-    @second = SmellWarning.new(Smells::FeatureEnvy.new, "self", "self")
+    @first = SmellWarning.new(Smells::FeatureEnvy.new, "self", "self", true)
+    @second = SmellWarning.new(Smells::FeatureEnvy.new, "self", "self", false)
   end
 
   it 'should hash equal when the smell is the same' do
@@ -22,4 +22,32 @@ describe SmellWarning, 'equality' do
   it 'should compare equal when using <=>' do
     (@first <=> @second).should == 0
   end
+  
+  class CountingReport
+    attr_reader :masked, :non_masked
+    def initialize
+      @masked = @non_masked = 0
+    end
+    def <<(sw)
+      @non_masked += 1
+    end
+    
+    def record_masked_smell(sw)
+      @masked += 1
+    end
+  end
+
+  it 'reports as masked when masked' do
+    rpt = CountingReport.new
+    @first.report_on(rpt)
+    rpt.masked.should == 1
+    rpt.non_masked.should == 0
+  end
+
+  it 'reports as non-masked when non-masked' do
+    rpt = CountingReport.new
+    @second.report_on(rpt)
+    rpt.masked.should == 0
+    rpt.non_masked.should == 1
+  end
 end

data/spec/reek/smells/duplication_spec.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
+require 'reek/configuration'
 require 'reek/method_context'
 require 'reek/stop_context'
 require 'reek/smells/duplication'
@@ -65,7 +66,7 @@ end
 describe Duplication, 'when disabled' do
   before :each do
     @ctx = MethodContext.new(StopContext.new, [0, :double_thing])
-    @dup = Duplication.new({SmellDetector::ENABLED_KEY => false})
+    @dup = Duplication.new({SmellConfiguration::ENABLED_KEY => false})
   end
 
   it 'should not report repeated call' do

data/spec/reek/smells/feature_envy_spec.rb

@@ -182,6 +182,21 @@ def report
   @report
 end
 EOS
+
+    ruby.should_not reek
+  end
+
+  it 'interprets << correctly' do
+    ruby = <<EOS
+def report_on(report)
+  if @is_masked
+    report.record_masked_smell(self)
+  else
+    report << self
+  end
+end
+EOS
+
     ruby.should_not reek
   end
 end

data/spec/reek/smells/large_class_spec.rb

@@ -14,7 +14,7 @@ describe LargeClass, 'checking Class objects' do
     pending('test requires ParseTree') unless ObjectSource.can_parse_objects?
     class BigOne
       26.times do |i|
-        define_method "method#{i}".to_sym do
+        define_method "method#{i}x".to_sym do
           @melting
         end
       end
@@ -25,12 +25,12 @@ describe LargeClass, 'checking Class objects' do
   it 'should not report short class' do
     pending('test requires ParseTree') unless ObjectSource.can_parse_objects?
     class ShortClass
-      def method1() @var1; end
-      def method2() @var2; end
-      def method3() @var3; end
-      def method4() @var4; end
-      def method5() @var5; end
-      def method6() @var6; end
+      def method_a() @var_a; end
+      def method_b() @var_b; end
+      def method_c() @var_c; end
+      def method_d() @var_d; end
+      def method_e() @var_e; end
+      def method_f() @var_f; end
     end
     ShortClass.should_not reek
   end
@@ -111,9 +111,10 @@ describe LargeClass, 'checking source code' do
 
     it 'should not report 10 ivars in 2 extensions' do
       src = <<EOS
-class Full;def ivars1() @aa=@ab=@ac=@ad=@ae; end;end
-class Full;def ivars2() @af=@ag=@ah=@ai=@aj; end;end
+class Full;def ivars_a() @aa=@ab=@ac=@ad=@ae; end;end
+class Full;def ivars_b() @af=@ag=@ah=@ai=@aj; end;end
 EOS
+
       src.should_not reek
     end
   end
@@ -134,11 +135,11 @@ EOS
     it 'should not report 25 methods' do
       src = <<EOS
 class Full
-  def me01()3 end;def me02()3 end;def me03()3 end;def me04()3 end;def me05()3 end
-  def me11()3 end;def me12()3 end;def me13()3 end;def me14()3 end;def me15()3 end
-  def me21()3 end;def me22()3 end;def me23()3 end;def me24()3 end;def me25()3 end
-  def me31()3 end;def me32()3 end;def me33()3 end;def me34()3 end;def me35()3 end
-  def me41()3 end;def me42()3 end;def me43()3 end;def me44()3 end;def me45()3 end
+  def me01x()3 end;def me02x()3 end;def me03x()3 end;def me04x()3 end;def me05x()3 end
+  def me11x()3 end;def me12x()3 end;def me13x()3 end;def me14x()3 end;def me15x()3 end
+  def me21x()3 end;def me22x()3 end;def me23x()3 end;def me24x()3 end;def me25x()3 end
+  def me31x()3 end;def me32x()3 end;def me33x()3 end;def me34x()3 end;def me35x()3 end
+  def me41x()3 end;def me42x()3 end;def me43x()3 end;def me44x()3 end;def me45x()3 end
 end
 EOS
       src.should_not reek
@@ -147,12 +148,12 @@ EOS
     it 'should report 26 methods' do
       src = <<EOS
 class Full
-  def me01()3 end;def me02()3 end;def me03()3 end;def me04()3 end;def me05()3 end
-  def me11()3 end;def me12()3 end;def me13()3 end;def me14()3 end;def me15()3 end
-  def me21()3 end;def me22()3 end;def me23()3 end;def me24()3 end;def me25()3 end
-  def me31()3 end;def me32()3 end;def me33()3 end;def me34()3 end;def me35()3 end
-  def me41()3 end;def me42()3 end;def me43()3 end;def me44()3 end;def me45()3 end
-  def me51()3 end
+  def me01x()3 end;def me02x()3 end;def me03x()3 end;def me04x()3 end;def me05x()3 end
+  def me11x()3 end;def me12x()3 end;def me13x()3 end;def me14x()3 end;def me15x()3 end
+  def me21x()3 end;def me22x()3 end;def me23x()3 end;def me24x()3 end;def me25x()3 end
+  def me31x()3 end;def me32x()3 end;def me33x()3 end;def me34x()3 end;def me35x()3 end
+  def me41x()3 end;def me42x()3 end;def me43x()3 end;def me44x()3 end;def me45x()3 end
+  def me51x()3 end
 end
 EOS
       src.should reek_of(:LargeClass)

data/spec/reek/smells/simulated_polymorphism_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+require 'reek/smells/simulated_polymorphism'
+
+include Reek::Smells
+
+describe SimulatedPolymorphism do
+  it 'should report 3 similar conditions in a class' do
+    src = <<EOS
+class Scrunch
+  def first
+    return @field == :sym ? 0 : 3;
+  end
+  def second
+    if @field == :sym
+      @other += " quarts"
+    end
+  end
+  def third
+    raise 'flu!' unless @field == :sym
+  end
+end
+EOS
+
+    src.should reek_only_of(:SimulatedPolymorphism, /@field == :sym/)
+  end
+
+  it 'should include case statements in the count' do
+    src = <<EOS
+class Scrunch
+  def first
+    return @field ? 0 : 3;
+  end
+  def second
+    case @field
+    when :sym
+      @other += " quarts"
+    end
+  end
+  def third
+    raise 'flu!' unless @field
+  end
+end
+EOS
+
+    src.should reek_only_of(:SimulatedPolymorphism, /@field/)
+  end
+
+  # And count code in superclasses, if we have it
+end

data/spec/reek/smells/smell_detector_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-require 'reek/adapters/report'
+require 'reek/configuration'
 require 'reek/smells/duplication'
 require 'reek/smells/large_class'
 require 'reek/smells/long_method'
@@ -14,8 +14,8 @@ describe SmellDetector, 'configuration' do
   end
 
   it 'adopts new max_statements value' do
-    @detector.configure_with('max_statements' => 25)
-    @detector.max_statements.should == 25
+    @detector.configure_with(LongMethod::MAX_ALLOWED_STATEMENTS_KEY => 25)
+    @detector.value(LongMethod::MAX_ALLOWED_STATEMENTS_KEY, nil, 0).should == 25
   end
 end
 
@@ -31,7 +31,7 @@ describe SmellDetector, 'when copied' do
 
   it 'should change independently of its parent' do
     default_max = @detector.max_statements
-    @copy.configure_with('max_statements' => 25)
+    @copy.configure_with(LongMethod::MAX_ALLOWED_STATEMENTS_KEY => 25)
     @detector.max_statements.should == default_max
   end
 end
@@ -47,7 +47,7 @@ describe SmellDetector, 'configuration' do
   it 'becomes disabled when disabled' do
     @detector = LargeClass.new
     @detector.should be_enabled
-    @detector.configure({'LargeClass' => {'enabled' => false}})
+    @detector.configure({'LargeClass' => {SmellConfiguration::ENABLED_KEY => false}})
     @detector.should_not be_enabled
   end
 end

data/spec/reek/smells/uncommunicative_name_spec.rb

@@ -16,6 +16,9 @@ describe UncommunicativeName, "method name" do
   it 'should report name of the form "x2"' do
     'def x2(fred) basics(17) end'.should reek_only_of(:UncommunicativeName, /x2/)
   end
+  it 'should report long name ending in a number' do
+    'def method2(fred) basics(17) end'.should reek_only_of(:UncommunicativeName, /method2/)
+  end
 end
 
 describe UncommunicativeName, "field name" do
@@ -28,6 +31,9 @@ describe UncommunicativeName, "field name" do
   it 'should report name of the form "x2"' do
     'class Thing; def simple(fred) @x2 end end'.should reek_only_of(:UncommunicativeName, /@x2/, /Thing/, /variable name/)
   end
+  it 'should report long name ending in a number' do
+    'class Thing; def simple(fred) @field12 end end'.should reek_only_of(:UncommunicativeName, /@field12/, /Thing/, /variable name/)
+  end
   it 'should report one-letter fieldname in assignment' do
     'class Thing; def simple(fred) @x = fred end end'.should reek_only_of(:UncommunicativeName, /@x/, /Thing/, /variable name/)
   end
@@ -43,6 +49,9 @@ describe UncommunicativeName, "local variable name" do
   it 'should report name of the form "x2"' do
     'def simple(fred) x2 = jim(45) end'.should reek_only_of(:UncommunicativeName, /x2/, /variable name/)
   end
+  it 'should report long name ending in a number' do
+    'def simple(fred) var123 = jim(45) end'.should reek_only_of(:UncommunicativeName, /var123/, /variable name/)
+  end
   it 'should report variable name only once' do
     'def simple(fred) x = jim(45); x = y end'.should reek_only_of(:UncommunicativeName, /x/)
   end
@@ -63,6 +72,9 @@ describe UncommunicativeName, "parameter name" do
   it 'should report name of the form "x2"' do
     'def help(x2) basics(17) end'.should reek_only_of(:UncommunicativeName, /x2/, /variable name/)
   end
+  it 'should report long name ending in a number' do
+    'def help(param1) basics(17) end'.should reek_only_of(:UncommunicativeName, /param1/, /variable name/)
+  end
 end
 
 describe UncommunicativeName, "block parameter name" do
@@ -78,6 +90,7 @@ def bad
   end
 end
 EOS
+
     src.should reek_only_of(:UncommunicativeName, /'x'/)
   end
 end
@@ -100,6 +113,7 @@ class Thing
   end
 end
 EOS
+
     source.should reek_of(:UncommunicativeName, /'x'/)
     source.should reek_of(:UncommunicativeName, /'y'/)
   end