reek 1.2.7 → 1.2.7.1

data/History.txt

@@ -1,4 +1,9 @@
-== 1.2.7 (in development)
+== 1.2.7.1 (in development)
+
+=== Minor Changes
+* Fixed crash on a case statement with no condition (#58)
+
+== 1.2.7 (2010-02-01)
 
 === Major Changes
 * New option --yaml reports smells in YAML format

data/lib/reek.rb

@@ -2,7 +2,7 @@
 # Reek's core functionality
 #
 module Reek
-  VERSION = '1.2.7'
+  VERSION = '1.2.7.1'
 end
 
 require File.join(File.dirname(File.expand_path(__FILE__)), 'reek', 'examiner')

data/lib/reek/smells/control_couple.rb

@@ -63,6 +63,7 @@ module Reek
       def control_parameters(method_ctx)
         params = method_ctx.exp.parameter_names
         result = Hash.new {|hash,key| hash[key] = []}
+        return result if params.empty?
         method_ctx.local_nodes(:if) do |if_node|
           cond = if_node[1]
           if cond[0] == :lvar and params.include?(cond[1])

data/lib/reek/smells/simulated_polymorphism.rb

@@ -61,14 +61,14 @@ module Reek
       # the given syntax tree together with the number of times each
       # occurs. Ignores nested classes and modules.
       #
-      def conditional_counts(klass)
+      def conditional_counts(sexp)
         result = Hash.new {|hash,key| hash[key] = []}
         collector = proc { |node|
           condition = node.condition
-          next if condition == s(:call, nil, :block_given?, s(:arglist))
+          next if condition.nil? or condition == s(:call, nil, :block_given?, s(:arglist))
           result[condition].push(condition.line)
         }
-        [:if, :case].each {|stmt| klass.local_nodes(stmt, &collector) }
+        [:if, :case].each {|stmt| sexp.local_nodes(stmt, &collector) }
         result
       end
     end

data/reek.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{reek}
-  s.version = "1.2.7"
+  s.version = "1.2.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Rutherford"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-03}
   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.

data/spec/reek/smells/class_variable_spec.rb

@@ -10,6 +10,7 @@ include Reek::Smells
 describe ClassVariable do
   before :each do
     @detector = ClassVariable.new('raffles')
+    @class_variable = '@@things'
   end
 
   context 'with no class variables' do
@@ -25,99 +26,62 @@ describe ClassVariable do
 
   context 'with one class variable' do
     shared_examples_for 'one variable found' do
-      it 'records the class variable' do
-        @detector.class_variables_in(@ctx).should include(:@@tools)
+      before :each do
+        @detector.examine_context(@ctx)
+        @smells = @detector.smells_found
       end
       it 'records only that class variable' do
-        @detector.class_variables_in(@ctx).length.should == 1
+        @smells.length.should == 1
       end
-      it 'records the variable in the YAML report' do
-        @detector.examine_context(@ctx)
-        @detector.smells_found.each do |warning|
-          warning.to_yaml.should match(/variable:[\s]*"@@tools"/)
+      it 'records the variable name' do
+        @smells.each do |warning|
+          warning.smell['variable'].should == @class_variable
         end
       end
     end
 
-    context 'declared in a class' do
-      before :each do
-        @ctx = ClassContext.from_s('class Fred; @@tools = {}; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
-
-    context 'used in a class' do
-      before :each do
-        @ctx = ClassContext.from_s('class Fred; def jim() @@tools = {}; end; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
-
-    context 'indexed in a class' do
-      before :each do
-        @ctx = ClassContext.from_s('class Fred; def jim() @@tools[mash] = {}; end; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
-
-    context 'declared and used in a class' do
-      before :each do
-        @ctx = ClassContext.from_s('class Fred; @@tools = {}; def jim() @@tools = {}; end; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
+    ['class', 'module'].each do |scope|
+      context "declared in a #{scope}" do
+        before :each do
+          @ctx = ClassContext.from_s("#{scope} Fred; #{@class_variable} = {}; end")
+        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')
+        it_should_behave_like 'one variable found'
       end
 
-      it_should_behave_like 'one variable found'
-    end
+      context "used in a #{scope}" do
+        before :each do
+          @ctx = ClassContext.from_s("#{scope} Fred; def jim() #{@class_variable} = {}; end; end")
+        end
 
-    context 'declared in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; @@tools = {}; end')
+        it_should_behave_like 'one variable found'
       end
 
-      it_should_behave_like 'one variable found'
-    end
+      context "indexed in a #{scope}" do
+        before :each do
+          @ctx = ClassContext.from_s("#{scope} Fred; def jim() #{@class_variable}[mash] = {}; end; end")
+        end
 
-    context 'used in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; def jim() @@tools = {}; end; end')
+        it_should_behave_like 'one variable found'
       end
 
-      it_should_behave_like 'one variable found'
-    end
+      context "declared and used in a #{scope}" do
+        before :each do
+          @ctx = ClassContext.from_s("#{scope} Fred; #{@class_variable} = {}; def jim() #{@class_variable} = {}; end; end")
+        end
 
-    context 'indexed in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; def jim() @@tools[mash] = {}; end; end')
+        it_should_behave_like 'one variable found'
       end
 
-      it_should_behave_like 'one variable found'
-    end
+      context "used twice in a #{scope}" do
+        before :each do
+          @ctx = ClassContext.from_s("#{scope} Fred; def jeff() #{@class_variable} = {}; end; def jim() #{@class_variable} = {}; end; end")
+        end
 
-    context 'declared and used in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; @@tools = {}; def jim() @@tools = {}; end; end')
+        it_should_behave_like 'one variable found'
       end
-
-      it_should_behave_like 'one variable found'
     end
 
-    context 'used twice in a module' do
-      before :each do
-        @ctx = ClassContext.from_s('module Fred; def jeff() @@tools = {}; end; def jim() @@tools = {}; end; end')
-      end
-
-      it_should_behave_like 'one variable found'
-    end
   end
 
   it_should_behave_like 'SmellDetector'

data/spec/reek/smells/simulated_polymorphism_spec.rb

@@ -30,6 +30,14 @@ describe SimulatedPolymorphism do
     end
   end
 
+  context 'with an empty condition' do
+    it 'does not record the condition' do
+      ast = 'def fred() case; when 3; end; end'.to_reek_source.syntax_tree
+      ctx = CodeContext.new(nil, ast)
+      @detector.conditional_counts(ctx).length.should == 0
+    end
+  end
+
   context 'with three identical conditionals' do
     before :each do
       @cond = '@field == :sym'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: reek
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.7.1
 platform: ruby
 authors: 
 - Kevin Rutherford
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +00:00
+date: 2010-02-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency