tailor 1.0.0.alpha2 → 1.0.0

data/spec/tailor/lexer_spec.rb

@@ -16,7 +16,8 @@ describe Tailor::Lexer do
   end
 
   before do
-    Tailor::Lexer.any_instance.stub(:ensure_trailing_newline).and_return(file_text)
+    Tailor::Lexer.any_instance.stub(:ensure_trailing_newline).
+      and_return(file_text)
   end
 
   describe "#initialize" do
@@ -45,67 +46,11 @@ describe Tailor::Lexer do
     end
   end
 
-  describe "#on_ignored_nl" do
-    it "calls #current_line_lex" do
-      pending
-      subject.stub(:only_spaces?).and_return true
-      subject.should_receive(:current_line_lex)
-      subject.on_ignored_nl("\n")
-    end
-
-    context "#only_spaces? is true" do
-      pending
-      before { subject.stub(:only_spaces?).and_return true }
-
-      it "does not call #update_actual_indentation" do
-        pending
-      end
-    end
-  end
-
   describe "#on_sp" do
-    context "@config says to disallow hard tabs" do
-      before do
-        config = { horizontal_spacing: { allow_hard_tabs: false } }
-        subject.instance_variable_set(:@config, config)
-      end
-
-      context "token contains a hard tab" do
-        it "adds a new problem to @problems" do
-          pending "This behavior moved to indent_sp_ruler--move there."
-
-          subject.instance_variable_set(:@problems, [])
-
-          expect { subject.on_sp("\t") }.
-            to change{subject.instance_variable_get(:@problems).size}.
-            from(0).to 1
-        end
-      end
-
-      context "token does not contain a hard tab" do
-        it "does not add a new problem to @problems" do
-          pending "This behavior moved to indent_sp_ruler--move there."
-
-          subject.instance_variable_set(:@problems, [])
-
-          expect { subject.on_sp("\x20") }.
-            to_not change{subject.instance_variable_get(:@problems).size}.
-            from(0).to 1
-        end
-      end
-    end
-
-    context "@config says to allow hard tabs" do
-      before do
-        config = { horizontal_spacing: { allow_hard_tabs: true } }
-        subject.instance_variable_set(:@config, config)
-      end
-
-      it "does not check the token" do
-        token = double "token"
-        token.stub(:size)
-        token.should_not_receive(:=~)
-        subject.on_sp(token)
+    context "token is a backslash then newline" do
+      it "calls #notify_ignored_nl_observers" do
+        subject.should_receive(:notify_ignored_nl_observers)
+        subject.on_sp("\\\n")
       end
     end
   end
@@ -157,10 +102,10 @@ describe Tailor::Lexer do
     before do
       Tailor::Lexer.any_instance.unstub(:ensure_trailing_newline)
     end
-    
+
     context "text contains a trailing newline already" do
       let!(:text) { "text\n" }
-      
+
       before do
         subject.stub(:count_trailing_newlines).and_return 1
       end

data/spec/tailor/problem_spec.rb

@@ -5,7 +5,7 @@ describe Tailor::Problem do
   before do
     Tailor::Problem.any_instance.stub(:log)
   end
-  
+
   let(:lineno) { 10 }
   let(:column) { 11 }
 
@@ -15,60 +15,28 @@ describe Tailor::Problem do
     end
 
     it "sets self[:type] to the type param" do
-      Tailor::Problem.new(:test, lineno, column).should include(type: :test)
+      Tailor::Problem.new(:test, lineno, column, "", :b).
+        should include(type: :test)
     end
 
     it "sets self[:line] to the lineno param" do
-      Tailor::Problem.new(:test, lineno, column).should include(line: lineno)
-    end
-
-    it "sets self[:column] to 'column' from the binding" do
-      Tailor::Problem.new(:test, lineno, column).should include(column: column)
-    end
-
-    it "sets self[:message] to what's returned from #message for @type" do
-      Tailor::Problem.any_instance.should_receive(:message).with(:test).
-        and_return("test message")
-
-      problem = Tailor::Problem.new(:test, lineno, column)
-      problem.should include(message: "test message")
-    end
-  end
-
-  describe "#message" do
-    before do
-      Tailor::Problem.any_instance.stub(:set_values)
-    end
-
-    context "type is :indentation" do
-      it "builds a successful message" do
-        options = { actual_indentation: 10, should_be_at: 97 }
-        problem = Tailor::Problem.new(:test, lineno, column, options)
-        problem.message(:indentation).should match /10.*97/
-      end
+      Tailor::Problem.new(:test, lineno, column, "", :c).
+        should include(line: lineno)
     end
 
-    context "type is :trailing_newlines" do
-      it "builds a successful message" do
-        options = { actual_trailing_newlines: 123, should_have: 777 }
-        problem = Tailor::Problem.new(:test, lineno, column, options)
-        problem.message(:trailing_newlines).should match /123.*777/
-      end
+    it "sets self[:column] to the column param" do
+      Tailor::Problem.new(:test, lineno, column, "", :d).
+        should include(column: column)
     end
 
-    context "type is :hard_tab" do
-      it "builds a successful message" do
-        problem = Tailor::Problem.new(:test, lineno, column)
-        problem.message(:hard_tab).should match /Hard tab found./
-      end
+    it "sets self[:message] to the message param" do
+      Tailor::Problem.new(:test, lineno, column, "test", :d).
+        should include(message: "test")
     end
 
-    context "type is :line_length" do
-      it "builds a successful message" do
-        options = { actual_length: 88, should_be_at: 77 }
-        problem = Tailor::Problem.new(:test, lineno, column, options)
-        problem.message(:line_length).should match /88.*77/
-      end
+    it "sets self[:level] to the level param" do
+      Tailor::Problem.new(:test, lineno, column, "test", :d).
+        should include(level: :d)
     end
   end
 end

data/spec/tailor/reporter_spec.rb

@@ -8,22 +8,22 @@ describe Tailor::Reporter do
 
       it "creates a new Formatter object of the type passed in" do
         reporter = Tailor::Reporter.new(formats)
-        reporter.formatters.first.should be_a Tailor::Formatter::Text
+        reporter.formatters.first.should be_a Tailor::Formatters::Text
       end
     end
   end
-  
+
   describe "#file_report" do
     let(:file_problems) { double "file problems" }
-    let(:formatter) { double "Tailor::Formatter::SomeFormatter" }
-    
+    let(:formatter) { double "Tailor::Formatters::SomeFormatter" }
+
     subject do
       t = Tailor::Reporter.new
       t.instance_variable_set(:@formatters, [formatter])
-      
+
       t
-    end 
-    
+    end
+
     it "calls #file_report on each @formatters" do
       label = :some_label
       formatter.should_receive(:file_report).with(file_problems, label)
@@ -34,7 +34,7 @@ describe Tailor::Reporter do
 
   describe "#summary_report" do
     let(:all_problems) { double "all problems" }
-    let(:formatter) { double "Tailor::Formatter::SomeFormatter" }
+    let(:formatter) { double "Tailor::Formatters::SomeFormatter" }
 
     subject do
       t = Tailor::Reporter.new

data/spec/tailor/ruler_spec.rb

@@ -2,7 +2,7 @@ require_relative '../spec_helper'
 require 'tailor/ruler'
 
 describe Tailor::Ruler do
-  before { subject.stub(:log) }
+  before { Tailor::Logger.stub(:log) }
 
   describe "#add_child_ruler" do
     it "adds new rulers to @child_rulers" do

data/spec/tailor/rulers/indentation_spaces_ruler/indentation_manager_spec.rb

@@ -8,7 +8,7 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
   let!(:lexed_line) { double "LexedLine" }
 
   before do
-    #Tailor::Logger.stub(:log)
+    Tailor::Logger.stub(:log)
     subject.instance_variable_set(:@spaces, spaces)
   end
 
@@ -23,13 +23,6 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
     end
   end
 
-  describe "#next_should_be_at" do
-    it "returns @proper[:next_line]" do
-      subject.instance_variable_set(:@proper, { next_line: 123 })
-      subject.next_should_be_at.should == 123
-    end
-  end
-
   describe "#decrease_this_line" do
     let!(:spaces) { 27 }
 
@@ -76,67 +69,7 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
     end
   end
 
-  describe "#increase_next_line" do
-    context "#started? is true" do
-      before { subject.stub(:started?).and_return true }
-
-      it "increases @proper[:next_line] by @spaces" do
-        expect { subject.increase_next_line }.to change{subject.next_should_be_at}.
-          by(spaces)
-      end
-    end
-
-    context "#started? is false" do
-      before { subject.stub(:started?).and_return false }
-
-      it "does not increases @proper[:next_line]" do
-        expect { subject.increase_next_line }.to_not change{subject.next_should_be_at}.
-          by(spaces)
-      end
-    end
-  end
-
-  describe "#decrease_next_line" do
-    let!(:spaces) { 27 }
-
-    context "#started? is true" do
-      before { subject.stub(:started?).and_return true }
-
-      it "decrements @proper[:next_line] by @spaces" do
-        expect { subject.decrease_next_line }.to change{subject.next_should_be_at}.
-          by(-spaces)
-      end
-    end
-
-    context "#started? is false" do
-      before { subject.stub(:started?).and_return false }
-
-      it "decrements @proper[:next_line] by @spaces" do
-        expect { subject.decrease_next_line }.to_not change{subject.next_should_be_at}.
-          by(-spaces)
-      end
-    end
-  end
-
   describe "#set_up_line_transition" do
-    context "@amount_to_change_next > 0" do
-      before { subject.instance_variable_set(:@amount_to_change_next, 1) }
-
-      it "should call #increase_next_line" do
-        subject.should_receive(:increase_next_line)
-        subject.set_up_line_transition
-      end
-    end
-
-    context "@amount_to_change_next < 0" do
-      before { subject.instance_variable_set(:@amount_to_change_next, -1) }
-
-      it "should call #increase_next_line" do
-        subject.should_receive(:decrease_next_line)
-        subject.set_up_line_transition
-      end
-    end
-
     context "@amount_to_change_this < 0" do
       before { subject.instance_variable_set(:@amount_to_change_this, -1) }
 
@@ -155,18 +88,16 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
         subject.instance_variable_set(:@proper, { next_line: 33 })
 
         expect { subject.transition_lines }.to change{subject.should_be_at}.
-          from(subject.should_be_at).to(subject.next_should_be_at)
+          from(subject.should_be_at).to(33)
       end
     end
 
-    context "#started? is true" do
+    context "#started? is false" do
       before { subject.stub(:started?).and_return false }
 
       it "sets @proper[:this_line] to @proper[:next_line]" do
         subject.instance_variable_set(:@proper, { next_line: 33 })
-
-        expect { subject.transition_lines }.to_not change{subject.should_be_at}.
-          from(subject.should_be_at).to(subject.next_should_be_at)
+        expect { subject.transition_lines }.to_not change{subject.should_be_at}
       end
     end
   end
@@ -243,14 +174,19 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
   end
 
   describe "#line_ends_with_single_token_indenter?" do
-    context "lexed_line doesn't end with an op, comma, or period" do
+    context "lexed_line doesn't end with an op, comma, period, label, or kw" do
       before do
         lexed_line.stub(ends_with_op?: false)
         lexed_line.stub(ends_with_comma?: false)
         lexed_line.stub(ends_with_period?: false)
+        lexed_line.stub(ends_with_label?: false)
+        lexed_line.stub(ends_with_modifier_kw?: false)
       end
 
-      specify { subject.line_ends_with_single_token_indenter?(lexed_line).should be_false }
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).
+          should be_false
+      end
     end
 
     context "lexed_line ends with an op" do
@@ -258,9 +194,13 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
         lexed_line.stub(ends_with_op?: true)
         lexed_line.stub(ends_with_comma?: false)
         lexed_line.stub(ends_with_period?: false)
+        lexed_line.stub(ends_with_label?: false)
+        lexed_line.stub(ends_with_modifier_kw?: false)
       end
 
-      specify { subject.line_ends_with_single_token_indenter?(lexed_line).should be_true }
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).should be_true
+      end
     end
 
     context "lexed_line ends with a comma" do
@@ -268,9 +208,13 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
         lexed_line.stub(ends_with_op?: false)
         lexed_line.stub(ends_with_comma?: true)
         lexed_line.stub(ends_with_period?: false)
+        lexed_line.stub(ends_with_label?: false)
+        lexed_line.stub(ends_with_modifier_kw?: false)
       end
 
-      specify { subject.line_ends_with_single_token_indenter?(lexed_line).should be_true }
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).should be_true
+      end
     end
 
     context "lexed_line ends with a period" do
@@ -278,16 +222,48 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
         lexed_line.stub(ends_with_op?: false)
         lexed_line.stub(ends_with_comma?: false)
         lexed_line.stub(ends_with_period?: true)
+        lexed_line.stub(ends_with_label?: false)
+        lexed_line.stub(ends_with_modifier_kw?: false)
+      end
+
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).should be_true
+      end
+    end
+
+    context "lexed_line ends with a label" do
+      before do
+        lexed_line.stub(ends_with_op?: false)
+        lexed_line.stub(ends_with_comma?: false)
+        lexed_line.stub(ends_with_period?: false)
+        lexed_line.stub(ends_with_label?: true)
+        lexed_line.stub(ends_with_modifier_kw?: false)
       end
 
-      specify { subject.line_ends_with_single_token_indenter?(lexed_line).should be_true }
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).should be_true
+      end
+    end
+
+    context "lexed_line ends with a modified kw" do
+      before do
+        lexed_line.stub(ends_with_op?: false)
+        lexed_line.stub(ends_with_comma?: false)
+        lexed_line.stub(ends_with_period?: false)
+        lexed_line.stub(ends_with_label?: false)
+        lexed_line.stub(ends_with_modifier_kw?: true)
+      end
+
+      specify do
+        subject.line_ends_with_single_token_indenter?(lexed_line).should be_true
+      end
     end
   end
 
   describe "#line_ends_with_same_as_last" do
-    context "@single_tokens is empty" do
+    context "@indent_reasons is empty" do
       before do
-        subject.instance_variable_set(:@single_tokens, [])
+        subject.instance_variable_set(:@indent_reasons, [])
       end
 
       it "returns false" do
@@ -295,11 +271,12 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
       end
     end
 
-    context "@single_tokens.last[:token] != token_event.last" do
+    context "@indent_reasons.last[:token] != token_event.last" do
       let(:last_single_token) { [[1, 2], :on_comma, ','] }
 
       before do
-        subject.instance_variable_set(:@single_tokens, [{ event: :on_op }])
+        subject.instance_variable_set(:@indent_reasons,
+          [{ event_type: :on_op }])
       end
 
       it "returns false" do
@@ -307,148 +284,127 @@ describe Tailor::Rulers::IndentationSpacesRuler::IndentationManager do
       end
     end
 
-    context "@single_tokens.last[:token] == token_event.last" do
+    context "@indent_reasons.last[:token] == token_event.last" do
       let(:last_single_token) { [[1, 2], :on_comma, ','] }
 
       before do
-        subject.instance_variable_set(:@single_tokens, [{ event: :on_comma }])
+        subject.instance_variable_set(:@indent_reasons,
+          [{ event_type: :on_comma }])
       end
 
-      it "returns false" do
+      it "returns true" do
         subject.line_ends_with_same_as_last(last_single_token).should be_true
       end
     end
   end
 
-  describe "#comma_is_part_of_enclosed_statement?" do
-    context "lexed_line does not end with a comma" do
-      before { lexed_line.stub(ends_with_comma?: false) }
-
-      it "returns false" do
-        subject.comma_is_part_of_enclosed_statement?(lexed_line, 1).
-          should be_false
-      end
-    end
-
-    context "lexed_line ends with a comma" do
-      before { lexed_line.stub(ends_with_comma?: true) }
-
-      context "continuing_enclosed_statement? is true" do
-        before { subject.stub(continuing_enclosed_statement?: true) }
+  describe "#multi_line_parens?" do
+    context "an unclosed ( exists on the previous line" do
+      context "an unclosed ( does not exist on the current line" do
+        before do
+          d_tokens = [{ token: '(', lineno: 1 }]
+          subject.instance_variable_set(:@indent_reasons, d_tokens)
+        end
 
         it "returns true" do
-          subject.comma_is_part_of_enclosed_statement?(lexed_line, 1).
-            should be_true
+          subject.multi_line_parens?(2).should be_true
         end
       end
 
-      context "continuing_enclosed_statement? is true" do
-        before { subject.stub(continuing_enclosed_statement?: false) }
+      context "an unclosed ( exists on the current line" do
+        before do
+          d_tokens = [{ token: '(', lineno: 1 }, { token: '(', lineno: 2 }]
+          subject.instance_variable_set(:@indent_reasons, d_tokens)
+        end
 
-        it "returns false" do
-          subject.comma_is_part_of_enclosed_statement?(lexed_line, 1).
-            should be_false
+        it "returns true" do
+          subject.multi_line_parens?(2).should be_false
         end
       end
     end
-  end
 
-  describe "#keyword_and_single_token_line?" do
-    context "no @double_tokens on this line" do
+    context "an unclosed ( does not exist on the previous line" do
       before do
-        d_tokens = [{ lineno: 12345 }]
-        subject.instance_variable_set(:@double_tokens, d_tokens)
+        d_tokens = [{ token: '(', lineno: 1 }]
+        subject.instance_variable_set(:@indent_reasons, d_tokens)
       end
 
-      it "returns false" do
-        subject.keyword_and_single_token_line?(1).should be_false
+      it "returns true" do
+        subject.multi_line_parens?(1).should be_false
       end
     end
+  end
 
-    context "@double_tokens exist on this line" do
-      context "no kw tokens on this line" do
-        before do
-          d_tokens = [{ token: '{', lineno: 1 }]
-          subject.instance_variable_set(:@double_tokens, d_tokens)
-        end
+  describe "#last_opening_event" do
+    context "@indent_reasons is empty" do
+      before { subject.instance_variable_set(:@indent_reasons, []) }
+      specify { subject.last_opening_event(nil).should be_nil }
+    end
 
-        it "returns false" do
-          subject.keyword_and_single_token_line?(1).should be_false
-        end
+    context "@indent_reasons contains the corresponding opening event" do
+      let(:indent_reasons) do
+        [{ event_type: :on_lparen }, { event_type: :on_lbrace }]
       end
 
-      context "kw tokens on this line" do
-        before do
-          d_tokens = [{ token: 'class', lineno: 1 }]
-          subject.instance_variable_set(:@double_tokens, d_tokens)
-        end
+      before { subject.instance_variable_set(:@indent_reasons, indent_reasons) }
 
-        context "no @single_tokens on this line" do
-          it "returns false" do
-            subject.keyword_and_single_token_line?(1).should be_false
-          end
+      context "the corresponding opening event is last" do
+        it "returns the matching opening event" do
+          subject.last_opening_event(:on_rbrace).should == indent_reasons.last
         end
+      end
 
-        context "@single_tokens exist on this line" do
-          before do
-            s_tokens = [{ token: '[', lineno: 1 }]
-            subject.instance_variable_set(:@single_tokens, s_tokens)
-          end
-
-          it "returns true" do
-            subject.keyword_and_single_token_line?(1).should be_true
-          end
+      context "the corresponding opening event is not last" do
+        it "returns the matching opening event" do
+          subject.last_opening_event(:on_rparen).should == indent_reasons.first
         end
       end
     end
   end
 
-  describe "#multi_line_braces?" do
-    pending
-  end
+  describe "#remove_continuation_keywords" do
+    before do
+      subject.instance_variable_set(:@indent_reasons, indent_reasons)
+    end
 
-  describe "#multi_line_brackets?" do
-    pending
-  end
+    context "@indent_reasons is empty" do
+      let(:indent_reasons) do
+        i = double "@indent_reasons"
+        i.stub_chain(:last, :[]).and_return []
+        i.stub(:empty?).and_return true
 
-  describe "#multi_line_parens?" do
-    context "an unclosed ( exists on the previous line" do
-      context "an unclosed ( does not exist on the current line" do
-        before do
-          d_tokens = [{ token: '(', lineno: 1 }]
-          subject.instance_variable_set(:@double_tokens, d_tokens)
-        end
-
-        it "returns true" do
-          subject.multi_line_parens?(2).should be_true
-        end
+        i
       end
 
-      context "an unclosed ( exists on the current line" do
-        before do
-          d_tokens = [{ token: '(', lineno: 1 }, { token: '(', lineno: 2 }]
-          subject.instance_variable_set(:@double_tokens, d_tokens)
-        end
+      specify { subject.remove_continuation_keywords.should be_nil }
+    end
 
-        it "returns true" do
-          subject.multi_line_parens?(2).should be_false
-        end
+    context "@indent_reasons does not contain CONTINUATION_KEYWORDS" do
+      let(:indent_reasons) do
+        i = double "@indent_reasons"
+        i.stub_chain(:last, :[]).and_return [{ token: 'if' }]
+        i.stub(:empty?).and_return false
+
+        i
+      end
+
+      it "should not call #pop on @indent_reasons" do
+        indent_reasons.should_not_receive(:pop)
+        subject.remove_continuation_keywords
       end
     end
 
-    context "an unclosed ( does not exist on the previous line" do
-      before do
-        d_tokens = [{ token: '(', lineno: 1 }]
-        subject.instance_variable_set(:@double_tokens, d_tokens)
+    context "@indent_reasons contains CONTINUATION_KEYWORDS" do
+      let(:indent_reasons) do
+        [{ token: 'if' }, { token: 'elsif' }]
       end
 
-      it "returns true" do
-        subject.multi_line_parens?(1).should be_false
+      it "should call #pop on @indent_reasons one time" do
+        subject.instance_variable_set(:@indent_reasons, indent_reasons)
+        subject.remove_continuation_keywords
+        subject.instance_variable_get(:@indent_reasons).should ==
+          [{ token: 'if' }]
       end
     end
   end
-
-  describe "#in_tstring?" do
-    pending
-  end
 end