textbringer 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a7999df616ed4ffd10a360bdf4f05981ca689e5
-  data.tar.gz: ec1adb45ac78222f521317d019a2c6f34d2bdbf3
+  metadata.gz: 57386322dcb1c04c07b26ccc281b10dc86fff8e1
+  data.tar.gz: 1dc85e31122a28561a9e47bb750b0602ec8619f7
 SHA512:
-  metadata.gz: a42aebf208fc3570b68f068909665e185958c77d0f038cc60bc6d4e470b373245d56290712cc8e13065fce2c16eb02094b8f36bcbd5710ef7ee7423bc9019080
-  data.tar.gz: 974172125b75ae24a3156303988697d4cec95c9d1c1db61a3825cf66edbf522ffbcd774f9ef0d708edcd52e7a82ed68461a8d0b560ff2bc4bbbe441e208ee576
+  metadata.gz: 29a2f745379f31d22b838691f1f61ef8fd5502786cdd32a9fd698cd603b96ffb9d48c93091ed3186ee6c677d5c495bc9a51d6b358deb1a21da93b9ab179ded7f
+  data.tar.gz: c9e02c3d2161d3f5a4d1fe52bee20c7bb66972fa9c716737e94fbdd56fc59db1b5bd3a22500a5d34d48629dfea8bf324f9d9b748c1c4645e803adc284a80787e

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.2.7
+
+* Add isearch_yank_word_or_char.
+
 ## 0.2.6
 
 * Add the following new commands:

data/appveyor.yml

@@ -14,4 +14,5 @@ environment:
   UPLOAD_TO_CODECOV: 1
   SSL_CERT_FILE: C:\projects\textbringer\cacert.pem
   matrix:
+    - ruby_version: "23"
     - ruby_version: "23-x64"

data/lib/textbringer/buffer.rb

@@ -42,7 +42,20 @@ module Textbringer
 
     NKF_DETECT_ENCODING = ->(s) {
       e = NKF.guess(s)
-      e == Encoding::US_ASCII ? Encoding::UTF_8 : e
+      case e
+      when Encoding::US_ASCII
+        Encoding::UTF_8
+      when Encoding::ASCII_8BIT
+        s.force_encoding(Encoding::UTF_8)
+        if s.valid_encoding?
+          Encoding::UTF_8
+        else
+          s.force_encoding(Encoding::ASCII_8BIT)
+          Encoding::ASCII_8BIT
+        end
+      else
+        e
+      end
     }
 
     @@detect_encoding_proc = DEFAULT_DETECT_ENCODING

data/lib/textbringer/commands/isearch.rb

@@ -18,6 +18,7 @@ module Textbringer
     ISEARCH_MODE_MAP.define_key(?\C-h, :isearch_delete_char)
     ISEARCH_MODE_MAP.define_key(?\C-s, :isearch_repeat_forward)
     ISEARCH_MODE_MAP.define_key(?\C-r, :isearch_repeat_backward)
+    ISEARCH_MODE_MAP.define_key(?\C-w, :isearch_yank_word_or_char)
     ISEARCH_MODE_MAP.define_key(?\C-m, :isearch_exit)
     ISEARCH_MODE_MAP.define_key(?\C-g, :isearch_abort)
     
@@ -105,6 +106,16 @@ module Textbringer
       isearch_search
     end
 
+    define_command(:isearch_yank_word_or_char, doc: <<~EOD) do
+        Yank next word or character onto the end of the search string.
+      EOD
+      buffer = Buffer.current
+      if buffer.looking_at?(/(\p{Letter}|\p{Number})+|\s+|./)
+        ISEARCH_STATUS[:string].concat(buffer.match_string(0))
+        isearch_search
+      end
+    end
+
     def isearch_search
       forward = ISEARCH_STATUS[:forward]
       options = if /\A[A-Z]/ =~ ISEARCH_STATUS[:string]

data/lib/textbringer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Textbringer
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-26 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses