ruco 0.0.42 → 0.0.43

data/Readme.md

@@ -72,7 +72,6 @@ TODO
  - find next (Alt+n)
  - add selection colors to forms in command_bar
  - smart staying at column when changing line
- - warnings / messages
  - syntax highlighting
  - raise when binding to a unsupported key
  - search history via up/down arrow
@@ -84,6 +83,6 @@ TODO
 
 Author
 ======
-[Michael Grosser](http://grosser.it)  
-grosser.michael@gmail.com  
+[Michael Grosser](http://grosser.it)<br/>
+grosser.michael@gmail.com<br/>
 Hereby placed under public domain, do what you want, just do not hold me accountable...

data/VERSION

@@ -1 +1 @@
-0.0.42
+0.0.43

data/bin/ruco

@@ -60,49 +60,44 @@ def init_screen
   end
 end
 
-def display(lines, offset, color_mask)
+def display(lines, style_mask)
+  columns = Curses.stdscr.maxx
   @screen ||= [] # current screen is used as cache
+  style_mask = style_mask.flatten
 
   lines.each_with_index do |content, line|
-    colors = color_mask[line] || []
+    styles = style_mask[line]
 
-    # expand line with whitespace
-    line += offset
-    clearer = Curses.stdscr.maxx + 1 - content.size
-    clearer = " " * clearer
-    content += clearer
-    content.gsub!("\t",' ') # display tabs as single-space -> nothing breaks
+    # expand line with whitespace to overwrite previous content
+    missing = columns - content.size
+    content += " " * missing
+
+    # display tabs as single-space -> nothing breaks
+    content.gsub!("\t",' ')
 
     # cache !?
-    next if @screen[line] == [content, colors]
-    @screen[line] = [content, colors]
+    next if @screen[line] == [content, styles]
+    @screen[line] = [content, styles]
 
-    # position at start of line
-    index = 0
+    # position at start of line and draw
     Curses.setpos(line,0)
-    Curses.attrset(Curses::A_NORMAL)
-
-    # write colored string
-    colors.each do |start, color|
-      Curses.addstr(content[index...start])
-      Curses.attrset color
-      index = start
+    Ruco::StyleMap.styled(content, styles).each do |style, part|
+      Curses.attrset Ruco::StyleMap.curses_style(style)
+      Curses.addstr part
     end
-    Curses.addstr(content[index...-1])
 
-    write(line, 0, (rand(899)+100).to_s) if @options[:debug_cache]
+    if @options[:debug_cache]
+      write(line, 0, (rand(899)+100).to_s)
+    end
   end
 end
 
 def show_app(app)
   lines = app.view.naive_split("\n")
-  color_mask = app.color_mask
+  style_map = app.style_map
 
   # TODO move this logic into application
-  display([lines.first], 0, [color_mask.first])
-  display(lines[1..-2], 1, color_mask[1..-2])
-  display([lines.last], Curses.stdscr.maxy - 1, [color_mask.last])
-
+  display(lines, style_map)
   Curses.setpos(app.cursor.line, app.cursor.column)
 end
 

data/lib/ruco/application.rb

@@ -14,9 +14,10 @@ module Ruco
       status.view + "\n" + editor.view + command.view
     end
 
-    def color_mask
-      reverse = [[[0,Curses::A_REVERSE]]]
-      reverse + editor.color_mask + reverse
+    def style_map
+      reverse = StyleMap.new(1)
+      reverse.add(:reverse, 0, 0...@options[:columns])
+      reverse + editor.style_map + reverse
     end
 
     def cursor

data/lib/ruco/core_ext/array.rb

@@ -30,4 +30,18 @@ class Array
   def >=(other)
     self.>(other) or self.==other
   end
+end
+
+# http://madeofcode.com/posts/74-ruby-core-extension-array-sum
+class Array
+  def sum(method = nil, &block)
+    if block_given?
+      raise ArgumentError, "You cannot pass a block and a method!" if method
+      inject(0) { |sum, i| sum + yield(i) }
+    elsif method
+      inject(0) { |sum, i| sum + i.send(method) }
+    else
+      inject(0) { |sum, i| sum + i }
+    end
+  end
 end

data/lib/ruco/core_ext/string.rb

@@ -32,4 +32,16 @@ class String
       bytes.first
     end
   end
+end
+
+# http://grosser.it/2010/12/31/ruby-string-indexes-indices-find-all-indexes-in-a-string
+class String
+  def indexes(needle)
+    found = []
+    current_index = -1
+    while current_index = index(needle, current_index+1)
+      found << current_index
+    end
+    found
+  end
 end

data/lib/ruco/editor.rb

@@ -3,7 +3,7 @@ module Ruco
     attr_reader :file
     attr_reader :text_area
     private :text_area
-    delegate :view, :color_mask, :cursor,
+    delegate :view, :style_map, :cursor,
       :insert, :indent, :unindent, :delete, :delete_line,
       :redo, :undo,
       :selecting, :selection, :text_in_selection, :reset,

data/lib/ruco/style_map.rb

@@ -0,0 +1,90 @@
+module Ruco
+  class StyleMap
+    attr_accessor :lines
+
+    def initialize(lines)
+      @lines = Array.new(lines)
+    end
+
+    def add(style, line, columns)
+      @lines[line] ||= []
+      @lines[line] << [style, columns]
+    end
+
+    def flatten
+      @lines.map do |styles|
+        next unless styles
+
+        # start and one after end of every column-range changes styles
+        points_of_change = styles.map{|s,c| [c.first, c.last+1] }.flatten
+
+        flat = []
+
+        styles.each do |style, columns|
+          points_of_change.each do |point|
+            next unless columns.include?(point)
+            flat[point] ||= []
+            flat[point].unshift style
+          end
+        end
+
+        max = styles.map{|s,c|c.last}.max
+        flat[max+1] = []
+        flat
+      end
+    end
+
+    def +(other)
+      lines = self.lines + other.lines
+      new = StyleMap.new(0)
+      new.lines = lines
+      new
+    end
+
+    def slice!(*args)
+      sliced = lines.slice!(*args)
+      new = StyleMap.new(0)
+      new.lines = sliced
+      new
+    end
+
+    def shift
+      slice!(0, 1)
+    end
+
+    def pop
+      slice!(-1, 1)
+    end
+    
+    STYLES = {
+      :normal => 0,
+      :reverse => Curses::A_REVERSE
+    }
+
+    def self.styled(content, styles)
+      styles ||= []
+      content = content.dup
+
+      build = []
+      build << [[]]
+
+      buffered = ''
+      styles.each do |style|
+        if style
+          build[-1] << buffered
+          buffered = ''
+
+          # set new style
+          build << [style]
+        end
+        buffered << (content.slice!(0,1) || '')
+      end
+      build[-1] << buffered + content
+      build
+    end
+
+    def self.curses_style(styles)
+      styles.sum{|style| STYLES[style] or raise("Unknown style #{style}") }
+    end
+  end
+end

data/lib/ruco/text_area.rb

@@ -21,9 +21,9 @@ module Ruco
       @window.cursor
     end
 
-    def color_mask
+    def style_map
       adjust_window
-      @window.color_mask(@selection)
+      @window.style_map(@selection)
     end
 
     def move(where, *args)

data/lib/ruco/window.rb

@@ -49,22 +49,23 @@ module Ruco
       self.left = result if result
     end
 
-    def color_mask(selection)
-      mask = Array.new(lines)
+    def style_map(selection)
+      mask = StyleMap.new(lines)
       return mask unless selection
 
-      mask.map_with_index do |_,line|
+      lines.times do |line|
         visible = visible_area(line)
         next unless selection.overlap?(visible)
 
         first = [selection.first, visible.first].max
+        first = first[1] - left
         last = [selection.last, visible.last].min
+        last = last[1] - left
 
-        [
-          [first[1]-left, Curses::A_REVERSE],
-          [last[1]-left, Curses::A_NORMAL]
-        ]
+        mask.add(:reverse, line, first...last)
       end
+
+      mask
     end
 
     def left=(x)

data/lib/ruco.rb

@@ -12,6 +12,7 @@ require 'ruco/position'
 require 'ruco/history'
 require 'ruco/file_store'
 require 'ruco/window'
+require 'ruco/style_map'
 
 require 'ruco/editor'
 require 'ruco/status_bar'

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.42"
+  s.version = "0.0.43"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "lib/ruco/keyboard.rb",
     "lib/ruco/position.rb",
     "lib/ruco/status_bar.rb",
+    "lib/ruco/style_map.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
     "lib/ruco/version.rb",
@@ -52,6 +53,7 @@ Gem::Specification.new do |s|
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
+    "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",
     "spec/ruco/window_spec.rb",
     "spec/ruco_spec.rb",
@@ -59,7 +61,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/ruco}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.4.2}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -72,6 +74,7 @@ Gem::Specification.new do |s|
     "spec/ruco/history_spec.rb",
     "spec/ruco/keyboard_spec.rb",
     "spec/ruco/status_bar_spec.rb",
+    "spec/ruco/style_map_spec.rb",
     "spec/ruco/text_area_spec.rb",
     "spec/ruco/window_spec.rb",
     "spec/ruco_spec.rb",
@@ -79,7 +82,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/ruco/editor_spec.rb

@@ -363,9 +363,9 @@ describe Ruco::Editor do
     end
   end
 
-  describe :color_mask do
+  describe :style_map do
     it "is empty by default" do
-      editor.color_mask.should == [nil,nil,nil]
+      editor.style_map.flatten.should == [nil,nil,nil]
     end
 
     it "shows one-line selection" do
@@ -373,10 +373,10 @@ describe Ruco::Editor do
       editor.selecting do
         move(:to, 0, 4)
       end
-      editor.color_mask.should == [
-        [[0,262144],[4,0]],
-        nil,
+      editor.style_map.flatten.should == [
+        [[:reverse], nil, nil, nil, nil, []],
         nil,
+        nil
       ]
     end
 
@@ -386,10 +386,10 @@ describe Ruco::Editor do
       editor.selecting do
         move(:to, 1, 1)
       end
-      editor.color_mask.should == [
-        [[1,262144],[5,0]],
-        [[0,262144],[1,0]],
-        nil,
+      editor.style_map.flatten.should == [
+        [nil, [:reverse], nil, nil, nil, nil, []],
+        [[:reverse], nil, []],
+        nil
       ]
     end
 
@@ -399,10 +399,10 @@ describe Ruco::Editor do
       editor.selecting do
         move(:to, 0, 4)
       end
-      editor.color_mask.should == [
-        [[2,262144], [4,0]],
-        nil,
+      editor.style_map.flatten.should == [
+        [nil, nil, [:reverse], nil, nil, []],
         nil,
+        nil
       ]
     end
 
@@ -412,10 +412,10 @@ describe Ruco::Editor do
       editor.selecting do
         move(:to, 1, 4)
       end
-      editor.color_mask.should == [
-        nil,
-        [[2,262144], [4,0]],
+      editor.style_map.flatten.should == [
         nil,
+        [nil, nil, [:reverse], nil, nil, []],
+        nil
       ]
     end
 
@@ -429,10 +429,10 @@ describe Ruco::Editor do
       end
       editor.view.should == "789\n789\n789\n"
       editor.cursor.should == [2,2]
-      editor.color_mask.should == [
-        [[1,262144],[5,0]], # start to end of screen
-        [[0,262144],[5,0]], # 0 to end of screen
-        [[0,262144],[2,0]], # 0 to end of selection
+      editor.style_map.flatten.should == [
+        [nil, [:reverse], nil, nil, nil, nil, []], # start to end of screen
+        [[:reverse], nil, nil, nil, nil, nil, []], # 0 to end of screen
+        [[:reverse], nil, nil, []] # 0 to end of selection
       ]
     end
   end

data/spec/ruco/style_map_spec.rb

@@ -0,0 +1,97 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::StyleMap do
+  let(:map){ Ruco::StyleMap.new(3) }
+
+  describe :flat do
+    it "is empty by default" do
+      map.flatten.should == [nil, nil, nil]
+    end
+
+    it "reproduces simple styles" do
+      map.add(:red, 1, 3..5)
+      # red from 3 to 5
+      map.flatten.should == [
+        nil,
+        [nil, nil, nil, [:red], nil, nil, []],
+        nil
+      ]
+    end
+
+    it "reproduces merged styles" do
+      map.add(:red, 1, 3..5)
+      map.add(:reverse, 1, 2..4)
+      # reverse at 2 -- reverse and red at 3,4 -- red at 5
+      map.flatten.should == [
+        nil,
+        [nil, nil, [:reverse], [:reverse, :red], nil, [:red], []],
+        nil
+      ]
+    end
+  end
+
+  describe 'array style operations' do
+    it "adds two maps" do
+      s1 = Ruco::StyleMap.new(1)
+      s1.add(:reverse, 0, 0..1)
+      s2 = Ruco::StyleMap.new(2)
+      s2.add(:reverse, 0, 2..3)
+      (s1 + s2).flatten.should == [
+        [[:reverse], nil, []],
+        [nil, nil, [:reverse], nil, []],
+        nil
+      ]
+    end
+
+    it "can shift" do
+      s = Ruco::StyleMap.new(2)
+      s.add(:reverse, 0, 0..1)
+      s.add(:reverse, 1, 1..2)
+      s.shift.flatten.should == [[[:reverse],nil,[]]]
+      s.flatten.should == [[nil, [:reverse],nil,[]]]
+    end
+
+    it "can pop" do
+      s = Ruco::StyleMap.new(2)
+      s.add(:reverse, 0, 0..1)
+      s.add(:reverse, 1, 1..2)
+      s.pop.flatten.should == [[nil, [:reverse],nil,[]]]
+      s.flatten.should == [[[:reverse],nil,[]]]
+    end
+  end
+
+  describe :styled do
+    it "can style an unstyled line" do
+      Ruco::StyleMap.styled("a", nil).should == [[[], "a"]]
+    end
+
+    it "can style an styled line" do
+      Ruco::StyleMap.styled("a", [[:reverse],nil]).should == [[[], ""], [[:reverse], "a"]]
+    end
+
+    it "keeps unstyled parts" do
+      Ruco::StyleMap.styled("abc", [[:reverse],[]]).should == [[[], ""], [[:reverse], "a"],[[],'bc']]
+    end
+  end
+
+  describe :curses_style do
+    it "is 'normal' for nothing" do
+      Ruco::StyleMap.curses_style([]).should == Curses::A_NORMAL
+    end
+
+    it "is red for red" do
+      pending
+      Ruco::StyleMap.curses_style([:red]).should == Curses::color_pair( Curses::COLOR_RED )
+    end
+
+    it "is reverse for reverse" do
+      Ruco::StyleMap.curses_style([:reverse]).should == Curses::A_REVERSE
+    end
+
+    it "raises on unknown style" do
+      lambda{
+        Ruco::StyleMap.curses_style([:foo])
+      }.should raise_error
+    end
+  end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 73
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 42
-  version: 0.0.42
+  - 43
+  version: 0.0.43
 platform: ruby
 authors: 
 - Michael Grosser
@@ -18,20 +19,21 @@ date: 2011-02-06 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: clipboard
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
-  type: :runtime
   prerelease: false
   version_requirements: *id001
+  type: :runtime
+  name: clipboard
 description: 
 email: michael@grosser.it
 executables: 
@@ -64,6 +66,7 @@ files:
 - lib/ruco/keyboard.rb
 - lib/ruco/position.rb
 - lib/ruco/status_bar.rb
+- lib/ruco/style_map.rb
 - lib/ruco/text_area.rb
 - lib/ruco/text_field.rb
 - lib/ruco/version.rb
@@ -79,6 +82,7 @@ files:
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
+- spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb
 - spec/ruco/window_spec.rb
 - spec/ruco_spec.rb
@@ -97,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 916252531
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -106,13 +110,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby
@@ -127,6 +132,7 @@ test_files:
 - spec/ruco/history_spec.rb
 - spec/ruco/keyboard_spec.rb
 - spec/ruco/status_bar_spec.rb
+- spec/ruco/style_map_spec.rb
 - spec/ruco/text_area_spec.rb
 - spec/ruco/window_spec.rb
 - spec/ruco_spec.rb