twterm 1.3.0 → 2.0.0.beta1

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -1,4 +1,6 @@
+require 'twterm/image'
 require 'twterm/tab/base'
+require 'twterm/tab/searchable'
 
 module Twterm
   module Tab
@@ -10,39 +12,44 @@ module Twterm
       end
 
       SHORTCUTS = {
-        'General' => {
-          '[d] [C-d]'         => 'Scroll down',
-          '[g]'               => 'Move to top',
-          '[G]'               => 'Move to bottom',
-          '[j] [C-p] [DOWN]'  => 'Move down',
-          '[k] [C-n] [UP]'    => 'Move up',
-          '[u] [C-u]'         => 'Scroll up',
-          '[Q]'               => 'Quit twterm'
+        ['General', :general] => {
+          page_down: 'Page down',
+          top: 'Move to top',
+          bottom: 'Move to bottom',
+          down: 'Move down',
+          up: 'Move up',
+          page_up: 'Page up',
+          left: 'Left',
+          right: 'Right',
         },
-        'Tabs' => {
-          '[h] [C-b] [LEFT]'  => 'Previous tab',
-          '[l] [C-f] [RIGHT]' => 'Next tab',
-          '[N]'               => 'New tab',
-          '[C-R]'             => 'Reload',
-          '[w]'               => 'Close tab',
-          '[q]'               => 'Quit filter mode',
-          '[/]'               => 'Filter mode',
-          '[1] - [9]'         => 'Nth tab',
-          '[0]'               => 'Last tab'
+        ['Tabs', :tab] => {
+          new: 'New tab',
+          reload: 'Reload',
+          close: 'Close tab',
+          search_down: 'Search down',
+          search_up: 'Search up',
+          find_next: 'Find next',
+          find_previous: 'Find previous',
         },
-        'Tweets' => {
-          '[c]'               => 'Conversation',
-          '[D]'               => 'Delete',
-          '[L]'               => 'Like',
-          '[n]'               => 'New tweet',
-          '[o]'               => 'Open URLs',
-          '[r]'               => 'Reply',
-          '[R]'               => 'Retweet',
-          '[U]'               => 'User'
+        ['Tweets', :status] => {
+          compose: 'New tweet',
+          conversation: 'Conversation',
+          destroy: 'Delete',
+          like: 'Like',
+          open_link: 'Open URLs',
+          reply: 'Reply',
+          retweet: 'Retweet',
+          user: 'User',
         },
-        'Others' => {
-          '[P]'               => 'My profile',
-          '[?]'               => 'Key assignments cheatsheet'
+        ['Cursor', :cursor] => {
+          top_of_window: 'Top of window',
+          middle_of_window: 'Middle of window',
+          bottom_of_window: 'Bottom of window'
+        },
+        ['Others', :app] => {
+          me: 'My profile',
+          cheatsheet: 'Key assignments cheatsheet',
+          quit: 'Quit',
         }
       }
 
@@ -50,8 +57,27 @@ module Twterm
         window.maxy - 3
       end
 
-      def initialize
-        super
+      def image
+        k = KeyMapper.instance
+
+        SHORTCUTS
+          .flat_map { |(cat_str, cat_sym), shortcuts|
+            [
+              !Image.string(cat_str).color(:green),
+              Image.blank_line,
+              *shortcuts.map { |cmd, desc|
+                Image.string('  ') - !Image.string(k.as_string(cat_sym, cmd).center(3)).color(:cyan) - Image.whitespace - Image.string(desc)
+              },
+              Image.blank_line,
+            ]
+          }
+          .drop(scroller.offset)
+          .take(drawable_item_count)
+          .reduce(Image.empty, :|)
+      end
+
+      def initialize(app, client)
+        super(app, client)
         scroller.set_no_cursor_mode!
       end
 
@@ -68,31 +94,6 @@ module Twterm
       def total_item_count
         @count ||= SHORTCUTS.count * 4 + SHORTCUTS.values.map(&:count).reduce(0, :+) + 1
       end
-
-      def update
-        offset = scroller.offset
-        line = 0
-
-        window.setpos(line - offset + 2, 3)
-        window.bold { window.addstr('Key assignments') } if scroller.nth_item_drawable?(line)
-
-        SHORTCUTS.each do |category, shortcuts|
-          line += 3
-          window.setpos(line - offset + 2, 5)
-          window.bold { window.addstr("<#{category}>") } if scroller.nth_item_drawable?(line)
-          line += 1
-
-          shortcuts.each do |key, description|
-            line += 1
-            next unless scroller.nth_item_drawable?(line)
-
-            window.setpos(line - offset + 2, 7)
-            window.bold { window.addstr(key.rjust(17)) }
-            window.setpos(line - offset + 2, 25)
-            window.addstr(": #{description}")
-          end
-        end
-      end
     end
   end
 end

data/lib/twterm/tab/loadable.rb

@@ -0,0 +1,20 @@
+module Twterm
+  module Tab
+    module Loadable
+      def initialize(*)
+        super
+
+        @initially_loaded = false
+      end
+
+      def initially_loaded?
+        @initially_loaded
+      end
+
+      def initially_loaded!
+        @initially_loaded = true
+        render
+      end
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
-require 'twterm/event/notification'
+require 'twterm/event/notification/info'
 require 'twterm/tab/base'
+require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
     module New
       class List < Base
-        include FilterableList
-        include Scrollable
+        include Loadable
+        include Publisher
+        include Searchable
 
         @@lists = nil
 
@@ -18,28 +20,36 @@ module Twterm
           (window.maxy - 6).div(3)
         end
 
-        def initialize
-          super
+        def initialize(app, client)
+          super(app, client)
 
-          refresh
+          client.lists.then do |lists|
+            @@lists = lists.sort_by(&:full_name)
+            initially_loaded!
+          end
         end
 
         def items
-          (@@lists || []).select { |l| l.matches?(filter_query) }
+          @@lists || []
+        end
+
+        def matches?(list, query)
+          [
+            other.description,
+            other.full_name,
+          ].any? { |x| x.downcase.include?(query.downcase) }
         end
 
         def respond_to_key(key)
           return true if scroller.respond_to_key(key)
 
+          k = KeyMapper.instance
+
           case key
           when 10
             return true if current_list.nil?
-            list_tab = Tab::Statuses::ListTimeline.new(current_list.id)
-            TabManager.instance.switch(list_tab)
-          when ?q
-            reset_filter
-          when ?/
-            filter
+            list_tab = Tab::Statuses::ListTimeline.new(app, client, current_list.id)
+            app.tab_manager.switch(list_tab)
           else
             return false
           end
@@ -61,40 +71,19 @@ module Twterm
           @@lists.nil? ? nil : items[scroller.index]
         end
 
-        def show_lists
-          return if @@lists.nil?
+        def image
+          return Image.string(initially_loaded? ? 'No results found' : 'Loading...') if items.empty?
 
-          index, offset = scroller.index, scroller.offset
+          drawable_items.map.with_index(0) do |list, i|
+            cursor = Image.cursor(2, scroller.current_index?(i))
 
-          drawable_items.each.with_index(0) do |list, i|
-            window.with_color(:black, :magenta) do
-              window.setpos(i * 3 + 5, 4)
-              window.addstr(' ')
-              window.setpos(i * 3 + 6, 4)
-              window.addstr(' ')
-            end if scroller.current_item?(i)
+            summary = Image.string("#{list.full_name} (#{list.member_count} members / #{list.subscriber_count} subscribers)")
+            desc = Image.string('  ') - Image.string(list.description)
 
-            window.setpos(i * 3 + 5, 6)
-            window.addstr("#{list.full_name} (#{list.member_count} members / #{list.subscriber_count} subscribers)")
-            window.setpos(i * 3 + 6, 8)
-            window.addstr(list.description)
+            cursor - Image.whitespace - (summary | desc)
           end
-        end
-
-        def update
-          window.setpos(2, 3)
-          window.bold { window.addstr('Open list tab') }
-
-          Thread.new do
-            publish(Event::Notification.new(:message, 'Loading lists ...'))
-            Client.current.lists.then do |lists|
-              @@lists = lists.sort_by(&:full_name)
-              show_lists
-              window.refresh if TabManager.instance.current_tab == self
-            end
-          end if @@lists.nil?
-
-          show_lists
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty, :|)
         end
       end
     end

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

@@ -1,14 +1,17 @@
+require 'concurrent'
+
 require 'twterm/tab/base'
+require 'twterm/tab/loadable'
 
 module Twterm
   module Tab
     module New
       class Search < Base
+        include Loadable
         include Readline
-        include FilterableList
-        include Scrollable
+        include Searchable
 
-        @@queries = []
+        @@queries = Concurrent::Array.new
 
         def ==(other)
           other.is_a?(self.class)
@@ -18,8 +21,8 @@ module Twterm
           (window.maxy - 6).div(3)
         end
 
-        def initialize
-          super
+        def initialize(app, client)
+          super(app, client)
 
           update_saved_search
         end
@@ -28,36 +31,32 @@ module Twterm
           resetter = proc do
             reset_prog_mode
             sleep 0.1
-            Screen.instance.refresh
+            app.screen.refresh
           end
 
           input_thread = Thread.new do
             close_screen
-            CompletionManager.instance.set_default_mode!
+            app.completion_manager.set_default_mode!
             puts "\ninput search query"
             query = (readline('> ') || '').strip
             resetter.call
 
-            tab = query.nil? || query.empty? ? Tab::New::Search.new : Tab::Statuses::Search.new(query)
-            TabManager.instance.switch(tab)
+            tab = query.nil? || query.empty? ? Tab::New::Search.new(app, client) : Tab::Statuses::Search.new(app, client, query)
+            app.tab_manager.switch(tab)
           end
 
-          App.instance.register_interruption_handler do
+          app.register_interruption_handler do
             input_thread.kill
             resetter.call
             tab = Tab::New::Search.new
-            TabManager.instance.switch(tab)
+            app.tab_manager.switch(tab)
           end
 
           input_thread.join
         end
 
         def items
-          if filter_query.empty?
-            ['<Input search query>'] + @@queries
-          else
-            @@queries.select { |q| q.matches?(filter_query) }
-          end
+          ['<Input search query>', *@@queries]
         end
 
         def respond_to_key(key)
@@ -66,10 +65,6 @@ module Twterm
           case key
           when 10
             open_search_tab_with_current_query
-          when ?q
-            reset_filter
-          when ?/
-            filter
           else
             return false
           end
@@ -92,42 +87,34 @@ module Twterm
         def open_search_tab_with_current_query
           index = scroller.index
 
-          if filter_query.empty? && index.zero?
+          if search_query.empty? && index.zero?
             invoke_input
           else
             query = items[index]
-            tab = Tab::Statuses::Search.new(query)
-            TabManager.instance.switch(tab)
+            tab = Tab::Statuses::Search.new(app, client, query)
+            app.tab_manager.switch(tab)
           end
         end
 
-        def update
-          offset = scroller.offset
-
-          window.setpos(2, 3)
-          window.bold { window.addstr('Open search tab') }
-
-          drawable_items.each.with_index(0) do |query, i|
-            line = 3 * i + 5
-
-            window.with_color(:black, :magenta) do
-              window.setpos(line, 4)
-              window.addstr(' ')
-              window.setpos(line + 1, 4)
-              window.addstr(' ')
-            end if scroller.current_item?(i)
-
-            window.setpos(line, 6)
-            window.addstr(query)
-          end
+        def image
+          [
+            *drawable_items
+              .map.with_index(0) { |query, i|
+                Image.cursor(1, scroller.current_index?(i)) - Image.whitespace - Image.string(query)
+              },
+            (Image.string('  Loading saved searches...') unless initially_loaded?),
+          ]
+            .reject(&:nil?)
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty, :|)
         end
 
         def update_saved_search
           return unless @@queries.empty?
 
-          Client.current.saved_search.then do |searches|
+          client.saved_search.then do |searches|
             @@queries = searches.map(&:query)
-            refresh
+            initially_loaded!
           end
         end
       end

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

@@ -1,5 +1,6 @@
 require 'twterm/tab/base'
 require 'twterm/tab/direct_message/conversation_list'
+require 'twterm/tab/rate_limit_status'
 
 module Twterm
   module Tab
@@ -22,28 +23,21 @@ module Twterm
             search_tab
             user_tab
             key_assignments_cheatsheet
+            rate_limit_status
           ).freeze
         end
 
-        def initialize
-          super
-          refresh
+        def initialize(app, client)
+          super(app, client)
+          render
         end
 
         def respond_to_key(key)
           return true if scroller.respond_to_key(key)
 
           case key
-          when 'D'
-            open_direct_messages
           when 10
             perform_selected_action
-          when 'L'
-            open_list_tab
-          when 'S'
-            open_search_tab
-          when 'U'
-            open_user_tab
           else
             return false
           end
@@ -56,26 +50,57 @@ module Twterm
 
         private
 
+        def image
+          drawable_items
+            .map.with_index(0) { |item, i|
+              cursor = Image.cursor(1, scroller.current_index?(i))
+
+              desc =
+                case item
+                when :direct_messages
+                  'Direct messages'
+                when :list_tab
+                  'List tab'
+                when :search_tab
+                  'Search tab'
+                when :user_tab
+                  'User tab'
+                when :key_assignments_cheatsheet
+                  'Key assignments cheatsheet'
+                when :rate_limit_status
+                  'Rate limit status'
+                end
+
+              cursor - Image.whitespace - Image.string(desc)
+            }
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty, :|)
+        end
+
         def open_direct_messages
-          switch(Tab::DirectMessage::ConversationList.new)
+          switch(Tab::DirectMessage::ConversationList.new(app, client))
         end
 
         def open_list_tab
-          switch(Tab::New::List.new)
+          switch(Tab::New::List.new(app, client))
         end
 
         def open_search_tab
-          switch(Tab::New::Search.new)
+          switch(Tab::New::Search.new(app, client))
+        end
+
+        def open_rate_limit_status
+          switch(Tab::RateLimitStatus.new(app, client))
         end
 
         def open_user_tab
-          tab = Tab::New::User.new
+          tab = Tab::New::User.new(app, client)
           switch(tab)
           tab.invoke_input
         end
 
         def open_key_assignments_cheatsheet
-          switch(Tab::KeyAssignmentsCheatsheet.new)
+          switch(Tab::KeyAssignmentsCheatsheet.new(app, client))
         end
 
         def perform_selected_action
@@ -90,49 +115,13 @@ module Twterm
             open_user_tab
           when :key_assignments_cheatsheet
             open_key_assignments_cheatsheet
+          when :rate_limit_status
+            open_rate_limit_status
           end
         end
 
         def switch(tab)
-          TabManager.instance.switch(tab)
-        end
-
-        def update
-          window.setpos(2, 3)
-          window.bold { window.addstr('Open new tab') }
-
-          drawable_items.each.with_index(0) do |item, i|
-            line = 4 + i * 2
-            window.setpos(line, 5)
-
-            case item
-            when :direct_messages
-              window.addstr('[D] Direct messages')
-              window.setpos(line, 6)
-              window.bold { window.addch(?D) }
-            when :list_tab
-              window.addstr('[L] List tab')
-              window.setpos(line, 6)
-              window.bold { window.addch(?L) }
-            when :search_tab
-              window.addstr('[S] Search tab')
-              window.setpos(line, 6)
-              window.bold { window.addch(?S) }
-            when :user_tab
-              window.addstr('[U] User tab')
-              window.setpos(line, 6)
-              window.bold { window.addch(?U) }
-            when :key_assignments_cheatsheet
-              window.addstr('[?] Key assignments cheatsheet')
-              window.setpos(line, 6)
-              window.bold { window.addch(??) }
-            end
-
-            window.with_color(:black, :magenta) do
-              window.setpos(line, 3)
-              window.addch(' ')
-            end if scroller.current_item?(i)
-          end
+          app.tab_manager.switch(tab)
         end
       end
     end

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

@@ -1,5 +1,6 @@
 require 'twterm/publisher'
 require 'twterm/tab/base'
+require 'twterm/event/notification/error'
 
 module Twterm
   module Tab
@@ -16,10 +17,10 @@ module Twterm
           resetter = proc do
             reset_prog_mode
             sleep 0.1
-            Screen.instance.refresh
+            app.screen.refresh
           end
 
-          CompletionManager.instance.set_screen_name_mode!
+          app.completion_manager.set_screen_name_mode!
 
           input_thread = Thread.new do
             close_screen
@@ -28,25 +29,25 @@ module Twterm
             resetter.call
 
             if screen_name.nil? || screen_name.empty?
-              TabManager.instance.switch(Tab::New::Start.new)
+              app.tab_manager.switch(Tab::New::Start.new(app, client))
             else
-              Client.current.show_user(screen_name).then do |user|
+              client.show_user(screen_name).then do |user|
                 if user.nil?
-                  publish(Event::Notification.new(:error, 'User not found'))
-                  tab = Tab::New::Start.new
+                  publish(Event::Notification::Error.new('User not found'))
+                  tab = Tab::New::Start.new(app, client)
                 else
-                  tab = Tab::UserTab.new(user.id)
+                  tab = Tab::UserTab.new(app, client, user.id)
                 end
-                TabManager.instance.switch(tab)
+                app.tab_manager.switch(tab)
               end
             end
           end
 
-          App.instance.register_interruption_handler do
+          app.register_interruption_handler do
             input_thread.kill
             resetter.call
-            tab = Tab::New::Start.new
-            TabManager.instance.switch(tab)
+            tab = Tab::New::Start.new(app, client)
+            app.tab_manager.switch(tab)
           end
 
           input_thread.join
@@ -62,7 +63,9 @@ module Twterm
 
         private
 
-        def update; end
+        def image
+          Image.empty
+        end
       end
     end
   end