ruco 0.0.36 → 0.0.37

data/Readme.md

@@ -56,12 +56,15 @@ Customize
 
 TIPS
 ====
+ - [RVM] `alias r="rvm ree exec ruco"` and you only have to install ruco once 
  - [Ruby1.9] Unicode support -> install libncursesw5-dev before installing ruby (does not work for 1.8)
  - [ssh vs clipboard] access your desktops clipboard by installing `xauth` on the server and then using `ssh -X`
  - [Alt key] if Alt does not work try your Meta/Win/Cmd key
 
 TODO
 =====
+ - big warning when editing a not-writeable file
+ - nice warning when failing to write a write-only file
  - find next (Alt+n)
  - add selection colors to forms in command_bar
  - session storage (stay at same line/column when reopening)

data/VERSION

@@ -1 +1 @@
-0.0.36
+0.0.37

data/lib/ruco.rb

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

data/lib/ruco/editor_area.rb

@@ -23,28 +23,26 @@ module Ruco
     end
 
     def delete_line
-      lines.slice!(@line, 1)
-      adjust_view
+      lines.slice!(line, 1)
+      sanitize_position
     end
 
     def indent
       selected_lines.each do |line|
-        @lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
+        lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
       end
       adjust_to_indentation Ruco::TAB_SIZE
-      adjust_view
     end
 
     def unindent
-      lines_to_unindent = (selection ? selected_lines : [@line])
+      lines_to_unindent = (selection ? selected_lines : [line])
       removed = lines_to_unindent.map do |line|
-        remove = [@lines[line].leading_whitespace.size, Ruco::TAB_SIZE].min
-        @lines[line].slice!(0, remove)
+        remove = [lines[line].leading_whitespace.size, Ruco::TAB_SIZE].min
+        lines[line].slice!(0, remove)
         remove
       end
 
       adjust_to_indentation -removed.first, -removed.last
-      adjust_view
     end
 
     private
@@ -60,14 +58,17 @@ module Ruco
     def state=(data)
       @selection = nil
       @lines = data[:content].naive_split("\n")
-      @line, @column = data[:position]
-      @scrolled_lines, @scrolled_columns = data[:screen_position]
-      adjust_view
+      self.position = data[:position]
+      self.screen_position = data[:screen_position]
     end
 
     # TODO use this instead of instance variables
     def screen_position
-      Position.new(@scrolled_lines, @scrolled_columns)
+      Position.new(@window.top, @window.left)
+    end
+
+    def screen_position=(pos)
+      @window.top, @window.left = pos
     end
 
     def adjust_to_indentation(first, last=nil)
@@ -76,9 +77,9 @@ module Ruco
         cursor_adjustment = (selection.first == position ? first : last)
         selection.first.column = [selection.first.column + first, 0].max
         selection.last.column = [selection.last.column + last, 0].max
-        @column += cursor_adjustment
+        self.column += cursor_adjustment
       else
-        @column += first
+        self.column += first
       end
     end
 

data/lib/ruco/text_area.rb

@@ -1,69 +1,57 @@
 module Ruco
   class TextArea
-    attr_reader :lines, :selection
+    attr_reader :lines, :selection, :column, :line
 
     def initialize(content, options)
       @lines = content.naive_split("\n")
-      @options = options
-      @line = 0
+      @options = options.dup
       @column = 0
-      @cursor_line = 0
-      @cursor_column = 0
-      @scrolled_lines = 0
-      @scrolled_columns = 0
-      @options[:line_scrolling_offset] ||= @options[:lines] / 2
-      @options[:column_scrolling_offset] ||= @options[:columns] / 2
+      @line = 0
+      @window = Window.new(@options.delete(:lines), @options.delete(:columns))
+      @window.position = position
     end
 
     def view
-      Array.new(@options[:lines]).map_with_index do |_,i|
-        (lines[i + @scrolled_lines] || "").slice(@scrolled_columns, @options[:columns])
-      end * "\n" + "\n"
+      @window.position = position
+      @window.crop(lines) * "\n" + "\n"
     end
 
