textbringer 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb6561f5d595d683562f67d0553ef75b556b99b9
-  data.tar.gz: 9f7caf1348f813c52dd69654625e15dcd267e55e
+  metadata.gz: 906c3f715935cd762c39a92b8d92a9a7021179b4
+  data.tar.gz: 5ba42d51b5af2086d2e9a839e07d4960f2f2f270
 SHA512:
-  metadata.gz: 21644b91f2a282c768345186da700628d221f4b177f5b8184d203029d8c0daa0e6b25ff82b93b1432f424e55fe81c144495c980dd56191113f24106c8ba92051
-  data.tar.gz: fb3bf64d60ba016956c87e3dc040aa3de4bcb12f78aa30362e15a015aa355c988c1cf67a635cea327775651ed0c81a251e922754c1f4cd9d07add6f3f5228528
+  metadata.gz: 2fd110a1970b6d0237c36365f8d1ff7eac130e881d5adcb7f0c0a4132bc5cdece78208397c87de0808c24c5538fea5ae492431b75b3220a132eb60b47736c42b
+  data.tar.gz: e80b7040d0bcd2c7af8f166545f31f9c5573488fd8e5ad2c0d3d1ab838d2afcc9ed7bb7af44567e1806439e23ec9664c0280cd6b87f449f5830641386a4300a4

data/CHANGES.md

@@ -1,3 +1,9 @@
+## 0.2.1
+
+* Add revert_buffer and revert_buffer_with_encoding.
+* Fixes for an ncurses issue on macOS that unget_wch() doesn't work with
+  multibyte characters.
+
 ## 0.2.0
 
 * Add bury_buffer and unbury_buffer.

data/lib/textbringer/buffer.rb

@@ -195,29 +195,11 @@ module Textbringer
                    file_encoding: CONFIG[:default_file_encoding],
                    file_mtime: nil, new_file: true, undo_limit: UNDO_LIMIT,
                    read_only: false)
-      case s.encoding
-      when Encoding::UTF_8, Encoding::ASCII_8BIT
-        @contents = s.frozen? ? s.dup : s
-      else
-        @contents = s.encode(Encoding::UTF_8)
-      end
-      @contents.force_encoding(Encoding::ASCII_8BIT)
+      set_contents(s, file_encoding)
       @name = name
       @file_name = file_name
       self.file_encoding = file_encoding
       @file_mtime = file_mtime
-      case @contents
-      when /(?<!\r)\n/ 
-        @file_format = :unix
-      when /\r(?!\n)/
-        @file_format = :mac
-        @contents.gsub!(/\r/, "\n")
-      when /\r\n/
-        @file_format = :dos
-        @contents.gsub!(/\r/, "")
-      else
-        @file_format = CONFIG[:default_file_format]
-      end
       @new_file = new_file
       @undo_limit = undo_limit
       @point = 0
@@ -346,21 +328,33 @@ module Textbringer
     end
 
     def self.open(file_name, name: File.basename(file_name))
