ruco 0.2.0.beta → 0.2.0.beta2

data/lib/ruco/style_map.rb

@@ -1,6 +1,6 @@
 module Ruco
   class StyleMap
-    attr_accessor :lines, :foreground, :background
+    attr_accessor :lines
 
     def initialize(lines)
       @lines = Array.new(lines)
@@ -20,7 +20,7 @@ module Ruco
       @lines.map do |styles|
         next unless styles
 
-        # change to style at start and recalculate one after the end
+        # change to style at start and revert to normal one after the end
         points_of_change = styles.map{|s,c| [c.first, c.last_element+1] }.flatten.uniq
 
         flat = []

data/lib/ruco/window.rb

@@ -50,15 +50,9 @@ module Ruco
     end
 
     def style_map(selection)
-      map = StyleMap.new(lines)
-      if selection
-        add_selection_styles(map, selection)
-      else
-        map
-      end
-    end
+      mask = StyleMap.new(lines)
+      return mask unless selection
 
-    def add_selection_styles(map, selection)
       lines.times do |line|
         visible = visible_area(line)
         next unless selection.overlap?(visible)
@@ -68,9 +62,10 @@ module Ruco
         last = [selection.last, visible.last].min
         last = last[1] - left
 
-        map.add(:reverse, line, first...last)
+        mask.add(:reverse, line, first...last)
       end
-      map
+
+      mask
     end
 
     def left=(x)
@@ -82,14 +77,6 @@ module Ruco
       @top = [[line, max_top].min, 0].max
     end
 
-    def visible_lines
-      @top..(@top+@lines-1)
-    end
-
-    def visible_columns
-      @left..(@left+@columns-1)
-    end
-
     private
 
     def adjustment(current, allowed, threshold, offset)
@@ -108,5 +95,13 @@ module Ruco
       end_of_line = [line, last_visible_column]
       start_of_line..end_of_line
     end
+
+    def visible_lines
+      @top..(@top+@lines-1)
+    end
+
+    def visible_columns
+      @left..(@left+@columns-1)
+    end
   end
-end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.2.0.beta"
+  s.version = "0.2.0.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-09-23}
+  s.date = %q{2011-09-24}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
     "bin/ruco",
     "lib/ruco.rb",
     "lib/ruco/application.rb",
-    "lib/ruco/array_processor.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
     "lib/ruco/core_ext/file.rb",
@@ -31,7 +30,6 @@ Gem::Specification.new do |s|
     "lib/ruco/core_ext/range.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/editor.rb",
-    "lib/ruco/editor/colors.rb",
     "lib/ruco/editor/history.rb",
     "lib/ruco/editor/line_numbers.rb",
     "lib/ruco/editor_area.rb",
@@ -44,19 +42,12 @@ Gem::Specification.new do |s|
     "lib/ruco/screen.rb",
     "lib/ruco/status_bar.rb",
     "lib/ruco/style_map.rb",
-    "lib/ruco/syntax_parser.rb",
     "lib/ruco/text_area.rb",
     "lib/ruco/text_field.rb",
-    "lib/ruco/tm_theme.rb",
     "lib/ruco/version.rb",
     "lib/ruco/window.rb",
-    "playground/benchmark_syntax_parser.rb",
     "ruco.gemspec",
-    "spec/fixtures/railscasts.tmTheme",
-    "spec/fixtures/slow.js",
-    "spec/fixtures/test.tmTheme",
     "spec/ruco/application_spec.rb",
-    "spec/ruco/array_processor_spec.rb",
     "spec/ruco/command_bar_spec.rb",
     "spec/ruco/core_ext/array_spec.rb",
     "spec/ruco/core_ext/range_spec.rb",
@@ -70,9 +61,7 @@ Gem::Specification.new do |s|
     "spec/ruco/screen_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco/style_map_spec.rb",
-    "spec/ruco/syntax_parser_spec.rb",
     "spec/ruco/text_area_spec.rb",
-    "spec/ruco/tm_theme_spec.rb",
     "spec/ruco/window_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
@@ -86,6 +75,26 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Commandline editor written in ruby}
+  s.test_files = [
+    "spec/ruco/application_spec.rb",
+    "spec/ruco/command_bar_spec.rb",
+    "spec/ruco/core_ext/array_spec.rb",
+    "spec/ruco/core_ext/range_spec.rb",
+    "spec/ruco/core_ext/string_spec.rb",
+    "spec/ruco/editor_spec.rb",
+    "spec/ruco/file_store_spec.rb",
+    "spec/ruco/form_spec.rb",
+    "spec/ruco/history_spec.rb",
+    "spec/ruco/keyboard_spec.rb",
+    "spec/ruco/option_accessor_spec.rb",
+    "spec/ruco/screen_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",
+    "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/ruco/core_ext/range_spec.rb

@@ -10,28 +10,4 @@ describe Range 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,17 +9,8 @@ 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, :language => language)
+    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{
@@ -35,7 +26,6 @@ describe Ruco::Editor do
   before do
     `rm -rf ~/.ruco/sessions`
     @file = 'spec/temp.txt'
-    write('')
   end
 
   describe "strange newline formats" do
@@ -580,7 +570,7 @@ describe Ruco::Editor do
     end
 
     it "shows one-line selection" do
-      write('abcdefghi')
+      write('12345678')
       editor.selecting do
         move(:to, 0, 4)
       end
@@ -592,7 +582,7 @@ describe Ruco::Editor do
     end
 
     it "shows multi-line selection" do
-      write("abc\nabc\nabc")
+      write("012\n345\n678")
       editor.move(:to, 0,1)
       editor.selecting do
         move(:to, 1, 1)
@@ -605,7 +595,7 @@ describe Ruco::Editor do
     end
 
     it "shows the selection from offset" do
-      write('abcdefghi')
+      write('12345678')
       editor.move(:to, 0, 2)
       editor.selecting do
         move(:to, 0, 4)
@@ -618,7 +608,7 @@ describe Ruco::Editor do
     end
 
     it "shows the selection in nth line" do
-      write("\nabcdefghi")
+      write("\n12345678")
       editor.move(:to, 1, 2)
       editor.selecting do
         move(:to, 1, 4)
@@ -646,112 +636,6 @@ describe Ruco::Editor do
         [: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
@@ -961,17 +845,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")
@@ -1108,7 +992,6 @@ describe Ruco::Editor do
     end
 
     it "is changed after delete" do
-      write("abc")
       editor.delete(1)
       editor.modified?.should == true
     end
@@ -1125,7 +1008,6 @@ describe Ruco::Editor do
     end
 
     it "is changed after delete_line" do
-      write("\n\n\n")
       editor.delete_line
       editor.modified?.should == true
     end
@@ -1227,16 +1109,16 @@ describe Ruco::Editor do
     let(:editor){ Ruco::Editor.new(@file, :lines => 5, :columns => 10, :line_numbers => true) }
 
     before do
-      write("a\nb\nc\nd\ne\nf\ng\nh\n")
+      write("0\n1\n2\n3\n4\n5\n6\n7\n")
     end
 
     it "adds numbers to view" do
-      editor.view.should == "   1 a\n   2 b\n   3 c\n   4 d\n   5 e"
+      editor.view.should == "   1 0\n   2 1\n   3 2\n   4 3\n   5 4"
     end
 
     it "does not show numbers for empty lines" do
       editor.move(:to, 10,0)
-      editor.view.should == "   6 f\n   7 g\n   8 h\n   9 \n     "
+      editor.view.should == "   6 5\n   7 6\n   8 7\n   9 \n     "
     end
 
     it "adjusts the cursor" do

data/spec/ruco/file_store_spec.rb

@@ -16,10 +16,6 @@ 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
@@ -45,45 +41,4 @@ 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