text_editor 0.0.0 → 0.0.1

data/lib/text_editor/reactor.rb

@@ -1,4 +1,5 @@
 class TextEditor
+  # The main event loop for the text editor.
   class Reactor
     include Component
 
@@ -23,10 +24,11 @@ class TextEditor
         key = editor.keyboard.listen
         next unless key
 
-        command = editor.mode.resolve(key)
-        next unless command
+        keybinding, args = editor.mode.resolve(key)
+        resolved = command.resolve(keybinding)
+        next unless resolved
 
-        command.call(editor, key.to_s)
+        resolved.call(editor, *args, key.to_s)
         render
       end
     end

data/lib/text_editor/terminal.rb

@@ -9,10 +9,6 @@ class TextEditor
       cols
     end
 
-    def delete_line
-      deleteln
-    end
-
     def keys
       self.class.constants.sort.grep(/^KEY/).reduce({}) do |hash, constant|
         value = self.class.const_get(constant)
@@ -24,10 +20,6 @@ class TextEditor
       getch
     end
 
-    def move(*coords)
-      setpos(*coords)
-    end
-
     def render
       noecho              # hide typed characters
       nonl                # disable newline translation
@@ -41,17 +33,8 @@ class TextEditor
       close_screen
     end
 
-    def write(string)
-      padded = string.ljust(columns)
-      addstr(padded)
-    end
-
-    def x
-      stdscr.curx
-    end
-
-    def y
-      stdscr.cury
+    def window(lines, columns, y, x)
+      stdscr.subwin(lines, columns, y, x)
     end
   end
 end

data/lib/text_editor/window.rb

@@ -17,8 +17,8 @@ class TextEditor
       buffer.each_line.with_index do |line, index|
         if cache[index] != line
           cache[index] = line
-          terminal.move(index, 0)
-          terminal.write(line)
+          move(index, 0)
+          write(line)
         end
       end
 
@@ -26,11 +26,20 @@ class TextEditor
 
       deleted_lines.each do |index|
         cache.delete(index)
-        terminal.move(index, 0)
-        terminal.delete_line
+        move(index, 0)
+        delete_line
       end
 
-      terminal.move(*cursor.position)
+      line = cursor.line
+      content = buffer.line(line)
+      search = content[0..cursor.column]
+
+      tabs = search.scan("\t").size
+      width = config.tab.width - 1
+      column = cursor.column + (tabs * width)
+
+      move(line, column)
+      window.refresh
     end
 
     def state
@@ -40,5 +49,25 @@ class TextEditor
     def update(buffer, cursor)
       @state = State.new(buffer, cursor)
     end
+
+    private
+
+    def delete_line
+      window.deleteln
+    end
+
+    def move(*coords)
+      window.setpos(*coords)
+    end
+
+    def window
+      @window ||= terminal.window(terminal.lines, terminal.columns, 0, 0)
+    end
+
+    def write(string)
+      tabbed = string.gsub("\t", config.tab.to_s)
+      padded = tabbed.ljust(terminal.columns)
+      window.addstr(padded)
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,6 +8,9 @@ end
 
 require File.expand_path("../../lib/text_editor", __FILE__)
 
+support = Pathname.new(__FILE__).dirname.join("support")
+support.children.each { |file| require file }
+
 RSpec.configure do |config|
   config.filter_run :focus
   config.raise_errors_for_deprecations!

data/spec/support/command_helper.rb

@@ -0,0 +1,43 @@
+module CommandHelper
+  extend Forwardable
+
+  def_delegators :subject, :buffer, :column, :cursor, :line, :window
+
+  def self.included(spec)
+    spec.class_eval do
+      subject { described_class.new(editor) }
+      let(:editor) { TextEditor.new(args).tap(&:bootstrap) }
+      let(:args) { [] }
+    end
+  end
+
+  def expect_buffer(content)
+    expect(buffer.to_s).to eq(content)
+  end
+
+  def expect_cursor(line, column)
+    expect(cursor.position).to eq([line, column])
+  end
+
+  def expect_mode(mode)
+    expect(editor.mode.name).to eq(mode)
+  end
+
+  def update_buffer(content)
+    new_buffer = buffer
+
+    content.each_line.map(&:chomp).each.with_index do |line, index|
+      method = index.zero? ? :replace_line : :insert_line
+      new_buffer = new_buffer.send(method, index, line)
+    end
+
+    window.update(new_buffer, cursor)
+    expect_buffer(content)
+  end
+
+  def update_cursor(line, column)
+    new_cursor = cursor.move(line, column)
+    window.update(buffer, new_cursor)
+    expect_cursor(line, column)
+  end
+end

data/spec/text_editor/clipboard_spec.rb

@@ -5,13 +5,6 @@ RSpec.describe TextEditor::Clipboard do
 
   let(:editor) { double("editor") }
 
-  describe "#clear" do
-    it "delegates to adapter.clear" do
-      expect(subject).to receive_message_chain(:adapter, :clear)
-      subject.clear
-    end
-  end
-
   describe "#copy" do
     it "delegates to adapter.copy" do
       expect(subject).to receive_message_chain(:adapter, :copy)

data/spec/text_editor/command/append_line_and_insert_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::AppendLineAndInsert do
+  include CommandHelper
+
+  let(:args) { %w(--flavor vim) }
+
+  before { expect_mode(:normal) }
+  after { expect_mode(:insert) }
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "adds newline and moves cursor" do
+        subject.run
+        expect_buffer("\n")
+        expect_cursor(1, 0)
+      end
+    end
+
+    context "with a non-empty buffer" do
+      before do
+        update_buffer("123")
+        update_cursor(0, 2)
+      end
+
+      it "adds newline and moves cursor" do
+        subject.run
+        expect_buffer("123\n")
+        expect_cursor(1, 0)
+      end
+    end
+  end
+end

data/spec/text_editor/command/backspace_spec.rb

@@ -0,0 +1,54 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::Backspace do
+  include CommandHelper
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "does not change buffer or cursor" do
+        subject.run
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with a one line buffer" do
+      before { update_buffer("ab") }
+
+      it "deletes a character and moves cursor" do
+        update_cursor(0, 2)
+
+        subject.run
+        expect_cursor(0, 1)
+        expect_buffer("a")
+
+        subject.run
+        expect_cursor(0, 0)
+        expect_buffer("")
+      end
+
+      it "does not change buffer if cursor is at start of line" do
+        expect_cursor(0, 0)
+        subject.run
+        expect_cursor(0, 0)
+        expect_buffer("ab")
+      end
+    end
+
+    context "with a multi line buffer" do
+      before { update_buffer("ab\ncd") }
+
+      it "backspaces to previous line" do
+        update_cursor(1, 0)
+        subject.run
+        expect_cursor(0, 2)
+        expect_buffer("abcd")
+      end
+    end
+  end
+end

data/spec/text_editor/command/change_mode_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::ChangeMode do
+  include CommandHelper
+
+  describe "#run" do
+    before { editor.flavor.modes[:test] = :example }
+
+    it "only switches to a valid mode" do
+      expect(editor.mode).not_to eq(:example)
+      subject.run(:test)
+      expect(editor.mode).to eq(:example)
+
+      expect { subject.run(:invalid) }.to raise_error(KeyError)
+    end
+  end
+end

data/spec/text_editor/command/cursor_down_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::CursorDown do
+  include CommandHelper
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "does not move cursor" do
+        subject.run
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with a one line buffer" do
+      before { update_buffer("ab") }
+
+      it "does not move cursor" do
+        expect_cursor(0, 0)
+        subject.run
+        expect_cursor(0, 0)
+        expect_buffer("ab")
+      end
+    end
+
+    context "with a buffer containing multiple lines" do
+      before do
+        update_buffer("ab\ncd")
+        update_cursor(0, 1)
+      end
+
+      it "moves down one line" do
+        subject.run
+        expect_buffer("ab\ncd")
+        expect_cursor(1, 1)
+      end
+    end
+
+    context "with a buffer containing different length lines" do
+      before do
+        update_buffer("abc\nd")
+        update_cursor(0, 2)
+      end
+
+      it "moves down one line and clamps to the end" do
+        subject.run
+        expect_buffer("abc\nd")
+        expect_cursor(1, 1)
+      end
+    end
+  end
+end

data/spec/text_editor/command/cursor_end_and_insert_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::CursorEndAndInsert do
+  include CommandHelper
+
+  let(:args) { %w(--flavor vim) }
+
+  before { expect_mode(:normal) }
+  after { expect_mode(:insert) }
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "does not move cursor" do
+        subject.run
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with an non-empty buffer" do
+      before { update_buffer("ab cd") }
+
+      it "moves cursor one column past the end of the line" do
+        subject.run
+        expect_buffer("ab cd")
+        expect_cursor(0, 5)
+      end
+    end
+  end
+end

data/spec/text_editor/command/cursor_end_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::CursorEnd do
+  include CommandHelper
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "does not move cursor" do
+        subject.run
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with an non-empty buffer" do
+      before { update_buffer("ab cd") }
+
+      it "moves cursor one column past the end of the line" do
+        subject.run
+        expect_buffer("ab cd")
+        expect_cursor(0, 5)
+      end
+    end
+  end
+end

data/spec/text_editor/command/cursor_left_spec.rb

@@ -0,0 +1,46 @@
+require "spec_helper"
+
+RSpec.describe TextEditor::Command::CursorLeft do
+  include CommandHelper
+
+  describe "#run" do
+    context "with an empty buffer" do
+      before do
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+
+      it "does not move cursor" do
+        subject.run
+        expect_buffer("")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with an non-empty buffer" do
+      before do
+        update_buffer("ab")
+        update_cursor(0, 1)
+      end
+
+      it "moves cursor to the left" do
+        subject.run
+        expect_buffer("ab")
+        expect_cursor(0, 0)
+      end
+    end
+
+    context "with a buffer containing multiple lines" do
+      before do
+        update_buffer("ab\ncd")
+        update_cursor(1, 0)
+      end
+
+      it "does not wrap to previous line" do
+        subject.run
+        expect_buffer("ab\ncd")
+        expect_cursor(1, 0)
+      end
+    end
+  end
+end