tailor 1.3.1 → 1.4.0

data/lib/tailor/version.rb

@@ -1,3 +1,3 @@
 class Tailor
-  VERSION = '1.3.1'
+  VERSION = '1.4.0'
 end

data/spec/functional/conditional_parentheses_spec.rb

@@ -0,0 +1,325 @@
+require 'spec_helper'
+require_relative '../support/conditional_parentheses_cases'
+require 'tailor/critic'
+require 'tailor/configuration/style'
+
+describe 'Conditional parentheses' do
+
+  def file_name
+    self.class.description
+  end
+
+  def contents
+    CONDITIONAL_PARENTHESES[file_name] || begin
+      raise "Example not found: #{file_name}"
+    end
+  end
+
+  before do
+    Tailor::Logger.stub(:log)
+    FakeFS.activate!
+    FileUtils.touch file_name
+    File.open(file_name, 'w') { |f| f.write contents }
+  end
+
+  let(:critic) { Tailor::Critic.new }
+
+  let(:style) do
+    style = Tailor::Configuration::Style.new
+    style.trailing_newlines 0, level: :off
+    style.allow_invalid_ruby true, level: :off
+
+    style
+  end
+
+  context :no_parentheses do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :with_parentheses do
+    it 'warns' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 4,
+        message: 'Parentheses around conditional expression at column 4.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :with_parentheses_no_space do
+    it 'warns' do
+      critic.check_file(file_name, style.to_hash)
+
+      expect(critic.problems[file_name].select do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 3,
+        message: 'Parentheses around conditional expression at column 3.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name].select do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+
+      expect(critic.problems[file_name].select do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
+    end
+  end
+
+  context :method_call do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :indented_method_call do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :method_call_on_parens do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :double_parens do
+    it 'warns by default' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 4,
+        message: 'Parentheses around conditional expression at column 4.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :unless_no_parentheses do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :unless_with_parentheses do
+    it 'warns on parentheses' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 8,
+        message: 'Parentheses around conditional expression at column 8.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :case_no_parentheses do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :case_with_parentheses do
+    it 'warns on parentheses' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 6,
+        message: 'Parentheses around conditional expression at column 6.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :while_no_parentheses do
+    it 'does not warn' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+
+  context :while_with_parentheses do
+    it 'warns on parentheses' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'conditional_parentheses',
+        line: 1,
+        column: 7,
+        message: 'Parentheses around conditional expression at column 7.',
+        level: :warn
+      }]
+    end
+
+    it 'does not warn when parentheses are allowed' do
+      style.allow_conditional_parentheses true, level: :warn
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when parentheses are disabled' do
+      style.allow_conditional_parentheses false, level: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+  end
+end

data/spec/functional/conditional_spacing_spec.rb

@@ -34,55 +34,67 @@ describe 'Conditional spacing' do
   context :no_space_after_if do
     it 'warns when there is no space after an if statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 0,
-        :message => '0 spaces after conditional at column 0, expected 1.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 0,
+        message: '0 spaces after conditional at column 0, expected 1.',
+        level: :error
       }]
     end
 
     it 'warns with the correct number of expected spaces' do
       style.spaces_after_conditional 2, level: :error
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 0,
-        :message => '0 spaces after conditional at column 0, expected 2.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 0,
+        message: '0 spaces after conditional at column 0, expected 2.',
+        level: :error
       }]
     end
 
     it 'does not warn if spaces are set to zero' do
       style.spaces_after_conditional 0, level: :error
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
 
     it 'does not warn if spaces are disabled' do
       style.spaces_after_conditional 2, level: :off
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
   end
 
   context :space_after_if do
     it 'does not warn when there is a space after the if' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
 
     it 'warns if spaces has been set to zero' do
       style.spaces_after_conditional 0, level: :error
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 0,
-        :message => '1 spaces after conditional at column 0, expected 0.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 0,
+        message: '1 spaces after conditional at column 0, expected 0.',
+        level: :error
       }]
     end
   end
@@ -90,19 +102,23 @@ describe 'Conditional spacing' do
   context :no_parens do
     it 'never warns' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
   end
 
   context :nested_parens do
     it 'warns when there is no space after an if statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 0,
-        :message => '0 spaces after conditional at column 0, expected 1.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 0,
+        message: '0 spaces after conditional at column 0, expected 1.',
+        level: :error
       }]
     end
   end
@@ -110,12 +126,14 @@ describe 'Conditional spacing' do
   context :no_space_after_unless do
     it 'warns when there is no space after an unless statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 0,
-        :message => '0 spaces after conditional at column 0, expected 1.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 0,
+        message: '0 spaces after conditional at column 0, expected 1.',
+        level: :error
       }]
     end
   end
@@ -123,19 +141,23 @@ describe 'Conditional spacing' do
   context :space_after_unless do
     it 'does not warn when there is space after an unless statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
   end
 
   context :no_space_after_case do
     it 'warns when there is no space after a case statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to eql [{
-        :type => 'spaces_after_conditional',
-        :line => 1,
-        :column => 5,
-        :message => '0 spaces after conditional at column 5, expected 1.',
-        :level => :error
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to eql [{
+        type: 'spaces_after_conditional',
+        line: 1,
+        column: 5,
+        message: '0 spaces after conditional at column 5, expected 1.',
+        level: :error
       }]
     end
   end
@@ -143,7 +165,9 @@ describe 'Conditional spacing' do
   context :space_after_case do
     it 'does not warn when there is space after a case statement' do
       critic.check_file(file_name, style.to_hash)
-      expect(critic.problems[file_name]).to be_empty
+      expect(critic.problems[file_name].reject do |p|
+        p[:type] == 'conditional_parentheses'
+      end).to be_empty
     end
   end
 end