rubocop 0.28.0 → 0.29.0

data/spec/rubocop/cop/style/empty_lines_around_class_body_spec.rb

@@ -36,6 +36,35 @@ describe RuboCop::Cop::Style::EmptyLinesAroundClassBody, :config do
       expect(cop.messages)
         .to eq(['Extra empty line detected at class body end.'])
     end
+
+    it 'registers an offense for singleton class body starting with a blank' do
+      inspect_source(cop,
+                     ['class << self',
+                      '',
+                      '  do_something',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Extra empty line detected at class body beginning.'])
+    end
+
+    it 'autocorrects singleton class body containing only a blank' do
+      corrected = autocorrect_source(cop,
+                                     ['class << self',
+                                      '',
+                                      'end'])
+      expect(corrected).to eq ['class << self',
+                               'end'].join("\n")
+    end
+
+    it 'registers an offense for singleton class body ending with a blank' do
+      inspect_source(cop,
+                     ['class << self',
+                      '  do_something',
+                      '',
+                      'end'])
+      expect(cop.messages)
+        .to eq(['Extra empty line detected at class body end.'])
+    end
   end
 
   context 'when EnforcedStyle is empty_lines' do
@@ -71,5 +100,36 @@ describe RuboCop::Cop::Style::EmptyLinesAroundClassBody, :config do
                                 '',
                                 'end'].join("\n"))
     end
+
+    it 'registers an offense for singleton class body not starting or ending ' \
+       'with a blank' do
+      inspect_source(cop,
+                     ['class << self',
+                      '  do_something',
+                      'end'])
+      expect(cop.messages).to eq(['Empty line missing at class body beginning.',
+                                  'Empty line missing at class body end.'])
+    end
+
+    it 'autocorrects singleton class body containing nothing' do
+      corrected = autocorrect_source(cop,
+                                     ['class << self',
+                                      'end'])
+      expect(corrected).to eq ['class << self',
+                               '',
+                               'end'].join("\n")
+    end
+
+    it 'autocorrects beginning and end' do
+      new_source = autocorrect_source(cop,
+                                      ['class << self',
+                                       '  do_something',
+                                       'end'])
+      expect(new_source).to eq(['class << self',
+                                '',
+                                '  do_something',
+                                '',
+                                'end'].join("\n"))
+    end
   end
 end

data/spec/rubocop/cop/style/empty_lines_spec.rb

@@ -19,7 +19,7 @@ describe RuboCop::Cop::Style::EmptyLines do
 
   it 'works when there are no tokens' do
     inspect_source(cop,
-                   ['#comment'])
+                   '#comment')
     expect(cop.offenses).to be_empty
   end
 
@@ -30,11 +30,11 @@ describe RuboCop::Cop::Style::EmptyLines do
   end
 
   it 'does not register an offense for empty lines in a string' do
-    inspect_source(cop, ['result = "test
+    inspect_source(cop, 'result = "test
 
 
 
-                                  string"'])
+                                  string"')
     expect(cop.offenses).to be_empty
   end
 

data/spec/rubocop/cop/style/empty_literal_spec.rb

@@ -8,7 +8,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
   describe 'Empty Array' do
     it 'registers an offense for Array.new()' do
       inspect_source(cop,
-                     ['test = Array.new()'])
+                     'test = Array.new()')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use array literal `[]` instead of `Array.new`.'])
@@ -16,7 +16,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'registers an offense for Array.new' do
       inspect_source(cop,
-                     ['test = Array.new'])
+                     'test = Array.new')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use array literal `[]` instead of `Array.new`.'])
@@ -24,7 +24,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'does not register an offense for Array.new(3)' do
       inspect_source(cop,
-                     ['test = Array.new(3)'])
+                     'test = Array.new(3)')
       expect(cop.offenses).to be_empty
     end
 
@@ -37,7 +37,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
   describe 'Empty Hash' do
     it 'registers an offense for Hash.new()' do
       inspect_source(cop,
-                     ['test = Hash.new()'])
+                     'test = Hash.new()')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use hash literal `{}` instead of `Hash.new`.'])
@@ -45,7 +45,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'registers an offense for Hash.new' do
       inspect_source(cop,
-                     ['test = Hash.new'])
+                     'test = Hash.new')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(['Use hash literal `{}` instead of `Hash.new`.'])
@@ -53,26 +53,43 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'does not register an offense for Hash.new(3)' do
       inspect_source(cop,
-                     ['test = Hash.new(3)'])
+                     'test = Hash.new(3)')
       expect(cop.offenses).to be_empty
     end
 
     it 'does not register an offense for Hash.new { block }' do
       inspect_source(cop,
-                     ['test = Hash.new { block }'])
+                     'test = Hash.new { block }')
       expect(cop.offenses).to be_empty
     end
 
     it 'auto-corrects Hash.new to {}' do
-      new_source = autocorrect_source(cop, 'test = Hash.new')
-      expect(new_source).to eq('test = {}')
+      new_source = autocorrect_source(cop, 'Hash.new')
+      expect(new_source).to eq('{}')
+    end
+
+    it 'auto-corrects Hash.new to {} in various contexts' do
+      new_source =
+        autocorrect_source(cop, ['test = Hash.new',
+                                 'Hash.new.merge("a" => 3)',
+                                 'yadayada.map { a }.reduce(Hash.new, :merge)'])
+      expect(new_source)
+        .to eq(['test = {}',
+                '{}.merge("a" => 3)',
+                'yadayada.map { a }.reduce({}, :merge)'].join("\n"))
+    end
+
+    it 'does not auto-correct Hash.new to {} if changing code meaning' do
+      source = 'yadayada.map { a }.reduce Hash.new, :merge'
+      new_source = autocorrect_source(cop, source)
+      expect(new_source).to eq(source)
     end
   end
 
   describe 'Empty String' do
     it 'registers an offense for String.new()' do
       inspect_source(cop,
-                     ['test = String.new()'])
+                     'test = String.new()')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use string literal `''` instead of `String.new`."])
@@ -80,7 +97,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'registers an offense for String.new' do
       inspect_source(cop,
-                     ['test = String.new'])
+                     'test = String.new')
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages)
         .to eq(["Use string literal `''` instead of `String.new`."])
@@ -88,7 +105,7 @@ describe RuboCop::Cop::Style::EmptyLiteral do
 
     it 'does not register an offense for String.new("top")' do
       inspect_source(cop,
-                     ['test = String.new("top")'])
+                     'test = String.new("top")')
       expect(cop.offenses).to be_empty
     end
 

data/spec/rubocop/cop/style/encoding_spec.rb

@@ -12,14 +12,14 @@ describe RuboCop::Cop::Style::Encoding, :config do
 
     it 'registers no offense when no encoding present but only ASCII ' \
        'characters' do
-      inspect_source(cop, ['def foo() end'])
+      inspect_source(cop, 'def foo() end')
 
       expect(cop.offenses).to be_empty
     end
 
     it 'registers an offense when there is no encoding present but non ' \
        'ASCII characters' do
