twterm 2.5.1 → 2.10.0

data/lib/twterm/app.rb

@@ -1,16 +1,13 @@
 require 'curses'
 
 require 'twterm/completion_manager'
-require 'twterm/direct_message_composer'
 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'
 require 'twterm/preferences'
 require 'twterm/photo_viewer'
-require 'twterm/repository/direct_message_repository'
 require 'twterm/repository/friendship_repository'
 require 'twterm/repository/hashtag_repository'
 require 'twterm/repository/list_repository'
@@ -26,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
@@ -42,14 +45,6 @@ module Twterm
       @completion_manager ||= CompletionManager.new(self)
     end
 
-    def direct_message_composer
-      @direct_message_composer ||= DirectMessageComposer.new(self, client)
-    end
-
-    def direct_message_repository
-      @direct_messages_repository ||= Repository::DirectMessageRepository.new
-    end
-
     def friendship_repository
       @friendship_repository ||= Repository::FriendshipRepository.new
     end
@@ -73,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)
@@ -89,8 +84,6 @@ module Twterm
 
       publish(Event::Screen::Refresh.new)
 
-      client.connect_user_stream
-
       reset_interruption_handler
 
       Signal.trap(:WINCH) { on_resize }
@@ -105,11 +98,6 @@ module Twterm
         user_repository.expire(3600)
       end
 
-      direct_message_repository.before_create do |dm|
-        user_repository.create(dm.recipient)
-        user_repository.create(dm.sender)
-      end
-
       user_repository.before_create do |user|
         client_id = client.user_id
 
@@ -160,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
@@ -181,7 +169,6 @@ module Twterm
         config[:access_token_secret],
         {
           friendship: friendship_repository,
-          direct_message: direct_message_repository,
           hashtag: hashtag_repository,
           list: list_repository,
           status: status_repository,
@@ -195,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/client.rb

@@ -1,10 +1,8 @@
 require 'twterm/rest_client'
-require 'twterm/streaming_client'
 
 module Twterm
   class Client
     include RESTClient
-    include StreamingClient
 
     attr_reader :user_id, :screen_name
 
@@ -13,7 +11,6 @@ module Twterm
       @access_token, @access_token_secret = access_token, access_token_secret
 
       @friendship_repository = repositories[:friendship]
-      @direct_message_repository = repositories[:direct_message]
       @hashtag_repository = repositories[:hashtag]
       @list_repository = repositories[:list]
       @status_repository = repositories[:status]
@@ -29,12 +26,10 @@ module Twterm
             muted_user_ids.include?(status.retweeted_status.user.id))
         end
       end
-
-      direct_message_manager
     end
 
     private
 
-    attr_reader :friendship_repository, :direct_message_repository, :hashtag_repository, :list_repository, :status_repository, :user_repository
+    attr_reader :friendship_repository, :hashtag_repository, :list_repository, :status_repository, :user_repository
   end
 end

data/lib/twterm/color_manager.rb

@@ -1,18 +1,17 @@
 module Twterm
   class ColorManager
     include Singleton
-    include Curses
 
     COLORS = [:black, :white, :red, :green, :blue, :yellow, :cyan, :magenta, :transparent]
     CURSES_COLORS = {
-      black: COLOR_BLACK,
-      white: COLOR_WHITE,
-      red: COLOR_RED,
-      green: COLOR_GREEN,
-      blue: COLOR_BLUE,
-      yellow: COLOR_YELLOW,
-      cyan: COLOR_CYAN,
-      magenta: COLOR_MAGENTA,
+      black: Curses::COLOR_BLACK,
+      white: Curses::COLOR_WHITE,
+      red: Curses::COLOR_RED,
+      green: Curses::COLOR_GREEN,
+      blue: Curses::COLOR_BLUE,
+      yellow: Curses::COLOR_YELLOW,
+      cyan: Curses::COLOR_CYAN,
+      magenta: Curses::COLOR_MAGENTA,
       transparent: -1
     }
 

data/lib/twterm/image.rb

@@ -3,10 +3,12 @@ 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'
 require 'twterm/image/string_image'
+require 'twterm/image/underlined'
 require 'twterm/image/vertical_sequential_image'
 
 class Twterm::Image
@@ -14,6 +16,10 @@ class Twterm::Image
     @column, @line = column, line
   end
 
+  def _
+    underlined
+  end
+
   def !
     bold
   end
@@ -44,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
@@ -101,6 +111,27 @@ class Twterm::Image
     StringImage.new(str)
   end
 
+  # @param items [Array<Symbol>]
+  # @param selected [Symbol]
+  #
+  # @return [Image]
+  def self.toggle_switch(items, selected)
+    items
+      .map do |item|
+        on = item == selected
+        string(item.to_s)
+          .bold(on)
+          .underlined(on)
+      end
+      .intersperse(string(' | '))
+      .reduce(empty) { |acc, x| acc - x }
+      .brackets
+  end
+
+  def underlined(on = true)
+    on ? Underlined.new(self) : self
+  end
+
   def self.whitespace
     string(' ')
   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

@@ -0,0 +1,17 @@
+require 'twterm/image/attr'
+
+module Twterm
+  class Image
+    class Underlined < Twterm::Image::Attr
+      def to_s
+        "\e[4m#{image}\e[0m"
+      end
+
+      protected
+
+      def attr
+        Curses::A_UNDERLINE
+      end
+    end
+  end
+end

data/lib/twterm/image_builder/user_name_image_builder.rb

@@ -1,6 +1,7 @@
 require 'twterm/image'
 
 module Twterm
+  # @todo Rename to `Presenter`
   module ImageBuilder
     class UserNameImageBuilder
       COLORS = [:red, :blue, :green, :cyan, :yellow, :magenta].freeze

data/lib/twterm/key_mapper.rb

@@ -1,4 +1,4 @@
-require 'toml'
+require 'toml-rb'
 require 'singleton'
 
 require 'twterm/app'
@@ -105,14 +105,12 @@ module Twterm
     end
 
     def load_dict_file!
-      dict = TOML.load_file(dict_file_path, symbolize_keys: true)
-    rescue TOML::ParseError, TOML::ValueOverwriteError => e
+      dict = TomlRB.load_file(dict_file_path, symbolize_keys: true)
+    rescue TomlRB::ParseError => e
       first_line =
         case e
-        when TOML::ParseError
-          "Your key assignments dictionary file (#{dict_file_path}) could not be parsed"
-        when TOML::ValueOverwriteError
-          "Command `#{e.key}` is declared more than once"
+        when TomlRB::ParseError
+          "Your key assignments dictionary file (#{dict_file_path}) could not be parsed:\n#{e.message}"
         end
 
       warn <<-EOS
@@ -132,7 +130,7 @@ Press any key to continue
     end
 
     def save!(mappings)
-      dict = TOML.dump(mappings).gsub("\n[", "\n\n[")
+      dict = TomlRB.dump(mappings).gsub("\n[", "\n\n[")
       File.open(dict_file_path, 'w', 0644) { |f| f.write(dict) }
     end
   end

data/lib/twterm/key_mapper/abstract_key_mapper.rb

@@ -35,8 +35,6 @@ module Twterm
 
       def translate(key)
         case key
-        when '!'..'}' then key
-        when /\A\^([A-Z]?)\Z/ then $1.ord - 'A'.ord + 1
         when 'F1' then Curses::Key::F1
         when 'F2' then Curses::Key::F2
         when 'F3' then Curses::Key::F3
@@ -49,6 +47,8 @@ module Twterm
         when 'F10' then Curses::Key::F10
         when 'F11' then Curses::Key::F11
         when 'F12' then Curses::Key::F12
+        when /\A\^([A-Z]?)\Z/ then $1.ord - 'A'.ord + 1
+        when '!'..'}' then key
         else
           raise NoSuchKey.new(key)
         end