ruco 0.1.8 → 0.1.9

data/Readme.md

@@ -15,7 +15,7 @@ Features:
  - stays at last position when reopening a file
  - opens file at line with `ruco foo/bar.rb:32` syntax
  - keeps whatever newline format you use (\r \n \r\n)
- - working backspace and delete key on Termial.app
+ - surrounds selection with quotes/braces (select abc + " --> "abc")
  - (optional) remove trailing whitespace on save
  - (optional) blank line before eof on save
  - (optional) line numbers
@@ -82,6 +82,7 @@ TIPS
 
 TODO
 =====
+ - do not fall back to 0:0 after undoing the first change
  - slow when opening file with 10,000+ short lines -> investigate
  - check writable status every x seconds (e.g. in background) -> faster while typing
  - search help e.g. 'Nothing found' '#4 of 6 hits' 'no more hits, start from beginning ?'
@@ -98,6 +99,7 @@ TODO
  - add auto-confirm to 'replace?' dialog -> type s == skip, no enter needed
  - 1.8: unicode support <-> already finished but unusable due to Curses (see encoding branch)
  - shorten long file names in the middle/start, not at the end
+ - add double quotes/braces when typing one + skip over quote/brace when its already typed at current position
 
 Authors
 =======

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/lib/ruco/core_ext/object.rb

@@ -13,7 +13,7 @@ def #{method}(*args, &block)
 end
 EOS
     end
-  end
+  end unless defined? delegate
 end
 
 class Object
@@ -44,3 +44,9 @@ class Object
     end
   end
 end
+
+class Object
+  def deep_copy
+    Marshal.load(Marshal.dump(self))
+  end unless defined? deep_copy
+end

data/lib/ruco/core_ext/string.rb

@@ -36,6 +36,12 @@ class String
       bytes.first
     end
   end
+
+  def surrounded_in?(*words)
+    first = words.first
+    last = words.last
+    slice(0,first.size) == first and slice(-last.size,last.size) == last
+  end
 end
 
 # http://grosser.it/2010/12/31/ruby-string-indexes-indices-find-all-indexes-in-a-string

data/lib/ruco/text_area.rb

@@ -1,5 +1,15 @@
 module Ruco
   class TextArea
+    SURROUNDING_CHARS = {
+      '<' => '>',
+      '(' => ')',
+      '[' => ']',
+      '{' => '}',
+      '"' => '"',
+      "'" => "'",
+      '/' => '/'
+    }
+
     attr_reader :lines, :selection, :column, :line
 
     def initialize(content, options)
@@ -78,7 +88,13 @@ module Ruco
     end
 
     def insert(text)
-      delete_content_in_selection if @selection
+      if @selection
+        if SURROUNDING_CHARS[text]
+          return surround_selection_with(text)
+        else
+          delete_content_in_selection
+        end
+      end
 
       text.tabs_to_spaces!
       if text == "\n" and @column >= current_line.leading_whitespace.size
@@ -269,5 +285,22 @@ module Ruco
       sanitize_position
       @window.set_position(position, :max_lines => @lines.size)
     end
+
+    def surround_selection_with(text)
+      open_char = text
+      close_char = SURROUNDING_CHARS[text]
+      old_selection = @selection.deep_copy
+      selected = text_in_selection
+
+      replace_surrounding_chars = SURROUNDING_CHARS.any?{|chars| selected.surrounded_in?(*chars) }
+      if replace_surrounding_chars
+        selected = selected[1..-2]
+      else
+        old_selection.last.column += 2
+      end
+
+      insert("#{open_char}#{selected}#{close_char}")
+      @selection = old_selection
+    end
   end
 end

data/ruco.gemspec

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

data/spec/ruco/core_ext/string_spec.rb

@@ -14,4 +14,19 @@ describe String do
       "".naive_split('a').should == ['']
     end
   end
-end
+
+  describe :surrounded_in? do
+    [
+      ['aba','a',true],
+      ['abcab','ab',true],
+      ['acc','a',false],
+      ['cca','a',false],
+      ['(cca)',['(',')'],true],
+      ['(cca',['(',')'],false],
+    ].each do |text, word, success|
+      it "is #{success} for #{word} in #{text}" do
+        text.surrounded_in?(*[*word]).should == success
+      end
+    end
+  end
+end

data/spec/ruco/text_area_spec.rb

@@ -54,4 +54,100 @@ describe Ruco::TextArea do
       end
     end
   end
+
+  describe :insert do
+    let(:text){Ruco::TextArea.new("", :lines => 3, :columns => 10)}
+
+    describe "inserting surrounding characters" do
+      xit "does nothing special when pasting" do
+        text.insert("'bar'")
+        text.view.should == "'bar'\n\n"
+        text.cursor.should == [0,5]
+      end
+
+      xit "inserts a pair when just typing" do
+        text.insert("'")
+        text.view.should == "''\n\n"
+        text.cursor.should == [0,1]
+      end
+
+      xit "closes the surround if only char in surround" do
+        text.insert("'")
+        text.insert("'")
+        text.view.should == "''\n\n"
+        text.cursor.should == [0,2]
+      end
+
+      xit "overwrites next if its the same" do
+        text.insert("'bar'")
+        text.move(:relative, 0,-1)
+        text.insert("'")
+        text.view.should == "'bar'\n\n"
+        text.cursor.should == [0,5]
+      end
+
+      it "surrounds text when selecting" do
+        text.insert('bar')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,2) }
+        text.insert("{")
+        text.view.should == "{ba}r\n\n"
+        text.cursor.should == [0,4]
+      end
+
+      it "does not surround text with closing char when selecting" do
+        text.insert('bar')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,2) }
+        text.insert("}")
+        text.view.should == "}r\n\n"
+        text.cursor.should == [0,1]
+      end
+
+      it "replaces surrounding quotes" do
+        text.insert('"bar"')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,5) }
+        text.insert("'")
+        text.view.should == "'bar'\n\n"
+        text.cursor.should == [0,5]
+      end
+
+      it "replace surrounding braces" do
+        text.insert('(bar)')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,5) }
+        text.insert("'")
+        text.view.should == "'bar'\n\n"
+        text.cursor.should == [0,5]
+      end
+
+      it "does not replace when only one side has surrounding char" do
+        text.insert("\"bar\"")
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,3) }
+        text.insert("'")
+        text.view.should == "'\"ba'r\"\n\n"
+        text.cursor.should == [0,5]
+      end
+
+      it "expands selection when surrounding" do
+        text.insert('bar')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,2) }
+        text.insert("{")
+        text.view.should == "{ba}r\n\n"
+        text.selection.should == ([0,0]..[0,4])
+      end
+
+      it "keeps selection when replacing surround" do
+        text.insert('"bar"')
+        text.move(:to, 0,0)
+        text.selecting{ move(:to, 0,5) }
+        text.insert("'")
+        text.view.should == "'bar'\n\n"
+        text.selection.should == ([0,0]..[0,5])
+      end
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-05 00:00:00 +02:00
+date: 2011-08-24 00:00:00 +02:00
 default_executable: ruco
 dependencies: 
 - !ruby/object:Gem::Dependency