reek 1.2.1 → 1.2.3

data/lib/reek/tree_dresser.rb

@@ -0,0 +1,74 @@
+module Reek
+
+  #
+  # Extensions to +Sexp+ to allow +CodeParser+ to navigate the abstract
+  # syntax tree more easily.
+  #
+  module SexpNode
+    def children
+      find_all { |item| Sexp === item }
+    end
+
+    def is_language_node?
+      first.class == Symbol
+    end
+
+    def has_type?(type)
+      is_language_node? and first == type
+    end
+
+    #
+    # Carries out a depth-first traversal of this syntax tree, yielding
+    # every Sexp of type +target_type+. The traversal ignores any node
+    # whose type is listed in the Array +ignoring+.
+    #
+    def look_for(target_type, ignoring, &blk)
+      each do |elem|
+        if Sexp === elem then
+          elem.look_for(target_type, ignoring, &blk) unless ignoring.include?(elem.first)
+        end
+      end
+      blk.call(self) if first == target_type
+    end
+  end
+
+  module CvarNode
+    def name
+      self[1]
+    end
+  end
+
+  module IfNode
+    def condition
+      self[1]
+    end
+  end
+
+  module CaseNode
+    def condition
+      self[1]
+    end
+  end
+
+  class TreeDresser
+    # SMELL: Duplication
+    # Put these into a new module and build the mapping automagically
+    # based on the node type
+    EXTENSIONS = {
+      :cvar => CvarNode,
+      :cvasgn => CvarNode,
+      :cvdecl => CvarNode,
+      :if => IfNode,
+      :case => CaseNode,
+    }
+
+    def dress(sexp)
+      sexp.extend(SexpNode)
+      if EXTENSIONS.has_key?(sexp[0])
+        sexp.extend(EXTENSIONS[sexp[0]])
+      end
+      sexp[0..-1].each { |sub| dress(sub) if Array === sub }
+      sexp
+    end
+  end
+end

data/lib/reek.rb

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

data/reek.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.2.1"
+  s.version = "1.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2009-10-03}
+  s.date = %q{2009-11-02}
   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.rdoc"]
-  s.files = ["History.txt", "License.txt", "README.rdoc", "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/command_line.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/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/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/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/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/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/reek/stop_context_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 = ["History.txt", "License.txt", "README.rdoc", "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", "lib/reek.rb", "lib/reek/adapters/application.rb", "lib/reek/adapters/command_line.rb", "lib/reek/adapters/config_file.rb", "lib/reek/adapters/core_extras.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/configuration.rb", "lib/reek/detector_stack.rb", "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/attribute.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/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/tree_dresser.rb", "lib/reek/yield_call_context.rb", "reek.gemspec", "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/attribute_spec.rb", "spec/reek/smells/behaves_like_variable_detector.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/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/reek/stop_context_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/should_reek_of_spec.rb

@@ -8,8 +8,14 @@ include Reek::Spec
 
 # belongs in its own spec file
 describe ReekMatcher do
+  before :each do
+    smelly_code = Dir['spec/samples/two_smelly_files/*.rb']
+    @sniffers = smelly_code.sniff.sniffers
+    @full = FullReport.new(@sniffers, '%c %w (%s)', false).report
+  end
+
   it 'reports quietly' do
-    @smelly_code = 'def x() y = 4; end'
+    ReekMatcher.create_reporter(@sniffers).should_not == @full
   end
 end
 

data/spec/reek/block_context_spec.rb

@@ -9,37 +9,37 @@ describe BlockContext do
 
   it "should record single parameter" do
     element = StopContext.new
-    element = BlockContext.new(element, s(s(:lasgn, :x), nil))
+    element = BlockContext.new(element, s(:iter, nil, s(:lasgn, :x), nil))
     element.variable_names.should == [Name.new(:x)]
   end
 
   it "should record single parameter within a method" do
     element = StopContext.new
     element = MethodContext.new(element, s(:defn, :help))
-    element = BlockContext.new(element, s(s(:lasgn, :x), nil))
+    element = BlockContext.new(element, s(:iter, nil, s(:lasgn, :x), nil))
     element.variable_names.should == [Name.new(:x)]
   end
 
   it "records multiple parameters" do
     element = StopContext.new
-    element = BlockContext.new(element, s(s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))), nil))
+    element = BlockContext.new(element, s(:iter, nil, s(:masgn, s(:array, s(:lasgn, :x), s(:lasgn, :y))), nil))
     element.variable_names.should == [Name.new(:x), Name.new(:y)]
   end
 
   it "should not pass parameters upward" do
     mc = MethodContext.new(StopContext.new, s(:defn, :help, s(:args)))
-    element = BlockContext.new(mc, s(s(:lasgn, :x)))
+    element = BlockContext.new(mc, s(:iter, nil, s(:lasgn, :x)))
     mc.variable_names.should be_empty
   end
 
   it 'records local variables' do
-    bctx = BlockContext.new(StopContext.new, nil)
+    bctx = BlockContext.new(StopContext.new, s(nil, nil))
     bctx.record_local_variable(:q2)
     bctx.variable_names.should include(Name.new(:q2))
   end
 
   it 'copes with a yield to an ivar' do
-    scope = BlockContext.new(StopContext.new, [s(:iasgn, :@list), s(:self)])
+    scope = BlockContext.new(StopContext.new, s(:iter, nil, s(:iasgn, :@list), s(:self)))
     scope.record_instance_variable(:@list)
     scope.variable_names.should == [:@list]
   end

data/spec/reek/class_context_spec.rb

@@ -150,33 +150,12 @@ describe CodeContext, 'find class' do
 end
 
 describe ClassContext do
-  it 'should not report empty class in another module' do
+  it 'does not report empty class in another module' do
     'class Treetop::Runtime::SyntaxNode; end'.should_not reek
   end
 
-  it 'should deal with :: scoped names' do
+  it 'deals with :: scoped names' 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/code_context_spec.rb

@@ -9,85 +9,167 @@ require 'reek/stop_context'
 
 include Reek
 
-describe CodeContext, 'to_s' do
-
-  it "should report full context" do
-    element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    element = ClassContext.new(element, [0, :klass])
-    element = MethodContext.new(element, [0, :bad])
-    element = BlockContext.new(element, nil)
-    element.to_s.should match(/bad/)
-    element.to_s.should match(/klass/)
-    element.to_s.should match(/mod/)
-  end
+describe CodeContext do
+  context 'to_s' do
+    it "reports the full context" do
+      element = StopContext.new
+      element = ModuleContext.new(element, Name.new(: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.to_s.should match(/bad/)
+      element.to_s.should match(/klass/)
+      element.to_s.should match(/mod/)
+    end
 
-  it "should report method name via if context" do
-    element1 = StopContext.new
-    element2 = MethodContext.new(element1, [0, :bad])
-    element3 = IfContext.new(element2, [0,1])
-    BlockContext.new(element3, nil).to_s.should match(/bad/)
-  end
+    it 'reports the method name via if context' do
+      element1 = StopContext.new
+      element2 = MethodContext.new(element1, [0, :bad])
+      element3 = IfContext.new(element2, [0,1])
+      BlockContext.new(element3, s(nil, nil)).to_s.should match(/bad/)
+    end
 
-  it "should report method name via nested blocks" do
-    element1 = StopContext.new
-    element2 = MethodContext.new(element1, [0, :bad])
-    element3 = BlockContext.new(element2, nil)
-    BlockContext.new(element3, nil).to_s.should match(/bad/)
+    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)).to_s.should match(/bad/)
+    end
   end
-end
 
-describe CodeContext, 'instance variables' do
-  it 'should pass instance variables down to the first class' do
-    element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    class_element = ClassContext.new(element, [0, :klass])
-    element = MethodContext.new(class_element, [0, :bad])
-    element = BlockContext.new(element, nil)
-    element.record_instance_variable(:fred)
-    class_element.variable_names.size.should == 1
-    class_element.variable_names.should include(Name.new(:fred))
+  context 'instance variables' do
+    it 'should pass instance variables down to the first class' do
+      element = StopContext.new
+      element = ModuleContext.new(element, Name.new(: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.record_instance_variable(:fred)
+      class_element.variable_names.size.should == 1
+      class_element.variable_names.should include(Name.new(:fred))
+    end
   end
-end
 
-describe CodeContext, 'generics' do
-  it 'should pass unknown method calls down the stack' do
-    stop = StopContext.new
-    def stop.bananas(arg1, arg2) arg1 + arg2 + 43 end
-    element = ModuleContext.new(stop, Name.new(:mod))
-    class_element = ClassContext.new(element, [0, :klass])
-    element = MethodContext.new(class_element, [0, :bad])
-    element = BlockContext.new(element, nil)
-    element.bananas(17, -5).should == 55
+  context 'generics' do
+    it 'should pass unknown method calls down the stack' do
+      stop = StopContext.new
+      def stop.bananas(arg1, arg2) arg1 + arg2 + 43 end
+      element = ModuleContext.new(stop, Name.new(: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
-end
 
-describe CodeContext do
-  it 'should recognise itself in a collection of names' do
-    element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    element.matches?(['banana', 'mod']).should == true
-  end
+  context 'name matching' do
+    it 'should recognise itself in a collection of names' do
+      element = StopContext.new
+      element = ModuleContext.new(element, Name.new(: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, Name.new(: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, Name.new(:mod))
-    element.matches?([/banana/, /mod/]).should == true
+    it 'should recognise its fq name in a collection of names' do
+      element = StopContext.new
+      element = ModuleContext.new(element, Name.new(: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, Name.new(: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
 
-  it 'should recognise its fq name in a collection of names' do
-    element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    element = ClassContext.create(element, [0, :klass])
-    element.matches?(['banana', 'mod']).should == true
-    element.matches?(['banana', 'mod::klass']).should == true
+  context 'enumerating syntax elements' do
+    context 'in an empty module' do
+      before :each do
+        @module_name = 'Emptiness'
+        src = "module #{@module_name}; end"
+        ast = src.to_reek_source.syntax_tree
+        @ctx = CodeContext.new(nil, ast)
+      end
+      it 'yields no calls' do
+        @ctx.each(:call, []) {|exp| raise "#{exp} yielded by empty module!"}
+      end
+      it 'yields one module' do
+        mods = 0
+        @ctx.each(:module, []) {|exp| mods += 1}
+        mods.should == 1
+      end
+      it "yields the module's full AST" do
+        @ctx.each(:module, []) {|exp| exp[1].should == @module_name.to_sym}
+      end
+
+      context 'with no block' do
+        it 'returns an empty array of ifs' do
+          @ctx.each(:if, []).should be_empty
+        end
+      end
+    end
+
+    context 'with a nested element' do
+      before :each do
+        @module_name = 'Loneliness'
+        @method_name = 'calloo'
+        src = "module #{@module_name}; def #{@method_name}; puts('hello') end; end"
+        ast = src.to_reek_source.syntax_tree
+        @ctx = CodeContext.new(nil, ast)
+      end
+      it 'yields no ifs' do
+        @ctx.each(:if, []) {|exp| raise "#{exp} yielded by empty module!"}
+      end
+      it 'yields one module' do
+        @ctx.each(:module, []).length.should == 1
+      end
+      it "yields the module's full AST" do
+        @ctx.each(:module, []) {|exp| exp[1].should == @module_name.to_sym}
+      end
+      it 'yields one method' do
+        @ctx.each(:defn, []).length.should == 1
+      end
+      it "yields the method's full AST" do
+        @ctx.each(:defn, []) {|exp| exp[1].should == @method_name.to_sym}
+      end
+
+      context 'pruning the traversal' do
+        it 'ignores the call inside the method' do
+          @ctx.each(:call, [:defn]).should be_empty
+        end
+      end
+    end
+
+    it 'finds 3 ifs 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
 
-  it 'should recognise its fq name in a collection of names' do
-    element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    element = ClassContext.create(element, [0, :klass])
-    element.matches?([/banana/, /mod/]).should == true
-    element.matches?([/banana/, /mod::klass/]).should == true
+      ast = src.to_reek_source.syntax_tree
+      ctx = CodeContext.new(nil, ast)
+      ctx.each(:if, []).length.should == 3
+    end
   end
 end

data/spec/reek/code_parser_spec.rb

@@ -5,22 +5,22 @@ require 'reek/code_parser'
 include Reek
 
 describe CodeParser, "with no method definitions" do
-  it 'should report no problems for empty source code' do
+  it 'reports no problems for empty source code' do
     ''.should_not reek
   end
-  it 'should report no problems for empty class' do
+  it 'reports no problems for empty class' do
     'class Fred; end'.should_not reek
   end
 end
 
 describe CodeParser, 'with a global method definition' do
-  it 'should report no problems for simple method' do
+  it 'reports no problems for simple method' do
     'def Outermost::fred() true; end'.should_not reek
   end
 end
 
 describe CodeParser, 'when a yield is the receiver' do
-  it 'should report no problems' do
+  it 'reports no problems' do
     source = 'def values(*args)
   @to_sql += case
     when block_given? then " #{yield.to_sql}"
@@ -39,105 +39,89 @@ describe CodeParser do
 end
 
 describe CodeParser do
-  context 'with no class variables' do
+  context 'with no attributes' do
     it 'records nothing in the class' do
       klass = ClassContext.from_s('class Fred; end')
-      klass.class_variables.should be_empty
+      klass.attributes.should be_empty
     end
     it 'records nothing in the module' do
       ctx = ModuleContext.from_s('module Fred; end')
-      ctx.class_variables.should be_empty
+      ctx.attributes.should be_empty
     end
   end
 
-  context 'with one class variable' do
-    shared_examples_for 'one variable found' do
-      it 'records the class variable' do
-        @ctx.class_variables.should include(Name.new(:@@tools))
+  context 'with one attribute' do
+    shared_examples_for 'one attribute found' do
+      it 'records the attribute' do
+        @ctx.attributes.should include(Name.new(:property))
       end
-      it 'records only that class variable' do
-        @ctx.class_variables.length.should == 1
+      it 'records only that attribute' do
+        @ctx.attributes.length.should == 1
       end
     end
 
     context 'declared in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; @@tools = {}; end')
+        @ctx = ClassContext.from_s('class Fred; attr :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'used in a class' do
+    context 'reader in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; def jim() @@tools = {}; end; end')
+        @ctx = ClassContext.from_s('class Fred; attr_reader :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'indexed in a class' do
+    context 'writer in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; def jim() @@tools[mash] = {}; end; end')
+        @ctx = ClassContext.from_s('class Fred; attr_writer :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'declared and used in a class' do
+    context 'accessor in a class' do
       before :each do
-        @ctx = ClassContext.from_s('class Fred; @@tools = {}; def jim() @@tools = {}; end; end')
+        @ctx = ClassContext.from_s('class Fred; attr_accessor :property; end')
       end
 
-      it_should_behave_like 'one variable found'
-    end
-
-    context 'used twice in a class' do
-      before :each do
-        @ctx = ClassContext.from_s('class Fred; def jeff() @@tools = {}; end; def jim() @@tools = {}; end; end')
-      end
-
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
     context 'declared in a module' do
       before :each do
-        @ctx = ClassContext.from_s('module Fred; @@tools = {}; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
-
-    context 'used in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; def jim() @@tools = {}; end; end')
+        @ctx = ModuleContext.from_s('module Fred; attr :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'indexed in a module' do
+    context 'reader in a module' do
       before :each do
-        @ctx = ClassContext.from_s('module Fred; def jim() @@tools[mash] = {}; end; end')
+        @ctx = ModuleContext.from_s('module Fred; attr_reader :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'declared and used in a module' do
+    context 'writer in a module' do
       before :each do
-        @ctx = ClassContext.from_s('module Fred; @@tools = {}; def jim() @@tools = {}; end; end')
+        @ctx = ModuleContext.from_s('module Fred; attr_writer :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
 
-    context 'used twice in a module' do
+    context 'accessor in a module' do
       before :each do
-        @ctx = ClassContext.from_s('module Fred; def jeff() @@tools = {}; end; def jim() @@tools = {}; end; end')
+        @ctx = ModuleContext.from_s('module Fred; attr_accessor :property; end')
       end
 
-      it_should_behave_like 'one variable found'
+      it_should_behave_like 'one attribute found'
     end
   end
 end

data/spec/reek/method_context_spec.rb

@@ -7,7 +7,7 @@ include Reek
 
 describe MethodContext, 'matching' do
   before :each do
-    @element = MethodContext.new(StopContext.new, [0, :mod])
+    @element = MethodContext.new(StopContext.new, s(0, :mod), s(:module, :mod, nil))
   end
 
   it 'should recognise itself in a collection of names' do
@@ -24,9 +24,9 @@ end
 describe MethodContext, 'matching fq names' do
   before :each do
     element = StopContext.new
-    element = ModuleContext.new(element, Name.new(:mod))
-    element = ClassContext.new(element, Name.new(:klass))
-    @element = MethodContext.new(element, [0, :meth])
+    element = ModuleContext.new(element, Name.new(:mod), s(:module, :mod, nil))
+    element = ClassContext.new(element, Name.new(:klass), s())
+    @element = MethodContext.new(element, s(0, :meth))
   end
 
   it 'should recognise itself in a collection of names' do