reek 1.2.7.1 → 1.2.7.2

data/lib/reek/spec/should_reek.rb

@@ -18,7 +18,7 @@ module Reek
         "Expected no smells, but got:\n#{list_smells(@examiner)}"
       end
       def list_smells(examiner)
-        examiner.all_active_smells.map do |smell|
+        examiner.smells.map do |smell|
           "#{smell.report('%c %w (%s)')}"
         end.join("\n")
       end

data/lib/reek/spec/should_reek_of.rb

@@ -14,7 +14,7 @@ module Reek
       end
       def matches?(actual)
         @examiner = Examiner.new(actual)
-        @all_smells = @examiner.all_active_smells
+        @all_smells = @examiner.smells
         @all_smells.any? {|warning| warning.matches?(@klass, @patterns)}
       end
       def failure_message_for_should

data/lib/reek/spec/should_reek_only_of.rb

@@ -13,7 +13,7 @@ module Reek
       end
       def matches_examiner?(examiner)
         @examiner = examiner
-        @all_smells = @examiner.all_active_smells
+        @all_smells = @examiner.smells
         @all_smells.length == 1 and @all_smells[0].matches?(@klass, @patterns)
       end
       def failure_message_for_should

data/reek.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.2.7.1"
+  s.version = "1.2.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-03-05}
   s.default_executable = %q{reek}
   s.description = %q{Reek is a tool that examines Ruby classes, modules and methods
 and reports any code smells it finds.
@@ -14,7 +14,7 @@ and reports any code smells it finds.
   s.email = ["kevin@rutherford-software.com"]
   s.executables = ["reek"]
   s.extra_rdoc_files = ["History.txt", "License.txt"]
-  s.files = [".yardopts", "History.txt", "License.txt", "README.md", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/profile.feature", "features/rake_task.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "features/yaml.feature", "lib/reek.rb", "lib/reek/cli/application.rb", "lib/reek/cli/command_line.rb", "lib/reek/cli/help_command.rb", "lib/reek/cli/reek_command.rb", "lib/reek/cli/report.rb", "lib/reek/cli/version_command.rb", "lib/reek/cli/yaml_command.rb", "lib/reek/core/block_context.rb", "lib/reek/core/class_context.rb", "lib/reek/core/code_context.rb", "lib/reek/core/code_parser.rb", "lib/reek/core/detector_stack.rb", "lib/reek/core/masking_collection.rb", "lib/reek/core/method_context.rb", "lib/reek/core/module_context.rb", "lib/reek/core/object_refs.rb", "lib/reek/core/singleton_method_context.rb", "lib/reek/core/smell_configuration.rb", "lib/reek/core/sniffer.rb", "lib/reek/core/stop_context.rb", "lib/reek/examiner.rb", "lib/reek/rake/task.rb", "lib/reek/smell_warning.rb", "lib/reek/smells.rb", "lib/reek/smells/attribute.rb", "lib/reek/smells/boolean_parameter.rb", "lib/reek/smells/class_variable.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/data_clump.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/irresponsible_module.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_method_name.rb", "lib/reek/smells/uncommunicative_module_name.rb", "lib/reek/smells/uncommunicative_parameter_name.rb", "lib/reek/smells/uncommunicative_variable_name.rb", "lib/reek/smells/utility_function.rb", "lib/reek/source.rb", "lib/reek/source/code_comment.rb", "lib/reek/source/config_file.rb", "lib/reek/source/core_extras.rb", "lib/reek/source/sexp_formatter.rb", "lib/reek/source/source_code.rb", "lib/reek/source/source_file.rb", "lib/reek/source/source_locator.rb", "lib/reek/source/tree_dresser.rb", "lib/reek/spec.rb", "lib/reek/spec/should_reek.rb", "lib/reek/spec/should_reek_of.rb", "lib/reek/spec/should_reek_only_of.rb", "reek.gemspec", "spec/reek/cli/help_command_spec.rb", "spec/reek/cli/reek_command_spec.rb", "spec/reek/cli/report_spec.rb", "spec/reek/cli/version_command_spec.rb", "spec/reek/cli/yaml_command_spec.rb", "spec/reek/core/block_context_spec.rb", "spec/reek/core/class_context_spec.rb", "spec/reek/core/code_context_spec.rb", "spec/reek/core/code_parser_spec.rb", "spec/reek/core/config_spec.rb", "spec/reek/core/masking_collection_spec.rb", "spec/reek/core/method_context_spec.rb", "spec/reek/core/module_context_spec.rb", "spec/reek/core/object_refs_spec.rb", "spec/reek/core/singleton_method_context_spec.rb", "spec/reek/core/smell_configuration_spec.rb", "spec/reek/core/stop_context_spec.rb", "spec/reek/examiner_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/attribute_spec.rb", "spec/reek/smells/behaves_like_variable_detector.rb", "spec/reek/smells/boolean_parameter_spec.rb", "spec/reek/smells/class_variable_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/data_clump_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/irresponsible_module_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/long_yield_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/simulated_polymorphism_spec.rb", "spec/reek/smells/smell_detector_shared.rb", "spec/reek/smells/uncommunicative_method_name_spec.rb", "spec/reek/smells/uncommunicative_module_name_spec.rb", "spec/reek/smells/uncommunicative_parameter_name_spec.rb", "spec/reek/smells/uncommunicative_variable_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/source/code_comment_spec.rb", "spec/reek/source/object_source_spec.rb", "spec/reek/source/source_code_spec.rb", "spec/reek/source/tree_dresser_spec.rb", "spec/reek/spec/should_reek_of_spec.rb", "spec/reek/spec/should_reek_only_of_spec.rb", "spec/reek/spec/should_reek_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.files = [".yardopts", "History.txt", "License.txt", "README.md", "Rakefile", "bin/reek", "config/defaults.reek", "features/masking_smells.feature", "features/options.feature", "features/rake_task.feature", "features/reports.feature", "features/samples.feature", "features/stdin.feature", "features/step_definitions/reek_steps.rb", "features/support/env.rb", "features/yaml.feature", "lib/reek.rb", "lib/reek/cli/application.rb", "lib/reek/cli/command_line.rb", "lib/reek/cli/help_command.rb", "lib/reek/cli/reek_command.rb", "lib/reek/cli/report.rb", "lib/reek/cli/version_command.rb", "lib/reek/cli/yaml_command.rb", "lib/reek/core/class_context.rb", "lib/reek/core/code_context.rb", "lib/reek/core/code_parser.rb", "lib/reek/core/detector_stack.rb", "lib/reek/core/masking_collection.rb", "lib/reek/core/method_context.rb", "lib/reek/core/module_context.rb", "lib/reek/core/object_refs.rb", "lib/reek/core/singleton_method_context.rb", "lib/reek/core/smell_configuration.rb", "lib/reek/core/sniffer.rb", "lib/reek/core/stop_context.rb", "lib/reek/examiner.rb", "lib/reek/rake/task.rb", "lib/reek/smell_warning.rb", "lib/reek/smells.rb", "lib/reek/smells/attribute.rb", "lib/reek/smells/boolean_parameter.rb", "lib/reek/smells/class_variable.rb", "lib/reek/smells/control_couple.rb", "lib/reek/smells/data_clump.rb", "lib/reek/smells/duplication.rb", "lib/reek/smells/feature_envy.rb", "lib/reek/smells/irresponsible_module.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_method_name.rb", "lib/reek/smells/uncommunicative_module_name.rb", "lib/reek/smells/uncommunicative_parameter_name.rb", "lib/reek/smells/uncommunicative_variable_name.rb", "lib/reek/smells/utility_function.rb", "lib/reek/source.rb", "lib/reek/source/code_comment.rb", "lib/reek/source/config_file.rb", "lib/reek/source/core_extras.rb", "lib/reek/source/reference_collector.rb", "lib/reek/source/sexp_formatter.rb", "lib/reek/source/source_code.rb", "lib/reek/source/source_file.rb", "lib/reek/source/source_locator.rb", "lib/reek/source/tree_dresser.rb", "lib/reek/spec.rb", "lib/reek/spec/should_reek.rb", "lib/reek/spec/should_reek_of.rb", "lib/reek/spec/should_reek_only_of.rb", "reek.gemspec", "spec/reek/cli/help_command_spec.rb", "spec/reek/cli/reek_command_spec.rb", "spec/reek/cli/report_spec.rb", "spec/reek/cli/version_command_spec.rb", "spec/reek/cli/yaml_command_spec.rb", "spec/reek/core/class_context_spec.rb", "spec/reek/core/code_context_spec.rb", "spec/reek/core/code_parser_spec.rb", "spec/reek/core/config_spec.rb", "spec/reek/core/masking_collection_spec.rb", "spec/reek/core/method_context_spec.rb", "spec/reek/core/module_context_spec.rb", "spec/reek/core/object_refs_spec.rb", "spec/reek/core/singleton_method_context_spec.rb", "spec/reek/core/smell_configuration_spec.rb", "spec/reek/core/stop_context_spec.rb", "spec/reek/examiner_spec.rb", "spec/reek/smell_warning_spec.rb", "spec/reek/smells/attribute_spec.rb", "spec/reek/smells/behaves_like_variable_detector.rb", "spec/reek/smells/boolean_parameter_spec.rb", "spec/reek/smells/class_variable_spec.rb", "spec/reek/smells/control_couple_spec.rb", "spec/reek/smells/data_clump_spec.rb", "spec/reek/smells/duplication_spec.rb", "spec/reek/smells/feature_envy_spec.rb", "spec/reek/smells/irresponsible_module_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/long_yield_list_spec.rb", "spec/reek/smells/nested_iterators_spec.rb", "spec/reek/smells/simulated_polymorphism_spec.rb", "spec/reek/smells/smell_detector_shared.rb", "spec/reek/smells/uncommunicative_method_name_spec.rb", "spec/reek/smells/uncommunicative_module_name_spec.rb", "spec/reek/smells/uncommunicative_parameter_name_spec.rb", "spec/reek/smells/uncommunicative_variable_name_spec.rb", "spec/reek/smells/utility_function_spec.rb", "spec/reek/source/code_comment_spec.rb", "spec/reek/source/object_source_spec.rb", "spec/reek/source/reference_collector_spec.rb", "spec/reek/source/source_code_spec.rb", "spec/reek/source/tree_dresser_spec.rb", "spec/reek/spec/should_reek_of_spec.rb", "spec/reek/spec/should_reek_only_of_spec.rb", "spec/reek/spec/should_reek_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/cli/reek_command_spec.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), 'spec_helper')
 require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'cli', 'reek_command')