-    def color_mask
-      mask = Array.new(@options[:lines])
-      return mask unless @selection
-
-      mask.map_with_index do |_,line|
-        visible = visible_area(line)
-        next unless @selection.overlap?(visible)
-
-        first = [@selection.first, visible.first].max
-        last = [@selection.last, visible.last].min
+    def cursor
+      @window.position = position
+      @window.cursor
+    end
 
-        [
-          [first[1]-@scrolled_columns,Curses::A_REVERSE],
-          [last[1]-@scrolled_columns, Curses::A_NORMAL]
-        ]
-      end
+    def color_mask
+      @window.position = position
+      @window.color_mask(@selection)
     end
 
     def move(where, *args)
       case where
       when :relative then
-        @line += args.first
-        @column += args.last
+        self.line += args.first
+        self.column += args.last
       when :to then
-        @line, @column = args
+        self.line, self.column = args
       when :to_bol then move_to_bol(*args)
       when :to_eol then move_to_eol(*args)
-      when :to_line then @line = args.first
-      when :to_column then @column = args.first
+      when :to_line then self.line = args.first
+      when :to_column then self.column = args.first
       when :to_index then move(:to, *position_for_index(*args))
       when :page_down then
-        shift = @options[:lines] - 1
-        @line += shift
-        @scrolled_lines += shift
+        shift = @window.lines - 1
+        old = self.line
+        self.line += shift
+        @window.top += (line - old) # force scroll
       when :page_up then
-        shift = @options[:lines] - 1
-        @line -= shift
-        @scrolled_lines -= shift
+        shift = @window.lines - 1
+        old = self.line 
+        self.line -= shift
+        @window.top += (line - old) # force scroll
       else
         raise "Unknown move type #{where} with #{args.inspect}"
       end
       @selection = nil unless @selecting
-      adjust_view
     end
 
     def selecting(&block)
@@ -98,7 +86,7 @@ module Ruco
       text.tabs_to_spaces!
       if text == "\n" and @column >= after_last_word
         current_whitespace = current_line.leading_whitespace
-        next_whitespace = lines[@line+1].to_s.leading_whitespace
+        next_whitespace = lines[line+1].to_s.leading_whitespace
         text = text + [current_whitespace, next_whitespace].max
       end
       insert_into_content text
@@ -124,10 +112,6 @@ module Ruco
       end
     end
 
-    def cursor
-      Position.new @cursor_line, @cursor_column
-    end
-
     def index_for_position(position=self.position)
       index = lines[0...position.line].join("\n").size + position.column
       index += 1 if position.line > 0 # account for missing newline
@@ -139,14 +123,14 @@ module Ruco
     end
 
     def resize(lines, columns)
-      @options[:lines] = lines
-      @options[:columns] = columns
+      @window.lines = lines
+      @window.columns = columns
     end
 
     protected
 
     def position
-      Position.new(@line, @column)
+      Position.new(line, column)
     end
 
     def position_for_index(index)
@@ -204,46 +188,17 @@ module Ruco
       end
     end
 
-    def adjust_view
-      @line =    [[@line,   0].max, lines.size - 1].min
-      @column =  [[@column, 0].max, current_line.size].min
-      reposition_cursor
-      scroll_column_into_view
-      scroll_line_into_view
-      reposition_cursor
+    def line=(x)
+      @line = [[x, 0].max, [lines.size - 1, 0].max ].min
+      self.column = @column # e.g. now in an empty line
     end
 
-    def scroll_column_into_view
-      offset = [@options[:column_scrolling_offset], @options[:columns]].min
-
-      if @cursor_column >= @options[:columns]
-        @scrolled_columns = @column - @options[:columns] + offset
-      end
-
-      if @cursor_column < 0
-        @scrolled_columns = @column - offset
-      end
-
-      @scrolled_columns = [[@scrolled_columns, 0].max, @column].min
-    end
-
-    def scroll_line_into_view
-      offset = [@options[:line_scrolling_offset], @options[:lines]].min
-
-      if @cursor_line >= @options[:lines]
-        @scrolled_lines = @line - @options[:lines] + offset
-      end
-
-      if @cursor_line < 0
-        @scrolled_lines = @line - offset
-      end
-
-      @scrolled_lines = [[@scrolled_lines, 0].max, @line].min
+    def column=(x)
+      @column = [[x, 0].max, current_line.size].min
     end
 
