natty-ui 0.9.2 → 0.9.3

data/lib/natty-ui/line_animation/default.rb

@@ -11,7 +11,7 @@ module NattyUI
       end
 
       def print(line)
-        line = plain(line)
+        line = Text.plain(line)
         time = 0.5 / line.size
         @stream << @color
         if (@num += 1).odd?

data/lib/natty-ui/line_animation/matrix.rb

@@ -9,7 +9,7 @@ module NattyUI
       end
 
       def print(line)
-        line = plain(line)
+        line = Text.plain(line)
         str = Array.new(line.size) { CHARS.sample }.join
         pos = Array.new(line.size, &:itself).shuffle
         until pos.size < 4

data/lib/natty-ui/line_animation/rainbow.rb

@@ -9,7 +9,7 @@ module NattyUI
       end
 
       def print(line)
-        line = plain(line)
+        line = Text.plain(line)
         11.upto(200) do |spread|
           (
             @stream << @prefix <<

data/lib/natty-ui/line_animation/type_writer.rb

@@ -12,48 +12,28 @@ module NattyUI
       end
 
       def print(line)
-        line = plain(line)
+        line = Text.plain(line)
         if (@num += 1).odd?
-          line.each_char do |char|
-            cursor(char)
-            (@stream << char).flush
-          end
+          line.each_char { (@stream << cursor(_1)).flush }
         else
           pos = @column + line.size
           line.reverse!
           line.each_char do |char|
             @stream << Ansi.cursor_column(pos -= 1)
-            cursor(char)
-            (@stream << char).flush
+            (@stream << cursor(char)).flush
           end
         end
       end
 
       def cursor(char)
-        return sleep(0.016) if SPACE.match?(char)
         @stream << @cursor_color
-        '▁▂▃▄▅▆▇█'.each_char do |cursor|
+        (SPACE.match?(char) ? '▁' : '▁▂▃▄▅▆▇█').each_char do |cursor|
           (@stream << cursor).flush
           sleep(0.002)
           @stream << CURSOR_BACK
         end
         @stream << @color
-      end
-
-      def print_org(line)
-        plain(line).each_char do |char|
-          if SPACE.match?(char)
-            sleep(0.016)
-          else
-            @stream << @cursor_color
-            '▁▂▃▄▅▆▇█'.each_char do |cursor|
-              (@stream << cursor).flush
-              sleep(0.002)
-              @stream << CURSOR_BACK
-            end
-          end
-          (@stream << @color << char).flush
-        end
+        char
       end
 
       CURSOR_BACK = Ansi.cursor_back(1)

data/lib/natty-ui/line_animation.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'ansi'
-
 module NattyUI
   module LineAnimation
     def self.defined = @defined.keys
@@ -23,13 +21,12 @@ module NattyUI
         @options = options
       end
 
-      def print(_line) = nil
+      def print(_line) = raise(NotImplementedError)
 
       protected
 
       def to_column = Ansi.cursor_column(@options[:prefix_width] + 1)
       def color = attribute(:color, :default)
-      def plain(str) = NattyUI.plain(str, ansi: false)
 
       def attribute(name, *default)
         att = @options[name] or return Ansi[*default]
@@ -45,10 +42,7 @@ module NattyUI
       default: "#{dir}/line_animation/default",
       matrix: "#{dir}/line_animation/matrix",
       rainbow: "#{dir}/line_animation/rainbow",
-      type_writer: "#{dir}/line_animation/type_writer",
-      test: "#{dir}/line_animation/test"
+      type_writer: "#{dir}/line_animation/type_writer"
     }.compare_by_identity
   end
-
-  private_constant :LineAnimation
 end

data/lib/natty-ui/preload.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require_relative '../natty-ui'
+
+module NattyUI
+  LineAnimation.defined?(:matrix)
+  Text::EastAsianWidth[0]
+  KEY_MAP[0]
+end