+require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'cli', 'report')
 require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'examiner')
 
 include Reek
@@ -13,7 +14,7 @@ describe ReekCommand do
   context 'with smells' do
     before :each do
       examiner = Examiner.new('def x(); end')
-      @cmd = ReekCommand.new([examiner], QuietReport, false)
+      @cmd = ReekCommand.new([examiner], QuietReport)
     end
 
     it 'displays the correct text on the view' do
@@ -30,7 +31,7 @@ describe ReekCommand do
   context 'with no smells' do
     before :each do
       examiner = Examiner.new('def clean(); end')
-      @cmd = ReekCommand.new([examiner], QuietReport, false)
+      @cmd = ReekCommand.new([examiner], QuietReport)
     end
 
     it 'displays nothing on the view' do

data/spec/reek/cli/report_spec.rb

@@ -9,14 +9,14 @@ describe ReportSection, " when empty" do
   context 'empty source' do
     it 'has an empty quiet_report' do
       examiner = Examiner.new('')
-      ReportSection.new(examiner, false).quiet_report.should == ''
+      ReportSection.new(examiner).quiet_report.should == ''
     end
   end
 
   context 'with a couple of smells' do
     it 'should mention every smell name' do
       examiner = Examiner.new('def simple(a) a[3] end')
-      rpt = ReportSection.new(examiner, false)
+      rpt = ReportSection.new(examiner)
       @lines = rpt.smell_list.split("\n")
       @lines.should have_at_least(2).lines
       @lines[0].should match('[Utility Function]')

data/spec/reek/cli/yaml_command_spec.rb

@@ -12,7 +12,7 @@ describe YamlCommand do
 
   context 'with no smells' do
     before :each do
-      @examiner.should_receive(:all_smells).and_return([])
+      @examiner.should_receive(:smells).and_return([])
       @cmd = YamlCommand.new([@examiner])
     end
 
@@ -30,7 +30,7 @@ describe YamlCommand do
   context 'with smells' do
     before :each do
       @smell = SmellWarning.new('UncommunicativeName', "self", 27, "self", true)
-      @examiner.should_receive(:all_smells).and_return([@smell])
+      @examiner.should_receive(:smells).and_return([@smell])
       @cmd = YamlCommand.new([@examiner])
     end
 

data/spec/reek/core/code_context_spec.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__)))), 'spec_helper')
-require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'block_context')
 require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'class_context')
 require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'method_context')
 require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expand_path(__FILE__))))), 'lib', 'reek', 'core', 'module_context')
@@ -8,30 +7,47 @@ require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expan
 include Reek::Core
 
 describe CodeContext do
-  context 'full_name' do
-    it "reports the full context" do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element = ClassContext.new(element, [0, :klass], s())
-      element = MethodContext.new(element, [0, :bad])
-      element = BlockContext.new(element, s(nil, nil))
-      element.full_name.should match(/bad/)
-      element.full_name.should match(/klass/)
-      element.full_name.should match(/mod/)
+  context 'name recognition' do
+    before :each do
+      @exp_name = 'random_name'    # SMELL: could use a String.random here
+      @full_name = "::::::::::::::::::::#{@exp_name}"
+      @exp = mock('exp')
+      @exp.should_receive(:name).any_number_of_times.and_return(@exp_name)
+      @exp.should_receive(:full_name).any_number_of_times.and_return(@full_name)
+      @ctx = CodeContext.new(nil, @exp)
     end
-
-    it 'reports the method name via nested blocks' do
-      element1 = StopContext.new
-      element2 = MethodContext.new(element1, [0, :bad])
-      element3 = BlockContext.new(element2, s(nil, nil))
-      BlockContext.new(element3, s(nil, nil)).full_name.should match(/bad/)
+    it 'gets its short name from the exp' do
+      @ctx.name.should == @exp_name
+    end
+    it 'does not match an empty list' do
+      @ctx.matches?([]).should == false
+    end
+    it 'does not match when its own short name is not given' do
+      @ctx.matches?(['banana']).should == false
+    end
+    it 'recognises its own short name' do
+      @ctx.matches?(['banana', @exp_name]).should == true
+    end
+    it 'recognises its short name as a regex' do
+      @ctx.matches?([/banana/, /#{@exp_name}/]).should == true
     end
-    it 'includes the enclosing context name' do
-      outer_name = 'randomstring'
-      outer = mock('outer')
-      outer.should_receive(:full_name).and_return(outer_name)
-      ifc = BlockContext.new(outer, s(:if, s()))
-      ifc.full_name.should == "#{outer_name}/block"
+
+    context 'when there is an outer' do
+      before :each do
+        @outer_name = 'another_random sting'
+        outer = mock('outer')
+        outer.should_receive(:full_name).at_least(:once).and_return(@outer_name)
+        @ctx = CodeContext.new(outer, @exp)
+      end
+      it 'creates the correct full name' do
+        @ctx.full_name.should == "#{@full_name}"
+      end
+      it 'recognises its own full name' do
+        @ctx.matches?(['banana', @full_name]).should == true
+      end
+      it 'recognises its full name as a regex' do
+        @ctx.matches?([/banana/, /#{@full_name}/]).should == true
+      end
     end
   end
 
@@ -42,41 +58,10 @@ describe CodeContext do
       element = ModuleContext.new(stop, 'mod', s(:module, :mod, nil))
       class_element = ClassContext.new(element, [0, :klass], s())
       element = MethodContext.new(class_element, [0, :bad])
-      element = BlockContext.new(element, s(nil, nil))
       element.bananas(17, -5).should == 55
     end
   end
 
-  context 'name matching' do
-    it 'should recognise itself in a collection of names' do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element.matches?(['banana', 'mod']).should == true
-    end
-
-    it 'should recognise itself in a collection of REs' do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element.matches?([/banana/, /mod/]).should == true
-    end
-
-    it 'should recognise its fq name in a collection of names' do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element = ClassContext.create(element, s(:class, :klass))
-      element.matches?(['banana', 'mod']).should == true
-      element.matches?(['banana', 'mod::klass']).should == true
-    end
-
-    it 'should recognise its fq name in a collection of names' do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element = ClassContext.create(element, s(:class, :klass))
-      element.matches?([/banana/, /mod/]).should == true
-      element.matches?([/banana/, /mod::klass/]).should == true
-    end
-  end
-
   context 'enumerating syntax elements' do
     context 'in an empty module' do
       before :each do

data/spec/reek/core/method_context_spec.rb

@@ -6,7 +6,9 @@ include Reek::Core
 
 describe MethodContext, 'matching' do
   before :each do
-    @element = MethodContext.new(StopContext.new, s(0, :mod))
+    exp = mock('exp', :null_object => true)
+    exp.should_receive(:full_name).at_least(:once).and_return('mod')
+    @element = MethodContext.new(StopContext.new, exp)
   end
 
   it 'should recognise itself in a collection of names' do
@@ -20,46 +22,25 @@ describe MethodContext, 'matching' do
   end
 end
 
-describe MethodContext, 'matching fq names' do
-  before :each do
-    element = StopContext.new
-    element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-    element = ClassContext.new(element, 'klass', s())
-    @element = MethodContext.new(element, s(0, :meth))
-  end
-
-  it 'should recognise itself in a collection of names' do
-    @element.matches?(['banana', 'meth']).should == true
-    @element.matches?(['banana', 'klass#meth']).should == true
-    @element.matches?(['banana']).should == false
-  end
-
-  it 'should recognise itself in a collection of names' do
-    @element.matches?([/banana/, /meth/]).should == true
-    @element.matches?([/banana/, /klass#meth/]).should == true
-    @element.matches?([/banana/]).should == false
-  end
-end
-
 describe MethodContext do
   it 'should record ivars as refs to self' do
     mctx = MethodContext.new(StopContext.new, [:defn, :feed])
     mctx.envious_receivers.should == []
-    mctx.record_call_to([:call, [:ivar, :@cow], :feed_to])
+    mctx.record_call_to(ast(:call, s(:ivar, :@cow), :feed_to))
     mctx.envious_receivers.should == []
   end
 
   it 'should count calls to self' do
     mctx = MethodContext.new(StopContext.new, [:defn, :equals])
     mctx.refs.record_ref([:lvar, :other])
-    mctx.record_call_to([:call, [:self], :thing])
+    mctx.record_call_to(ast(:call, s(:self), :thing))
     mctx.envious_receivers.should be_empty
   end
 
   it 'should recognise a call on self' do
     mc = MethodContext.new(StopContext.new, s(:defn, :deep))
-    mc.record_call_to(s(:call, s(:lvar, :text), :each, s(:arglist)))
-    mc.record_call_to(s(:call, nil, :shelve, s(:arglist)))
+    mc.record_call_to(ast(:call, s(:lvar, :text), :each, s(:arglist)))
+    mc.record_call_to(ast(:call, nil, :shelve, s(:arglist)))
     mc.envious_receivers.should be_empty
   end
 end

data/spec/reek/core/module_context_spec.rb

@@ -24,19 +24,4 @@ module ::Global
 # module for test
  class Inside; end; end'.should_not reek
   end
-
-  context 'full_name' do
-    it "reports full context" do
-      element = StopContext.new
-      element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-      element.full_name.should == 'mod'
-    end
-  end
-
-  it 'finds fq loaded class' do
-    exp = [:class, :"Reek::Smells::LargeClass", nil]
-    ctx = StopContext.new
-    res = ModuleContext.resolve(exp[1], ctx)
-    res[1].should == "LargeClass"
-  end
 end

data/spec/reek/core/singleton_method_context_spec.rb

@@ -6,10 +6,4 @@ require File.join(File.dirname(File.dirname(File.dirname(File.dirname(File.expan
 include Reek::Core
 
 describe SingletonMethodContext do
-  it "reports full context" do
-    element = StopContext.new
-    element = ModuleContext.new(element, 'mod', s(:module, :mod, nil))
-    element = SingletonMethodContext.new(element, s(:defs, s(:call, nil, :a, s(:arglist)), :b, s(:args)))
-    element.full_name.should match(/mod#a\.b/)
-  end
 end

data/spec/reek/examiner_spec.rb

@@ -10,32 +10,32 @@ describe Examiner do
   end
   it 'doesnt match a fragrant String' do
     examiner = Examiner.new('def good() true; end')
-    examiner.all_active_smells.should == []
+    examiner.smells.should == []
   end
   it 'matches a smelly String' do
-    Examiner.new('def fine() y = 4; end').all_active_smells.length.should == 1
+    Examiner.new('def fine() y = 4; end').smells.length.should == 1
   end
 
   context 'checking code in a Dir' do
     it 'matches a smelly Dir' do
       smelly_dir = Dir['spec/samples/all_but_one_masked/*.rb']
-      Examiner.new(smelly_dir).all_active_smells.length.should == 1
+      Examiner.new(smelly_dir).smells.length.should == 1
     end
     it 'doesnt match a fragrant Dir' do
       clean_dir = Dir['spec/samples/three_clean_files/*.rb']
-      Examiner.new(clean_dir).all_active_smells.length.should == 0
+      Examiner.new(clean_dir).smells.length.should == 0
     end
   end
 
   context 'checking code in a File' do
     it 'matches a smelly File' do
       smelly_file = File.new(Dir['spec/samples/all_but_one_masked/d*.rb'][0])
-      Examiner.new(smelly_file).all_active_smells.length.should == 1
+      Examiner.new(smelly_file).smells.length.should == 1
     end
 
     it 'doesnt match a fragrant File' do
       clean_file = File.new(Dir['spec/samples/three_clean_files/*.rb'][0])
-      Examiner.new(clean_file).all_active_smells.length.should == 0
+      Examiner.new(clean_file).smells.length.should == 0
     end
   end
 

data/spec/reek/smells/attribute_spec.rb

@@ -27,18 +27,37 @@ describe Attribute do
   end
 
   context 'with one attribute' do
+    before :each do
+      @attr_name = 'super_thing'
+    end
+
     shared_examples_for 'one attribute found' do
-      it 'records the attribute' do
-        @detector.attributes_in(@ctx).should include([:property, 1])
+      before :each do
+        ctx = CodeContext.new(nil, @src.to_reek_source.syntax_tree)
+        @detector.examine_context(ctx)
+        @smells = @detector.smells_found.to_a
       end
+
       it 'records only that attribute' do
-        @detector.attributes_in(@ctx).length.should == 1
+        @smells.length.should == 1
+      end
+      it 'reports the attribute name' do
+        @smells[0].smell[Attribute::ATTRIBUTE_KEY].should == @attr_name
+      end
+      it 'reports the declaration line number' do
+        @smells[0].lines.should == [1]
+      end
+      it 'reports the correct smell class' do
+        @smells[0].smell_class.should == Attribute::SMELL_CLASS
+      end
+      it 'reports the context fq name' do
+        @smells[0].context.should == 'Fred'
       end
     end
 
     context 'declared in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; attr :property; end')
+        @src = "class Fred; attr :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -46,7 +65,7 @@ describe Attribute do
 
     context 'reader in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; attr_reader :property; end')
+        @src = "class Fred; attr_reader :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -54,7 +73,7 @@ describe Attribute do
 
     context 'writer in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; attr_writer :property; end')
+        @src = "class Fred; attr_writer :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -62,7 +81,7 @@ describe Attribute do
 
     context 'accessor in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; attr_accessor :property; end')
+        @src = "class Fred; attr_accessor :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -70,7 +89,7 @@ describe Attribute do
 
     context 'declared in a module' do
       before :each do
-        @ctx = ModuleContext.from_s('module Fred; attr :property; end')
+        @src = "module Fred; attr :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -78,7 +97,7 @@ describe Attribute do
 
     context 'reader in a module' do
       before :each do
-        @ctx = ModuleContext.from_s('module Fred; attr_reader :property; end')
+        @src = "module Fred; attr_reader :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -86,7 +105,7 @@ describe Attribute do
 
     context 'writer in a module' do
       before :each do
-        @ctx = ModuleContext.from_s('module Fred; attr_writer :property; end')
+        @src = "module Fred; attr_writer :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
@@ -94,31 +113,10 @@ describe Attribute do
 
     context 'accessor in a module' do
       before :each do
-        @ctx = ModuleContext.from_s('module Fred; attr_accessor :property; end')
+        @src = "module Fred; attr_accessor :#{@attr_name}; end"
       end
 
       it_should_behave_like 'one attribute found'
     end
   end
-
-  context 'looking at the YAML' do
-    before :each do
-      @attr = 'prop'
-      src = <<EOS
-module Fred
-  attr_writer :#{@attr}
-end
-EOS
-      @ctx = ModuleContext.from_s(src)
-      @detector.examine_context(@ctx)
-      warning = @detector.smells_found.to_a[0]   # SMELL: too cumbersome!
-      @yaml = warning.to_yaml
-    end
-    it 'reports the attribute' do
-      @yaml.should match(/attribute:\s*#{@attr}/)
-    end
-    it 'reports the declaration line number' do
-      @yaml.should match(/lines:[\s-]*3/)
-    end
-  end
 end