tailor 1.2.1 → 1.3.0

data/spec/unit/tailor/rulers/indentation_spaces_ruler_spec.rb

@@ -1,110 +1,110 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/rulers/indentation_spaces_ruler'
 require 'ripper'
 
 describe Tailor::Rulers::IndentationSpacesRuler do
   let!(:spaces) { 5 }
-  let(:lexed_line) { double "LexedLine" }
+  let(:lexed_line) { double 'LexedLine' }
 
   subject do
     Tailor::Rulers::IndentationSpacesRuler.new(spaces, level: :error)
   end
 
-  describe "#comment_update" do
-    context "token does not contain a trailing newline" do
+  describe '#comment_update' do
+    context 'token does not contain a trailing newline' do
       pending
     end
 
-    context "token contains a trailing newline" do
-      context "lexed_line is spaces then a comment" do
+    context 'token contains a trailing newline' do
+      context 'lexed_line is spaces then a comment' do
         pending
       end
 
-      context "lexed_line is no spaces and a comment" do
+      context 'lexed_line is no spaces and a comment' do
         pending
       end
 
-      context "lexed_line ends with an operator" do
+      context 'lexed_line ends with an operator' do
         pending
       end
 
-      context "lexed_line ends with a comma" do
+      context 'lexed_line ends with a comma' do
         pending
       end
     end
   end
 
-  describe "#embexpr_beg_update" do
-    it "sets @embexpr_nesting to [true]" do
+  describe '#embexpr_beg_update' do
+    it 'sets @embexpr_nesting to [true]' do
       subject.instance_variable_set(:@embexpr_nesting, [])
       subject.embexpr_beg_update(lexed_line, 1, 1)
       subject.instance_variable_get(:@embexpr_nesting).should == [true]
     end
   end
 
-  describe "#embexpr_end_update" do
+  describe '#embexpr_end_update' do
     before do
       lexed_line.should_receive(:only_on_embexpr_end?).and_return(false)
     end
 
-    it "pops @embexpr_nesting" do
+    it 'pops @embexpr_nesting' do
       subject.instance_variable_set(:@embexpr_nesting, [true])
       subject.embexpr_end_update(lexed_line, 1, 1)
       subject.instance_variable_get(:@embexpr_nesting).should == []
     end
   end
 
-  describe "#ignored_nl_update" do
+  describe '#ignored_nl_update' do
     pending
   end
 
-  describe "#kw_update" do
+  describe '#kw_update' do
     pending
   end
 
-  describe "#lbrace_update" do
+  describe '#lbrace_update' do
     pending
   end
 
-  describe "#lbracket_update" do
+  describe '#lbracket_update' do
     pending
   end
 
-  describe "#lparen_update" do
+  describe '#lparen_update' do
     pending
   end
 
-  describe "#nl_update" do
+  describe '#nl_update' do
     pending
   end
 
-  describe "#period_update" do
+  describe '#period_update' do
     pending
   end
 
-  describe "#rbrace_update" do
+  describe '#rbrace_update' do
     pending
   end
 
-  describe "#rbracket_update" do
+  describe '#rbracket_update' do
     pending
   end
 
-  describe "#rparen_update" do
+  describe '#rparen_update' do
     pending
   end
 
-  describe "#tstring_beg_update" do
-    let(:manager) { double "IndentationManager" }
+  describe '#tstring_beg_update' do
+    let(:manager) { double 'IndentationManager' }
 
-    it "calls #stop on the indentation_manager object" do
+    it 'calls #stop on the indentation_manager object' do
       manager.should_receive(:update_actual_indentation).with lexed_line
       manager.should_receive(:stop)
       subject.instance_variable_set(:@manager, manager)
       subject.tstring_beg_update(lexed_line, 1)
     end
 
-    it "adds the lineno to @tstring_nesting" do
+    it 'adds the lineno to @tstring_nesting' do
       manager.stub(:update_actual_indentation)
       manager.stub(:stop)
       subject.instance_variable_set(:@manager, manager)
@@ -113,17 +113,17 @@ describe Tailor::Rulers::IndentationSpacesRuler do
     end
   end
 
-  describe "#tstring_end_update" do
-    context "@tstring_nesting is not empty" do
-      let(:manager) { double "IndentationManager" }
+  describe '#tstring_end_update' do
+    context '@tstring_nesting is not empty' do
+      let(:manager) { double 'IndentationManager' }
 
-      it "calls #start" do
+      it 'calls #start' do
         manager.should_receive(:start)
         subject.instance_variable_set(:@manager, manager)
         subject.tstring_end_update(2)
       end
 
-      it "removes the lineno to @tstring_nesting then calls @manager.start" do
+      it 'removes the lineno to @tstring_nesting then calls @manager.start' do
         manager.should_receive(:actual_indentation)
         manager.should_receive(:start)
         subject.instance_variable_set(:@manager, manager)

data/spec/unit/tailor/rulers/spaces_after_comma_ruler_spec.rb

