twterm 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b30c12f62dabee87d10f7f5973e2464230e9ffdce5edf90e36b82c07a639beb5
-  data.tar.gz: b7d3a6493e676da015cb69ad6a9a4f8c48cf321f30604f99220bc28948f0e109
+  metadata.gz: 457bad615e0cd1430c0a60a50e5fa87eca2cabb2bb49632db62c50f41e38f152
+  data.tar.gz: '08c9ab2b0cc67791264bfbb1f0bcd3a3f6a1c4a570c152de43d135d72297acd1'
 SHA512:
-  metadata.gz: 0a913981e4c174915e6bb8909cb56bcb7d4bb6aea0ca4679482bf7d0b15c5ca1c71e3b9a127eab566164b1a507f5eea05a8f7efe4757540394746972b8e3c353
-  data.tar.gz: e3dbe12e43379553fd3059bddb4f69f5afccabb2e7e1652b65b1cc097e5b4a998deba14a96193efb93888c6652446488ec3a999d06937fb794a8372840fef962
+  metadata.gz: dbfa53b1f51f469f78bf9301bbe87faa44894506be4a2ab17da11bcb87af471810be121cdb6941f3ae74f34383a8de3c33331335b317b8bfa8afaabaca7437a2
+  data.tar.gz: 59c32de0182c59ab17c3c96dd14d4de180d86b9d59de0491d5e6a693405aeb273a83718f59193522a2b9d8ec78d75453df09fd38547c7416cfdfda92d7165f49

data/Makefile

@@ -9,10 +9,13 @@ Gemfile.lock: Gemfile twterm.gemspec
 gemset.nix: Gemfile Gemfile.lock twterm.gemspec
 	nix-shell -p bundix --run 'bundix --lock'
 
-nix/Gemfile.lock: Gemfile.lock
-	cp -f Gemfile.lock nix/Gemfile.lock
+nix/Gemfile.lock: nix/Gemfile
+	nix-shell -p bundix --run 'bundix --lock --gemfile=nix/Gemfile'
 
 nix/gemset.nix: nix/Gemfile.lock
 	nix-shell -p bundix --run 'bundix --gemfile=nix/Gemfile --gemset=nix/gemset.nix --lockfile=nix/Gemfile.lock'
 
-prerelease: nix/Gemfile.lock nix/gemset.nix
+postrelease: nix/Gemfile.lock nix/gemset.nix
+
+test:
+	nix-shell --run 'bundle exec rspec'

data/README.md

@@ -6,25 +6,45 @@ A full-featured TUI Twitter client
 
 ## Installation
 
-### With [Nix](https://nixos.org/) (Recommended)
+<details>
+<summary>:snowflake: Nix (Recommended)</summary>
 
+```sh
+$ nix-channel --add https://github.com/ryota-ka/twterm/archive/master.tar.gz
+$ nix-env -iA twterm
 ```
-$ nix-env --install --file https://github.com/ryota-ka/twterm/archive/master.tar.gz
+
+:warning:
+If you have `BUNDLE_PATH` configured in `~/.bundle/config`, `twterm` may fail due to `Bundler::GemNotFound`.
+See [NixOS/nixpkgs#85989](https://github.com/NixOS/nixpkgs/issues/85989) for details.
+
+</details>
+
+<details>
+<summary>:beer: Homebrew</summary>
+
+```sh
+$ brew install ryota-ka/twterm/twterm
 ```
 
-### With [RubyGems](https://rubygems.org/)
+</details>
+
+<details>
+<summary>:gem: RubyGems</summary>
 
-####  Requirements
+You also have to install the following dependencies manually.
 
-- Ruby (>= 2.5, < 3, compiled with ncurses and Readline)
-- ncurses
-- Readline
+- [Ruby](https://www.ruby-lang.org/) (>= 2.5, < 3, compiled with ncurses and Readline)
+- [ncurses](https://invisible-island.net/ncurses/)
+- [GNU Readline](https://tiswww.case.edu/php/chet/readline/rltop.html)
 - [GNU Libidn](https://www.gnu.org/software/libidn/)
 
-```
+```sh
 $ gem install twterm
 ```
 
+</details>
+
 ## Usage
 
 To launch twterm, just type in your console:

data/gemset.nix

@@ -4632,161 +4632,12 @@
   twterm = {
     dependencies = ["concurrent-ruby" "curses" "launchy" "oauth" "terminal-notifier" "toml-rb" "twitter" "twitter-text"];
     groups = ["default"];
-    platforms = [{
-      engine = "maglev";
-    } {
-      engine = "maglev";
-    } {
-      engine = "maglev";
-      version = "1.8";
-    } {
-      engine = "maglev";
-      version = "1.8";
-    } {
-      engine = "maglev";
-      version = "1.9";
-    } {
-      engine = "maglev";
-      version = "1.9";
-    } {
-      engine = "maglev";
-      version = "2.0";
-    } {
-      engine = "maglev";
-      version = "2.0";
-    } {
-      engine = "maglev";
-      version = "2.1";
-    } {
-      engine = "maglev";
-      version = "2.1";
-    } {
-      engine = "maglev";
-      version = "2.2";
-    } {
-      engine = "maglev";
-      version = "2.2";
-    } {
-      engine = "maglev";
-      version = "2.3";
-    } {
-      engine = "maglev";
-      version = "2.3";
-    } {
-      engine = "maglev";
-      version = "2.4";
-    } {
-      engine = "maglev";
-      version = "2.4";
-    } {
-      engine = "maglev";
-      version = "2.5";
-    } {
-      engine = "maglev";
-      version = "2.5";
-    } {
-      engine = "maglev";
-      version = "2.6";
-    } {
-      engine = "maglev";
-      version = "2.6";
-    } {
-      engine = "rbx";
-    } {
-      engine = "rbx";
-    } {
-      engine = "rbx";
-      version = "1.8";
-    } {
-      engine = "rbx";
-      version = "1.9";
-    } {
-      engine = "rbx";
-      version = "2.0";
-    } {
-      engine = "rbx";
-      version = "2.1";
-    } {
-      engine = "rbx";
-      version = "2.2";
-    } {
-      engine = "rbx";
-      version = "2.3";
-    } {
-      engine = "rbx";
-      version = "2.4";
-    } {
-      engine = "rbx";
-      version = "2.5";
-    } {
-      engine = "rbx";
-      version = "2.6";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-    } {
-      engine = "ruby";
-      version = "1.8";
-    } {
-      engine = "ruby";
-      version = "1.8";
-    } {
-      engine = "ruby";
-      version = "1.9";
-    } {
-      engine = "ruby";
-      version = "1.9";
-    } {
-      engine = "ruby";
-      version = "2.0";
-    } {
-      engine = "ruby";
-      version = "2.0";
-    } {
-      engine = "ruby";
-      version = "2.1";
-    } {
-      engine = "ruby";
-      version = "2.1";
-    } {
-      engine = "ruby";
-      version = "2.2";
-    } {
-      engine = "ruby";
-      version = "2.2";
-    } {
-      engine = "ruby";
-      version = "2.3";
-    } {
-      engine = "ruby";
-      version = "2.3";
-    } {
-      engine = "ruby";
-      version = "2.4";
-    } {
-      engine = "ruby";
-      version = "2.4";
-    } {
-      engine = "ruby";
-      version = "2.5";
-    } {
-      engine = "ruby";
-      version = "2.5";
-    } {
-      engine = "ruby";
-      version = "2.6";
-    } {
-      engine = "ruby";
-      version = "2.6";
-    }];
+    platforms = [];
     source = {
       path = ./.;
       type = "path";
     };
-    version = "2.9.0";
+    version = "2.10.0";
   };
   unf = {
     dependencies = ["unf_ext"];

data/lib/twterm/app.rb

@@ -3,7 +3,6 @@ require 'curses'
 require 'twterm/completion_manager'
 require 'twterm/environment'
 require 'twterm/event/screen/refresh'
-require 'twterm/event/screen/resize'
 require 'twterm/message_window'
 require 'twterm/notification_dispatcher'
 require 'twterm/persistable_configuration_proxy'
@@ -24,6 +23,12 @@ module Twterm
 
     attr_reader :environment, :preferences, :screen
 
+    # return [Twterm::MessageWindow]
+    attr_reader :message_window
+
+    # return [Twterm::SearchQueryWindow]
+    attr_reader :search_query_window
+
     DATA_DIR = "#{ENV['HOME']}/.twterm".freeze
 
     def initialize
@@ -63,8 +68,8 @@ module Twterm
 
       @screen = Screen.new(self, client)
 
-      SearchQueryWindow.instance
-      MessageWindow.instance
+      @search_query_window = SearchQueryWindow.new(screen.search_query_window_window)
+      @message_window = MessageWindow.new(screen.message_window_window)
 
       @notification_dispatcher = NotificationDispatcher.new(preferences)
       @photo_viewer = PhotoViewer.new(preferences)
@@ -143,7 +148,7 @@ module Twterm
     end
 
     def tab_manager
-      @tab_manager ||= TabManager.new(self, client)
+      @tab_manager ||= TabManager.new(self, client, screen.tab_manager_window)
     end
 
     def tweetbox
@@ -177,11 +182,11 @@ module Twterm
     end
 
     def on_resize
-      return if Curses.closed?
+      lines, cols = `stty size`.split(' ').map(&:to_i)
+
+      Readline.set_screen_size(lines, cols)
 
-      lines = `tput lines`.to_i
-      cols = `tput cols`.to_i
-      publish(Event::Screen::Resize.new(lines, cols))
+      screen.resize(lines, cols) unless Curses.closed?
     end
   end
 end

data/lib/twterm/image.rb

@@ -3,6 +3,7 @@ require 'twterm/image/blank_line'
 require 'twterm/image/bold'
 require 'twterm/image/brackets'
 require 'twterm/image/color'
+require 'twterm/image/dim'
 require 'twterm/image/empty'
 require 'twterm/image/horizontal_sequential_image'
 require 'twterm/image/parens'
@@ -49,6 +50,10 @@ class Twterm::Image
     Brackets.new(self)
   end
 
+  def dim(on = true)
+    on ? Dim.new(self) : self
+  end
+
   def self.checkbox(checked)
     string(checked ? '*' : ' ').brackets
   end

data/lib/twterm/image/attr.rb

@@ -0,0 +1,42 @@
+require 'twterm/image'
+
+class Twterm::Image::Attr < Twterm::Image
+  # @param image [Twterm::Image]
+  def initialize(image)
+    super()
+
+    @image = image
+  end
+
+  def height
+    image.height
+  end
+
+  def render(window)
+    image, attr =
+      if image.is_a?(self.class) # fuse attributes when possible
+        [image.image, self.attr | image.attr]
+      else
+        [self.image, self.attr]
+      end
+
+    window.attron(attr)
+    image.at(line, column).render(window)
+    window.attroff(attr)
+  end
+
+  def width
+    image.width
+  end
+
+  protected
+
+  attr_reader :image
+
+  # @abstract
+  #
+  # @return [Integer]
+  def attr
+    raise NotImplementedError, '`attr` must be implemented'
+  end
+end

data/lib/twterm/image/bold.rb

@@ -1,31 +1,17 @@
+require 'twterm/image/attr'
+
 module Twterm
   class Image
-    class Bold < Twterm::Image
-      def initialize(image)
-        @image = image
-      end
-
-      def height
-        image.height
-      end
-
-      def render(window)
-        window.attron(Curses::A_BOLD)
-        image.at(line, column).render(window)
-        window.attroff(Curses::A_BOLD)
-      end
-
+    class Bold < Twterm::Image::Attr
       def to_s
         "\e[1m#{image}\e[0m"
       end
 
-      def width
-        image.width
-      end
+      protected
 
-      private
-
-      attr_reader :image
+      def attr
+        Curses::A_BOLD
+      end
     end
   end
 end

data/lib/twterm/image/color.rb

@@ -1,18 +1,12 @@
+require 'twterm/image/attr'
+
 module Twterm
   class Image
-    class Color < Twterm::Image
+    class Color < Twterm::Image::Attr
       def initialize(image, fg, bg = :transparent)
-        @image, @fg, @bg = image, fg, bg
-      end
-
-      def height
-        image.height
-      end
+        super(image)
 
-      def render(window)
-        window.attron(Curses.color_pair(color_pair_index))
-        image.at(line, column).render(window)
-        window.attroff(Curses.color_pair(color_pair_index))
+        @fg, @bg = fg, bg
       end
 
       def to_s
@@ -29,14 +23,14 @@ module Twterm
         @bg == :transparent ? str : "\e[#{bg_colors[@bg]}m#{str}"
       end
 
-      def width
-        image.width
+      protected
+
+      def attr
+        Curses.color_pair(color_pair_index)
       end
 
       private
 
-      attr_reader :image
-
       def color_pair_index
         Twterm::ColorManager.instance.get_color_pair_index(@fg, @bg)
       end

data/lib/twterm/image/dim.rb

@@ -0,0 +1,13 @@
+require 'twterm/image/attr'
+
+class Twterm::Image::Dim < Twterm::Image::Attr
+  def to_s
+    "\e[2m#{image}\e[0m"
+  end
+
+  protected
+
+  def attr
+    Curses::A_DIM
+  end
+end

data/lib/twterm/image/underlined.rb

@@ -1,31 +1,17 @@
+require 'twterm/image/attr'
+
 module Twterm
   class Image
-    class Underlined < Twterm::Image
-      def initialize(image)
-        @image = image
-      end
-
-      def height
-        image.height
-      end
-
-      def render(window)
-        window.attron(Curses::A_UNDERLINE)
-        image.at(line, column).render(window)
-        window.attroff(Curses::A_UNDERLINE)
-      end
-
+    class Underlined < Twterm::Image::Attr
       def to_s
         "\e[4m#{image}\e[0m"
       end
 
-      def width
-        image.width
-      end
+      protected
 
-      private
-
-      attr_reader :image
+      def attr
+        Curses::A_UNDERLINE
+      end
     end
   end
 end

data/lib/twterm/message_window.rb

@@ -1,22 +1,19 @@
 require 'twterm/subscriber'
 require 'twterm/event/message/abstract_message'
-require 'twterm/event/screen/resize'
 
 module Twterm
   class MessageWindow
-    include Singleton
     include Subscriber
 
-    def initialize
-      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, Curses.stdscr.maxy - 1, 0)
+    # @param window [Curses::Window]
+    def initialize(window)
+      @window = window
       @queue = Queue.new
 
       subscribe(Event::Message::AbstractMessage) do |e|
         queue(e)
       end
 
-      subscribe(Event::Screen::Resize, :resize)
-
       Thread.new do
         while message = @queue.pop # rubocop:disable Lint/AssignmentInCondition:
           show(message)
@@ -71,10 +68,5 @@ module Twterm
       @queue.push(message)
       self
     end
-
-    def resize(_event)
-      @window.resize(1, Curses.stdscr.maxx)
-      @window.move(Curses.stdscr.maxy - 1, 0)
-    end
   end
 end

data/lib/twterm/screen.rb

@@ -1,5 +1,4 @@
 require 'twterm/event/screen/refresh'
-require 'twterm/event/screen/resize'
 require 'twterm/key_mapper'
 require 'twterm/subscriber'
 
@@ -7,10 +6,35 @@ module Twterm
   class Screen
     include Subscriber
 
+    # @todo Make private
+    # @return [Curses::Window]
+    attr_reader :tab_manager_window
+
+    # @todo Make private
+    # @return [Curses::Window]
+    attr_reader :tab_window
+
+    # @todo Make private
+    # @return [Curses::Window]
+    attr_reader :message_window_window
+
+    # @todo Make private
+    # @return [Curses::Window]
+    attr_reader :search_query_window_window
+
     def initialize(app, client)
       @app, @client = app, client
 
-      @screen = Curses.init_screen
+      @stdscr = Curses.init_screen
+
+      width = @stdscr.maxx
+      height = @stdscr.maxy
+
+      @tab_manager_window = @stdscr.subwin(1, width, 0, 0)
+      @tab_window = @stdscr.subwin(height - 3, width, 2, 0)
+      @message_window_window = @stdscr.subwin(1, width, height - 1, 0)
+      @search_query_window_window = @stdscr.subwin(1, width, height - 1, 0)
+
       Curses.noecho
       Curses.raw
       Curses.curs_set(0)
@@ -20,7 +44,31 @@ module Twterm
       Curses.mousemask(Curses::BUTTON1_CLICKED | 65536 | 2097152)
 
       subscribe(Event::Screen::Refresh) { refresh }
-      subscribe(Event::Screen::Resize, :resize)
+    end
+
+    def resize(lines, cols)
+      return if Curses.closed?
+
+      Curses.resizeterm(lines, cols)
+      @stdscr.resize(lines, cols)
+
+      tab_manager_window.move(0, 0)
+      tab_manager_window.resize(1, cols)
+      tab_manager_window.refresh
+
+      tab_window.move(2, 0)
+      tab_window.resize(lines - 3, cols)
+      tab_window.refresh
+
+      message_window_window.move(cols - 1, 0)
+      message_window_window.resize(1, cols)
+      message_window_window.refresh
+
+      search_query_window_window.move(cols - 1, 0)
+      search_query_window_window.resize(1, cols)
+      search_query_window_window.refresh
+
+      refresh
     end
 
     def respond_to_key(key)
@@ -92,17 +140,7 @@ module Twterm
     def refresh
       app.tab_manager.refresh_window
       app.tab_manager.current_tab.render
-      MessageWindow.instance.show
-    end
-
-    def resize(event)
-      return if Curses.closed?
-
-      lines, cols = event.lines, event.cols
-      Curses.resizeterm(lines, cols)
-      @screen.resize(lines, cols)
-
-      refresh
+      app.message_window.show
     end
 
     def scan

data/lib/twterm/search_query_window.rb

@@ -1,22 +1,19 @@
-require 'twterm/event/screen/resize'
 require 'twterm/subscriber'
 
 module Twterm
   class SearchQueryWindow
-    include Singleton
     include Subscriber
 
     class CancelInput < StandardError; end
 
     attr_reader :last_query
 
-    def initialize
-      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, Curses.stdscr.maxy - 1, 0)
+    # @param window [Curses::Window]
+    def initialize(window)
+      @window = window
       @searching_down = true
       @str = ''
       @last_query = ''
-
-      subscribe(Event::Screen::Resize, :resize)
     end
 
     def input
@@ -113,13 +110,9 @@ module Twterm
 
     private
 
+    # @return [Curses::Window]
     attr_reader :window
 
-    def resize(_event)
-      window.resize(1, Curses.stdscr.maxx)
-      window.move(Curses.stdscr.maxy - 1, 0)
-    end
-
     def render(str)
       window.clear
       window.setpos(0, 0)

data/lib/twterm/tab/abstract_tab.rb

@@ -1,6 +1,5 @@
 require 'concurrent'
 
-require 'twterm/event/screen/resize'
 require 'twterm/image'
 require 'twterm/subscriber'
 
@@ -12,10 +11,6 @@ module Twterm
       # @return [String]
       attr_reader :title
 
-      # @return [Curses::Window]
-      # @todo This can be (and should be) private
-      attr_reader :window
-
       # @param other [Twterm::Tab::AbstractTab]
       #
       # @return [Boolean]
@@ -26,7 +21,6 @@ module Twterm
       # @return [void]
       def close
         unsubscribe
-        window.close
       end
 
       # A utility method to find a status by its ID
@@ -70,10 +64,6 @@ module Twterm
 
       def initialize(app, client)
         @app, @client = app, client
-
-        @window = Curses.stdscr.subwin(Curses.stdscr.maxy - 3, Curses.stdscr.maxx, 2, 0)
-
-        subscribe(Event::Screen::Resize, :resize)
       end
 
       def render
@@ -129,16 +119,15 @@ module Twterm
         )
       end
 
-      # @return [void]
-      def resize(_event)
-        window.resize(Curses.stdscr.maxy - 3, Curses.stdscr.maxx)
-        window.move(2, 0)
-      end
-
       # @return [Twterm::View]
       def view
         View.new(window, image)
       end
+
+      # @todo This method is for transition. `window` should explicitly be obtained on initialization.
+      def window
+        app.screen.tab_window
+      end
     end
   end
 end

data/lib/twterm/tab/scrollable.rb

@@ -27,7 +27,7 @@ module Twterm
         attr_reader :index, :offset
 
         attr_accessor :delegate
-        def_delegators :delegate, :items, :total_item_count, :drawable_item_count
+        def_delegators :delegate, :items, :total_item_count, :drawable_item_count, :search_query_window
 
         def after_move(&block)
           add_hook(:after_move, &block)

data/lib/twterm/tab/searchable.rb

@@ -14,6 +14,12 @@ module Twterm
         raise NotImplementedError, '`matches?` method must be implemented'
       end
 
+      # @abstract
+      # @return [Twterm::SearchQueryWindow]
+      def search_query_window
+        raise NotImplementedError, '`search_query_window` method must be implemented'
+      end
+
       class Scroller < Scrollable::Scroller
         extend Forwardable
         include Publisher
@@ -122,10 +128,6 @@ module Twterm
           end
         end
 
-        def search_query_window
-          SearchQueryWindow.instance
-        end
-
         alias_method :count, :total_item_count
       end
     end

data/lib/twterm/tab/statuses/abstract_statuses_tab.rb

@@ -226,10 +226,10 @@ module Twterm
 
             header = [
               ImageBuilder::UserNameImageBuilder.new(user).build,
-              Image.string(original.date.to_s).brackets,
+              Image.string(original.date.to_s).brackets.dim,
               (Image.whitespace.color(:black, :red) if original.favorited?),
               (Image.whitespace.color(:black, :green) if original.retweeted?),
-              ((Image.string('retweeted by ') - !Image.string("@#{retweeted_by.screen_name}")).parens if status.retweet?),
+              ((Image.string('retweeted by ') - !Image.string("@#{retweeted_by.screen_name}")).parens.dim if status.retweet?),
               ((Image.number(original.favorite_count) - Image.plural(original.favorite_count, 'like')).color(:red) if original.favorite_count.positive?),
               ((Image.number(original.retweet_count) - Image.plural(original.retweet_count, 'RT')).color(:green) if original.retweet_count.positive?),
             ].compact.intersperse(Image.whitespace).reduce(Image.empty, :-)
@@ -263,6 +263,11 @@ module Twterm
           end
         end
 
+        # for the sake of Twterm::Tab::Searchable
+        def search_query_window
+          app.search_query_window
+        end
+
         def sort
           return if items.empty? || scroller.current_item.nil?
 

data/lib/twterm/tab_manager.rb

@@ -1,4 +1,3 @@
-require 'twterm/event/screen/resize'
 require 'twterm/publisher'
 require 'twterm/subscriber'
 require 'twterm/utils'
@@ -82,16 +81,17 @@ module Twterm
       left <= x && x < right && top <= y && y < bottom
     end
 
-    def initialize(app, client)
+    # @param app [Twterm::App]
+    # @param client [Twterm::Client]
+    # @param window [Curses::Window]
+    def initialize(app, client, window)
       @app, @client = app, client
 
       @tabs = []
       @index = 0
       @history = []
 
-      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, 0, 0)
-
-      subscribe(Event::Screen::Resize, :resize)
+      @window = window
     end
 
     # Open the clicked tab
@@ -266,10 +266,5 @@ module Twterm
 
       nil
     end
-
-    def resize(_event)
-      @window.resize(1, Curses.stdscr.maxx)
-      @window.move(0, 0)
-    end
   end
 end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

data/nix/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'twterm'
+gem 'twterm', '2.9.0'

data/nix/Gemfile.lock

@@ -5,57 +5,64 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     buftok (0.2.0)
     citrus (3.0.2)
-    concurrent-ruby (1.0.5)
-    curses (1.3.2)
+    concurrent-ruby (1.1.8)
+    curses (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
-    http (3.3.0)
+    ffi (1.14.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    http (4.4.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
+    http-parser (1.2.3)
+      ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
     idn-ruby (0.1.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
+    launchy (2.5.0)
+      addressable (~> 2.7)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     multipart-post (2.1.1)
     naught (1.1.0)
-    oauth (0.5.4)
-    public_suffix (4.0.5)
+    oauth (0.5.5)
+    public_suffix (4.0.6)
+    rake (13.0.3)
     simple_oauth (0.3.1)
     terminal-notifier (2.0.0)
     thread_safe (0.3.6)
-    toml-rb (0.3.15)
+    toml-rb (2.0.1)
       citrus (~> 3.0, > 3.0)
-    twitter (6.2.0)
+    twitter (7.0.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
       equalizer (~> 0.0.11)
-      http (~> 3.0)
+      http (~> 4.0)
       http-form_data (~> 2.0)
       http_parser.rb (~> 0.6.0)
       memoizable (~> 0.4.0)
       multipart-post (~> 2.0)
       naught (~> 1.0)
       simple_oauth (~> 0.3.0)
-    twitter-text (2.1.0)
+    twitter-text (3.1.0)
       idn-ruby
       unf (~> 0.1.0)
-    twterm (2.8.0)
-      concurrent-ruby (~> 1.0.5)
-      curses (~> 1.3.2)
-      launchy (~> 2.4.3)
+    twterm (2.9.0)
+      concurrent-ruby (~> 1.1.7)
+      curses (~> 1.4.0)
+      launchy (~> 2.5.0)
       oauth (~> 0.5.1)
       terminal-notifier (~> 2.0.0)
-      toml-rb (~> 0.3.14)
-      twitter (~> 6.2.0)
-      twitter-text (~> 2.1.0)
+      toml-rb (~> 2.0.1)
+      twitter (~> 7.0.0)
+      twitter-text (~> 3.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
@@ -64,7 +71,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  twterm
+  twterm (= 2.9.0)
 
 BUNDLED WITH
    2.1.4

data/nix/gemset.nix

@@ -35,20 +35,20 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3";
       type = "gem";
     };
-    version = "1.0.5";
+    version = "1.1.8";
   };
   curses = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg";
+      sha256 = "0i4j6j18ih6lx7gk9jg2p7q8iswc897mgzn5m62jbf0zv0f7mkji";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   domain_name = {
     dependencies = ["unf"];
@@ -71,16 +71,37 @@
     };
     version = "0.0.11";
   };
+  ffi = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
+      type = "gem";
+    };
+    version = "1.14.2";
+  };
+  ffi-compiler = {
+    dependencies = ["ffi" "rake"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
   http = {
-    dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
+    dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jlm5prw437wqpfxcigh88lfap3m7g8mnmj5as7qw6dzqnvrxwmc";
+      sha256 = "0z8vmvnkrllkpzsxi94284di9r63g9v561a16an35izwak8g245y";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "4.4.1";
   };
   http-cookie = {
     dependencies = ["domain_name"];
@@ -103,6 +124,17 @@
     };
     version = "2.3.0";
   };
+  http-parser = {
+    dependencies = ["ffi-compiler"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18qqvckvqjffh88hfib6c8pl9qwk9gp89w89hl3f2s1x8hgyqka1";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
   "http_parser.rb" = {
     groups = ["default"];
     platforms = [];
@@ -129,10 +161,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      sha256 = "1xdyvr5j0gjj7b10kgvh8ylxnwk3wx19my42wqn9h82r4p246hlm";
       type = "gem";
     };
-    version = "2.4.3";
+    version = "2.5.0";
   };
   memoizable = {
     dependencies = ["thread_safe"];
@@ -170,20 +202,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
+      sha256 = "1m08365nyp0fgw2iyzj8q8qy8zml0c1hw2dd8cp82pp6656ahbh3";
       type = "gem";
     };
-    version = "0.5.4";
+    version = "0.5.5";
   };
   public_suffix = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0vywld400fzi17cszwrchrzcqys4qm6sshbv73wy5mwcixmrgg7g";
+      sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9";
+      type = "gem";
+    };
+    version = "4.0.6";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iik52mf9ky4cgs38fp2m8r6skdkq1yz23vh18lk95fhbcxb6a67";
       type = "gem";
     };
-    version = "4.0.5";
+    version = "13.0.3";
   };
   simple_oauth = {
     groups = ["default"];
@@ -221,10 +263,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf";
+      sha256 = "0x5j95w28vj85bzw98g1dyd4gm7xpli2fdvwwrgwlay7gb3wc5jh";
       type = "gem";
     };
-    version = "0.3.15";
+    version = "2.0.1";
   };
   twitter = {
     dependencies = ["addressable" "buftok" "equalizer" "http" "http-form_data" "http_parser.rb" "memoizable" "multipart-post" "naught" "simple_oauth"];
@@ -232,10 +274,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fjyz3viabz3xs5d9aad18zgdbhfwm51jsnzigc8kxk77p1x58n5";
+      sha256 = "13dmkjgsnym1avym9f7y2i2h3mlk8crqvc87drrzr4f0sf9l8g2y";
       type = "gem";
     };
-    version = "6.2.0";
+    version = "7.0.0";
   };
   twitter-text = {
     dependencies = ["idn-ruby" "unf"];
@@ -243,10 +285,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1igv713wn6wqhq4nlr81r93v7wmgjqny24jwp3ai5i4ipk2f2k6a";
+      sha256 = "1dnmp0bj3l01nbb52zby2c7hrazcdwfg846knkrjdfl0yfmv793z";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "3.1.0";
   };
   twterm = {
     dependencies = ["concurrent-ruby" "curses" "launchy" "oauth" "terminal-notifier" "toml-rb" "twitter" "twitter-text"];
@@ -254,10 +296,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "075rq11axsz41hcrmm6ixjyy0kz3axf0mhkvq3cgryqib2isjbk9";
+      sha256 = "16jbad4d5g8xf5gphlzf1ip7yih1xdvj2aqn9sb3xhy2vssb5y0c";
       type = "gem";
     };
-    version = "2.8.0";
+    version = "2.9.0";
   };
   unf = {
     dependencies = ["unf_ext"];

data/spec/twterm/image/bold_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe Twterm::Image::Bold do
+  let(:string_image) { Twterm::Image::StringImage.new(str) }
+  let(:str) { 'Hello' }
+
+  describe '#height' do
+    subject { image.height }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq string_image.height }
+  end
+
+  describe '#to_s' do
+    subject { image.to_s }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq "\e[1mHello\e[0m" }
+  end
+
+  describe '#width' do
+    subject { image.width }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq string_image.width }
+  end
+end

data/spec/twterm/image/color_spec.rb

@@ -4,6 +4,14 @@ RSpec.describe Twterm::Image::Color do
   let(:string_image) { Twterm::Image::StringImage.new(str) }
   let(:str) { 'Hello' }
 
+  describe '#height' do
+    subject { image.height }
+
+    let(:image) { described_class.new(string_image, :red) }
+
+    it { is_expected.to eq string_image.height }
+  end
+
   describe '#to_s' do
     subject { image.to_s }
 
@@ -19,4 +27,12 @@ RSpec.describe Twterm::Image::Color do
       it { is_expected.to eq "\e[47m\e[31mHello\e[0m" }
     end
   end
+
+  describe '#width' do
+    subject { image.width }
+
+    let(:image) { described_class.new(string_image, :red) }
+
+    it { is_expected.to eq string_image.width }
+  end
 end

data/spec/twterm/image/dim_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe Twterm::Image::Dim do
+  let(:string_image) { Twterm::Image::StringImage.new(str) }
+  let(:str) { 'Hello' }
+
+  describe '#height' do
+    subject { image.height }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq string_image.height }
+  end
+
+  describe '#to_s' do
+    subject { image.to_s }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq "\e[2mHello\e[0m" }
+  end
+
+  describe '#width' do
+    subject { image.width }
+
+    let(:image) { described_class.new(string_image) }
+
+    it { is_expected.to eq string_image.width }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Ryota Kameoka
@@ -254,7 +254,6 @@ files:
 - lib/twterm/event/open_photo.rb
 - lib/twterm/event/open_uri.rb
 - lib/twterm/event/screen/refresh.rb
-- lib/twterm/event/screen/resize.rb
 - lib/twterm/event/status/abstract_status_event.rb
 - lib/twterm/event/status/mention.rb
 - lib/twterm/event/status_deleted.rb
@@ -268,11 +267,13 @@ files:
 - lib/twterm/friendship.rb
 - lib/twterm/hashtag.rb
 - lib/twterm/image.rb
+- lib/twterm/image/attr.rb
 - lib/twterm/image/between.rb
 - lib/twterm/image/blank_line.rb
 - lib/twterm/image/bold.rb
 - lib/twterm/image/brackets.rb
 - lib/twterm/image/color.rb
+- lib/twterm/image/dim.rb
 - lib/twterm/image/empty.rb
 - lib/twterm/image/horizontal_sequential_image.rb
 - lib/twterm/image/parens.rb
@@ -368,13 +369,14 @@ files:
 - spec/supports/shared_examples/abstract_key_mapper.rb
 - spec/twterm/completer/search_query_completer_spec.rb
 - spec/twterm/config_spec.rb
-- spec/twterm/event/screen/resize_spec.rb
 - spec/twterm/event_dispatcher_spec.rb
 - spec/twterm/extension/enumerator/lazy_spec.rb
 - spec/twterm/friendship_spec.rb
 - spec/twterm/image/blank_line_spec.rb
+- spec/twterm/image/bold_spec.rb
 - spec/twterm/image/brackets_spec.rb
 - spec/twterm/image/color_spec.rb
+- spec/twterm/image/dim_spec.rb
 - spec/twterm/image/empry_spec.rb
 - spec/twterm/image/horizontal_sequential_image_spec.rb
 - spec/twterm/image/parens_spec.rb

data/lib/twterm/event/screen/resize.rb

@@ -1,13 +0,0 @@
-require 'twterm/event/abstract_event'
-
-module Twterm
-  module Event
-    module Screen
-      class Resize < AbstractEvent
-        def fields
-          { lines: Integer, cols: Integer }
-        end
-      end
-    end
-  end
-end

data/spec/twterm/event/screen/resize_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-require 'twterm/event/screen/resize'
-
-RSpec.describe Twterm::Event::Screen::Resize do
-  describe '#fields' do
-    it 'has fields of Integer * Integer' do
-      expect { described_class.new(5, 10) }.not_to raise_error
-      expect { described_class.new('hello', 'world') }.to raise_error
-    end
-  end
-end