ruco 0.0.40 → 0.0.41

data/VERSION

@@ -1 +1 @@
-0.0.40
+0.0.41

data/lib/ruco/editor_area.rb

@@ -68,7 +68,8 @@ module Ruco
     end
 
     def screen_position=(pos)
-      @window.top, @window.left = pos
+      @window.set_top(pos[0], @lines.size)
+      @window.left = pos[1]
     end
 
     def adjust_to_indentation(first, last=nil)

data/lib/ruco/text_area.rb

@@ -8,21 +8,21 @@ module Ruco
       @column = 0
       @line = 0
       @window = Window.new(@options.delete(:lines), @options.delete(:columns))
-      @window.position = position
+      adjust_window
     end
 
     def view
-      @window.position = position
+      adjust_window
       @window.crop(lines) * "\n" + "\n"
     end
 
     def cursor
-      @window.position = position
+      adjust_window
       @window.cursor
     end
 
     def color_mask
-      @window.position = position
+      adjust_window
       @window.color_mask(@selection)
     end
 
@@ -39,15 +39,11 @@ module Ruco
       when :to_column then self.column = args.first
       when :to_index then move(:to, *position_for_index(*args))
       when :page_down then
-        shift = @window.lines - 1
-        old = self.line
-        self.line += shift
-        @window.top += (line - old) # force scroll
+        self.line += @window.lines
+        @window.set_top(@window.top + @window.lines, @lines.size)
       when :page_up then
-        shift = @window.lines - 1
-        old = self.line 
-        self.line -= shift
-        @window.top += (line - old) # force scroll
+        self.line -= @window.lines
+        @window.set_top(@window.top - @window.lines, @lines.size)
       else
         raise "Unknown move type #{where} with #{args.inspect}"
       end
@@ -245,5 +241,9 @@ module Ruco
       self.line = line
       self.column = column
     end
+
+    def adjust_window
+      @window.set_position(position, :max_lines => @lines.size)
+    end
   end
 end

data/lib/ruco/window.rb

@@ -2,10 +2,17 @@ module Ruco
   class Window
     OFFSET = 5
 
-    attr_accessor :position, :lines, :columns, :top, :left
-    attr_reader :cursor
+    attr_accessor :lines, :columns, :left
+    attr_reader :cursor, :top
+
+    def initialize(lines, columns, options={})
+      @options = options
+
+      @options[:line_scroll_threshold] ||= 1
+      @options[:line_scroll_offset] ||= 1
+      @options[:column_scroll_threshold] ||= 1
+      @options[:column_scroll_offset] ||= 5
 
-    def initialize(lines, columns)
       @lines = lines
       @columns = columns
       @top = 0
@@ -13,19 +20,33 @@ module Ruco
       @cursor = Position.new(0,0)
     end
 
-    def crop(content)
-      lines = content[visible_lines] || []
-      lines[@lines-1] ||= nil
-      lines.map do |line|
+    def position=(x)
+      set_position(x)
+    end
+
+    def set_position(position, options={})
+      scroll_line_into_view position.line, (options[:max_lines] || 9999)
+      scroll_column_into_view position.column
+      @cursor = Position.new(position.line - @top, position.column - @left)
+    end
+
+    def crop(lines)
+      lines_to_display = lines[visible_lines] || []
+      lines_to_display[@lines-1] ||= nil
+      lines_to_display.map do |line|
         line ||= ''
         line[visible_columns] || ''
       end
     end
 
-    def position=(pos)
-      self.top = pos.line - line_offset unless visible_lines.include?(pos.line)
-      self.left = pos.column - column_offset  unless visible_columns.include?(pos.column)
-      @cursor = Position.new(pos.line - @top, pos.column - @left)
+    def scroll_line_into_view(line, total_lines)
+      result = adjustment(line, visible_lines, @options[:line_scroll_threshold], @options[:line_scroll_offset])
+      set_top result, total_lines if result
+    end
+
+    def scroll_column_into_view(column)
+      result = adjustment(column, visible_columns, @options[:column_scroll_threshold], @options[:column_scroll_offset])
+      self.left = result if result
     end
 
     def color_mask(selection)
@@ -46,16 +67,26 @@ module Ruco
       end
     end
 
-    def top=(x)
-      @top = [x,0].max
-    end
-
     def left=(x)
       @left = [x,0].max
     end
 
+    def set_top(line, total_lines)
+      max_top = total_lines - lines + 1 + @options[:line_scroll_offset]
+      @top = [[line, max_top].min, 0].max
+    end
+
     private
 
+    def adjustment(current, allowed, threshold, offset)
+      if current < (allowed.first + threshold)
+        current - offset
+      elsif current > (allowed.last - threshold)
+        size = allowed.last - allowed.first + 1
+        current - size + 1 + offset
+      end
+    end
+
     def visible_area(line)
       line += @top
       start_of_line = [line, @left]
@@ -64,14 +95,6 @@ module Ruco
       start_of_line..end_of_line
     end
 
-    def line_offset
-      @lines / 2
-    end
-
-    def column_offset
-      @columns / 2
-    end
-
     def visible_lines
       @top..(@top+@lines-1)
     end

data/ruco.gemspec

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

data/spec/ruco/application_spec.rb

@@ -39,7 +39,7 @@ describe Ruco::Application do
     app.key(:enter)
     app.key('2')
     app.key(:enter)
-    app.view.should == "#{status.sub('.txt ','.txt*')}22\n2\n\n#{command}"
+    app.view.should == "#{status.sub('.txt ','.txt*')}2\n\n\n#{command}"
   end
 
   it "does not enter key-codes" do
@@ -204,7 +204,7 @@ describe Ruco::Application do
       app.key(:tab)
       app.key(:tab)
       app.key(:'Ctrl+v') # paste
-      editor_part(app.view).should == "    ab\n  cd\n  ef"
+      editor_part(app.view).should == "  cd\n  ef\n"
     end
 
     it "indents when typing" do

data/spec/ruco/editor_spec.rb

@@ -5,7 +5,19 @@ describe Ruco::Editor do
     File.open(@file,'w'){|f| f.write(content) }
   end
 
-  let(:editor){ Ruco::Editor.new(@file, :lines => 3, :columns => 5, :line_scrolling_offset => 5, :column_scrolling_offset => 5) }
+  let(:editor){
+    editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5)
+    # only scroll when we reach end of lines/columns <-> able to test with smaller area
+    editor.send(:text_area).instance_eval{
+      @window.instance_eval{
+        @options[:line_scroll_threshold] = 0
+        @options[:line_scroll_offset] = 1
+        @options[:column_scroll_threshold] = 0
+        @options[:column_scroll_offset] = 1
+      }
+    }
+    editor
+  }
 
   before do
     @file = 'spec/temp.txt'
@@ -113,26 +125,26 @@ describe Ruco::Editor do
         editor.cursor.column.should == 4
 
         editor.move(:relative, 0,1)
-        editor.view.should == "45678\n\n\n"
-        editor.cursor.column.should == 2
+        editor.view.should == "34567\n3\n\n"
+        editor.cursor.column.should == 3
       end
 
       it "cannot scroll past the screen" do
         write('123456789')
         editor.move(:relative, 0,4)
         6.times{ editor.move(:relative, 0,1) }
-        editor.view.should == "89\n\n\n"
-        editor.cursor.column.should == 2
+        editor.view.should == "789\n\n\n"
+        editor.cursor.column.should == 3
       end
 
       it "can scroll columns backwards" do
-        write('123456789')
+        write('0123456789')
         editor.move(:relative, 0,5)
-        editor.view.should == "45678\n\n\n"
+        editor.view.should == "23456\n\n\n"
 
-        editor.move(:relative, 0,-3)
-        editor.view.should == "12345\n\n\n"
-        editor.cursor.column.should == 2
+        editor.move(:relative, 0,-4)
+        editor.view.should == "01234\n\n\n"
+        editor.cursor.column.should == 1
       end
     end
 

data/spec/ruco/text_area_spec.rb

@@ -7,14 +7,14 @@ describe Ruco::TextArea do
         text = Ruco::TextArea.new("1\n2\n3\n4\n5\n6\n7\n8\n9\n", :lines => 3, :columns => 3)
         text.move(:page_down)
         text.view.should == "3\n4\n5\n"
-        text.cursor.should == [0,0]
+        text.cursor.should == [1,0]
       end
 
       it "keeps cursor position when moving down" do
-        text = Ruco::TextArea.new("1\n2abc\n3\n4ab\n5\n6\n7\n8\n9\n", :lines => 3, :columns => 5)
+        text = Ruco::TextArea.new("1\n2abc\n3\n4\n5ab\n6\n7\n8\n9\n", :lines => 3, :columns => 5)
         text.move(:to, 1,4)
         text.move(:page_down)
-        text.view.should == "3\n4ab\n5\n"
+        text.view.should == "4\n5ab\n6\n"
         text.cursor.should == [1,3]
       end
 
@@ -24,17 +24,17 @@ describe Ruco::TextArea do
         text.view.should == "3\n4\n5\n"
         text.cursor.should == [1,0]
         text.move(:page_up)
-        text.view.should == "1\n2\n3\n"
+        text.view.should == "0\n1\n2\n"
         text.cursor.should == [1,0]
       end
 
       it "keeps column position when moving up" do
-        text = Ruco::TextArea.new("0\n1\n2\n3ab\n4\n5abc\n6\n7\n8\n", :lines => 3, :columns => 5)
-        text.move(:to, 5, 4)
+        text = Ruco::TextArea.new("0\n1\n2ab\n3\n4\n5abc\n6\n7\n8\n9\n10\n11\n", :lines => 3, :columns => 5)
+        text.move(:to, 5, 3)
         text.view.should == "4\n5abc\n6\n"
-        text.cursor.should == [1,4]
+        text.cursor.should == [1,3]
         text.move(:page_up)
-        text.view.should == "2\n3ab\n4\n"
+        text.view.should == "1\n2ab\n3\n"
         text.cursor.should == [1,3]
       end
 

data/spec/ruco/window_spec.rb

@@ -4,7 +4,12 @@ describe Ruco::Window do
   let(:window){ Ruco::Window.new(10,10) }
 
   describe :crop do
-    let(:window){ Ruco::Window.new(2,4) }
+    let(:window){
+      Ruco::Window.new(2,4,
+        :line_scroll_threshold => 0, :line_scroll_offset => 1,
+        :column_scroll_threshold => 0, :column_scroll_offset => 1
+      )
+    }
 
     it "does not modify given lines" do
       original = ['1234','1234']
@@ -39,67 +44,84 @@ describe Ruco::Window do
 
     describe 'scrolled' do
       it "goes out of frame if line is out of frame" do
-        window = Ruco::Window.new(6,1)
+        window = Ruco::Window.new(6,1, :line_scroll_offset => 0, :line_scroll_threshold => 0)
         window.position = Ruco::Position.new(6,0)
         result = window.crop(['1','2','3','4','5','6','7','8','9'])
-        result.should == ['4','5','6','7','8','9']
+        result.should == ['2','3','4','5','6','7']
       end
 
       it "goes out of frame if column is out of frame" do
-        window = Ruco::Window.new(1,6)
+        window = Ruco::Window.new(1,6, :column_scroll_offset => 0, :column_scroll_threshold => 0)
         window.position = Ruco::Position.new(0,6)
         result = window.crop(['1234567890'])
-        result.should == ['456789']
+        result.should == ['234567']
       end
     end
   end
 
   describe :top do
+    let(:window){ Ruco::Window.new(10,10, :line_scroll_threshold => 1, :line_scroll_offset => 3) }
+
     it "does not change when staying in frame" do
       window.top.should == 0
-      window.position = Ruco::Position.new(9,0)
+      window.position = Ruco::Position.new(8,0)
       window.top.should == 0
     end
 
-    it "changes by offset when going vertically out of frame" do
-      window.position = Ruco::Position.new(10,0)
-      window.top.should == 5
+    it "changes by offset when going down out of frame" do
+      window.position = Ruco::Position.new(9,0)
+      window.top.should == 3
     end
 
-    it "changes to x - offset when going down out of frame" do
+    it "stays at bottom when going down out of frame" do
       window.position = Ruco::Position.new(20,0)
-      window.top.should == 15
+      window.top.should == 20 - 10 + 3 + 1
     end
 
-    it "changes to x - offset when going down out of frame" do
+    it "stays at top when going up out of frame" do
       window.position = Ruco::Position.new(20,0)
       window.position = Ruco::Position.new(7,0)
-      window.top.should == 2
+      window.top.should == 7 - 3
+    end
+
+    it "changes to 0 when going up to 1" do
+      window.position = Ruco::Position.new(20,0)
+      window.position = Ruco::Position.new(1,0)
+      window.top.should == 0
+    end
+
+    it "does not change when staying in changed frame" do
+      window.position = Ruco::Position.new(9,0)
+      window.top.should == 3
+      window.position = Ruco::Position.new(11,0)
+      window.top.should == 3
     end
   end
 
   describe :left do
+    let(:window){ Ruco::Window.new(10,10, :column_scroll_threshold => 1, :column_scroll_offset => 3) }
+
     it "does not change when staying in frame" do
       window.left.should == 0
-      window.position = Ruco::Position.new(0,9)
+      window.position = Ruco::Position.new(0,8)
       window.left.should == 0
     end
 
     it "changes by offset when going vertically out of frame" do
+      window.position = Ruco::Position.new(0,8)
       window.position = Ruco::Position.new(0,9)
-      window.position = Ruco::Position.new(0,10)
-      window.left.should == 5
+      window.left.should == 3
     end
 
-    it "changes to x - offset when going right out of frame" do
+    it "stays right when going right out of frame" do
       window.position = Ruco::Position.new(0,20)
-      window.left.should == 15
+      window.left.should == 20 - 10 + 3 + 1
     end
 
-    it "changes to x - offset when going left out of frame" do
+    it "stays left when going left out of frame" do
       window.position = Ruco::Position.new(0,20)
       window.position = Ruco::Position.new(0,7)
-      window.left.should == 2
+      window.left.should == 7 - 3
     end
 
     it "changes to 0 when going left out of frame to 1" do
@@ -109,24 +131,29 @@ describe Ruco::Window do
     end
 
     it "does not change when staying in changed frame" do
+      window.position = Ruco::Position.new(0,8)
       window.position = Ruco::Position.new(0,9)
-      window.position = Ruco::Position.new(0,10)
-      window.left.should == 5
-      window.position = Ruco::Position.new(0,14)
-      window.left.should == 5
+      window.left.should == 3
+      window.position = Ruco::Position.new(0,11)
+      window.left.should == 3
     end
   end
 
-  describe :top= do
+  describe :set_top do
     it "sets" do
-      window.top = 1
+      window.set_top 1, 20
       window.top.should == 1
     end
 
     it "does not allow negative" do
-      window.top = -1
+      window.set_top -1, 20
       window.top.should == 0
     end
+
+    it "does not go above maximum top" do
+      window.set_top 20, 20
+      window.top.should == 20 - 10 + 3 - 1
+    end
   end
 
   describe :left= do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 40
-  version: 0.0.40
+  - 41
+  version: 0.0.41
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 +01:00
+date: 2011-02-05 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -441011373
+      hash: 282935183
       segments: 
       - 0
       version: "0"