-    def reposition_cursor
-      @cursor_column = @column - @scrolled_columns
-      @cursor_line = @line - @scrolled_lines
+    def position=(pos)
+      self.line, self.column = pos
     end
 
     def insert_into_content(text)
@@ -253,24 +208,23 @@ module Ruco
         end
       else
         # faster but complicated for newlines
-        lines[@line].insert(@column, text)
+        lines[line].insert(@column, text)
       end
     end
 
     def position_inside_content?
-      @line < lines.size and @column < lines[@line].to_s.size
+      line < lines.size and @column < lines[line].to_s.size
     end
 
     def current_line
-      lines[@line] || ''
+      lines[line] || ''
     end
 
     def move_according_to_insert(text)
       inserted_lines = text.naive_split("\n")
       if inserted_lines.size > 1
-        # column position does not add up when hitting return
-        @column = inserted_lines.last.size
-        move(:relative, inserted_lines.size - 1, 0)
+        self.line += inserted_lines.size - 1
+        self.column = inserted_lines.last.size
       else
         move(:relative, inserted_lines.size - 1, inserted_lines.last.size)
       end
@@ -286,12 +240,9 @@ module Ruco
       @selection = nil
     end
 
-    def visible_area(line)
-      line += @scrolled_lines
-      start_of_line = [line, @scrolled_columns]
-      last_visible_column = @scrolled_columns + @options[:columns]
-      end_of_line = [line, last_visible_column]
-      start_of_line..end_of_line
+    def sanitize_position
+      self.line = line
+      self.column = column
     end
   end
 end

data/lib/ruco/window.rb

@@ -0,0 +1,83 @@
+module Ruco
+  class Window
+    OFFSET = 5
+
+    attr_accessor :position, :lines, :columns, :top, :left
+    attr_reader :cursor
+
+    def initialize(lines, columns)
+      @lines = lines
+      @columns = columns
+      @top = 0
+      @left = 0
+      @cursor = Position.new(0,0)
+    end
+
+    def crop(content)
+      lines = content[visible_lines] || []
+      lines[@lines-1] ||= nil
+      lines.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)
+    end
+
+    def color_mask(selection)
+      mask = Array.new(lines)
+      return mask unless selection
+
+      mask.map_with_index do |_,line|
+        visible = visible_area(line)
+        next unless selection.overlap?(visible)
+
+        first = [selection.first, visible.first].max
+        last = [selection.last, visible.last].min
+
+        [
+          [first[1]-left, Curses::A_REVERSE],
+          [last[1]-left, Curses::A_NORMAL]
+        ]
+      end
+    end
+
+    def top=(x)
+      @top = [x,0].max
+    end
+
+    def left=(x)
+      @left = [x,0].max
+    end
+
+    private
+
+    def visible_area(line)
+      line += @top
+      start_of_line = [line, @left]
+      last_visible_column = @left + @columns
+      end_of_line = [line, last_visible_column]
+      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
+
+    def visible_columns
+      @left..(@left+@columns-1)
+    end
+  end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.36"
+  s.version = "0.0.37"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-29}
+  s.date = %q{2011-01-31}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
     "lib/ruco/version.rb",
+    "lib/ruco/window.rb",
     "ruco.gemspec",
     "spec/ruco/application_spec.rb",
     "spec/ruco/command_bar_spec.rb",
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",
+    "spec/ruco/window_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/text_area_spec.rb",
+    "spec/ruco/window_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/ruco/editor_spec.rb

@@ -91,26 +91,26 @@ describe Ruco::Editor do
         editor.cursor.column.should == 4
 
         editor.move(:relative, 0,1)
-        editor.view.should == "6789\n\n\n"
-        editor.cursor.column.should == 0
+        editor.view.should == "45678\n\n\n"
+        editor.cursor.column.should == 2
       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 == "6789\n\n\n"
-        editor.cursor.column.should == 4
+        editor.view.should == "89\n\n\n"
+        editor.cursor.column.should == 2
       end
 
       it "can scroll columns backwards" do
         write('123456789')
         editor.move(:relative, 0,5)
-        editor.view.should == "6789\n\n\n"
+        editor.view.should == "45678\n\n\n"
 
-        editor.move(:relative, 0,-1)
+        editor.move(:relative, 0,-3)
         editor.view.should == "12345\n\n\n"
-        editor.cursor.column.should == 4
+        editor.cursor.column.should == 2
       end
     end
 
@@ -119,19 +119,19 @@ describe Ruco::Editor do
         write("1\n2\n3\n4\n5\n6\n7\n8\n9")
       end
 
-      it "can scroll lines down (at maximum of screen size)" do
+      it "can scroll lines down" do
         editor.move(:relative, 2,0)
         editor.view.should == "1\n2\n3\n"
 
         editor.move(:relative, 1,0)
-        editor.view.should == "4\n5\n6\n"
-        editor.cursor.line.should == 0
+        editor.view.should == "3\n4\n5\n"
+        editor.cursor.line.should == 1
       end
 
       it "can scroll till end of file" do
         editor.move(:relative, 15,0)
-        editor.view.should == "9\n\n\n"
-        editor.cursor.line.should == 0
+        editor.view.should == "8\n9\n\n"
+        editor.cursor.line.should == 1
       end
     end
 
@@ -386,8 +386,9 @@ describe Ruco::Editor do
 
     it "shows multi-line selection in scrolled space" do
       write("\n\n\n\n\n0123456789\n0123456789\n0123456789\n\n")
-      editor.move(:to, 5,7)
-      editor.move(:relative, 0, 1)
+      ta = editor.send(:text_area)
+      ta.send(:position=, [5,8])
+      ta.send(:screen_position=, [5,7])
       editor.selecting do
         move(:relative, 2, 1)
       end
@@ -591,11 +592,6 @@ describe Ruco::Editor do
       editor.unindent
       editor.cursor.should == [0,0]
     end
-
-    it "marks as modified" do
-      editor.unindent
-      editor.modified?.should == true
-    end
   end
 
   describe 'history' do
@@ -629,16 +625,6 @@ describe Ruco::Editor do
       editor.undo
       editor.modified?.should == true
     end
-
-    it "sets modified on undo" do
-      editor.insert('a')
-      editor.view # trigger save point
-      editor.undo
-      editor.save
-      editor.modified?.should == false
-      editor.redo
-      editor.modified?.should == true
-    end
   end
 
   describe :save do

data/spec/ruco/text_area_spec.rb

@@ -21,36 +21,36 @@ describe Ruco::TextArea do
       it "can move up a page" do
         text = Ruco::TextArea.new("0\n1\n2\n3\n4\n5\n6\n7\n8\n", :lines => 3, :columns => 3)
         text.move(:to, 4, 0)
-        text.view.should == "2\n3\n4\n"
-        text.cursor.should == [2,0]
+        text.view.should == "3\n4\n5\n"
+        text.cursor.should == [1,0]
         text.move(:page_up)
-        text.view.should == "0\n1\n2\n"
-        text.cursor.should == [2,0]
+        text.view.should == "1\n2\n3\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.view.should == "3ab\n4\n5abc\n"
-        text.cursor.should == [2,4]
+        text.view.should == "4\n5abc\n6\n"
+        text.cursor.should == [1,4]
         text.move(:page_up)
-        text.view.should == "1\n2\n3ab\n"
-        text.cursor.should == [2,3]
+        text.view.should == "2\n3ab\n4\n"
+        text.cursor.should == [1,3]
       end
 
       it "moves pages symetric" do
         text = Ruco::TextArea.new("0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n0\n", :lines => 3, :columns => 3)
         text.move(:to, 4, 1)
-        text.view.should == "2\n3\n4\n"
-        text.cursor.should == [2,1]
+        text.view.should == "3\n4\n5\n"
+        text.cursor.should == [1,1]
 
         text.move(:page_down)
         text.move(:page_down)
         text.move(:page_up)
         text.move(:page_up)
 
-        text.cursor.should == [2,1]
-        text.view.should == "2\n3\n4\n"
+        text.cursor.should == [1,1]
+        text.view.should == "3\n4\n5\n"
       end
     end
   end

data/spec/ruco/window_spec.rb

@@ -0,0 +1,143 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::Window do
+  let(:window){ Ruco::Window.new(10,10) }
+
+  describe :crop do
+    let(:window){ Ruco::Window.new(2,4) }
+
+    it "does not modify given lines" do
+      original = ['1234','1234']
+      window.crop(original)
+      original.should == ['1234','1234']
+    end
+
+    it "removes un-displayable chars" do
+      result = window.crop(['12345','12345','12345'])
+      result.should == ['1234','1234']
+    end
+
+    it "does not add whitespace" do
+      result = window.crop(['1','',''])
+      result.should == ['1','']
+    end
+
+    it "creates lines if necessary" do
+      result = window.crop(['1234'])
+      result.should == ['1234','']
+    end
+
+    it "stays inside frame as long as position is in frame" do
+      window.position = Ruco::Position.new(1,3)
+      result = window.crop(['12345678','12345678'])
+      result.should == ['1234','1234']
+    end
+
+    it "can display empty lines" do
+      window.crop([]).should == ['','']
+    end
+
+    describe 'scrolled' do
+      it "goes out of frame if line is out of frame" do
+        window = Ruco::Window.new(6,1)
+        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']
+      end
+
+      it "goes out of frame if column is out of frame" do
+        window = Ruco::Window.new(1,6)
+        window.position = Ruco::Position.new(0,6)
+        result = window.crop(['1234567890'])
+        result.should == ['456789']
+      end
+    end
+  end
+
+  describe :top do
+    it "does not change when staying in frame" do
+      window.top.should == 0
+      window.position = Ruco::Position.new(9,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
+    end
+
+    it "changes to x - offset when going down out of frame" do
+      window.position = Ruco::Position.new(20,0)
+      window.top.should == 15
+    end
+
+    it "changes to x - offset when going down out of frame" do
+      window.position = Ruco::Position.new(20,0)
+      window.position = Ruco::Position.new(7,0)
+      window.top.should == 2
+    end
+  end
+
+  describe :left do
+    it "does not change when staying in frame" do
+      window.left.should == 0
+      window.position = Ruco::Position.new(0,9)
+      window.left.should == 0
+    end
+
+    it "changes by offset when going vertically out of frame" do
+      window.position = Ruco::Position.new(0,9)
+      window.position = Ruco::Position.new(0,10)
+      window.left.should == 5
+    end
+
+    it "changes to x - offset when going right out of frame" do
+      window.position = Ruco::Position.new(0,20)
+      window.left.should == 15
+    end
+
+    it "changes to x - offset 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
+    end
+
+    it "changes to 0 when going left out of frame to 1" do
+      window.position = Ruco::Position.new(0,20)
+      window.position = Ruco::Position.new(0,1)
+      window.left.should == 0
+    end
+
+    it "does not change when staying in changed frame" do
+      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
+    end
+  end
+
+  describe :top= do
+    it "sets" do
+      window.top = 1
+      window.top.should == 1
+    end
+
+    it "does not allow negative" do
+      window.top = -1
+      window.top.should == 0
+    end
+  end
+
+  describe :left= do
+    it "sets" do
+      window.left = 1
+      window.left.should == 1
+    end
+
+    it "does not allow negative" do
+      window.left = -1
+      window.left.should == 0
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 0
-  - 36
-  version: 0.0.36
+  - 37
+  version: 0.0.37
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +01:00
+date: 2011-01-31 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
 - lib/ruco/version.rb
+- lib/ruco/window.rb
 - ruco.gemspec
 - spec/ruco/application_spec.rb
 - spec/ruco/command_bar_spec.rb
@@ -78,6 +79,7 @@ files:
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb
+- spec/ruco/window_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -125,5 +127,6 @@ test_files:
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco/text_area_spec.rb
+- spec/ruco/window_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb