ruco 0.0.32 → 0.0.33

data/Readme.md

@@ -10,6 +10,7 @@ Features:
  - find / go to line / delete line / search & replace
  - configuration via `~/.ruco.rb`
  - cut, copy and paste -> Ctrl+x/c/v
+ - undo / redo
 
 Install
 =======
@@ -57,12 +58,16 @@ TIPS
 
 TODO
 =====
+ - a = replace all
+ - limit possible file size to e.g. 1MB (would hang/be too slow with insanely big files)
+ - find next (Alt+n)
  - add selection colors to forms in command_bar
  - session storage (stay at same line/column when reopening)
  - smart staying at end of line/column when changing line
  - warnings / messages
  - syntax highlighting
  - raise when binding to a unsupported key
+ - search history via up/down arrow
  - search options regex + case-sensitive
  - add auto-confirm to 'replace?' dialog -> type s == skip, no enter needed
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)

data/VERSION

@@ -1 +1 @@
-0.0.32
+0.0.33

data/lib/ruco/application.rb

@@ -189,6 +189,9 @@ module Ruco
           end
         end
       end
+
+      action(:undo){ @editor.undo if @focused == @editor }
+      action(:redo){ @editor.redo if @focused == @editor }
     end
 
     def setup_keys
@@ -204,6 +207,8 @@ module Ruco
       bind :"Ctrl+x", :cut
       bind :"Ctrl+c", :copy
       bind :"Ctrl+v", :paste
+      bind :"Ctrl+z", :undo
+      bind :"Ctrl+y", :redo
     end
 
     def load_user_config

data/lib/ruco/editor.rb

@@ -5,7 +5,7 @@ module Ruco
     private :text_area
     delegate :view, :color_mask, :cursor,
       :selecting, :selection, :text_in_selection, :reset,
-      :move, :resize,
+      :move, :resize, :undo, :redo,
       :to => :text_area
 
     def initialize(file, options)

data/lib/ruco/editor_area.rb

@@ -2,6 +2,26 @@ module Ruco
   # everything that does not belong to a text-area
   # but is needed for Ruco::Editor
   class EditorArea < TextArea
+    def initialize(*args)
+      super(*args)
+      @history = History.new(:state => state, :track => [:content], :entries => 100)
+    end
+
+    def undo
+      @history.undo
+      self.state = @history.state
+    end
+
+    def redo
+      @history.redo
+      self.state = @history.state
+    end
+
+    def view
+      @history.add(state)
+      super
+    end
+
     def delete_line
       lines.slice!(@line, 1)
       adjust_view
@@ -29,6 +49,27 @@ module Ruco
 
     private
 
+    def state
+      {
+        :content => content,
+        :position => position,
+        :screen_position => screen_position
+      }
+    end
+
+    def state=(data)
+      @selection = nil
+      @lines = data[:content].naive_split("\n")
+      @line, @column = data[:position]
+      @scrolled_lines, @scrolled_columns = data[:screen_position]
+      adjust_view
+    end
+
+    # TODO use this instead of instance variables
+    def screen_position
+      Position.new(@scrolled_lines, @scrolled_columns)
+    end
+
     def adjust_to_indentation(first, last=nil)
       last ||= first
       if selection

data/lib/ruco/history.rb

@@ -0,0 +1,48 @@
+module Ruco
+  class History
+    def initialize(options)
+      @options = options
+      @stack = [@options.delete(:state)]
+      @position = 0
+    end
+
+    def state
+      @stack[@position]
+    end
+
+    def add(state)
+      return unless tracked_field_changes?(state)
+      remove_undone_states
+      @position += 1
+      @stack << state
+      limit_stack
+    end
+
+    def undo
+      @position = [@position - 1, 0].max
+    end
+
+    def redo
+      @position = [@position + 1, @stack.size - 1].min
+    end
+
+    private
+
+    def remove_undone_states
+      @stack.slice!(@position + 1, 9999999)
+    end
+
+    def tracked_field_changes?(data)
+      @options[:track].any? do |field|
+        state[field] != data[field]
+      end
+    end
+
+    def limit_stack
+      to_remove = @stack.size - @options[:entries]
+      return if to_remove < 1
+      @stack.slice!(0, to_remove)
+      @position -= to_remove
+    end
+  end
+end

data/lib/ruco.rb

@@ -8,6 +8,7 @@ require 'ruco/core_ext/range'
 
 require 'ruco/keyboard'
 require 'ruco/position'
+require 'ruco/history'
 
 require 'ruco/editor'
 require 'ruco/status_bar'

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.32"
+  s.version = "0.0.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-01-28}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/ruco/editor.rb",
     "lib/ruco/editor_area.rb",
     "lib/ruco/form.rb",
+    "lib/ruco/history.rb",
     "lib/ruco/keyboard.rb",
     "lib/ruco/position.rb",
     "lib/ruco/status_bar.rb",
@@ -44,6 +45,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
+    "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",
@@ -61,6 +63,7 @@ Gem::Specification.new do |s|
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
     "spec/ruco/form_spec.rb",
+    "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",

data/spec/ruco/editor_spec.rb

@@ -578,6 +578,28 @@ describe Ruco::Editor do
     end
   end
 
+  describe 'history' do
+    it "can undo an action" do
+      write("a")
+      editor.insert("b")
+      editor.view # trigger save point
+      editor.insert("c")
+      editor.view # trigger save point
+      editor.undo
+      editor.view.should == "ba\n\n\n"
+      editor.cursor.should == [0,1]
+    end
+
+    it "removes selection on undo" do
+      editor.insert('a')
+      editor.selecting{move(:to, 1,1)}
+      editor.selection.should != nil
+      editor.view # trigger save point
+      editor.undo
+      editor.selection.should == nil
+    end
+  end
+
   describe :save do
     it 'stores the file' do
       write('xxx')

data/spec/ruco/history_spec.rb

@@ -0,0 +1,77 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::History do
+  let(:history){ Ruco::History.new(:state => {:x => 1}, :track => [:x], :entries => 3) }
+
+  it "knows its state" do
+    history.state.should == {:x => 1}
+  end
+
+  it "can add a state" do
+    history.add :x => 2
+    history.state.should == {:x => 2}
+  end
+
+  it "can undo a state" do
+    history.add :x => 2
+    history.undo
+    history.state.should == {:x => 1}
+  end
+
+  it "can undo-redo-undo a state" do
+    history.add :x => 2
+    history.undo
+    history.redo
+    history.state.should == {:x => 2}
+  end
+
+  it "cannot redo a modified stack" do
+    history.add :x => 2
+    history.undo
+    history.add :x => 3
+    history.redo
+    history.state.should == {:x => 3}
+    history.redo
+    history.state.should == {:x => 3}
+  end
+
+  it "cannot undo into nirvana" do
+    history.add :x => 2
+    history.undo
+    history.undo
+    history.state.should == {:x => 1}
+  end
+
+  it "cannot redo into nirvana" do
+    history.add :x => 2
+    history.redo
+    history.state.should == {:x => 2}
+  end
+
+  it "cannot undo unimportant changes" do
+    history.add(:x => 1, :y => 1)
+    history.undo
+    history.state.should == {:x => 1}
+  end
+
+  it "tracks unimportant fields when an important one changes" do
+    history.add(:x => 2, :y => 1)
+    history.add(:x => 3)
+    history.undo
+    history.state.should == {:x => 2, :y => 1}
+    history.undo
+    history.state.should == {:x => 1}
+  end
+
+  it "does not track more than x states" do
+    history.add(:x => 2)
+    history.add(:x => 3)
+    history.add(:x => 4)
+    history.add(:x => 5)
+    history.undo
+    history.undo
+    history.undo
+    history.undo
+    history.state.should == {:x => 3}
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/ruco/editor.rb
 - lib/ruco/editor_area.rb
 - lib/ruco/form.rb
+- lib/ruco/history.rb
 - lib/ruco/keyboard.rb
 - lib/ruco/position.rb
 - lib/ruco/status_bar.rb
@@ -71,6 +72,7 @@ files:
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
+- spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb
@@ -90,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -723463789
+      hash: -1049918031
       segments: 
       - 0
       version: "0"
@@ -116,6 +118,7 @@ test_files:
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
 - spec/ruco/form_spec.rb
+- spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb