ruco 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/ruco/text_area.rb

@@ -28,9 +28,25 @@ module Ruco
 
     def move(where, *args)
       case where
-      when :relative then
-        self.line += args.first
-        self.column += args.last
+      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
         self.line, self.column = args
       when :to_bol then move_to_bol(*args)

data/ruco.gemspec

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

data/spec/ruco/editor_spec.rb

@@ -182,8 +182,36 @@ describe Ruco::Editor do
       editor.cursor.should == [0,0]
     end
 
-    it "cannot move right of characters" do
-      editor.move(:relative, 2,6)
+    it "does not move lines when jumping right" do
+      editor.move(:relative, 1, 5)
+      editor.cursor.should == [1,4]
+    end
+
+    it "does not move lines when jumping left" do
+      editor.move(:to, 2, 2)
+      editor.move(:relative, -1, -5)
+      editor.cursor.should == [1,0]
+    end
+
+    it "moves to next line when moving right of characters" do
+      editor.move(:relative, 0, 5)
+      editor.cursor.should == [1,0]
+    end
+
+    it "moves to prev line when moving left of characters" do
+      editor.move(:relative, 1, 0)
+      editor.move(:relative, 0, -1)
+      editor.cursor.should == [0,4]
+    end
+
+    it "stays at origin when moving left" do
+      editor.move(:relative, 0, -1)
+      editor.cursor.should == [0,0]
+    end
+
+    it "stays at eof when moving right" do
+      editor.move(:to, 2, 4)
+      editor.move(:relative, 0, 1)
       editor.cursor.should == [2,4]
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 +02:00
+date: 2011-05-22 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency