ver 2010.02 → 2010.08

data/spec/ver/keymap/vim/undo_redo.rb

@@ -0,0 +1,21 @@
+require_relative '../vim'
+
+VER.spec keymap: 'vim', hidden: false do
+  describe 'Keymap for VIM' do
+    describe 'Undo/Redo commands' do
+      behaves_like :destructive_key_spec
+
+      key 'u', 'undo last N changes' do
+        skip
+      end
+
+      key '<Control-r>', 'redo last N undone changes' do
+        skip
+      end
+
+      key 'U', 'restore last changed line' do
+        skip
+      end
+    end
+  end
+end

data/spec/ver/keymap/vim/up_down_motion.rb

@@ -0,0 +1,94 @@
+require_relative '../vim'
+
+VER.spec keymap: 'vim', hidden: false do
+  describe 'Keymap for VIM' do
+    describe 'Up-Down motions' do
+      behaves_like :key_spec
+
+      key 'k', '<Control-p>', '<Up>', 'go up N lines' do |key|
+        insert.index = '10.10'
+        type key
+        insert.index.should == '9.10'
+      end
+
+      keys 'j', '<Control-j>', '<Control-n>', '<Down>', 'go down N lines' do |key|
+        type key
+        insert.index.should == '2.0'
+        insert.index = '1.10'
+        type key
+        insert.index.should == '2.10'
+      end
+
+      key '-', 'up N lines, on the first non-blank character' do |key|
+        insert.index = 'end'
+        type key
+        insert.index.should == '40.0'
+        type "25#{key}"
+        insert.index.should == '15.4'
+      end
+
+      key '+', '<Control-m>', '<Return>',
+      'go down N lines, on the first non-blank character' do |key|
+        type key
+        insert.index.should == '2.0'
+        type "13#{key}"
+        insert.index.should == '15.4'
+      end
+
+      key '_', 'go down N-1 lines, on the first non-blank character' do
+        insert.index = '2.10'
+        type '_'
+        insert.index.should == '2.0'
+        type '2_'
+        insert.index.should == '3.0'
+        type '12_'
+        insert.index.should == '14.2'
+        type '2_'
+        insert.index.should == '15.4'
+      end
+
+      key 'G', 'goto line N (default: last line), on the first non-blank character' do
+        insert.index = '20.0'
+        type 'G'
+        insert.index.should == '41.0'
+        type '2G'
+        insert.index.should == '2.0'
+        type '15G'
+        insert.index.should == '15.4'
+      end
+
+      key 'gg', 'goes to line N (default: first line), on the first non-blank character' do
+        insert.index = '20.0'
+        type 'gg'
+        insert.index.should == '1.0'
+        type '2gg'
+        insert.index.should == '2.0'
+        type '015gg'
+        insert.index.should == '15.4'
+      end
+
+      key 'N%', 'goto line N percentage down in the file. N must be given' do
+        type '6%'
+        insert.index.should == '3.0'
+        type '12%'
+        insert.index.should == '5.0'
+        type '24%'
+        insert.index.should == '10.0'
+        type '48%'
+        insert.index.should == '20.0'
+        type '96%'
+        insert.index.should == '40.0'
+        type '100%'
+        insert.index.should == '41.0'
+      end
+
+      keys 'gk', 'g<Up>', 'go up N display lines' do |key|
+        skip
+      end
+
+      keys 'gj', 'g<Down>', 'go down N display lines' do |key|
+        skip
+      end
+    end
+  end
+end

data/spec/ver/keymap/vim/various_motion.rb

@@ -0,0 +1,33 @@
+require_relative '../vim'
+
+VER.spec keymap: 'vim', hidden: false do
+  describe 'Keymap for VIM' do
+    describe 'Control mode various motions motions' do
+      behaves_like :key_spec
+
+      key '%', 'find the next brace, bracket, comment, or "#if"/ "#else"/"#endif" in this line and go to its match' do |key|
+        skip
+      end
+
+      key 'H', 'go to the Nth line in the window, on the first non-blank' do |key|
+        skip
+      end
+
+      key 'M', 'go to the middle line in the window, on the first non-blank' do |key|
+        skip
+      end
+
+      key 'L', 'go to the Nth line from the bottom, on the first non-blank' do |key|
+        skip
+      end
+
+      key 'go', 'go to Nth byte in the buffer' do |key|
+        skip
+      end
+
+      key ':[range]go[to] [off]', 'go to [off] byte in the buffer' do |key|
+        skip
+      end
+    end
+  end
+end

