coolline 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c9e0491e7e65c920ecee01ffb8f7817a861a7ea
-  data.tar.gz: 8441446e2d59571b45220fffce3988aa77e43c57
+  metadata.gz: d5c06bef3a232dd46d512291be86f29a0a203dfc
+  data.tar.gz: 4c1e3321aa186997373bcadd3d69cbc9662bc139
 SHA512:
-  metadata.gz: ee8ec55d743a03a2317c60a17503e1869df2dd110fc666f255b7bd4654935de4fc1c8d18aef12bd71ffa790d6cdc89981087fbfff7e2e762c4fd55bf9164a1cf
-  data.tar.gz: 0709d7d1450462b3e4728e5496fd4481542486aeb2478b8b303de211044f76267bf41a7ded72d08d0ddf2b30a48dab57459009ce117d0b668fd6ac78a6d62164
+  metadata.gz: 69910fdbadffda0f8cfd76af7ee224988cb1d25f4a2c9ff4fe6720a1457a6de9b6375471c38451caa8dcd4d8a963e0a7238f5a46074a4acd87944ef8e1c514c0
+  data.tar.gz: 2c80c94cb3711eb172ed0fb3ca26d868dbdb2a3146d96c9d94fb54ce3d56b4026ac78bb9217d4b606af1b68e9cf894731139b506916a22f12c3b3f26adfea15f

data/lib/coolline/ansi.rb

@@ -9,10 +9,10 @@ class Coolline
   module ANSI
     Code = %r{(\e\[\??\d+(?:[;\d]*)\w)}
 
-    # @return [Integer] Amount of characters within the string, disregarding
-    #   color codes.
+    # @return [Integer] Display width taken up by the string, where
+    #   color codes take up no width at all.
     def ansi_length(string)
-      strip_ansi_codes(string).length
+      UnicodeUtils.display_width strip_ansi_codes(string)
     end
 
     # @return [String] The initial string without ANSI codes.
@@ -31,21 +31,21 @@ class Coolline
     #
     # @param [String] string
     # @param [Integer] start
-    # @param [Integer] stop Stop index, excluded from the range.
+    # @param [Integer] stop Stop column index, excluded from the range.
     def ansi_print(string, start, stop)
       i = 0
       string.split(Code).each do |str|
         if start_with_ansi_code? str
           print str
         else
-          if i >= start
-            print str[0..(stop - i - 1)]
-          elsif i < start && i + str.size >= start
-            print str[(start - i), stop - start - 1]
-          end
+          width = UnicodeUtils.display_width str
 
-          i += str.size
-          break if i >= stop
+          UnicodeUtils.each_grapheme(str) { |g|
+            width = UnicodeUtils.display_width g
+            print g if i >= start && i + width <= stop
+            i += width
+            break if i >= stop
+          }
         end
       end
     end

data/lib/coolline/coolline.rb

@@ -1,4 +1,5 @@
 require 'io/console'
+require 'unicode_utils'
 
 class Coolline
   include ANSI
@@ -27,6 +28,7 @@ class Coolline
   # @return [Hash] All the defaults settings
   Settings = {
     :word_boundaries => [" ", "-", "_"],
+    :completion_word_boundaries => [" ", "-", "_"],
 
     :handlers =>
     [
@@ -123,7 +125,9 @@ class Coolline
     @input  = STDIN # must be the actual IO object
     @output = $stdout
 
-    self.word_boundaries   = Settings[:word_boundaries].dup
+    self.word_boundaries            = Settings[:word_boundaries].dup
+    self.completion_word_boundaries = Settings[:completion_word_boundaries].dup
+
     self.handlers          = Settings[:handlers].dup
     self.transform_proc    = Settings[:transform_proc]
     self.unknown_char_proc = Settings[:unknown_char_proc]
@@ -141,7 +145,8 @@ class Coolline
   # @return [IO]
   attr_accessor :input, :output
 
-  # @return [Array<String, Regexp>] Expressions detected as word boundaries
+  # @return [Array<String, Regexp>] Expressions detected as word boundaries for
+  #   the purpose of motion commands.
   attr_reader :word_boundaries
 
   # @return [Regexp] Regular expression to match word boundaries
@@ -152,6 +157,10 @@ class Coolline
     @word_boundaries_regexp = /\A#{Regexp.union(*array)}\z/
   end
 
+  # @return [Array<String, Regexp>] Expressions detected as word boundaries for
+  #   the purpose of autocompletion.
+  attr_accessor :completion_word_boundaries
+
   # @return [Proc] Proc called to change the way a line is displayed
   attr_accessor :transform_proc
 
@@ -265,6 +274,9 @@ class Coolline
 
     reset_line
 
+    width_before = UnicodeUtils.display_width @line[0..@pos]
+    width_before += 1 if @pos >= @line.length
+
     if ansi_length(@prompt + line) <= width
       print @prompt + line
     else
@@ -272,14 +284,15 @@ class Coolline
 
       left_width = width - prompt_size
 
-      start_index = [@pos - left_width + 1, 0].max
+      start_index = [width_before - left_width, 0].max
       end_index   = start_index + left_width
 
       ansi_print(line, start_index, end_index)
     end
 
     @menu.display
-    go_to_col [prompt_size + @pos + 1, width].min
+    go_to_col [prompt_size + width_before, width].
+      min
   end
 
   # Reads a line with no prompt
@@ -414,6 +427,9 @@ class Coolline
 
   # Tries to complete the current word
   def complete
+    old_word_boundaries = word_boundaries
+    self.word_boundaries = completion_word_boundaries
+
     return if word_boundary? line[pos - 1]
 
     completions = @completion_proc.call(self)
@@ -424,6 +440,8 @@ class Coolline
       menu.list = completions
       self.completed_word = common_beginning(completions)
     end
+  ensure
+    self.word_boundaries = old_word_boundaries
   end
 
   def word_boundary?(char)

data/lib/coolline/version.rb

@@ -1,3 +1,3 @@
 class Coolline
-  Version = "0.4.4"
+  Version = "0.5.0"
 end

data/test/coolline_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path("helpers.rb", File.dirname(__FILE__))
 
 context "a user uses colors for live code highlighting" do
@@ -28,3 +29,30 @@ context "a user uses non-tty input" do
   asserts(:readline).equals "p 82"
   asserts(:readline).nil
 end
+
+context "printing part of a string" do
+  setup {
+    $stdout = StringIO.new
+    extend Coolline::ANSI
+  }
+
+  context "with ASCII characters" do
+    hookup { ansi_print("Hello World", 2, 9) }
+    asserts { $stdout.string }.equals "llo Wor"
+  end
+
+  context "with non-ASCII characters" do
+    hookup { ansi_print("Hellô Wörld", 3, 7) }
+    asserts { $stdout.string }.equals "lô W"
+  end
+
+  context "with full-width characters" do
+    hookup { ansi_print("日本e本語語本語本語", 3, 9) }
+    asserts { $stdout.string }.equals "e本語"
+  end
+
+  context "with ANSI codes interleaved" do
+    hookup { ansi_print("\e[3mH\e[42mello W\e[41morld\e[0m", 2, 9) }
+    asserts { $stdout.string }.equals "\e[3m\e[42mllo W\e[41mor\e[0m"
+  end
+end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: coolline
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Mon ouie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-09-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: riot
   requirement: !ruby/object:Gem::Requirement