twterm 2.8.0 → 2.9.0

data/lib/twterm/tab/abstract_tab.rb

@@ -7,20 +7,31 @@ require 'twterm/subscriber'
 module Twterm
   module Tab
     class AbstractTab
-      include Curses
       include Subscriber
 
-      attr_reader :window, :title
+      # @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]
       def ==(other)
         self.equal?(other)
       end
 
+      # @return [void]
       def close
         unsubscribe
         window.close
       end
 
+      # A utility method to find a status by its ID
+      #
+      # @return [Concurrent::Promise<Twterm::Status>]
       def find_or_fetch_status(id)
         status = app.status_repository.find(id)
 
@@ -31,6 +42,9 @@ module Twterm
         end
       end
 
+      # A utility method to find a list by their ID
+      #
+      # @return [Concurrent::Promise<Twterm::List>]
       def find_or_fetch_list(id)
         list = app.list_repository.find(id)
 
@@ -41,6 +55,9 @@ module Twterm
         end
       end
 
+      # A utility method to find a user by their id
+      #
+      # @return [Concurrent::Promise<Twterm::User>]
       def find_or_fetch_user(id)
         user = app.user_repository.find(id)
 
@@ -54,7 +71,7 @@ module Twterm
       def initialize(app, client)
         @app, @client = app, client
 
-        @window = stdscr.subwin(stdscr.maxy - 5, stdscr.maxx, 3, 0)
+        @window = Curses.stdscr.subwin(Curses.stdscr.maxy - 3, Curses.stdscr.maxx, 2, 0)
 
         subscribe(Event::Screen::Resize, :resize)
       end
@@ -72,7 +89,7 @@ module Twterm
               end
             end
 
-            view.at(1, 2).render
+            view.render
           end if refreshable?
         end
       end
@@ -88,8 +105,13 @@ module Twterm
 
       private
 
-      attr_reader :app, :client
+      # @return [Twterm::App]
+      attr_reader :app
+
+      # @return [Twterm::Client]
+      attr_reader :client
 
+      # @return [Twterm::Image]
       def image
         Image.string('view method is not implemented')
       end
@@ -98,19 +120,22 @@ module Twterm
         @refresh_mutex ||= Mutex.new
       end
 
+      # @return [Boolean]
       def refreshable?
         !(
           refresh_mutex.locked? ||
-            closed? ||
+            Curses.closed? ||
             app.tab_manager.current_tab.object_id != object_id
         )
       end
 
+      # @return [void]
       def resize(_event)
-        window.resize(stdscr.maxy - 5, stdscr.maxx)
-        window.move(3, 0)
+        window.resize(Curses.stdscr.maxy - 3, Curses.stdscr.maxx)
+        window.move(2, 0)
       end
 
+      # @return [Twterm::View]
       def view
         View.new(window, image)
       end

data/lib/twterm/tab/new/search.rb

@@ -32,13 +32,13 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             app.completion_manager.set_search_mode!
             puts "\ninput search query"
             query = (readline('> ', true) || '').strip

data/lib/twterm/tab/new/user.rb

@@ -16,7 +16,7 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
@@ -24,7 +24,7 @@ module Twterm
           app.completion_manager.set_screen_name_mode!
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             puts "\nSearch user"
             screen_name = (readline('> @', true) || '').strip
             resetter.call

data/lib/twterm/tab/preferences/control.rb

@@ -0,0 +1,77 @@
+require 'twterm/image'
+require 'twterm/preferences'
+require 'twterm/publisher'
+require 'twterm/tab/abstract_tab'
+require 'twterm/tab/scrollable'
+
+module Twterm
+  module Tab
+    module Preferences
+      class Control < AbstractTab
+        include Scrollable
+        include Publisher
+
+        def drawable_item_count
+          1
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            curr = scroller.current_index?(i)
+            cursor = Image.cursor(2, curr)
+            options = Image.toggle_switch(['traditional', 'natural'], app.preferences[:control, item])
+            desc =
+              case item
+              when :scroll_direction
+                header = Image.string('Scroll direction')
+                body = Image.string('  ') - options
+                cursor - Image.whitespace - (header | body)
+              end
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          [
+            :scroll_direction,
+          ]
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            perform_selected_action
+          end
+
+          false
+        end
+
+        def title
+          'Control preferences'
+        end
+
+        private
+
+        def perform_selected_action
+          item = scroller.current_item
+
+          case item
+          when :scroll_direction
+            app.preferences[:control, :scroll_direction] =
+              case app.preferences[:control, :scroll_direction]
+              when 'natural'
+                'traditional'
+              when 'traditional'
+                'natural'
+              end
+          end
+
+          render
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/preferences/index.rb

@@ -1,4 +1,5 @@
 require 'twterm/image'
+require 'twterm/tab/preferences/control'
 require 'twterm/tab/preferences/notification_backend'
 require 'twterm/tab/preferences/photo_viewer_backend'
 require 'twterm/preferences'
@@ -26,6 +27,8 @@ module Twterm
             cursor = Image.cursor(1, curr)
             desc =
               case item
+              when :control
+                'Control preferences'
               when :notification_backend
                 'Notification backend preferences'
               when :photo_viewer_backend
@@ -40,6 +43,7 @@ module Twterm
 
         def items
           [
+            :control,
             :notification_backend,
             :photo_viewer_backend,
           ]
@@ -67,6 +71,8 @@ module Twterm
         def open
           tab =
             case scroller.current_item
