twterm 2.5.0 → 2.9.0

data/lib/twterm/app.rb

@@ -1,7 +1,6 @@
 require 'curses'
 
 require 'twterm/completion_manager'
-require 'twterm/direct_message_composer'
 require 'twterm/environment'
 require 'twterm/event/screen/refresh'
 require 'twterm/event/screen/resize'
@@ -10,7 +9,6 @@ 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'
@@ -42,14 +40,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
@@ -89,8 +79,6 @@ module Twterm
 
       publish(Event::Screen::Refresh.new)
 
-      client.connect_user_stream
-
       reset_interruption_handler
 
       Signal.trap(:WINCH) { on_resize }
@@ -105,11 +93,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
 
@@ -181,7 +164,6 @@ module Twterm
         config[:access_token_secret],
         {
           friendship: friendship_repository,
-          direct_message: direct_message_repository,
           hashtag: hashtag_repository,
           list: list_repository,
           status: status_repository,

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

@@ -7,6 +7,7 @@ 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 +15,10 @@ class Twterm::Image
     @column, @line = column, line
   end
 
+  def _
+    underlined
+  end
+
   def !
     bold
   end
@@ -101,6 +106,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/underlined.rb

@@ -0,0 +1,31 @@
+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
+
+      def to_s
+        "\e[4m#{image}\e[0m"
+      end
+
+      def width
+        image.width
+      end
+
+      private
+
+      attr_reader :image
+    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

data/lib/twterm/list.rb

@@ -1,7 +1,41 @@
 module Twterm
+  # A Twitter list
   class List
-    attr_reader :id, :name, :slug, :full_name, :mode, :description, :member_count, :subscriber_count, :url
+    # Unique ID of the list
+    #
+    # @return [Integer]
+    attr_reader :id
 
+    # @return [String]
+    attr_reader :name
+
+    # @return [String]
+    attr_reader :slug
+
+    # @return [String]
+    attr_reader :full_name
+
+    attr_reader :mode
+
+    # @return [String]
+    attr_reader :description
+
+    # The number of users that are in this list
+    #
+    # @return [Integer]
+    attr_reader :member_count
+
+    # The number of users that subscribe this list
+    #
+    # @return [Integer]
+    attr_reader :subscriber_count
+
+    # @return [String]
+    attr_reader :url
+
+    # @param other [List]
+    #
+    # @return [Boolean]
     def ==(other)
       other.is_a?(self.class) && id == other.id
     end
@@ -11,6 +45,7 @@ module Twterm
       update!(list)
     end
 
+    # @return [self]
     def update!(list)
       @name = list.name
       @slug = list.slug

data/lib/twterm/message_window.rb

@@ -5,11 +5,10 @@ require 'twterm/event/screen/resize'
 module Twterm
   class MessageWindow
     include Singleton
-    include Curses
     include Subscriber
 
     def initialize
-      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 2, 0)
+      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, Curses.stdscr.maxy - 1, 0)
       @queue = Queue.new
 
       subscribe(Event::Message::AbstractMessage) do |e|
@@ -34,7 +33,7 @@ module Twterm
 
     def show(message = nil)
       loop do
-        break unless closed?
+        break unless Curses.closed?
         sleep 0.5
       end
 
@@ -74,8 +73,8 @@ module Twterm
     end
 
     def resize(_event)
-      @window.resize(1, stdscr.maxx)
-      @window.move(stdscr.maxy - 2, 0)
+      @window.resize(1, Curses.stdscr.maxx)
+      @window.move(Curses.stdscr.maxy - 1, 0)
     end
   end
 end

data/lib/twterm/persistable_configuration_proxy.rb

@@ -1,4 +1,4 @@
-require 'toml'
+require 'toml-rb'
 
 module Twterm
   class PersistableConfigurationProxy
@@ -32,16 +32,16 @@ module Twterm
     # @param [String] filepath File path to load configuration from
     # @return [Twterm::PersistableConfigurationProxy] a configuration proxy
     def self.load_from_file!(klass, filepath)
-      config = TOML.load_file(filepath, symbolize_keys: true)
+      config = TomlRB.load_file(filepath, symbolize_keys: true)
       new(klass.new(config), filepath).migrate!
     rescue Errno::ENOENT
       new(klass.default, filepath)
-    rescue TOML::ParseError, TOML::ValueOverwriteError => e
+    rescue TomlRB::ParseError, TomlRB::ValueOverwriteError => e
       msg =
         case e
-        when TOML::ParseError
+        when TomlRB::ParseError
           "Your configuration file could not be parsed"
-        when TOML::ValueOverwriteError
+        when TomlRB::ValueOverwriteError
           "`#{e.key}` is declared more than once"
         end
 
@@ -75,7 +75,7 @@ Press any key to continue
     attr_reader :filepath, :instance
 
     def persist!
-      hash = TOML.dump(instance.to_h).gsub("\n[", "\n\n[")
+      hash = TomlRB.dump(instance.to_h).gsub("\n[", "\n\n[")
       File.open(filepath, 'w', 0644) { |f| f.write(hash) }
     end
   end

data/lib/twterm/preferences.rb

@@ -1,4 +1,4 @@
-require 'toml'
+require 'toml-rb'
 
 require 'twterm/abstract_persistable_configuration'
 
@@ -27,6 +27,9 @@ module Twterm
     # @return [Twterm::Preferences] an instance having the default value
     def self.default
       new({
+        control: {
+          scroll_direction: 'traditional',
+        },
         photo_viewer_backend: {
           browser: true,
           imgcat: false,
@@ -48,8 +51,12 @@ module Twterm
     # @return [Hash]
     def self.structure
       bool = -> x { x == true || x == false }
+      scroll_direction = -> x { x == 'natural' || x == 'traditional' }
 
       {
+        control: {
+          scroll_direction: scroll_direction
+        },
         photo_viewer_backend: {
           browser: bool,
           imgcat: bool,

data/lib/twterm/rest_client.rb

@@ -1,6 +1,4 @@
 require 'concurrent'
-require 'twterm/direct_message'
-require 'twterm/direct_message_manager'
 require 'twterm/publisher'
 require 'twterm/event/message/success'
 
@@ -25,33 +23,6 @@ module Twterm
       end
     end
 
-    def create_direct_message(recipient, text)
-      send_request do
-        rest_client.create_direct_message(recipient.id, text)
-      end.then do |message|
-        msg = direct_message_repository.create(message)
-        direct_message_manager.add(recipient.id, msg)
-        publish(Event::DirectMessage::Fetched.new)
-        publish(Event::Message::Success.new('Your message to @%s has been sent' % recipient.screen_name))
-      end
-    end
-
-    def direct_message_conversations
-      direct_message_manager.conversations
-    end
-
-    def direct_messages_received
-      send_request do
-        rest_client.direct_messages(count: 200).map { |dm| direct_message_repository.create(dm) }
-      end
-    end
-
-    def direct_messages_sent
-      send_request do
-        rest_client.direct_messages_sent(count: 200).map { |dm| direct_message_repository.create(dm) }
-      end
-    end
-
     def destroy_status(status)
       send_request_without_catch do
         rest_client.destroy_status(status.id)
@@ -424,10 +395,6 @@ module Twterm
 
     private
 
-    def direct_message_manager
-      @direct_message_manager ||= DirectMessageManager.new(self)
-    end
-
     def show_error
       proc do |e|
         case e