kevinrutherford-reek 1.1.2 → 1.1.2.1

data/History.txt

@@ -1,5 +1,10 @@
 == 1.2.0 (In progress)
 
+== Fixes
+* LargeClass now relies only on the given source code (#26)
+
+== 1.1.2 2009-05-18
+
 === Major Enhancements
 * Switched from ParseTree to ruby_parser for source code parsing
 * 'MyClass.should_not reek' now only possible if ParseTree gem installed

data/config/defaults.reek

@@ -1,11 +1,8 @@
 --- 
 LargeClass: 
   max_methods: 25
-  exclude: 
-  - Array
-  - Hash
-  - Module
-  - String
+  exclude: []
+
   enabled: true
   max_instance_variables: 9
 LongParameterList: 

data/lib/reek.rb

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

data/lib/reek/class_context.rb

@@ -2,10 +2,6 @@ require 'set'
 require 'reek/code_context'
 
 class Class
-  def non_inherited_methods
-    instance_methods(false) + private_instance_methods(false)
-  end
-
   def is_overriding_method?(sym)
     instance_methods(false).include?(sym) and superclass.instance_methods(true).include?(sym)
   end
@@ -47,8 +43,7 @@ module Reek
     end
 
     def num_methods
-      meths = myself ? @myself.non_inherited_methods : @parsed_methods
-      meths.length
+      @parsed_methods.length
     end
 
     def record_instance_variable(sym)

data/lib/reek/code_parser.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'sexp_processor'
+require 'sexp'
 require 'reek/block_context'
 require 'reek/class_context'
 require 'reek/module_context'
@@ -11,31 +11,24 @@ require 'reek/yield_call_context'
 
 module Reek
 
-  class CodeParser < SexpProcessor
+  class CodeParser
 
-    def self.unify(sexp)   # :nodoc:
-      unifier = Unifier.new
-      unifier.processors.each do |proc|
-        proc.unsupported.delete :cfunc # HACK
-      end
-      return unifier.process(sexp[0])
-    end
-
-    # Creates a new Ruby code checker. Any smells discovered by
-    # +check_source+ or +check_object+ will be stored in +report+.
+    # Creates a new Ruby code checker. Any smells discovered
+    # will be stored in +report+.
     def initialize(report, smells, ctx = StopContext.new)
-      super()
       @report = report
       @smells = smells
       @element = ctx
-      @unsupported -= [:cfunc]
-      @default_method = :process_default
-      @require_empty = @warn_on_default = false
+    end
+
+    def process(exp)
+      meth = "process_#{exp[0]}"
+      meth = :process_default unless self.respond_to?(meth)
+      self.send(meth, exp)
     end
 
     def process_default(exp)
       exp[0..-1].each { |sub| process(sub) if Array === sub }
-      s(exp)
     end
 
     def process_module(exp)
@@ -43,7 +36,6 @@ module Reek
         process_default(exp)
         check_smells(:module)
       end
-      s(exp)
     end
 
     def process_class(exp)
@@ -51,7 +43,6 @@ module Reek
         process_default(exp) unless @element.is_struct?
         check_smells(:class)
       end
-      s(exp)
     end
 
     def process_defn(exp)
@@ -64,18 +55,15 @@ module Reek
 
     def process_args(exp)
       exp[1..-1].each {|sym| @element.record_parameter(sym) }
-      s(exp)
     end
 
     def process_attrset(exp)
       @element.record_depends_on_self if /^@/ === exp[1].to_s
-      s(exp)
     end
 
     def process_lit(exp)
       val = exp[1]
       @element.record_depends_on_self if val == :self
-      s(exp)
     end
 
     def process_iter(exp)
@@ -109,12 +97,10 @@ module Reek
 
     def process_cfunc(exp)
       @element.record_depends_on_self
-      s(exp)
     end
 
     def process_vcall(exp)
       @element.record_use_of_self
-      s(exp)
     end
 
     def process_attrasgn(exp)
@@ -135,8 +121,7 @@ module Reek
 
     def process_lasgn(exp)
       @element.record_local_variable(exp[1])
-      process(exp[2])
-      s(exp)
+      process_default(exp)
     end
 
     def process_iasgn(exp)
@@ -147,7 +132,6 @@ module Reek
 
     def process_self(exp)
       @element.record_depends_on_self
-      s(exp)
     end
 
     def self.count_statements(exp)
@@ -173,7 +157,6 @@ module Reek
         process_default(exp)
         check_smells(type)
       end
-      s(exp)
     end
 
     def check_smells(type)
@@ -189,7 +172,6 @@ module Reek
     
     def pop(exp)
       @element = @element.outer
-      s(exp)
     end
   end
 end

data/lib/reek/object_source.rb

@@ -11,6 +11,15 @@ module Reek
   end
 
   class ObjectSource < Source   # :nodoc:
+
+    def self.unify(sexp)   # :nodoc:
+      unifier = Unifier.new
+      unifier.processors.each do |proc|
+        proc.unsupported.delete :cfunc # HACK
+      end
+      return unifier.process(sexp[0])
+    end
+
     def can_parse_objects?
       return true if Object.const_defined?(:ParseTree)
       begin
@@ -21,10 +30,9 @@ module Reek
       end
     end
 
-    def check(parser) # :nodoc:
+    def generate_syntax_tree
       if can_parse_objects?
-        sexp = CodeParser.unify(ParseTree.new.parse_tree(@source))
-        parser.process(sexp)
+        ObjectSource.unify(ParseTree.new.parse_tree(@source))
       else
         throw ArgumentError.new('You must install the ParseTree gem to use this feature')
       end

data/lib/reek/smells/large_class.rb

@@ -32,7 +32,7 @@ module Reek
         super.adopt(
           MAX_ALLOWED_METHODS_KEY => 25,
           MAX_ALLOWED_IVARS_KEY => 9,
-          EXCLUDE_KEY => ['Array', 'Hash', 'Module', 'String']
+          EXCLUDE_KEY => []
           )
       end
 

data/lib/reek/source.rb

@@ -65,9 +65,8 @@ module Reek
       @cf = @cf.load_local(dir) if dir
     end
 
-    def check(parser) # :nodoc:
-      sexp = RubyParser.new.parse(@source, @desc)
-      parser.process(sexp)
+    def generate_syntax_tree
+      RubyParser.new.parse(@source, @desc) || s()
     end
 
     #
@@ -78,7 +77,8 @@ module Reek
     def report
       unless @report
         @report = Report.new
-        check(CodeParser.new(@report, @cf.smell_listeners))
+        parser = CodeParser.new(@report, @cf.smell_listeners)
+        parser.process(generate_syntax_tree)
       end
       @report
     end

data/reek.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.1.2"
+  s.version = "1.1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]

data/spec/reek/class_context_spec.rb

@@ -39,46 +39,6 @@ EOEX
   end
 end
 
-describe Class do
-  
-  module Insert
-    def meth_a() end
-  private
-    def meth_b() end
-  protected
-    def meth_c() end
-  end
-
-  class Parent
-    def meth1() end
-  private
-    def meth2() end
-  protected
-    def meth3() end
-  end
-  
-  class FullChild < Parent
-    include Insert
-    def meth7() end
-  private
-    def meth8() end
-  protected
-    def meth6() end
-  end
-
-  describe 'with no superclass or modules' do
-    it 'should report correct number of methods' do
-      Parent.non_inherited_methods.length.should == 3
-    end
-  end
-
-  describe 'with superclass and modules' do
-    it 'should report correct number of methods' do
-      FullChild.non_inherited_methods.length.should == 3
-    end
-  end
-end
-
 describe ClassContext, 'overridden methods' do
   class Above
     def above() end

data/spec/slow/inline_spec.rb

@@ -21,7 +21,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:Duplication, /Inline::self.rootdir/, /env.nil?/)
     ruby.should reek_of(:Duplication, /Module#inline/, /Inline.const_get\(lang\)/)
     ruby.should reek_of(:FeatureEnvy, /Inline::C#strip_comments/, /src/)
-    ruby.should reek_of(:LargeClass, /Inline::C/, /methods/)
     ruby.should reek_of(:LargeClass, /Inline::C/, /instance variables/)
     ruby.should reek_of(:LongMethod, /File#self.write_with_backup/)
     ruby.should reek_of(:LongMethod, /Inline::C#build/)
@@ -39,6 +38,6 @@ describe 'sample gem source code' do
     ruby.should reek_of(:UncommunicativeName, /Inline::C#module_name/, /'x'/)
     ruby.should reek_of(:UncommunicativeName, /Inline::C#parse_signature/, /'x'/)
     ruby.should reek_of(:UtilityFunction, /Inline::C#strip_comments/)
-    ruby.report.should have_at_most(36).smells
+    ruby.report.should have_at_most(35).smells
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kevinrutherford-reek
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.2.1
 platform: ruby
 authors: 
 - Kevin Rutherford