+            when :control
+              Tab::Preferences::Control.new(app, client)
             when :notification_backend
               Tab::Preferences::NotificationBackend.new(app, client)
             when :photo_viewer_backend

data/lib/twterm/tab/status_tab.rb

@@ -67,6 +67,7 @@ module Twterm
 
       def items
         [
+          :show_conversation,
           :reply,
           :favorite,
           :retweet,
@@ -135,6 +136,8 @@ module Twterm
           Image.string('Quote this tweet')
         when :destroy
           Image.string('Delete this tweet')
+        when :show_conversation
+          Image.string("Show conversation")
         when :show_user
           Image.string("Show user (@#{user.screen_name})")
         when :open_in_browser
@@ -172,6 +175,8 @@ module Twterm
           quote!
         when :destroy
           destroy!
+        when :show_conversation
+          show_conversation!
         when :show_user
           show_user!
         when :open_in_browser
@@ -209,6 +214,11 @@ module Twterm
           .then { render }
       end
 
+      def show_conversation!
+        tab = Tab::Statuses::Conversation.new(app, client, status_id)
+        app.tab_manager.add_and_show(tab)
+      end
+
       def show_user!
         user_id = status.user_id
         user_tab = Tab::UserTab.new(app, client, user_id)

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

@@ -27,7 +27,7 @@ module Twterm
           return if @status_ids.include?(status.id)
 
           @status_ids.push(status.id)
-          status.split(window.maxx - 4)
+          status.split(window.maxx - 2)
           scroller.item_appended!
           render
         end
@@ -46,7 +46,7 @@ module Twterm
 
         def drawable_item_count
           statuses.drop(scroller.offset).lazy
-          .map { |s| s.split(window.maxx - 4).count + 2 }
+          .map { |s| s.split(window.maxx - 2).count + 2 }
           .scan(0, :+)
           .each_cons(2)
           .select { |_, l| l < window.maxy }
@@ -113,7 +113,7 @@ module Twterm
           return if @status_ids.include?(status.id)
 
           @status_ids.unshift(status.id)
-          status.split(window.maxx - 4)
+          status.split(window.maxx - 2)
           scroller.item_prepended!
           render
         end
@@ -235,7 +235,7 @@ module Twterm
             ].compact.intersperse(Image.whitespace).reduce(Image.empty, :-)
 
             body = original
-              .split(window.maxx - 4)
+              .split(window.maxx - 2)
               .map(&Image.method(:string))
               .reduce(Image.empty, :|)
 

data/lib/twterm/tab_manager.rb

@@ -6,7 +6,6 @@ require 'twterm/view'
 
 module Twterm
   class TabManager
-    include Curses
     include Publisher
     include Subscriber
     include Utils
@@ -69,6 +68,20 @@ module Twterm
       end
     end
 
+    # Returns if the given coordinate is enclosed by the window
+    #
+    # @param x [Integer]
+    # @param y [Integer]
+    # @return [Boolean]
+    def enclose?(x, y)
+      left = @window.begx
+      top = @window.begy
+      right = left + @window.maxx
+      bottom = top + @window.maxy
+
+      left <= x && x < right && top <= y && y < bottom
+    end
+
     def initialize(app, client)
       @app, @client = app, client
 
@@ -76,11 +89,50 @@ module Twterm
       @index = 0
       @history = []
 
-      @window = stdscr.subwin(3, stdscr.maxx, 0, 0)
+      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, 0, 0)
 
       subscribe(Event::Screen::Resize, :resize)
     end
 
+    # Open the clicked tab
+    #
+    # @param x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_left_click(x, _y)
+      n = find_tab_index_on_x(x)
+      return if n.nil?
+
+      show_nth_tab(n)
+
+      nil
+    end
+
+    # Open next tab
+    #
+    # @param _x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_scroll_down(_x, _y)
+      show_next
+
+      nil
+    end
+
+    # Open previous tab
+    #
+    # @param _x [Integer]
+    # @param _y [Integer]
+    #
+    # @return [nil]
+    def handle_scroll_up(_x, _y)
+      show_previous
+
+      nil
+    end
+
     def open_my_profile
       current_user_id = client.user_id
       tab = Tab::UserTab.new(app, client, current_user_id)
@@ -120,10 +172,10 @@ module Twterm
 
       image = @tabs
         .map { |t| [t, Image.string(t.title)] }
-        .map { |t, r| t.equal?(current_tab) ? !r : r }
+        .map { |t, r| t.equal?(current_tab) ? !r._ : r }
         .reduce(pipe) { |acc, x| acc - wss - x - wss - pipe }
 
-      View.new(@window, image).at(1, 1)
+      View.new(@window, image)
     end
 
     def respond_to_key(key)
@@ -195,8 +247,28 @@ module Twterm
 
     attr_reader :app, :client
 
+    # @param x [Integer]
+    #
+    # @return [Integer, nil]
+    def find_tab_index_on_x(x)
+      pos = 0
+
+      @tabs.each.with_index do |tab, index|
+        title = tab.title
+        len = title.length
+        left = pos + 1
+        right = left + len + 4 # each tab has 2 whitespaces on the both side
+
+        return index if left <= x && x < right
+
+        pos = right
+      end
+
+      nil
+    end
+
     def resize(_event)
-      @window.resize(3, stdscr.maxx)
+      @window.resize(1, Curses.stdscr.maxx)
       @window.move(0, 0)
     end
   end