-      inspect_source(cop, ['def foo() \'ä\' end'])
+      inspect_source(cop, 'def foo() \'ä\' end')
 
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(
@@ -86,7 +86,7 @@ describe RuboCop::Cop::Style::Encoding, :config do
     end
 
     it 'registers an offense when no encoding present' do
-      inspect_source(cop, ['def foo() end'])
+      inspect_source(cop, 'def foo() end')
 
       expect(cop.offenses.size).to eq(1)
       expect(cop.messages).to eq(

data/spec/rubocop/cop/style/end_block_spec.rb

@@ -6,7 +6,7 @@ describe RuboCop::Cop::Style::EndBlock do
   subject(:cop) { described_class.new }
 
   it 'reports an offense for an END block' do
-    src = ['END { test }']
+    src = 'END { test }'
     inspect_source(cop, src)
     expect(cop.offenses.size).to eq(1)
   end

data/spec/rubocop/cop/style/end_of_line_spec.rb

@@ -17,7 +17,7 @@ describe RuboCop::Cop::Style::EndOfLine do
   end
 
   it 'registers an offense for CR at end of file' do
-    inspect_source_file(cop, ["x=0\r"])
+    inspect_source_file(cop, "x=0\r")
     expect(cop.messages).to eq(['Carriage return character detected.'])
   end
 
@@ -57,7 +57,7 @@ describe RuboCop::Cop::Style::EndOfLine do
 
   context 'when source is a string' do
     it 'registers an offense' do
-      inspect_source(cop, ["x=0\r"])
+      inspect_source(cop, "x=0\r")
 
       expect(cop.messages).to eq(['Carriage return character detected.'])
     end

data/spec/rubocop/cop/style/even_odd_spec.rb

@@ -6,70 +6,159 @@ describe RuboCop::Cop::Style::EvenOdd do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for x % 2 == 0' do
-    inspect_source(cop,
-                   ['x % 2 == 0'])
+    inspect_source(cop, 'x % 2 == 0')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for x % 2 != 0' do
-    inspect_source(cop,
-                   ['x % 2 != 0'])
+    inspect_source(cop, 'x % 2 != 0')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for (x % 2) == 0' do
-    inspect_source(cop,
-                   ['(x % 2) == 0'])
+    inspect_source(cop, '(x % 2) == 0')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for (x % 2) != 0' do
-    inspect_source(cop,
-                   ['(x % 2) != 0'])
+    inspect_source(cop, '(x % 2) != 0')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for x % 2 == 1' do
-    inspect_source(cop,
-                   ['x % 2 == 1'])
+    inspect_source(cop, 'x % 2 == 1')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for x % 2 != 1' do
-    inspect_source(cop,
-                   ['x % 2 != 1'])
+    inspect_source(cop, 'x % 2 != 1')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'registers an offense for (x % 2) == 1' do
-    inspect_source(cop,
-                   ['(x % 2) == 1'])
+    inspect_source(cop, '(x % 2) == 1')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#odd?`.'])
   end
 
   it 'registers an offense for (x % 2) != 1' do
-    inspect_source(cop,
-                   ['(x % 2) != 1'])
+    inspect_source(cop, '(x % 2) != 1')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
+  end
+
+  it 'registers an offense for (x.y % 2) != 1' do
+    inspect_source(cop, '(x.y % 2) != 1')
+    expect(cop.offenses.size).to eq(1)
+    expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
+  end
+
+  it 'registers an offense for (x(y) % 2) != 1' do
+    inspect_source(cop, '(x(y) % 2) != 1')
     expect(cop.offenses.size).to eq(1)
     expect(cop.messages).to eq(['Replace with `Fixnum#even?`.'])
   end
 
   it 'accepts x % 3 == 0' do
-    inspect_source(cop,
-                   ['x % 3 == 0'])
+    inspect_source(cop, 'x % 3 == 0')
     expect(cop.offenses).to be_empty
   end
 
   it 'accepts x % 3 != 0' do
-    inspect_source(cop,
-                   ['x % 3 != 0'])
+    inspect_source(cop, 'x % 3 != 0')
     expect(cop.offenses).to be_empty
   end
+
+  it 'converts x % 2 == 0 to #even?' do
+    corrected = autocorrect_source(cop, 'x % 2 == 0')
+    expect(corrected).to eq('x.even?')
+  end
+
+  it 'converts x % 2 != 0 to #odd?' do
+    corrected = autocorrect_source(cop, 'x % 2 != 0')
+    expect(corrected).to eq('x.odd?')
+  end
+
+  it 'converts (x % 2) == 0 to #even?' do
+    corrected = autocorrect_source(cop, '(x % 2) == 0')
+    expect(corrected).to eq('x.even?')
+  end
+
+  it 'converts (x % 2) != 0 to #odd?' do
+    corrected = autocorrect_source(cop, '(x % 2) != 0')
+    expect(corrected).to eq('x.odd?')
+  end
+
+  it 'converts x % 2 == 1 to odd?' do
+    corrected = autocorrect_source(cop, 'x % 2 == 1')
+    expect(corrected).to eq('x.odd?')
+  end
+
+  it 'converts x % 2 != 1 to even?' do
+    corrected = autocorrect_source(cop, 'x % 2 != 1')
+    expect(corrected).to eq('x.even?')
+  end
+
+  it 'converts (x % 2) == 1 to odd?' do
+    corrected = autocorrect_source(cop, '(x % 2) == 1')
+    expect(corrected).to eq('x.odd?')
+  end
+
+  it 'converts (y % 2) != 1 to even?' do
+    corrected = autocorrect_source(cop, '(y % 2) != 1')
+    expect(corrected).to eq('y.even?')
+  end
+
+  it 'converts (x.y % 2) != 1 to even?' do
+    corrected = autocorrect_source(cop, '(x.y % 2) != 1')
+    expect(corrected).to eq('x.y.even?')
+  end
+
+  it 'converts (x(y) % 2) != 1 to even?' do
+    corrected = autocorrect_source(cop, '(x(y) % 2) != 1')
+    expect(corrected).to eq('x(y).even?')
+  end
+
+  it 'converts (x._(y) % 2) != 1 to even?' do
+    corrected = autocorrect_source(cop, '(x._(y) % 2) != 1')
+    expect(corrected).to eq('x._(y).even?')
+  end
+
+  it 'converts (x._(y)) % 2 != 1 to even?' do
+    corrected = autocorrect_source(cop, '(x._(y)) % 2 != 1')
+    expect(corrected).to eq('(x._(y)).even?')
+  end
+
+  it 'converts x._(y) % 2 != 1 to even?' do
+    corrected = autocorrect_source(cop, 'x._(y) % 2 != 1')
+    expect(corrected).to eq('x._(y).even?')
+  end
+
+  it 'converts 1 % 2 != 1 to even?' do
+    corrected = autocorrect_source(cop, '1 % 2 != 1')
+    expect(corrected).to eq('1.even?')
+  end
+
+  it 'converts complex examples' do
+    corrected = autocorrect_source(cop, [
+      'if (y % 2) != 1',
+      '  method == :== ? :even : :odd',
+      'elsif x % 2 == 1',
+      '  method == :== ? :odd : :even',
+      'end'
+    ])
+    expect(corrected).to eq([
+      'if y.even?',
+      '  method == :== ? :even : :odd',
+      'elsif x.odd?',
+      '  method == :== ? :odd : :even',
+      'end'
+    ].join("\n"))
+  end
 end

data/spec/rubocop/cop/style/extra_spacing_spec.rb

@@ -6,17 +6,17 @@ describe RuboCop::Cop::Style::ExtraSpacing do
   subject(:cop) { described_class.new }
 
   it 'registers an offense for double extra spacing on variable assignment' do
-    inspect_source(cop, ['m    = "hello"'])
+    inspect_source(cop, 'm    = "hello"')
     expect(cop.offenses.size).to eq(1)
   end
 
   it 'ignores whitespace at the beginning of the line' do
-    inspect_source(cop, ['  m = "hello"'])
+    inspect_source(cop, '  m = "hello"')
     expect(cop.offenses.size).to eq(0)
   end
 
   it 'ignores whitespace inside a string' do
-    inspect_source(cop, ['m = "hello   this"'])
+    inspect_source(cop, 'm = "hello   this"')
     expect(cop.offenses.size).to eq(0)
   end