@@ -1,27 +1,27 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/rulers/spaces_after_comma_ruler'
 
 describe Tailor::Rulers::SpacesAfterCommaRuler do
   subject { Tailor::Rulers::SpacesAfterCommaRuler.new(nil, {}) }
 
-  describe "#comma_update" do
-    it "adds the column number to @comma_columns" do
-      subject.comma_update(",", 2, 1)
+  describe '#comma_update' do
+    it 'adds the column number to @comma_columns' do
+      subject.comma_update(',', 2, 1)
       subject.instance_variable_get(:@comma_columns).should == [1]
     end
   end
 
-  describe "#check_spaces_after_comma" do
-    context "no event after comma" do
+  describe '#check_spaces_after_comma' do
+    context 'no event after comma' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_at)
         l.stub(:index)
 
         l
       end
 
-      it "doesn't detect any problems" do
+      it 'does not detect any problems' do
         Tailor::Problem.should_not_receive(:new)
         expect { subject.check_spaces_after_comma(lexed_line, 1) }.
           to_not raise_error

data/spec/unit/tailor/rulers/spaces_after_lbrace_ruler_spec.rb

@@ -1,143 +1,143 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/rulers/spaces_after_lbrace_ruler'
 
 describe Tailor::Rulers::SpacesAfterLbraceRuler do
   subject { Tailor::Rulers::SpacesAfterLbraceRuler.new('', {}) }
 
-  describe "#comment_update" do
-    context "token has a trailing newline" do
-      it "calls #ignored_nl_update" do
+  describe '#comment_update' do
+    context 'token has a trailing newline' do
+      it 'calls #ignored_nl_update' do
         subject.should_receive(:ignored_nl_update)
         subject.comment_update("\n", '', '', 1, 1)
       end
     end
 
-    context "token does not have a trailing newline" do
-      it "does not call #ignored_nl_update" do
+    context 'token does not have a trailing newline' do
+      it 'does not call #ignored_nl_update' do
         subject.should_not_receive(:ignored_nl_update)
-        subject.comment_update("# comment", '', '', 1, 1)
+        subject.comment_update('# comment', '', '', 1, 1)
       end
     end
   end
 
-  describe "#ignored_nl_update" do
-    it "calls #check_spaces_after_lbrace" do
+  describe '#ignored_nl_update' do
+    it 'calls #check_spaces_after_lbrace' do
       subject.should_receive(:check_spaces_after_lbrace)
       subject.ignored_nl_update('', 1, 1)
     end
   end
 
-  describe "#lbrace_update" do
-    it "adds column to @lbrace_columns" do
+  describe '#lbrace_update' do
+    it 'adds column to @lbrace_columns' do
       subject.lbrace_update('', 1, 1)
       subject.instance_variable_get(:@lbrace_columns).should == [1]
     end
   end
 
-  describe "#nl_update" do
-    it "calls #ignored_nl_update" do
+  describe '#nl_update' do
+    it 'calls #ignored_nl_update' do
       subject.should_receive(:ignored_nl_update)
       subject.nl_update('', 1, 1)
     end
   end
 
-  describe "#count_spaces" do
-    context "lexed_line.event_index returns nil" do
+  describe '#count_spaces' do
+    context 'lexed_line.event_index returns nil' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return nil
 
         l
       end
 
-      it "breaks from the loop and returns nil" do
+      it 'breaks from the loop and returns nil' do
         lexed_line.should_not_receive(:at)
         subject.count_spaces(lexed_line, 1).should be_nil
       end
     end
 
-    context "lexed_line.at returns nil" do
+    context 'lexed_line.at returns nil' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
         l.stub(:at).and_return nil
 
         l
       end
 
-      it "returns 0" do
+      it 'returns 0' do
         subject.count_spaces(lexed_line, 1).should be_zero
       end
     end
 
-    context "next_event is a :on_nl" do
+    context 'next_event is a :on_nl' do
       let!(:next_event) do
-        [[1, 1], :on_nl, "\n"]
+        [[1, 1], :on_nl, '\n']
       end
 
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
         l.should_receive(:at).with(2).and_return next_event
 
         l
       end
 
-      it "returns 0" do
+      it 'returns 0' do
         subject.count_spaces(lexed_line, 1).should be_zero
       end
     end
 
-    context "next_event is a :on_ignored_nl" do
+    context 'next_event is a :on_ignored_nl' do
       let!(:next_event) do
-        [[1, 1], :on_ignored_nl, "\n"]
+        [[1, 1], :on_ignored_nl, '\n']
       end
 
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
         l.should_receive(:at).with(2).and_return next_event
 
         l
       end
 
-      it "breaks from the loop and returns nil" do
+      it 'breaks from the loop and returns nil' do
         subject.count_spaces(lexed_line, 1)
       end
     end
 
-    context "next_event is a non-space event" do
+    context 'next_event is a non-space event' do
       let!(:next_event) do
-        [[1, 1], :on_kw, "def"]
+        [[1, 1], :on_kw, 'def']
       end
 
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
         l.stub(:at).and_return next_event
 
         l
       end
 
-      it "returns 0" do
+      it 'returns 0' do
         subject.count_spaces(lexed_line, 1).should be_zero
       end
     end
 
-    context "next_event is :on_sp" do
+    context 'next_event is :on_sp' do
       let!(:next_event) do
-        [[1, 1], :on_sp, "  "]
+        [[1, 1], :on_sp, '  ']
       end
 
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
         l.stub(:at).and_return next_event
 
         l
       end
 
-      it "returns 2" do
+      it 'returns 2' do
         subject.count_spaces(lexed_line, 1).should == 2
       end
     end

data/spec/unit/tailor/rulers/spaces_before_lbrace_ruler_spec.rb

@@ -1,14 +1,14 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/rulers/spaces_before_lbrace_ruler'
 
 describe Tailor::Rulers::SpacesBeforeLbraceRuler do
   subject { Tailor::Rulers::SpacesBeforeLbraceRuler.new(nil, {}) }
   before { Tailor::Logger.stub(:log) }
 
-  describe "#count_spaces" do
-    context "lexed_line.event_index is 0" do
+  describe '#count_spaces' do
+    context 'lexed_line.event_index is 0' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 0
         l.stub(:at).and_return nil
 
@@ -17,18 +17,18 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
 
       specify { subject.count_spaces(lexed_line, 1).should be_zero }
 
-      it "sets @do_measurement to false" do
+      it 'sets @do_measurement to false' do
         expect { subject.count_spaces(lexed_line, 1) }.
           to change{subject.instance_variable_get(:@do_measurement)}.from(true).
           to(false)
       end
     end
 
-    context "no space before lbrace" do
+    context 'no space before lbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 0], :on_const, "HI"]
+        l.stub(:at).and_return [[10, 0], :on_const, 'HI']
 
         l
       end
@@ -36,11 +36,11 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
       specify { subject.count_spaces(lexed_line, 1).should be_zero }
     end
 
-    context "1 space before lbrace" do
+    context '1 space before lbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 0], :on_sp, " "]
+        l.stub(:at).and_return [[10, 0], :on_sp, ' ']
 
         l
       end
@@ -48,11 +48,11 @@ describe Tailor::Rulers::SpacesBeforeLbraceRuler do
       specify { subject.count_spaces(lexed_line, 1).should == 1 }
     end
 
-    context "> 1 space before lbrace" do
+    context '> 1 space before lbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 1], :on_sp, "  "]
+        l.stub(:at).and_return [[10, 1], :on_sp, '  ']
 
         l
       end

data/spec/unit/tailor/rulers/spaces_before_rbrace_ruler_spec.rb

@@ -1,14 +1,14 @@
-require_relative '../../../spec_helper'
+require 'spec_helper'
 require 'tailor/rulers/spaces_before_rbrace_ruler'
 
 describe Tailor::Rulers::SpacesBeforeRbraceRuler do
   subject { Tailor::Rulers::SpacesBeforeRbraceRuler.new(nil, {}) }
   before { Tailor::Logger.stub(:log) }
 
-  describe "#count_spaces" do
-    context "lexed_line.event_index is 0" do
+  describe '#count_spaces' do
+    context 'lexed_line.event_index is 0' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 0
         l.stub(:at).and_return nil
 
@@ -17,18 +17,18 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
 
       specify { subject.count_spaces(lexed_line, 1).should be_zero }
 
-      it "sets @do_measurement to false" do
+      it 'sets @do_measurement to false' do
         expect { subject.count_spaces(lexed_line, 1) }.
           to change{subject.instance_variable_get(:@do_measurement)}.from(true).
           to(false)
       end
     end
 
-    context "no space before rbrace" do
+    context 'no space before rbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 0], :on_const, "HI"]
+        l.stub(:at).and_return [[10, 0], :on_const, 'HI']
 
         l
       end
@@ -36,11 +36,11 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
       specify { subject.count_spaces(lexed_line, 1).should be_zero }
     end
 
-    context "1 space before rbrace" do
+    context '1 space before rbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 0], :on_sp, " "]
+        l.stub(:at).and_return [[10, 0], :on_sp, ' ']
 
         l
       end
@@ -48,11 +48,11 @@ describe Tailor::Rulers::SpacesBeforeRbraceRuler do
       specify { subject.count_spaces(lexed_line, 1).should == 1 }
     end
 
-    context "> 1 space before rbrace" do
+    context '> 1 space before rbrace' do
       let(:lexed_line) do
-        l = double "LexedLine"
+        l = double 'LexedLine'
         l.stub(:event_index).and_return 1
-        l.stub(:at).and_return [[10, 0], :on_sp, "  "]
+        l.stub(:at).and_return [[10, 0], :on_sp, '  ']
 
         l
       end