ruco 0.0.4 → 0.0.5

data/Readme.md

@@ -10,7 +10,7 @@ Finished:
  - change-indicator
  - writeable indicator
  - backspace / delete
- - find
+ - find / go to line
 
 Install
 =======
@@ -22,7 +22,8 @@ Usage
 
 TODO
 =====
- - cursor move + delete/backspace inside find field
+ - delete line
+ - scrolling inside text field
  - smart staying at end of line/column when changing line
  - indentation + paste support
  - warnings / messages

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/bin/ruco

@@ -106,6 +106,9 @@ init_screen do
     when ?\C-f then
       focused = command
       command.find
+    when ?\C-g then
+      focused = command
+      command.move_to_line
     when 27 then
       focused.reset
       focused = editor # escape from focused

data/lib/ruco.rb

@@ -1,11 +1,16 @@
+require 'ruco/core_ext/object'
+require 'ruco/core_ext/string'
+require 'ruco/core_ext/array'
+
 require 'ruco/focusable'
 require 'ruco/command'
 
 require 'ruco/editor'
 require 'ruco/status_bar'
 require 'ruco/command_bar'
-require 'ruco/core_ext/string'
-require 'ruco/core_ext/array'
+
+require 'ruco/form'
+require 'ruco/text_field'
 
 module Ruco
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip

data/lib/ruco/command_bar.rb

@@ -2,49 +2,52 @@ module Ruco
   class CommandBar
     include Focusable
 
-    attr_accessor :cursor_line
+    attr_accessor :cursor_line, :form
+    delegate :move, :delete, :insert, :to => :form
 
     SHORTCUTS = [
       '^W Exit',
       '^S Save',
       '^F Find',
-      '^D Delete line'
+      '^D Delete line',
+      '^G Go to line'
     ]
 
     SEARCH_PREFIX = "Find: "
 
     def initialize(options)
       @options = options
+      @forms_cache = {}
       reset
     end
 
     def view
-      if @find_mode
-        SEARCH_PREFIX + @find_term
+      if @form
+        @form.view
       else
         available_shortcuts
       end
     end
 
     def find
-      @find_mode = true
+      @form = @forms_cache[:find] ||= Form.new('Find: ', :columns => @options[:columns], :command => :find)
     end
 
-    def insert(text)
-      @find_term += text
-      if @find_term.include?("\n")
-        @find_term.gsub!("\n",'')
-        Command.new(:find, @find_term)
-      end
+    def move_to_line
+      @form = Form.new('Go to Line: ', :columns => @options[:columns], :command => :move_to_line, :type => :integer)
     end
 
     def reset
-      @find_mode = false
-      @find_term = ''
+      @forms_cache[:find] = nil if @form == @forms_cache[:find]
+      @form = nil
     end
 
     def cursor_column
-      view.size
+      if @form
+        @form.cursor[1]
+      else
+        0
+      end
     end
 
     private

data/lib/ruco/core_ext/object.rb

@@ -0,0 +1,17 @@
+class Object
+  # copy from active_support
+  def delegate(*methods)
+    options = methods.pop
+    unless options.is_a?(Hash) && to = options[:to]
+      raise ArgumentError, "Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, :to => :greeter)."
+    end
+
+    methods.each do |method|
+      module_eval(<<-EOS, "(__DELEGATION__)", 1)
+def #{method}(*args, &block)
+#{to}.__send__(#{method.inspect}, *args, &block)
+end
+EOS
+    end
+  end
+end

data/lib/ruco/editor.rb

@@ -28,8 +28,8 @@ module Ruco
     end
 
     def move(line, column)
-      @line =    [[@line   + line,    0].max, lines.size].min
-      @column =  [[@column + column, 0].max, (lines[@line]||'').size].min
+      @line += line
+      @column += column
       adjust_view
     end
 
@@ -120,6 +120,8 @@ module Ruco
     end
 
     def adjust_view
+      @line =    [[@line,   0].max, lines.size - 1].min
+      @column =  [[@column, 0].max, (lines[@line]||'').size].min
       reposition_cursor
       scroll_column_into_view
       scroll_line_into_view

data/lib/ruco/form.rb

@@ -0,0 +1,36 @@
+module Ruco
+  class Form
+    delegate :move, :delete, :to => :text_field
+
+    def initialize(label, options)
+      @options = options
+      @label = label.strip + ' '
+      reset
+    end
+
+    def view
+      @label + @text_field.view
+    end
+
+    def insert(text)
+      @text_field.insert(text.gsub("\n",''))
+      if text.include?("\n")
+        result = @text_field.value
+        result = result.to_i if @options[:type] == :integer
+        Command.new(@options[:command], result)
+      end
+    end
+
+    def cursor
+      [0, @label.size + @text_field.cursor[1]]
+    end
+
+    def reset
+      @text_field = TextField.new(:columns => @options[:columns] - @label.size)
+    end
+
+    private
+
+    attr_reader :text_field
+  end
+end

data/lib/ruco/text_field.rb

@@ -0,0 +1,40 @@
+module Ruco
+  class TextField
+    def initialize(options)
+      @options = options
+      @content = ''
+      @column = 0
+    end
+
+    def insert(text)
+      @content += text
+      move(0, text.size)
+    end
+
+    def delete(count)
+      if count > 0
+        @content.slice!(@column, count)
+      else
+        delete_start = [@column - count.abs, 0].max
+        @content[delete_start...@column] = ''
+        @column = delete_start
+      end
+    end
+
+    def view
+      @content
+    end
+
+    def value
+      @content
+    end
+
+    def move(line, column)
+      @column = [[@column + column, 0].max, @content.size].min
+    end
+
+    def cursor
+      [0, @column]
+    end
+  end
+end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-09}
+  s.date = %q{2011-01-10}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -24,15 +24,19 @@ Gem::Specification.new do |s|
     "lib/ruco/command.rb",
     "lib/ruco/command_bar.rb",
     "lib/ruco/core_ext/array.rb",
+    "lib/ruco/core_ext/object.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/editor.rb",
     "lib/ruco/focusable.rb",
+    "lib/ruco/form.rb",
     "lib/ruco/status_bar.rb",
+    "lib/ruco/text_field.rb",
     "ruco.gemspec",
     "spec/ruco/command_bar_spec.rb",
     "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
+    "spec/ruco/form_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"
@@ -46,6 +50,7 @@ Gem::Specification.new do |s|
     "spec/ruco/command_spec.rb",
     "spec/ruco/core_ext/string_spec.rb",
     "spec/ruco/editor_spec.rb",
+    "spec/ruco/form_spec.rb",
     "spec/ruco/status_bar_spec.rb",
     "spec/ruco_spec.rb",
     "spec/spec_helper.rb"

data/spec/ruco/command_bar_spec.rb

@@ -28,6 +28,14 @@ describe Ruco::CommandBar do
       bar.cursor_column.should == 9
     end
 
+    it "keeps entered stuff" do
+      bar.find
+      bar.insert('abc')
+      bar.find
+      bar.view.should == "Find: abc"
+      bar.cursor_column.should == 9
+    end
+
     it "can reset the search" do
       bar.find
       bar.insert('abc')
@@ -54,4 +62,36 @@ describe Ruco::CommandBar do
       result.should == Ruco::Command.new(:find, 'abcd')
     end
   end
+
+  describe :move_to_line do
+    it "displays a form" do
+      bar.move_to_line
+      bar.view.should == "Go to Line: "
+    end
+
+    it "gets output" do
+      bar.move_to_line
+      bar.insert('123')
+      result = bar.insert("\n")
+      result.should == Ruco::Command.new(:move_to_line, 123)
+    end
+
+    it "gets reset" do
+      bar.move_to_line
+      bar.insert('123')
+      bar.move_to_line
+      bar.view.should == "Go to Line: "
+    end
+
+    it "does not reset search when resetting" do
+      bar.find
+      bar.insert('abc')
+      bar.move_to_line
+      bar.reset
+
+      bar.view.should include("^W Exit ") # default view
+      bar.find
+      bar.view.should == "Find: abc"
+    end
+  end
 end

data/spec/ruco/editor_spec.rb

@@ -48,10 +48,10 @@ describe Ruco::Editor do
       editor.cursor.should == [2,4]
     end
 
-    it "gets reset to empty line when moving past lines" do
+    it "stays in last line when moving past lines" do
       write("    ")
       editor.move(6,3)
-      editor.cursor.should == [1,0]
+      editor.cursor.should == [0,3]
     end
 
     describe 'column scrolling' do
@@ -101,12 +101,27 @@ describe Ruco::Editor do
 
       it "can scroll till end of file" do
         editor.move(15,0)
-        editor.view.should == "\n\n\n"
+        editor.view.should == "9\n\n\n"
         editor.cursor_line.should == 0
       end
     end
   end
 
+  describe :move_to do
+    it "cannot move outside of text (bottom/right)" do
+      write("123\n456")
+      editor.move_to(10,10)
+      editor.cursor.should == [1,3]
+    end
+
+    it "cannot move outside of text (top/left)" do
+      write("123\n456")
+      editor.move(1,1)
+      editor.move_to(-10,-10)
+      editor.cursor.should == [0,0]
+    end
+  end
+
   describe :move_to_eol do
     before do
       write("\n aa \n  ")
@@ -260,8 +275,9 @@ describe Ruco::Editor do
     end
 
     it "can add newlines to the moveable end" do
-      write('')
-      editor.move(1,0)
+      write('abc')
+      editor.move(0,3)
+      editor.insert("\n")
       editor.insert("\n")
       editor.cursor.should == [2,0]
     end

data/spec/ruco/form_spec.rb

@@ -0,0 +1,75 @@
+require File.expand_path('spec/spec_helper')
+
+describe Ruco::Form do
+  let(:form){ Ruco::Form.new('Test', :columns => 30, :command => :find) }
+
+  it "positions cursor in text field" do
+    form.cursor.should == [0, 5]
+  end
+
+  describe :insert do
+    it "adds label size and input size" do
+      form.insert('abc')
+      form.cursor.should == [0, 8]
+    end
+
+    it "returns nil on any insert" do
+      form.insert('abc').should == nil
+    end
+
+    it "returns value on enter" do
+      form.insert('abc')
+      form.insert("d\n").should == Ruco::Command.new(:find, 'abcd')
+    end
+  end
+
+  describe :move do
+    it "moves in text-field" do
+      form.insert('abc')
+      form.move(0, -1)
+      form.cursor.should == [0,7]
+    end
+
+    it "cannot move out of left side" do
+      form.move(0, -3)
+      form.cursor.should == [0,5]
+    end
+
+    it "cannot move out of right side" do
+      form.move(0, 4)
+      form.cursor.should == [0,5]
+      form.insert('abc')
+      form.move(0, 4)
+      form.cursor.should == [0,8]
+    end
+  end
+
+  describe :delete do
+    it "removes characters forward" do
+      form.insert('abc')
+      form.move(0, -2)
+      form.delete(1)
+      form.view.should == 'Test ac' 
+    end
+
+    it "removes characters backward" do
+      form.insert('abc')
+      form.move(0, -1)
+      form.delete(-1)
+      form.view.should == 'Test ac'
+    end
+
+    it "moves the cursor backward" do
+      form.insert('abc')
+      form.move(0, -1)
+      form.delete(-1)
+      form.cursor.should == [0,6]
+    end
+  end
+
+  describe :view do
+    it "can be viewed" do
+      form.view.should == "Test "
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-09 00:00:00 +01:00
+date: 2011-01-10 00:00:00 +01:00
 default_executable: ruco
 dependencies: []
 
@@ -38,15 +38,19 @@ files:
 - lib/ruco/command.rb
 - lib/ruco/command_bar.rb
 - lib/ruco/core_ext/array.rb
+- lib/ruco/core_ext/object.rb
 - lib/ruco/core_ext/string.rb
 - lib/ruco/editor.rb
 - lib/ruco/focusable.rb
+- lib/ruco/form.rb
 - lib/ruco/status_bar.rb
+- lib/ruco/text_field.rb
 - ruco.gemspec
 - spec/ruco/command_bar_spec.rb
 - spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
+- spec/ruco/form_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb
@@ -89,6 +93,7 @@ test_files:
 - spec/ruco/command_spec.rb
 - spec/ruco/core_ext/string_spec.rb
 - spec/ruco/editor_spec.rb
+- spec/ruco/form_spec.rb
 - spec/ruco/status_bar_spec.rb
 - spec/ruco_spec.rb
 - spec/spec_helper.rb