tailor 1.3.1 → 1.4.0

data/spec/functional/configuration_spec.rb

@@ -128,7 +128,7 @@ end
 
       it 'applies the nested configuration within the fileset' do
         expect(config.file_sets[:default].style[
-          :max_line_length]).to eql [90, { :level => :warn }]
+          :max_line_length]).to eql [90, { level: :warn }]
       end
 
     end

data/spec/functional/horizontal_spacing/braces_spec.rb

@@ -224,15 +224,16 @@ describe "Detection of spacing around braces" do
 
     context "no space before consecutive rbraces" do
       let(:file_name) { 'no_space_before_consecutive_rbraces' }
-      specify { critic.problems[file_name].size.should be 2 }
-      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name].first[:line].should be 1 }
-      specify { critic.problems[file_name].first[:column].should be 72 }
-      specify { critic.problems[file_name].first[:level].should be :error }
-      specify { critic.problems[file_name].last[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name].last[:line].should be 1 }
-      specify { critic.problems[file_name].last[:column].should be 73 }
-      specify { critic.problems[file_name].last[:level].should be :error }
+      let(:problems) { critic.problems[file_name].select { |p| p[:type] == 'spaces_before_rbrace' } }
+      specify { problems.size.should be 2 }
+      specify { problems.first[:type].should == "spaces_before_rbrace" }
+      specify { problems.first[:line].should be 1 }
+      specify { problems.first[:column].should be 72 }
+      specify { problems.first[:level].should be :error }
+      specify { problems.last[:type].should == "spaces_before_rbrace" }
+      specify { problems.last[:line].should be 1 }
+      specify { problems.last[:column].should be 73 }
+      specify { problems.last[:level].should be :error }
     end
   end
 end

data/spec/functional/horizontal_spacing/hard_tabs_spec.rb

@@ -9,13 +9,13 @@ HARD_TABS = {}
 
 HARD_TABS['hard_tab'] =
   %Q{def something
-\tputs "something"
+\tputs 'something'
 end}
 
 HARD_TABS['hard_tab_with_spaces'] =
   %Q{class Thing
   def something
-\t  puts "something"
+\t  puts 'something'
   end
 end}
 
@@ -27,14 +27,14 @@ end}
 HARD_TABS['hard_tab_with_1_indented_space'] =
   %Q{class Thing
   def something
-\t   puts "something"
+\t   puts 'something'
   end
 end}
 
 HARD_TABS['hard_tab_with_2_indented_spaces'] =
   %Q{class Thing
   def something
-\t    puts "something"
+\t    puts 'something'
   end
 end}
 

data/spec/functional/horizontal_spacing_spec.rb

@@ -70,11 +70,11 @@ end}
         critic.problems.should == {
           file_name => [
             {
-              :type => 'max_line_length',
-              :line => 3,
-              :column => 81,
-              :message => 'Line is 81 chars long, but should be 80.',
-              :level=>:error
+              type: 'max_line_length',
+              line: 3,
+              column: 81,
+              message: 'Line is 81 chars long, but should be 80.',
+              level: :error
             }
           ]
         }

data/spec/functional/indentation_spacing/argument_alignment_spec.rb

@@ -0,0 +1,511 @@
+require 'spec_helper'
+require_relative '../../support/argument_alignment_cases'
+require 'tailor/critic'
+require 'tailor/configuration/style'
+
+describe 'Argument alignment' do
+
+  def file_name
+    self.class.description
+  end
+
+  def contents
+    ARG_INDENT[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 :def_no_arguments do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :def_arguments_fit_on_one_line do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :def_arguments_aligned do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 14,
+        message: "Line is indented to column 14, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 14,
+        message: "Line is indented to column 14, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :def_arguments_indented do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'warns when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 2,
+        message: "Line is indented to column 2, but should be at 14.",
+        level: :error
+      }]
+    end
+
+  end
+
+  context :call_arguments_fit_on_one_line do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_no_arguments do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_aligned do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_aligned_args_are_integer_literals do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_aligned_args_are_string_literals do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_aligned_multiple_lines do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [
+        {
+          type: 'indentation_spaces',
+          line: 2,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        },
+        {
+          type: 'indentation_spaces',
+          line: 3,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        }
+      ]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [
+        {
+          type: 'indentation_spaces',
+          line: 2,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        },
+        {
+          type: 'indentation_spaces',
+          line: 3,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        }
+      ]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_aligned_args_have_parens do
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [
+        {
+          type: 'indentation_spaces',
+          line: 2,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        }
+      ]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [
+        {
+          type: 'indentation_spaces',
+          line: 2,
+          column: 49,
+          message: "Line is indented to column 49, but should be at 2.",
+          level: :error
+        }
+      ]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+
+  end
+
+  context :call_arguments_aligned_no_parens do
+
+    it 'warns when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'warns when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 49,
+        message: "Line is indented to column 49, but should be at 2.",
+        level: :error
+      }]
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_indented do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'warns when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to eql [{
+        type: 'indentation_spaces',
+        line: 2,
+        column: 2,
+        message: "Line is indented to column 2, but should be at 49.",
+        level: :error
+      }]
+    end
+
+  end
+
+  context :call_arguments_indented_separate_line do
+
+    it 'does not warn when argument alignment is not specified' do
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_on_next_line do
+
+    it 'does not warn when argument alignment is not specified' do
+      style.indentation_spaces 2, level: :error, line_continuations: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+  context :call_arguments_on_next_line_nested do
+
+    it 'does not warn when argument alignment is not specified' do
+      style.indentation_spaces 2, level: :error, line_continuations: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+  context :call_arguments_on_next_line_multiple do
+
+    it 'does not warn when argument alignment is not specified' do
+      style.indentation_spaces 2, level: :error, line_continuations: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is disabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: :off
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+    it 'does not warn when argument alignment is enabled' do
+      style.indentation_spaces 2, level: :error, line_continuations: true, argument_alignment: true
+      critic.check_file(file_name, style.to_hash)
+      expect(critic.problems[file_name]).to be_empty
+    end
+
+  end
+
+end