ruco 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/ruco/application.rb

@@ -52,24 +52,17 @@ module Ruco
       when :home then move_with_select_mode :to_bol
       when :page_up then move_with_select_mode :page_up
       when :page_down then move_with_select_mode :page_down
+      when :"Ctrl+right" then move_with_select_mode :jump, :right
+      when :"Ctrl+left" then move_with_select_mode :jump, :left
 
       # select
-      when :"Shift+down" then
-        @focused.selecting do
-          move(:relative, 1, 0)
-        end
-      when :"Shift+right"
-        @focused.selecting do
-          move(:relative, 0, 1)
-        end
-      when :"Shift+up"
-        @focused.selecting do
-          move(:relative, -1, 0)
-        end
-      when :"Shift+left" then
-        @focused.selecting do
-          move(:relative, 0, -1)
-        end
+      when :"Shift+down" then @focused.selecting { move(:relative, 1, 0) }
+      when :"Shift+right" then @focused.selecting { move(:relative, 0, 1) }
+      when :"Shift+up" then @focused.selecting { move(:relative, -1, 0) }
+      when :"Shift+left" then @focused.selecting { move(:relative, 0, -1) }
+      when :"Ctrl+Shift+left" then @focused.selecting{ move(:jump, :left) }
+      when :"Ctrl+Shift+right" then @focused.selecting{ move(:jump, :right) }
+
 
       # modify
       when :tab then

data/lib/ruco/text_area.rb

@@ -29,37 +29,22 @@ module Ruco
     def move(where, *args)
       case where
       when :relative
-        line_change, column_change = args
-        new_column = column + column_change
-
-        # user moves right on end of line -> next line
-        if line_change == 0 and line != lines.size - 1 and new_column > current_line.size
-          self.column = 0
-          self.line += 1
-
-        # user moves left on start of line -> prev line
-        elsif line_change == 0 and line != 0 and new_column <= 0
-          self.line -= 1
-          self.column = current_line.size
-
-        # normal movement
-        else
-          self.line += line_change
-          self.column += column_change
-        end
-      when :to then
+        move_relative(*args)
+      when :to
         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 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
+      when :page_down
         self.line += @window.lines
         @window.set_top(@window.top + @window.lines, @lines.size)
-      when :page_up then
+      when :page_up
         self.line -= @window.lines
         @window.set_top(@window.top - @window.lines, @lines.size)
+      when :jump
+        move_jump(args.first)
       else
         raise "Unknown move type #{where} with #{args.inspect}"
       end
@@ -125,9 +110,7 @@ module Ruco
     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
-      index
+      lines[0...position.line].sum{|l| l.size + 1} + position.column
     end
 
     def content
@@ -180,6 +163,30 @@ module Ruco
       move :to_column, column
     end
 
+    def move_relative(line_change, column_change)
+      if line_change == 0
+        # let user wrap around start/end of line
+        move :to_index, index_for_position + column_change
+      else
+        # normal movement
+        self.line += line_change
+        self.column += column_change
+      end
+    end
+
+    def move_jump(direction)
+      regex = /\b/m
+      text = content
+
+      next_index = if direction == :right
+        text.index(regex, index_for_position + 1) || text.size
+      else
+        text.rindex(regex,[index_for_position - 1, 0].max) || 0
+      end
+
+      move :to_index, next_index
+    end
+
     def backspace(count)
       if @column >= count
         new_colum = @column - count

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-05-25}
+  s.date = %q{2011-05-30}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]

data/spec/ruco/editor_spec.rb

@@ -349,6 +349,62 @@ describe Ruco::Editor do
         editor.cursor.should == [1,2]
       end
     end
+
+    describe 'jumping' do
+      it "can jump right" do
+        write("abc def")
+        editor.move(:jump, :right)
+        editor.cursor.should == [0,3]
+      end
+
+      it "does not jump over braces" do
+        write("abc(def")
+        editor.move(:jump, :right)
+        editor.cursor.should == [0,3]
+      end
+
+      it "can jump over whitespace and newlines" do
+        write("abc\n 123")
+        editor.move(:jump, :right)
+        editor.cursor.should == [0,3]
+        editor.move(:jump, :right)
+        editor.cursor.should == [1,1]
+      end
+
+      it "can jump left" do
+        write("abc def")
+        editor.move(:relative, 0,3)
+        editor.move(:jump, :left)
+        editor.cursor.should == [0,0]
+      end
+
+      it "can jump to start" do
+        write("abc\ndef")
+        editor.move(:relative, 0,2)
+        editor.move(:jump, :left)
+        editor.cursor.should == [0,0]
+      end
+
+      it "stays at start" do
+        write("abc\ndef")
+        editor.move(:jump, :left)
+        editor.cursor.should == [0,0]
+      end
+
+      it "can jump to end" do
+        write("abc\ndef")
+        editor.move(:relative, 1,1)
+        editor.move(:jump, :right)
+        editor.cursor.should == [1,3]
+      end
+
+      it "stays at end" do
+        write("abc\ndef")
+        editor.move(:to, 1,3)
+        editor.move(:jump, :right)
+        editor.cursor.should == [1,3]
+      end
+    end
   end
 
   describe :move_line do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-05-30 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: clipboard
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
-  requirement: *id001
-  prerelease: false
   type: :runtime
-  name: clipboard
+  prerelease: false
+  version_requirements: *id001
 description: 
 email: michael@grosser.it
 executables: 
@@ -95,11 +85,7 @@ has_rdoc: true
 homepage: http://github.com/grosser/ruco
 licenses: []
 
-post_install_message: |+
-  
-        Mac: shift/ctrl + arrow-keys only work in iterm (not Terminal.app)
-        Ubuntu: sudo apt-get install xclip # to use the clipboard
-  
+post_install_message: "\n      Mac: shift/ctrl + arrow-keys only work in iterm (not Terminal.app)\n      Ubuntu: sudo apt-get install xclip # to use the clipboard\n\n"
 rdoc_options: []
 
 require_paths: 
@@ -109,7 +95,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 472274319
       segments: 
       - 0
       version: "0"
@@ -118,9 +104,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []