ruco 0.0.19 → 0.0.20

data/VERSION

@@ -1 +1 @@
-0.0.19
+0.0.20

data/lib/ruco/core_ext/string.rb

@@ -12,15 +12,6 @@ class String
     found
   end
 
-  def nth_index(text, n)
-    offset = -1
-    (n+1).times do
-      offset += 1
-      offset = index(text, offset) or return
-    end
-    offset
-  end
-
   # stub for 1.8
   unless method_defined?(:force_encoding)
     def force_encoding(encoding)

data/lib/ruco/editor.rb

@@ -13,7 +13,7 @@ module Ruco
 
     def find(text)
       index = text_area.content.index(text, text_area.cursor_index+1) || text_area.cursor_index
-      move :to, *text_area.cursor_for_index(index)
+      move :to, *text_area.position_for_index(index)
     end
 
     def reset;end

data/lib/ruco/text_area.rb

@@ -1,9 +1,9 @@
 module Ruco
   class TextArea
-    attr_reader :content
+    attr_reader :lines
 
     def initialize(content, options)
-      @content = tabs_to_spaces(content)
+      @lines = tabs_to_spaces(content).naive_split("\n")
       @options = options
       @line = 0
       @column = 0
@@ -16,7 +16,6 @@ module Ruco
     end
 
     def view
-      lines = self.lines
       Array.new(@options[:lines]).map_with_index do |_,i|
         (lines[i + @scrolled_lines] || "").slice(@scrolled_columns, @options[:columns])
       end * "\n" + "\n"
@@ -54,29 +53,27 @@ module Ruco
         next_whitespace = lines[@line+1].to_s.match(/^\s*/)[0]
         text = text + [current_whitespace, next_whitespace].max
       end
-      insert_into_content cursor_index, text
-      move_according_to_insert(text)
+      insert_into_content text
+      move_according_to_insert text
     end
 
     def delete(count)
       if count > 0
-        @content.slice!(cursor_index, count)
+        if current_line[@column..-1].size >= count
+          current_line.slice!(@column, count)
+        else
+          with_lines_as_string do |content|
+            content.slice!(cursor_index, count)
+          end
+        end
       else
         backspace(count.abs)
       end
     end
 
-    # TODO this should go into editor
     def delete_line
-      old_position = position
-      move :to_column, 0
-      delete current_line.size
-      if position == [0,0]
-        delete(1)
-      else
-        delete(-1)
-      end
-      move :to, *old_position
+      lines.slice!(@line, 1)
+      adjust_view
     end
 
     def cursor
@@ -89,13 +86,23 @@ module Ruco
       index
     end
 
-    def cursor_for_index(index)
-      jump = @content.slice(0, index).to_s.naive_split("\n")
+    def position_for_index(index)
+      jump = content.slice(0, index).to_s.naive_split("\n")
       [jump.size - 1, jump.last.size]
     end
 
+    def content
+      (lines * "\n").freeze
+    end
+
     protected
 
+    def with_lines_as_string
+      string = @lines * "\n"
+      yield string
+      @lines = string.naive_split("\n")
+    end
+
     def after_last_word
       current_line.index(/\s*$/)
     end
@@ -125,18 +132,23 @@ module Ruco
     end
 
     def backspace(count)
-      start_index = cursor_index - count
-      if start_index < 0
-        count += start_index
-        start_index = 0
-      end
+      if @column >= count
+        new_colum = @column - count
+        current_line.slice!(new_colum, count)
+        move :to_column, new_colum
+      else
+        start_index = cursor_index - count
+        if start_index < 0
+          count += start_index
+          start_index = 0
+        end
 
-      @content.slice!(start_index, count)
-      move :to, *cursor_for_index(start_index)
-    end
+        with_lines_as_string do |content|
+          content.slice!(start_index, count)
+        end
 
-    def lines
-      @content.naive_split("\n")
+        move :to, *position_for_index(start_index)
+      end
     end
 
     def adjust_view
@@ -181,12 +193,19 @@ module Ruco
       @cursor_line = @line - @scrolled_lines
     end
 
-    def insert_into_content(index, text)
-      # expand with newlines when inserting after maximum position
-      if index > @content.size
-        @content << "\n" * (index - @content.size)
+    def insert_into_content(text)
+      if text.include?("\n")
+        with_lines_as_string do |content|
+          content.insert(cursor_index, text)
+        end
+      else
+        # faster but complicated for newlines
+        lines[@line].insert(@column, text)
       end
-      @content.insert(index, text)
+    end
+
+    def position_inside_content?
+      @line < lines.size and @column < lines[@line].to_s.size
     end
 
     def current_line

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.19"
+  s.version = "0.0.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-16}
+  s.date = %q{2011-01-19}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/grosser/ruco}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Commandline editor written in ruby}
   s.test_files = [
     "spec/ruco/application_spec.rb",
@@ -62,6 +62,7 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/spec/ruco/core_ext/string_spec.rb

@@ -14,19 +14,4 @@ describe String do
       "".naive_split('a').should == ['']
     end
   end
-
-  describe :nth_index do
-    it "finds the first by default" do
-      "a a a".nth_index('a',0).should == 0
-    end
-
-    it "finds the n-th index" do
-      "a a a".nth_index('a',2).should == 4
-    end
-
-    it "is nil when not found" do
-      "b b b".nth_index('a',0).should == nil
-      "b b b".nth_index('a',1).should == nil
-    end
-  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 19
-  version: 0.0.19
+  - 20
+  version: 0.0.20
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,25 +14,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-16 00:00:00 +01:00
+date: 2011-01-19 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: clipboard
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 9
         - 4
         version: 0.9.4
+  type: :runtime
   prerelease: false
   version_requirements: *id001
-  type: :runtime
-  name: clipboard
 description: 
 email: michael@grosser.it
 executables: 
@@ -87,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 588820097
       segments: 
       - 0
       version: "0"
@@ -96,14 +94,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Commandline editor written in ruby