-      s, mtime = File.open(file_name,
+      buffer = Buffer.new(name: name,
+                          file_name: file_name, new_file: false)
+      buffer.revert
+      buffer.read_only = !File.writable?(file_name)
+      buffer
+    end
+
+    def revert(enc = nil)
+      if @file_name.nil?
+        raise EditorError, "Buffer has no file name"
+      end
+      clear
+      s, mtime = File.open(@file_name,
                            external_encoding: Encoding::ASCII_8BIT,
                            binmode: true) { |f|
         f.flock(File::LOCK_SH)
         [f.read, f.mtime]
       }
-      enc = @@detect_encoding_proc.call(s) || Encoding::ASCII_8BIT
+      enc ||= @@detect_encoding_proc.call(s) || Encoding::ASCII_8BIT
       s.force_encoding(enc)
       unless s.valid_encoding?
         enc = Encoding::ASCII_8BIT
         s.force_encoding(enc)
       end
-      Buffer.new(s, name: name,
-                 file_name: file_name, file_encoding: enc, file_mtime: mtime,
-                 new_file: false, read_only: !File.writable?(file_name))
+      set_contents(s, enc)
+      @file_mtime = mtime
+      @modified = false
     end
 
     def save(file_name = @file_name)
@@ -1300,6 +1294,29 @@ module Textbringer
 
     private
 
+    def set_contents(s, enc)
+      case s.encoding
+      when Encoding::UTF_8, Encoding::ASCII_8BIT
+        @contents = s.frozen? ? s.dup : s
+      else
+        @contents = s.encode(Encoding::UTF_8)
+      end
+      @contents.force_encoding(Encoding::ASCII_8BIT)
+      self.file_encoding = enc
+      case @contents
+      when /(?<!\r)\n/ 
+        @file_format = :unix
+      when /\r(?!\n)/
+        @file_format = :mac
+        @contents.gsub!(/\r/, "\n")
+      when /\r\n/
+        @file_format = :dos
+        @contents.gsub!(/\r/, "")
+      else
+        @file_format = CONFIG[:default_file_format]
+      end
+    end
+
     def adjust_gap(min_size = 0, pos = @point)
       if @gap_start < pos
         len = user_to_gap(pos) - @gap_end

data/lib/textbringer/commands/files.rb

@@ -48,6 +48,29 @@ module Textbringer
       end
     end
 
+    define_command(:revert_buffer, doc: <<~EOD) do
+      Revert the contents of the current buffer from the file on disk.
+    EOD
+      unless yes_or_no?("Revert buffer from file?")
+        message("Cancelled")
+        next
+      end
+      Buffer.current.revert
+    end
+
+    define_command(:revert_buffer_with_encoding, doc: <<~EOD) do
+      Revert the contents of the current buffer from the file on disk
+      using the specified encoding.
+      If the specified encoding is not valid, fall back to ASCII-8BIT.
+    EOD
+      |encoding = read_from_minibuffer("File encoding: ")|
+      unless yes_or_no?("Revert buffer from file?")
+        message("Cancelled")
+        next
+      end
+      Buffer.current.revert(encoding)
+    end
+
     define_command(:save_buffer, doc: "Save the current buffer to a file.") do
       if Buffer.current.file_name.nil?
         Buffer.current.file_name = read_file_name("File to save in: ")

data/lib/textbringer/keymap.rb

@@ -158,6 +158,7 @@ module Textbringer
   GLOBAL_MAP.define_key("\C-xk", :kill_buffer)
   GLOBAL_MAP.define_key("\C-x\C-mf", :set_buffer_file_encoding)
   GLOBAL_MAP.define_key("\C-x\C-mn", :set_buffer_file_format)
+  GLOBAL_MAP.define_key("\C-x\C-mr", :revert_buffer_with_encoding)
   GLOBAL_MAP.define_key("\e.", :find_tag)
   GLOBAL_MAP.define_key("\ex", :execute_command)
   GLOBAL_MAP.define_key("\e:", :eval_expression)

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/textbringer/window.rb

@@ -261,6 +261,7 @@ module Textbringer
       @bottom_of_window = nil
       @point_mark = nil
       @deleted = false
+      @raw_key_buffer = []
       @key_buffer = []
     end
 
@@ -349,14 +350,14 @@ module Textbringer
     end
 
     def wait_input(msecs)
-      unless @key_buffer.empty?
-        return @key_buffer.first
+      if !@raw_key_buffer.empty? || !@key_buffer.empty?
+        return @raw_key_buffer.first || @key_buffer.first
       end
       @window.timeout = msecs
       begin
         c = @window.get_char
         if c
-          Curses.unget_char(c)
+          @raw_key_buffer.push(c)
         end
         c
       ensure
@@ -365,14 +366,14 @@ module Textbringer
     end
 
     def has_input?
-      unless @key_buffer.empty?
+      if !@raw_key_buffer.empty? || !@key_buffer.empty?
         return true
       end
       @window.nodelay = true
       begin
         c = @window.get_char
         if c
-          Curses.unget_char(c)
+          @raw_key_buffer.push(c)
         end
         !c.nil?
       ensure
@@ -782,7 +783,11 @@ module Textbringer
         PDCurses.PDC_save_key_modifiers(1) if PDCurses.dll_loaded?
         begin
           need_retry = false
-          key = @window.get_char
+          if @raw_key_buffer.empty?
+            key = @window.get_char
+          else
+            key = @raw_key_buffer.shift
+          end
           if PDCurses.dll_loaded?
             mods = PDCurses.PDC_get_key_modifiers
             if key.is_a?(String) && key.ascii_only?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Shugo Maeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An Emacs-like text editor