ruco 0.1.14 → 0.2.0.beta

data/spec/ruco/application_spec.rb

@@ -127,14 +127,14 @@ describe Ruco::Application do
     it "stores the session so I can reopen at the same position" do
       write("0\n1\n2\n")
       type :right, :down, :"Ctrl+q"
-      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10)
+      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10, :rc => rucorc)
       reopened.cursor.should == [2,1]
     end
 
     it "does not store or restore content" do
       write('')
       type 'x', :"Ctrl+s", :enter, :enter, 'a', :"Ctrl+q"
-      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10)
+      reopened = Ruco::Application.new(@file, :lines => 5, :columns => 10, :rc => rucorc)
       editor_part(reopened.view).should == "x\n\n"
     end
   end

data/spec/ruco/array_processor_spec.rb

@@ -0,0 +1,46 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::ArrayProcessor do
+  let(:p){ Ruco::ArrayProcessor.new }
+  before do
+    p.new_line('xxx')
+  end
+
+  it "is empty by default" do
+    p.lines.should == [[]]
+  end
+
+  it "parses simple syntax" do
+    p.open_tag('xxx',0)
+    p.close_tag('xxx',3)
+    p.lines.should == [[['xxx',0...3]]]
+  end
+
+  it "parses nested syntax" do
+    p.open_tag('xxx',0)
+    p.open_tag('yyy',2)
+    p.close_tag('yyy',3)
+    p.close_tag('xxx',3)
+    p.lines.should == [[["yyy", 2...3], ["xxx", 0...3]]]
+  end
+
+  it "parses multiline syntax" do
+    p.open_tag('xxx',0)
+    p.close_tag('xxx',3)
+    p.new_line('xxx')
+    p.open_tag('xxx',1)
+    p.close_tag('xxx',2)
+    p.lines.should == [
+      [["xxx", 0...3]],
+      [["xxx", 1...2]]
+    ]
+  end
+
+  it "parses multiply nested syntax" do
+    p.open_tag('yyy',0)
+    p.open_tag('yyy',2)
+    p.close_tag('yyy',3)
+    p.close_tag('yyy',3)
+    p.lines.should == [[["yyy", 2...3], ["yyy", 0...3]]]
+  end
+end

data/spec/ruco/command_bar_spec.rb

@@ -113,7 +113,7 @@ describe Ruco::CommandBar do
     let(:bar){ Ruco::CommandBar.new(:columns => 10) }
 
     it "is reverse" do
-      bar.style_map.flatten.should == [[:reverse, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, :normal]]
+      bar.style_map.flatten.should == [[:reverse, nil, nil, nil, nil, nil, nil, nil, nil, nil, :normal]]
     end
 
     it "has normal style for selected input field" do

data/spec/ruco/core_ext/range_spec.rb

@@ -0,0 +1,37 @@
+require File.expand_path('spec/spec_helper')
+
+describe Range do
+  describe :last_element do
+    it "is the last for normal ranges" do
+      (1..2).last_element.should == 2
+    end
+
+    it "is the last for exclusive ranges" do
+      (1...3).last_element.should == 2
+    end
+  end
+
+  describe :move do
+    it "does not modify the original" do
+      a = 1..3
+      a.move(3)
+      a.should == (1..3)
+    end
+
+    it "can move 0" do
+      (1..3).move(0).should == (1..3)
+    end
+
+    it "can move right" do
+      (1..3).move(1).should == (2..4)
+    end
+
+    it "can move left" do
+      (1..3).move(-2).should == (-1..1)
+    end
+
+    it "can move exclusive ranges" do
+      (1...3).move(2).should == (3...5)
+    end
+  end
+end

data/spec/ruco/editor_spec.rb

@@ -9,8 +9,17 @@ describe Ruco::Editor do
     File.binary_read(@file)
   end
 
+  def color(c)
+    {
+      :string => ["#718C00", nil],
+      :keyword => ["#8959A8", nil],
+      :instance_variable => ["#C82829", nil],
+    }[c]
+  end
+
+  let(:language){ LanguageSniffer::Language.new(:name => 'ruby', :lexer => 'ruby') }
   let(:editor){
-    editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5)
+    editor = Ruco::Editor.new(@file, :lines => 3, :columns => 5, :language => language)
     # only scroll when we reach end of lines/columns <-> able to test with smaller area
     editor.send(:text_area).instance_eval{
       @window.instance_eval{
@@ -26,6 +35,7 @@ describe Ruco::Editor do
   before do
     `rm -rf ~/.ruco/sessions`
     @file = 'spec/temp.txt'
+    write('')
   end
 
   describe "strange newline formats" do
@@ -570,52 +580,52 @@ describe Ruco::Editor do
     end
 
     it "shows one-line selection" do
-      write('12345678')
+      write('abcdefghi')
       editor.selecting do
         move(:to, 0, 4)
       end
       editor.style_map.flatten.should == [
-        [:reverse, nil, nil, nil, nil, :normal],
+        [:reverse, nil, nil, nil, :normal],
         nil,
         nil
       ]
     end
 
     it "shows multi-line selection" do
-      write("012\n345\n678")
+      write("abc\nabc\nabc")
       editor.move(:to, 0,1)
       editor.selecting do
         move(:to, 1, 1)
       end
       editor.style_map.flatten.should == [
-        [nil, :reverse, nil, nil, nil, nil, :normal],
-        [:reverse, nil, :normal],
+        [nil, :reverse, nil, nil, nil, :normal],
+        [:reverse, :normal],
         nil
       ]
     end
 
     it "shows the selection from offset" do
-      write('12345678')
+      write('abcdefghi')
       editor.move(:to, 0, 2)
       editor.selecting do
         move(:to, 0, 4)
       end
       editor.style_map.flatten.should == [
-        [nil, nil, :reverse, nil, nil, :normal],
+        [nil, nil, :reverse, nil, :normal],
         nil,
         nil
       ]
     end
 
     it "shows the selection in nth line" do
-      write("\n12345678")
+      write("\nabcdefghi")
       editor.move(:to, 1, 2)
       editor.selecting do
         move(:to, 1, 4)
       end
       editor.style_map.flatten.should == [
         nil,
-        [nil, nil, :reverse, nil, nil, :normal],
+        [nil, nil, :reverse, nil, :normal],
         nil
       ]
     end
@@ -631,11 +641,117 @@ describe Ruco::Editor do
       editor.view.should == "789\n789\n789"
       editor.cursor.should == [2,2]
       editor.style_map.flatten.should == [
-        [nil, :reverse, nil, nil, nil, nil, :normal], # start to end of screen
-        [:reverse, nil, nil, nil, nil, nil, :normal], # 0 to end of screen
-        [:reverse, nil, nil, :normal] # 0 to end of selection
+        [nil, :reverse, nil, nil, nil, :normal], # start to end of screen
+        [:reverse, nil, nil, nil, nil, :normal], # 0 to end of screen
+        [:reverse, nil, :normal] # 0 to end of selection
+      ]
+    end
+
+    it "shows keywords" do
+      write("class")
+      editor.style_map.flatten.should == [
+        [color(:keyword), nil, nil, nil, nil, :normal],
+        nil,
+        nil
+      ]
+    end
+
+    it "shows keywords for moved window" do
+      write("\n\n\n\n\n     if  ")
+      editor.move(:to, 5, 6)
+      editor.cursor.should == [1,3]
+      editor.view.should == "\n  if \n"
+      editor.style_map.flatten.should == [
+        nil,
+        [nil, nil, color(:keyword), nil, :normal],
+        nil
+      ]
+    end
+
+    it "shows multiple syntax elements" do
+      write("if @x")
+      editor.style_map.flatten.should == [
+        [color(:keyword), nil, :normal, color(:instance_variable), nil, :normal],
+        nil,
+        nil
+      ]
+    end
+
+    it "does not show keywords inside strings" do
+      write("'Foo'")
+      editor.style_map.flatten.should == [
+        [color(:string), nil, nil, nil, nil, :normal],
+        nil,
+        nil
+      ]
+    end
+
+    xit "shows multiline comments" do
+      write("=begin\na\nb\n=end")
+      editor.move(:to, 3,0)
+      editor.view.should == "b\n=end\n"
+      editor.style_map.flatten.should == [
+        [["#8E908C", nil], nil, :normal],
+        [["#8E908C", nil], nil, nil, nil, :normal],
+        nil
       ]
     end
+
+    it "shows selection on top" do
+      write("class")
+      editor.selecting do
+        move(:relative, 0, 3)
+      end
+      editor.style_map.flatten.should == [
+        [:reverse, nil, nil, ["#8959A8", nil], nil, :normal],
+        nil,
+        nil
+      ]
+    end
+
+    it "times out when styling takes too long" do
+      begin
+        STDERR.should_receive(:puts)
+        old = Ruco::Editor::Colors::STYLING_TIMEOUT
+        silence_warnings{ Ruco::Editor::Colors::STYLING_TIMEOUT = 0.001 }
+        write(File.read('lib/ruco.rb'))
+        editor.style_map.flatten.should == [nil,nil,nil]
+      ensure
+        silence_warnings{ Ruco::Editor::Colors::STYLING_TIMEOUT = old }
+      end
+    end
+
+    describe 'with theme' do
+      before do
+        write("class")
+        `rm -rf ~/.ruco/themes`
+      end
+
+      it "can download a theme" do
+        editor = Ruco::Editor.new(@file,
+          :lines => 3, :columns => 5, :language => language,
+          :color_theme => 'https://raw.github.com/ChrisKempson/Tomorrow-Theme/master/TextMate/Tomorrow-Night-Bright.tmTheme'
+        )
+        editor.style_map.flatten.should == [
+          [["#C397D8", nil], nil, nil, nil, nil, :normal],
+          nil,
+          nil
+        ]
+      end
+
+      it "does not fail with invalid theme url" do
+        STDERR.should_receive(:puts)
+        editor = Ruco::Editor.new(@file,
+          :lines => 3, :columns => 5, :language => language,
+          :color_theme => 'foooooo'
+        )
+        editor.style_map.flatten.should == [
+          [["#8959A8", nil], nil, nil, nil, nil, :normal],
+          nil,
+          nil
+        ]
+      end
+    end
   end
 
   describe :view do
@@ -845,17 +961,17 @@ describe Ruco::Editor do
       stack.length.should == 2
       stack[0][:state][:content].should == "a"
       stack[1][:state][:content].should == "ba"
-      
+
       editor.undo
       editor.history.position.should == 0
-      
+
       editor.insert("c")
       editor.view # trigger save point
       stack.length.should == 2
       stack[0][:state][:content].should == "a"
       stack[1][:state][:content].should == "ca"
     end
-    
+
     it "can undo an action" do
       write("a")
       editor.insert("b")
@@ -992,6 +1108,7 @@ describe Ruco::Editor do
     end
 
     it "is changed after delete" do
+      write("abc")
       editor.delete(1)
       editor.modified?.should == true
     end
@@ -1008,6 +1125,7 @@ describe Ruco::Editor do
     end
 
     it "is changed after delete_line" do
+      write("\n\n\n")
       editor.delete_line
       editor.modified?.should == true
     end
@@ -1109,16 +1227,16 @@ describe Ruco::Editor do
     let(:editor){ Ruco::Editor.new(@file, :lines => 5, :columns => 10, :line_numbers => true) }
 
     before do
-      write("0\n1\n2\n3\n4\n5\n6\n7\n")
+      write("a\nb\nc\nd\ne\nf\ng\nh\n")
     end
 
     it "adds numbers to view" do
-      editor.view.should == "   1 0\n   2 1\n   3 2\n   4 3\n   5 4"
+      editor.view.should == "   1 a\n   2 b\n   3 c\n   4 d\n   5 e"
     end
 
     it "does not show numbers for empty lines" do
       editor.move(:to, 10,0)
-      editor.view.should == "   6 5\n   7 6\n   8 7\n   9 \n     "
+      editor.view.should == "   6 f\n   7 g\n   8 h\n   9 \n     "
     end
 
     it "adjusts the cursor" do

data/spec/ruco/file_store_spec.rb

@@ -16,6 +16,10 @@ describe Ruco::FileStore do
 
   let(:store){ Ruco::FileStore.new(@folder, :keep => 3) }
 
+  it "can get unstored stuff" do
+    store.get('xxx').should == nil
+  end
+
   it "can store stuff" do
     store.set('xxx', 1)
     store.get('xxx').should == 1
@@ -41,4 +45,45 @@ describe Ruco::FileStore do
     store.set('zzz', 1)
     store.get('xxx').should == 1
   end
+
+  it "can cache" do
+    store.cache('x'){ 1 }.should == 1
+    store.cache('x'){ 2 }.should == 1
+  end
+
+  it "can cache false" do
+    store.cache('x'){ false }.should == false
+    store.cache('x'){ 2 }.should == false
+  end
+
+  it "does not cache nil" do
+    store.cache('x'){ nil }.should == nil
+    store.cache('x'){ 2 }.should == 2
+  end
+
+  it "can delete" do
+    store.set('x', 1)
+    store.set('y', 2)
+    store.delete('x')
+    store.get('x').should == nil
+    store.get('y').should == 2
+  end
+
+  it "can delete uncached" do
+    store.set('x', 1)
+    store.delete('z')
+    store.get('x').should == 1
+    store.get('z').should == nil
+  end
+
+  it "can clear" do
+    store.set('x', 1)
+    store.clear
+    store.get('x').should == nil
+  end
+
+  it "can clear unstored" do
+    store.clear
+    store.get('x').should == nil
+  end
 end

data/spec/ruco/screen_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path('spec/spec_helper')
 describe Ruco::Screen do
   describe :curses_style do
     it "is 'normal' for nothing" do
-      Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+      Ruco::Screen.curses_style(:normal).should == 256
     end
 
     it "is red for red" do
@@ -12,7 +12,7 @@ describe Ruco::Screen do
     end
 
     it "is reverse for reverse" do
-      Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+      Ruco::Screen.curses_style(:reverse).should == 512
     end
 
     it "raises on unknown style" do
@@ -20,5 +20,42 @@ describe Ruco::Screen do
         Ruco::Screen.curses_style(:foo)
       }.should raise_error
     end
+
+    describe 'without colors' do
+      before do
+        Ruco::Screen.class_eval '@@styles = {}' # clear cache
+        $ruco_colors = false
+      end
+
+      after do
+        $ruco_colors = true
+      end
+
+      it "is 'normal' for normal" do
+        Ruco::Screen.curses_style(:normal).should == Curses::A_NORMAL
+      end
+
+      it "is reverse for reverse" do
+        Ruco::Screen.curses_style(:reverse).should == Curses::A_REVERSE
+      end
+
+      it "is normal for unknown style" do
+        Ruco::Screen.curses_style(:foo).should == Curses::A_NORMAL
+      end
+    end
+  end
+
+  describe :html_to_terminal_color do
+    # http://www.mudpedia.org/wiki/Xterm_256_colors
+    [
+      ['#ff0000', 196],
+      ['#00ff00', 46],
+      ['#0000ff', 21],
+      ['#ffffff', 231]
+    ].each do |html,term|
+      it "converts #{html} to #{term}" do
+        Ruco::Screen.html_to_terminal_color(html).should == term
+      end
+    end
   end
 end