ruco 0.0.29 → 0.0.30

data/Readme.md

@@ -66,6 +66,7 @@ TODO
  - search & replace
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
  - support Alt+Fx keys
+ - (later) extract keyboard and html-style components into seperate project
 
 Author
 ======

data/VERSION

@@ -1 +1 @@
-0.0.29
+0.0.30

data/lib/ruco.rb

@@ -16,6 +16,7 @@ require 'ruco/application'
 
 require 'ruco/form'
 require 'ruco/text_area'
+require 'ruco/editor_area'
 require 'ruco/text_field'
 
 module Ruco

data/lib/ruco/editor.rb

@@ -18,7 +18,7 @@ module Ruco
           raise "#{@file} contains tabs.\nRuco atm does not support tabs, but will happily convert them to spaces if started with --convert-tabs or -c"
         end
       end
-      @text_area = TextArea.new(content, options)
+      @text_area = EditorArea.new(content, options)
       @modified = false
     end
 

data/lib/ruco/editor_area.rb

@@ -0,0 +1,48 @@
+module Ruco
+  # everything that does not belong to a text-area
+  # but is needed for Ruco::Editor
+  class EditorArea < TextArea
+    def delete_line
+      lines.slice!(@line, 1)
+      adjust_view
+    end
+
+    def indent
+      selected_lines.each do |line|
+        @lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
+      end
+      adjust_to_indentation Ruco::TAB_SIZE
+      adjust_view
+    end
+
+    def unindent
+      lines_to_unindent = (selection ? selected_lines : [@line])
+      removed = lines_to_unindent.map do |line|
+        remove = [@lines[line].leading_whitespace.size, Ruco::TAB_SIZE].min
+        @lines[line].slice!(0, remove)
+        remove
+      end
+
+      adjust_to_indentation -removed.first, -removed.last
+      adjust_view
+    end
+
+    private
+
+    def adjust_to_indentation(first, last=nil)
+      last ||= first
+      if selection
+        cursor_adjustment = (selection.first == position ? first : last)
+        selection.first.column = [selection.first.column + first, 0].max
+        selection.last.column = [selection.last.column + last, 0].max
+        @column += cursor_adjustment
+      else
+        @column += first
+      end
+    end
+
+    def selected_lines
+      selection.first.line.upto(selection.last.line)
+    end
+  end
+end

data/lib/ruco/keyboard.rb

@@ -3,6 +3,7 @@ require 'curses'
 class Keyboard
   MAX_CHAR = 255
   ENTER = 13
+  ESCAPE = 27
   IS_18 = RUBY_VERSION =~ /^1\.8/
   SEQUENCE_TIMEOUT = 0.01
   NOTHING = (2**32 - 1) # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
@@ -64,7 +65,7 @@ class Keyboard
     # misc
     when 0 then :"Ctrl+space"
     when 1..26 then :"Ctrl+#{A_TO_Z[key-1]}"
-    when 27 then :escape
+    when ESCAPE then :escape
     when Curses::KEY_RESIZE then :resize
     else
       key > MAX_CHAR ? key : key.chr
@@ -140,13 +141,13 @@ class Keyboard
   end
 
   def self.escape_sequence?(sequence)
-    sequence[0] == 27 # Esc
+    sequence[0] == ESCAPE and sequence.size.between?(2,6) # Esc
   end
 
   def self.escape_sequence_to_key(sequence)
     case sequence
-    when [27, 91, 49, 59, 50, 65] then :"Shift+up"
-    when [27, 91, 49, 59, 50, 66] then :"Shift+down"
+    when [ESCAPE, 91, 49, 59, 50, 65] then :"Shift+up"
+    when [ESCAPE, 91, 49, 59, 50, 66] then :"Shift+down"
     else
       if sequence.size == 2
         :"Alt+#{sequence[1].chr}"

data/lib/ruco/text_area.rb

@@ -120,34 +120,6 @@ module Ruco
       end
     end
 
-    # TODO should be on editor
-    def delete_line
-      lines.slice!(@line, 1)
-      adjust_view
-    end
-
-    # TODO should be on editor
-    def indent
-      selected_lines.each do |line|
-        @lines[line].insert(0, ' ' * Ruco::TAB_SIZE)
-      end
-      adjust_to_indentation Ruco::TAB_SIZE
-      adjust_view
-    end
-
-    # TODO should be on editor
-    def unindent
-      lines_to_unindent = (selection ? selected_lines : [@line])
-      removed = lines_to_unindent.map do |line|
-        remove = [@lines[line].leading_whitespace.size, Ruco::TAB_SIZE].min
-        @lines[line].slice!(0, remove)
-        remove
-      end
-
-      adjust_to_indentation -removed.first, -removed.last
-      adjust_view
-    end
-
     def cursor
       Position.new @cursor_line, @cursor_column
     end
@@ -317,21 +289,5 @@ module Ruco
       end_of_line = [line, last_visible_column]
       start_of_line..end_of_line
     end
-
-    def adjust_to_indentation(first, last=nil)
-      last ||= first
-      if selection
-        adjust_cursor = selection.first == position ? first : last
-        selection.first.column = [selection.first.column + first, 0].max
-        selection.last.column = [selection.last.column + last, 0].max
-        @column += adjust_cursor
-      else
-        @column += first
-      end
-    end
-
-    def selected_lines
-      selection.first.line.upto(selection.last.line)
-    end
   end
 end

data/ruco.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.29"
+  s.version = "0.0.30"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-01-27}
   s.default_executable = %q{ruco}
   s.email = %q{michael@grosser.it}
   s.executables = ["ruco"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/ruco/core_ext/range.rb",
     "lib/ruco/core_ext/string.rb",
     "lib/ruco/editor.rb",
+    "lib/ruco/editor_area.rb",
     "lib/ruco/form.rb",
     "lib/ruco/keyboard.rb",
     "lib/ruco/position.rb",

data/spec/ruco/keyboard_spec.rb

@@ -105,4 +105,9 @@ describe Keyboard do
     type [27,103]
     output.should == [:"Alt+g"]
   end
+
+  it "can return normal escape" do
+    type [27]
+    output.should == [:escape]
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 0
   - 0
-  - 29
-  version: 0.0.29
+  - 30
+  version: 0.0.30
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-01-27 00:00:00 +01:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,7 @@ files:
 - lib/ruco/core_ext/range.rb
 - lib/ruco/core_ext/string.rb
 - lib/ruco/editor.rb
+- lib/ruco/editor_area.rb
 - lib/ruco/form.rb
 - lib/ruco/keyboard.rb
 - lib/ruco/position.rb