data/spec/ver/keysyms.rb

@@ -0,0 +1,13 @@
+require_relative '../helper'
+
+VER.spec do
+  describe 'Event' do
+    def expand(pattern)
+      VER::Event.expand_pattern(pattern)
+    end
+
+    it 'expands pattern' do
+      expand('<C-A-x>').should == '<Control-Alt-x>'
+    end
+  end
+end

data/spec/ver/major_mode.rb

@@ -30,57 +30,57 @@ VER.spec do
 
     it 'returns an action for a given sequence' do
       mode = MajorMode[:spec]
-      mode.map(:kill_word, ['d', 'w'])
-      mode.map(:kill_line, ['d', 'd'])
+      mode.map(:kill_word, 'dw')
+      mode.map(:kill_line, 'dd')
 
-      action_mode, action = mode.resolve(['d', 'w'])
-      action_mode.should == mode
-      action.receiver.should == nil
-      action.method.should == :kill_word
+      action = mode.resolve(['d', 'w'])
+      action.mode.should == mode
+      action.handler.should == nil
+      action.invocation.should == :kill_word
     end
 
     it 'creates an unambigous keymap' do
       mode = MajorMode[:spec]
-      mode.map(:kill_word, ['d', 'w'])
-      mode.map(:kill_line, ['d', 'd'])
+      mode.map(:kill_word, 'dw')
+      mode.map(:kill_line, 'dd')
 
       action = mode.keymap['d', 'w']
-      action.method.should == :kill_word
-      action.receiver.should == nil
+      action.handler.should == nil
+      action.invocation.should == :kill_word
 
       action = mode.keymap['d', 'd']
-      action.receiver.should == nil
-      action.method.should == :kill_line
+      action.handler.should == nil
+      action.invocation.should == :kill_line
     end
 
     it 'can inherit another major mode' do
       fund = MajorMode[:Fundamental]
-      fund.map(:kill_word, ['d', 'w'])
-      fund.map(:kill_line, ['d', 'd'])
+      fund.map(:kill_word, 'dw')
+      fund.map(:kill_line, 'dd')
 
       ruby = MajorMode[:Ruby]
       ruby.inherits(:Fundamental)
-      ruby.map(:preview, ['Control-c', 'Control-c'])
+      ruby.map(:preview, '<Control-c><Control-c>')
 
-      action_mode, action = ruby.resolve(['d', 'd'])
-      action_mode.should == ruby
-      action.method.should == :kill_line
+      action = ruby.resolve(['d', 'd'])
+      action.mode.should == fund
+      action.invocation.should == :kill_line
 
-      action_mode, action = ruby.resolve(['d', 'w'])
-      action_mode.should == ruby
-      action.method.should == :kill_word
+      action = ruby.resolve(['d', 'w'])
+      action.mode.should == fund
+      action.invocation.should == :kill_word
 
-      action_mode, action = ruby.resolve(['<Control-c>', '<Control-c>'])
-      action_mode.should == ruby
-      action.method.should == :preview
+      action = ruby.resolve(['<Control-c>', '<Control-c>'])
+      action.mode.should == ruby
+      action.invocation.should == :preview
 
-      action_mode, action = fund.resolve(['d', 'd'])
-      action_mode.should == fund
-      action.method.should == :kill_line
+      action = fund.resolve(['d', 'd'])
+      action.mode.should == fund
+      action.invocation.should == :kill_line
 
-      action_mode, action = fund.resolve(['d', 'w'])
-      action_mode.should == fund
-      action.method.should == :kill_word
+      action = fund.resolve(['d', 'w'])
+      action.mode.should == fund
+      action.invocation.should == :kill_word
 
       action = fund.resolve(['<Control-c>', '<Control-c>'])
       action.should.be.kind_of Keymap::Results::Impossible
@@ -88,16 +88,16 @@ VER.spec do
 
     it 'may have a fallback that is invoked on impossible results' do
       mode = MajorMode[:spec]
-      mode.map(:kill_word, ['d', 'w'])
+      mode.map(:kill_word, 'dw')
       mode.missing(:insert)
 
-      action_mode, action = mode.resolve(['d', 'w'])
-      action_mode.should == mode
-      action.method.should == :kill_word
+      action = mode.resolve(['d', 'w'])
+      action.mode.should == mode
+      action.invocation.should == :kill_word
 
-      action_mode, action = mode.resolve(['f', 'o', 'o'])
-      action_mode.should == mode
-      action.method.should == :insert
+      action = mode.resolve(['f', 'o', 'o'])
+      action.mode.should == mode
+      action.invocation.should == :insert
     end
 
     it 'can have minor modes' do

data/spec/ver/minor_mode.rb

@@ -34,22 +34,22 @@ VER.spec do
       control.map(:quit, ['q'])
       control.inherits(:movement)
 
-      action_mode, action = control.resolve(['q'])
-      action_mode.should == control
-      action.method.should == :quit
+      action = control.resolve(['q'])
+      action.mode.should == control
+      action.invocation.should == :quit
 
-      action_mode, action = control.resolve(['j'])
-      action_mode.should == movement
-      action.method.should == :next_line
+      action = control.resolve(['j'])
+      action.mode.should == movement
+      action.invocation.should == :next_line
     end
 
     it 'indicates whether a sequence can be found' do
       control = MinorMode[:control]
       control.map(:quit, ['Z', 'Z'])
 
-      action_mode, action = control.resolve(['Z', 'Z'])
-      action_mode.should == control
-      action.method.should == :quit
+      action = control.resolve(['Z', 'Z'])
+      action.mode.should == control
+      action.invocation.should == :quit
 
       control.resolve(['Z']).should.be.kind_of Keymap::Results::Incomplete
       control.resolve(['X']).should.be.kind_of Keymap::Results::Impossible
@@ -60,11 +60,11 @@ VER.spec do
       mode.map(:kill_word, ['d', 'w'])
       mode.missing(:insert)
 
-      action_mode, action = mode.resolve(['d', 'w'])
-      action.method.should == :kill_word
+      action = mode.resolve(['d', 'w'])
+      action.invocation.should == :kill_word
 
-      action_mode, action = mode.resolve(['y'])
-      action.method.should == :insert
+      action = mode.resolve(['y'])
+      action.invocation.should == :insert
     end
 
     it "can do lookup spanning multiple minor modes" do
@@ -77,14 +77,15 @@ VER.spec do
       control = MinorMode[:control]
       control.inherits :move, :kill
 
-      action_mode, action = control.resolve(['d', 'd'])
-      action_mode.should == kill
-      action.method.should == :kill_line
+      action = control.resolve(['d', 'd'])
+      action.mode.should == kill
+      action.invocation.should == :kill_line
 
-      action_mode, action = control.resolve(['d', 'j'])
-      action_mode.should == kill
-      action.method.should == :kill_motion
-      action.args.first.method.should == :next_line
+      action = control.resolve(['d', 'j'])
+      action.mode.should == kill
+      action.invocation.size.should == 2
+      action.invocation.first.should == :kill_motion
+      action.invocation.last.invocation.should == :next_line
     end
   end
 end

data/spec/ver/plugin/smart_autoindent.rb

@@ -20,9 +20,9 @@ end
 # NOTE: do _not_ remove trailing whitespace in this file, it's essential.
 
 VER.spec do
-  require 'config/plugin/smart_autoindent'
+  describe 'VER::Methods::SmartAutoindent' do
+    require 'config/plugin/smart_autoindent'
 
-  describe VER::Methods::SmartAutoindent do
     describe 'insert indented newline' do
       Indent = VER::Methods::SmartAutoindent
 

data/spec/ver/text/index.rb

@@ -0,0 +1,122 @@
+require_relative '../../helper'
+
+before = lambda{ @buffer = VER::Buffer.new(VER.layout) }
+after = lambda{ @buffer.destroy }
+
+VER.spec do
+  describe 'VER::Buffer::Index' do
+    describe 'Buffer methods' do
+      before(&before)
+      after(&after)
+
+      it 'returns an Index from #index' do
+        @buffer.index('1.0').should == VER::Buffer::Index.new(@buffer, '1.0')
+      end
+    end
+
+    describe 'Instance methods' do
+      before(&before)
+      after(&after)
+
+      it 'has a bbox' do
+        bbox = @buffer.index('1.0').bbox
+        bbox.class.should == Array
+        bbox.size.should == 4
+        bbox.all?{|entry| entry.is_a?(Integer) }.should.be.true
+      end
+
+      it 'is comparable' do
+        @buffer.insert('1.0', 'some text')
+        @buffer.index('1.0').should < @buffer.index('1.1')
+        @buffer.index('1.1').should > @buffer.index('1.0')
+        @buffer.index('1.1').should == @buffer.index('1.1')
+        @buffer.index('1.1').should >= @buffer.index('1.1')
+        @buffer.index('1.1').should >= @buffer.index('1.0')
+        @buffer.index('1.1').should <= @buffer.index('1.1')
+        @buffer.index('1.0').should <= @buffer.index('1.1')
+        @buffer.index('1.0').should != @buffer.index('1.1')
+        @buffer.index('1.1').should.be.between @buffer.index('1.0'), @buffer.index('1.2')
+        @buffer.index('1.2').should.be.between @buffer.index('1.1'), @buffer.index('1.2')
+      end
+
+      it 'has dlineinfo' do
+        dlineinfo = @buffer.index('1.0').dlineinfo
+        dlineinfo.class.should == Array
+        dlineinfo.size.should == 5
+        dlineinfo.all?{|entry| entry.is_a?(Integer) }.should.be.true
+      end
+
+      it 'dumps all at index' do
+        @buffer.index('1.0').dump(:all).should == [
+          ["mark", "insert", "1.0"],
+          ["mark", "current", "1.0"],
+          ["text", "\n", "1.0"],
+        ]
+      end
+
+      it 'gets content at index' do
+        @buffer.index('1.0').get.should == "\n"
+      end
+
+      it 'deletes at index' do
+        @buffer.insert('end', 'abc')
+        @buffer.index('1.0').get.should == "a"
+        @buffer.index('1.0').delete
+        @buffer.value.should == "bc\n"
+        @buffer.index('1.0').get.should == "b"
+      end
+
+      it 'has a line' do
+        @buffer.index('1.0').line.should == 1
+        @buffer.index('2.0').line.should == 2
+        @buffer.index('3.0').line.should == 2
+      end
+
+      it 'has a char' do
+        @buffer.index('1.0').char.should == 0
+        @buffer.index('1.1').char.should == 0
+      end
+
+      it 'gets a list of tags at the position' do
+        @buffer.insert 'end', 'some', 'some-tag'
+        @buffer.insert 'end', ' '
+        @buffer.insert 'end', 'tags', 'tags-tag'
+        @buffer.index('1.0').tags.should == [@buffer.tag('some-tag')]
+        @buffer.index('1.4').tags.should == []
+        @buffer.index('1.5').tags.should == [@buffer.tag('tags-tag')]
+      end
+
+      it 'gets a list of tag names at the position' do
+        @buffer.insert 'end', 'some', 'some-tag'
+        @buffer.insert 'end', ' '
+        @buffer.insert 'end', 'tags', 'tags-tag'
+        @buffer.index('1.0').tag_names.should == ['some-tag']
+        @buffer.index('1.4').tag_names.should == []
+        @buffer.index('1.5').tag_names.should == ['tags-tag']
+      end
+
+      it 'copies line at position' do
+        @buffer.insert '1.0', 'one line'
+        VER::Clipboard.clear
+        @buffer.index('1.0').copy_line
+        VER::Clipboard.dwim.should == "one line\n"
+      end
+
+      it 'deletes line at position' do
+        @buffer.insert '1.0', 'one line'
+        VER::Clipboard.clear
+        @buffer.index('1.0').delete_line
+        VER::Clipboard.dwim.should.be.nil
+        @buffer.value.should == "\n"
+      end
+
+      it 'kills line at position' do
+        @buffer.insert '1.0', 'one line'
+        VER::Clipboard.clear
+        @buffer.index('1.0').kill_line
+        VER::Clipboard.dwim.should == "one line\n"
+        @buffer.value.should == "\n"
+      end
+    end
+  end
+end