@@ -15,10 +15,9 @@ module Reek attr_reader :parsed_methods - # SMELL: inconsistent with other contexts (not linked to the sexp) - def initialize(outer, name, exp = nil) - super(outer, name, exp) - @superclass = exp[2] if exp + def initialize(outer, name, exp) + super + @superclass = exp[2] @instance_variables = Set.new end @@ -31,10 +30,6 @@ module Reek @superclass == [:const, :Struct] end - def num_methods - @parsed_methods.length - end - def record_instance_variable(sym) @instance_variables << Name.new(sym) end lib/reek/class_context.rb @@ -14,7 +14,7 @@ describe CodeContext 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]) + 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/) @@ -41,7 +41,7 @@ describe CodeContext 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]) + 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) @@ -55,7 +55,7 @@ describe CodeContext 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]) + 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 spec/reek/code_context_spec.rb @@ -25,7 +25,7 @@ describe MethodContext, 'matching fq names' do before :each do element = StopContext.new element = ModuleContext.new(element, Name.new(:mod), s(:module, :mod, nil)) - element = ClassContext.new(element, Name.new(:klass)) + element = ClassContext.new(element, Name.new(:klass), s()) @element = MethodContext.new(element, s(0, :meth)) end spec/reek/method_context_spec.rb @@ -78,17 +78,6 @@ EOS end context 'counting methods' do - it 'should not report empty class' do - ClassContext.from_s('class Empty;end').num_methods.should == 0 - end - - it 'should count 1 method' do - ClassContext.from_s('class Empty;def ivars() @aa=@ab; end;end').num_methods.should == 1 - end - - it 'should count 2 methods' do - ClassContext.from_s('class Empty;def meth1() @aa=@ab;end;def meth2() @aa=@ab;end;end').num_methods.should == 2 - end it 'should not report 25 methods' do src = <<EOS spec/reek/smells/large_class_spec.rb 99b08be1818e41dc4d36bc4fe474370ae7ffbb26 Kevin Rutherford kevin@rutherford-software.com http://github.com/kevinrutherford/reek/commit/5dcd8e461ec507d88a48fdb7f1e9e8fa6eac3ed1 5dcd8e461ec507d88a48fdb7f1e9e8fa6eac3ed1 2009-11-02T07:18:23-08:00 2009-11-02T07:18:23-08:00 Refactored away some redundant methods 9abc1087e3d3dd08176a86be97b0ef57ed2d2f1c Kevin Rutherford kevin@rutherford-software.com