reek 1.4.0 → 1.5.0

data/spec/reek/source/sexp_formatter_spec.rb

@@ -11,8 +11,20 @@ describe SexpFormatter do
     end
 
     it 'formats a more complex s-expression' do
-      result = SexpFormatter.format s(:call, nil, :foo, s(:arglist, s(:lvar, :bar)))
+      result = SexpFormatter.format s(:send, nil, :foo, s(:lvar, :bar))
       expect(result).to eq('foo(bar)')
     end
+
+    it 'reduces very large ASTs to a single line' do
+      ast = s(:if,
+              s(:send, nil, :foo),
+              s(:send, nil, :bar),
+              s(:begin,
+                s(:send, nil, :baz),
+                s(:send, nil, :qux)))
+      result = SexpFormatter.format ast
+
+      expect(result).to eq 'if foo ... end'
+    end
   end
 end

data/spec/reek/source/sexp_node_spec.rb

@@ -7,20 +7,20 @@ describe SexpNode do
   context 'format' do
     it 'formats self' do
       @node = s(:self)
-      @node.extend(SexpNode)
       expect(@node.format_ruby).to eq('self')
     end
   end
 
   context 'hash' do
     it 'hashes equal for equal sexps' do
-      node1 = ast(:defn, s(:const2, :Fred, :jim), s(:call, :+, s(:lit, 4), :fred))
-      node2 = ast(:defn, s(:const2, :Fred, :jim), s(:call, :+, s(:lit, 4), :fred))
+      node1 = s(:def, :jim, s(:args), s(:send, s(:int, 4), :+, s(:send, nil, :fred)))
+      node2 = s(:def, :jim, s(:args), s(:send, s(:int, 4), :+, s(:send, nil, :fred)))
       expect(node1.hash).to eq(node2.hash)
     end
+
     it 'hashes diferent for diferent sexps' do
-      node1 = ast(:defn, s(:const2, :Fred, :jim), s(:call, :+, s(:lit, 4), :fred))
-      node2 = ast(:defn, s(:const2, :Fred, :jim), s(:call, :+, s(:lit, 3), :fred))
+      node1 = s(:def, :jim, s(:args), s(:send, s(:int, 4), :+, s(:send, nil, :fred)))
+      node2 = s(:def, :jim, s(:args), s(:send, s(:int, 3), :+, s(:send, nil, :fred)))
       expect(node1.hash).not_to eq(node2.hash)
     end
   end

data/spec/reek/source/source_code_spec.rb

@@ -5,6 +5,14 @@ require 'reek/source/source_code'
 include Reek::Source
 
 describe SourceCode do
+  describe '#syntax_tree' do
+    it 'associates comments with the AST' do
+      source_code = SourceCode.new("# this is\n# a comment\ndef foo; end", '(string)')
+      result = source_code.syntax_tree
+      expect(result.comments).to eq "# this is\n# a comment"
+    end
+  end
+
   context 'when the parser fails' do
     let(:source_name) { 'Test source' }
     let(:error_message) { 'Error message' }
@@ -23,7 +31,7 @@ describe SourceCode do
       end
 
       it 'returns an empty syntax tree' do
-        expect(src.syntax_tree).to eq(s())
+        expect(src.syntax_tree).to eq(s(:empty))
       end
 
       it 'records the syntax error' do
@@ -42,11 +50,13 @@ describe SourceCode do
       end
     end
 
-    context 'with a RubyParser::SyntaxError' do
-      let(:error_class) { RubyParser::SyntaxError }
+    context 'with a Parser::SyntaxError' do
+      let(:error_class) { Parser::SyntaxError }
+      let(:diagnostic) { double('diagnostic', message: error_message) }
 
       before do
-        allow(parser).to receive(:parse).and_raise(error_class.new(error_message))
+        allow(parser).to receive(:parse_with_comments).
+          and_raise error_class.new(diagnostic)
       end
 
       it_should_behave_like 'handling and recording the error'
@@ -56,7 +66,8 @@ describe SourceCode do
       let(:error_class) { Racc::ParseError }
 
       before do
-        allow(parser).to receive(:parse).and_raise(error_class.new(error_message))
+        allow(parser).to receive(:parse_with_comments).
+          and_raise(error_class.new(error_message))
       end
 
       it_should_behave_like 'handling and recording the error'
@@ -66,7 +77,8 @@ describe SourceCode do
       let(:error_class) { RuntimeError }
 
       before do
-        allow(parser).to receive(:parse).and_raise(error_class.new(error_message))
+        allow(parser).to receive(:parse_with_comments).
+          and_raise(error_class.new(error_message))
       end
 
       it 'raises the error' do

data/spec/reek/source/tree_dresser_spec.rb

@@ -4,15 +4,15 @@ require 'reek/source/tree_dresser'
 include Reek::Source
 
 describe TreeDresser do
-  let(:ifnode) { Sexp.new(:if) }
-  let(:callnode) { Sexp.new(:call) }
+  let(:ifnode) { Parser::AST::Node.new(:if) }
+  let(:sendnode) { Parser::AST::Node.new(:send) }
   let(:dresser) { TreeDresser.new }
 
   it 'dresses :if sexp with IfNode' do
-    expect(dresser.dress(ifnode)).to be_a Reek::Source::SexpExtensions::IfNode
+    expect(dresser.dress(ifnode, {})).to be_a Reek::Source::SexpExtensions::IfNode
   end
 
-  it 'dresses :call sexp with CallNode' do
-    expect(dresser.dress(callnode)).to be_a Reek::Source::SexpExtensions::CallNode
+  it 'dresses :send sexp with SendNode' do
+    expect(dresser.dress(sendnode, {})).to be_a Reek::Source::SexpExtensions::SendNode
   end
 end

data/spec/spec_helper.rb

@@ -1,14 +1,18 @@
 require 'reek/spec'
-require 'reek/source/tree_dresser'
+require 'reek/source/ast_node_class_map'
 
 require 'matchers/smell_of_matcher'
 
 SAMPLES_DIR = 'spec/samples'
 
+# :reek:UncommunicativeMethodName
+def s(type, *children)
+  @klass_map ||= Reek::Source::AstNodeClassMap.new
+  @klass_map.klass_for(type).new(type, children)
+end
+
 def ast(*args)
-  result = Reek::Source::TreeDresser.new.dress(s(*args))
-  result.line = 1
-  result
+  s(*args)
 end
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reek
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kevin Rutherford
@@ -10,62 +10,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: sexp_processor
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 2.2.0.pre.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: 2.2.0.pre.7
 - !ruby/object:Gem::Dependency
-  name: ruby2ruby
+  name: unparser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.8
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.1.16
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -142,20 +116,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: flay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -233,6 +193,7 @@ files:
 - lib/reek/core/warning_collector.rb
 - lib/reek/examiner.rb
 - lib/reek/rake/task.rb
+- lib/reek/smell_description.rb
 - lib/reek/smell_warning.rb
 - lib/reek/smells.rb
 - lib/reek/smells/attribute.rb
@@ -245,6 +206,7 @@ files:
 - lib/reek/smells/irresponsible_module.rb
 - lib/reek/smells/long_parameter_list.rb
 - lib/reek/smells/long_yield_list.rb
+- lib/reek/smells/module_initialize.rb
 - lib/reek/smells/nested_iterators.rb
 - lib/reek/smells/nil_check.rb
 - lib/reek/smells/prima_donna_method.rb
@@ -260,6 +222,8 @@ files:
 - lib/reek/smells/unused_parameters.rb
 - lib/reek/smells/utility_function.rb
 - lib/reek/source.rb
+- lib/reek/source/ast_node.rb
+- lib/reek/source/ast_node_class_map.rb
 - lib/reek/source/code_comment.rb
 - lib/reek/source/config_file.rb
 - lib/reek/source/core_extras.rb
@@ -295,6 +259,7 @@ files:
 - spec/reek/core/stop_context_spec.rb
 - spec/reek/core/warning_collector_spec.rb
 - spec/reek/examiner_spec.rb
+- spec/reek/smell_description_spec.rb
 - spec/reek/smell_warning_spec.rb
 - spec/reek/smells/attribute_spec.rb
 - spec/reek/smells/behaves_like_variable_detector.rb
@@ -307,6 +272,7 @@ files:
 - spec/reek/smells/irresponsible_module_spec.rb
 - spec/reek/smells/long_parameter_list_spec.rb
 - spec/reek/smells/long_yield_list_spec.rb
+- spec/reek/smells/module_initialize_spec.rb
 - spec/reek/smells/nested_iterators_spec.rb
 - spec/reek/smells/nil_check_spec.rb
 - spec/reek/smells/prima_donna_method_spec.rb