ruco 0.0.34 → 0.0.35

data/Readme.md

@@ -58,8 +58,6 @@ TIPS
 
 TODO
 =====
- - make modified smarter <-> no manual addition of every action
- - make history more efficient (e.g. no need to check when only moving / store only diffs)
  - limit possible file size to e.g. 1MB (would hang/be too slow with big files)
  - find next (Alt+n)
  - add selection colors to forms in command_bar

data/VERSION

@@ -1 +1 @@
-0.0.34
+0.0.35

data/lib/ruco/editor.rb

@@ -4,6 +4,8 @@ module Ruco
     attr_reader :text_area
     private :text_area
     delegate :view, :color_mask, :cursor,
+      :insert, :indent, :unindent, :delete, :delete_line,
+      :redo, :undo,
       :selecting, :selection, :text_in_selection, :reset,
       :move, :resize,
       :to => :text_area
@@ -18,8 +20,8 @@ module Ruco
           raise "#{@file} contains tabs.\nRuco atm does not support tabs, but will happily convert them to spaces if started with --convert-tabs or -c"
         end
       end
+      @saved_content = content
       @text_area = EditorArea.new(content, options)
-      @modified = false
     end
 
     def find(text)
@@ -31,22 +33,14 @@ module Ruco
       true
     end
 
-    %w[insert indent unindent delete delete_line redo undo].each do |modifying|
-      eval <<-RUBY
-        def #{modifying}(*args)
-          text_area.#{modifying}(*args)
-          @modified = true
-        end
-      RUBY
-    end
-
     def modified?
-      @modified
+      @saved_content != text_area.content
     end
 
     def save
-      File.open(@file,'w'){|f| f.write(text_area.content) }
-      @modified = false
+      content = text_area.content
+      File.open(@file,'w'){|f| f.write(content) }
+      @saved_content = content
     end
   end
 end

data/lib/ruco/editor_area.rb

@@ -4,7 +4,7 @@ module Ruco
   class EditorArea < TextArea
     def initialize(*args)
       super(*args)
-      @history = History.new(:state => state, :track => [:content], :entries => 100)
+      @history = History.new(:state => state, :track => [:content], :entries => 100, :timeout => 2)
     end
 
     def undo

data/lib/ruco/history.rb

@@ -1,8 +1,12 @@
 module Ruco
   class History
+    attr_accessor :timeout
+
     def initialize(options)
       @options = options
       @stack = [@options.delete(:state)]
+      @timeout = options.delete(:timeout) || 0
+      timeout!
       @position = 0
     end
 
@@ -13,16 +17,21 @@ module Ruco
     def add(state)
       return unless tracked_field_changes?(state)
       remove_undone_states
-      @position += 1
-      @stack << state
+      if merge_timeout?
+        @position += 1
+        @last_merge = Time.now.to_f
+      end
+      @stack[@position] = state
       limit_stack
     end
 
     def undo
+      timeout!
       @position = [@position - 1, 0].max
     end
 
     def redo
+      timeout!
       @position = [@position + 1, @stack.size - 1].min
     end
 
@@ -44,5 +53,13 @@ module Ruco
       @stack.slice!(0, to_remove)
       @position -= to_remove
     end
+
+    def timeout!
+      @last_merge = Time.now.to_f - @timeout
+    end
+
+    def merge_timeout?
+      (Time.now.to_f - @last_merge) > @timeout
+    end
   end
 end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.34"
+  s.version = "0.0.35"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-28}
+  s.date = %q{2011-01-29}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]

data/spec/ruco/editor_spec.rb

@@ -583,6 +583,8 @@ describe Ruco::Editor do
       write("a")
       editor.insert("b")
       editor.view # trigger save point
+      future = Time.now + 10
+      Time.stub!(:now).and_return future
       editor.insert("c")
       editor.view # trigger save point
       editor.undo

data/spec/ruco/history_spec.rb

@@ -74,4 +74,44 @@ describe Ruco::History do
     history.undo
     history.state.should == {:x => 3}
   end
+
+  describe 'with timeout' do
+    let(:history){ Ruco::History.new(:state => {:x => 1}, :track => [:x], :entries => 3, :timeout => 0.1) }
+
+    it "adds fast changes" do
+      history.add(:x => 2)
+      history.add(:x => 3)
+      history.add(:x => 4)
+      history.undo
+      history.state.should == {:x => 1}
+    end
+
+    it "does not modify undone states" do
+      history.undo
+      history.state.should == {:x => 1}
+      history.add(:x => 4)
+      history.undo
+      history.state.should == {:x => 1}
+    end
+
+    it "does not modify redone states" do
+      history.add(:x => 2)
+      history.undo
+      sleep 0.2
+      history.redo
+      history.state.should == {:x => 2}
+      history.add(:x => 3)
+      history.undo
+      history.state.should == {:x => 2}
+    end
+
+    it "does not add slow changes" do
+      history.add(:x => 2)
+      history.add(:x => 3)
+      sleep 0.2
+      history.add(:x => 4)
+      history.undo
+      history.state.should == {:x => 3}
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 0
-  - 34
-  version: 0.0.34
+  - 35
+  version: 0.0.35
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 +01:00
+date: 2011-01-29 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency