twterm 1.0.12 → 1.1.0.beta1

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

@@ -19,7 +19,6 @@ module Twterm
         def initialize
           super
 
-          @title = 'New tab'
           refresh
         end
 
@@ -28,33 +27,28 @@ module Twterm
         end
 
         def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
           case key
-          when ?d, 4
-            10.times { scroller.move_down }
-          when ?g
-            scroller.move_to_top
-          when ?G
-            scroller.move_to_bottom
-          when ?j, 14, Curses::Key::DOWN
-            scroller.move_down
           when 10
             return true if current_list.nil?
-            list_tab = Tab::ListTab.new(current_list.id)
+            list_tab = Tab::Statuses::ListTimeline.new(current_list.id)
             TabManager.instance.switch(list_tab)
-          when ?k, 16, Curses::Key::UP
-            scroller.move_up
           when ?q
             reset_filter
-          when ?u, 21
-            10.times { scroller.move_up }
           when ?/
             filter
           else
             return false
           end
+
           true
         end
 
+        def title
+          'New tab'.freeze
+        end
+
         def total_item_count
           items.count
         end
@@ -91,7 +85,7 @@ module Twterm
 
           Thread.new do
             Notifier.instance.show_message('Loading lists ...')
-            Client.current.lists do |lists|
+            Client.current.lists.then do |lists|
               @@lists = lists.sort_by(&:full_name)
               show_lists
               window.refresh if TabManager.instance.current_tab == self

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

@@ -20,8 +20,6 @@ module Twterm
         def initialize
           super
 
-          @title = 'New tab'
-
           update_saved_search
         end
 
@@ -39,7 +37,7 @@ module Twterm
             query = (readline('> ') || '').strip
             resetter.call
 
-            tab = query.nil? || query.empty? ? Tab::New::Search.new : Tab::SearchTab.new(query)
+            tab = query.nil? || query.empty? ? Tab::New::Search.new : Tab::Statuses::Search.new(query)
             TabManager.instance.switch(tab)
           end
 
@@ -62,21 +60,11 @@ module Twterm
         end
 
         def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
           case key
-          when ?d, 4
-            10.times { scroller.move_down }
-          when ?g
-            scroller.move_to_top
-          when ?G
-            scroller.move_to_bottom
           when 10
             open_search_tab_with_current_query
-          when ?j, 14, Curses::Key::DOWN
-            scroller.move_down
-          when ?k, 16, Curses::Key::UP
-            scroller.move_up
-          when ?u, 21
-            10.times { scroller.move_up }
           when ?q
             reset_filter
           when ?/
@@ -88,6 +76,10 @@ module Twterm
           true
         end
 
+        def title
+          'New tab'.freeze
+        end
+
         def total_item_count
           items.count
         end
@@ -103,7 +95,7 @@ module Twterm
             invoke_input
           else
             query = items[index]
-            tab = Tab::SearchTab.new(query)
+            tab = Tab::Statuses::Search.new(query)
             TabManager.instance.switch(tab)
           end
         end
@@ -132,7 +124,7 @@ module Twterm
         def update_saved_search
           return unless @@queries.empty?
 
-          Client.current.saved_search do |searches|
+          Client.current.saved_search.then do |searches|
             @@queries = searches.map(&:query)
             refresh
           end

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

@@ -3,60 +3,121 @@ module Twterm
     module New
       class Start
         include Base
+        include Scrollable
 
         def ==(other)
           other.is_a?(self.class)
         end
 
+        def drawable_item_count
+          (window.maxy - 1).div(2)
+        end
+
+        def items
+          %i(
+            list_tab
+            search_tab
+            user_tab
+            key_assignments_cheatsheet
+          ).freeze
+        end
+
         def initialize
           super
-          @title = 'New tab'
           refresh
         end
 
         def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
           case key
+          when 10
+            perform_selected_action
           when 'L'
-            tab = Tab::New::List.new
-            TabManager.instance.switch(tab)
+            open_list_tab
           when 'S'
-            tab = Tab::New::Search.new
-            TabManager.instance.switch(tab)
+            open_search_tab
           when 'U'
-            tab = Tab::New::User.new
-            TabManager.instance.switch(tab)
-            tab.invoke_input
+            open_user_tab
           else
             return false
           end
           true
         end
 
+        def title
+          'New tab'.freeze
+        end
+
         private
 
+        def open_list_tab
+          switch(Tab::New::List.new)
+        end
+
+        def open_search_tab
+          switch(Tab::New::Search.new)
+        end
+
+        def open_user_tab
+          tab = Tab::New::User.new
+          switch(tab)
+          tab.invoke_input
+        end
+
+        def open_key_assignments_cheatsheet
+          switch(Tab::KeyAssignmentsCheatsheet.new)
+        end
+
+        def perform_selected_action
+          case current_item
+          when :list_tab
+            open_list_tab
+          when :search_tab
+            open_search_tab
+          when :user_tab
+            open_user_tab
+          when :key_assignments_cheatsheet
+            open_key_assignments_cheatsheet
+          end
+        end
+
+        def switch(tab)
+          TabManager.instance.switch(tab)
+        end
+
         def update
           window.setpos(2, 3)
-          window.bold { window.addstr("You've opened a new tab") }
-
-          window.setpos(4, 5)
-          window.addstr('- [L] Open list tab')
-          window.setpos(4, 7)
-          window.bold { window.addstr('[L]') }
-
-          window.setpos(6, 5)
-          window.addstr('- [S] Open search tab')
-          window.setpos(6, 7)
-          window.bold { window.addstr('[S]') }
-
-          window.setpos(8, 5)
-          window.addstr('- [U] Open user tab')
-          window.setpos(8, 7)
-          window.bold { window.addstr('[U]') }
-
-          window.setpos(11, 3)
-          window.addstr('To cancel opening a new tab, just press [w] to close this tab.')
-          window.setpos(11, 43)
-          window.bold { window.addstr('[w]') }
+          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 :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
         end
       end
     end

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

@@ -9,12 +9,6 @@ module Twterm
           other.is_a?(self.class)
         end
 
-        def initialize
-          super
-
-          @title = 'New tab'
-        end
-
         def invoke_input
           resetter = proc do
             reset_prog_mode
@@ -33,7 +27,7 @@ module Twterm
             if screen_name.nil? || screen_name.empty?
               TabManager.instance.switch(Tab::New::Start.new)
             else
-              Client.current.show_user(screen_name) do |user|
+              Client.current.show_user(screen_name).then do |user|
                 if user.nil?
                   Notifier.instance.show_error 'User not found'
                   tab = Tab::New::Start.new
@@ -59,6 +53,10 @@ module Twterm
           false
         end
 
+        def title
+          'New tab'.freeze
+        end
+
         private
 
         def update; end

data/lib/twterm/tab/scrollable.rb

@@ -4,7 +4,7 @@ module Twterm
       extend Forwardable
 
       attr_reader :scroller
-      def_delegators :scroller, :drawable_items
+      def_delegators :scroller, :current_item, :drawable_items
 
       def scroller
         return @scroller unless @scroller.nil?
@@ -15,6 +15,12 @@ module Twterm
         @scroller
       end
 
+      # define default behaviour
+      # overwrite if necessary
+      def total_item_count
+        items.count
+      end
+
       private
 
       class Scroller
@@ -29,6 +35,10 @@ module Twterm
           add_hook(:after_move, &block)
         end
 
+        def current_item
+          items[index]
+        end
+
         def current_item?(i)
           index == offset + i
         end
@@ -54,7 +64,8 @@ module Twterm
 
         def item_prepended!
           @index += 1
-          @offset += 1
+          @offset += 1 unless @index < 4
+          # keep cursor position unless it is on the top
         end
 
         def move_down
@@ -100,14 +111,33 @@ module Twterm
           n.between?(offset, offset + drawable_item_count)
         end
 
+        def respond_to_key(key)
+          case key
+          when ?d, 4
+            10.times { move_down }
+          when ?g
+            move_to_top
+          when ?G
+            move_to_bottom
+          when ?j, 14, Curses::Key::DOWN
+            move_down
+          when ?k, 16, Curses::Key::UP
+            move_up
+          when ?u, 21
+            10.times { move_up }
+          else
+            return false
+          end
+
+          true
+        end
+
         def set_cursor_free!
           @cursor_free = true
         end
 
         private
 
-        alias_method :count, :total_item_count
-
         def add_hook(name, &block)
           @hooks ||= {}
           @hooks[name] = block
@@ -132,6 +162,8 @@ module Twterm
         def hook(name)
           @hooks[name].call unless @hooks[name].nil?
         end
+
+        alias_method :count, :total_item_count
       end
     end
   end

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

@@ -0,0 +1,240 @@
+module Twterm
+  module Tab
+    module Statuses
+      module Base
+        include Tab::Base
+        include FilterableList
+        include Scrollable
+
+        def append(status)
+          fail ArgumentError,
+            'argument must be an instance of Status class' unless status.is_a? Status
+
+          return if @status_ids.include?(status.id)
+
+          @status_ids.unshift(status.id)
+          status.split(window.maxx - 4)
+          status.touch!
+          scroller.item_appended!
+          refresh
+        end
+
+        def delete(status_id)
+          @status_ids.delete(status_id)
+          refresh
+        end
+
+        def destroy_status
+          status = highlighted_status
+
+          Client.current.destroy_status(status).then do
+            delete(status.id)
+            refresh
+          end
+        end
+
+        def drawable_item_count
+          statuses.reverse.drop(scroller.offset).lazy
+          .map { |s| s.split(window.maxx - 4).count + 2 }
+          .scan(0, :+)
+          .select { |l| l < window.maxy }
+          .count
+        end
+
+        def favorite
+          return if highlighted_status.nil?
+
+          method_name = highlighted_status.favorited ? :unfavorite : :favorite
+          Client.current.method(method_name).call(highlighted_status)
+            .then { refresh }
+        end
+
+        def fetch
+          fail NotImplementedError, 'fetch method must be implemented'
+        end
+
+        def initialize
+          super
+
+          @status_ids = []
+        end
+
+        def items
+          statuses.reverse
+        end
+
+        def open_link
+          return if highlighted_status.nil?
+
+          status = highlighted_status
+          urls = status.urls.map(&:expanded_url) + status.media.map(&:expanded_url)
+          urls.each(&Launchy.method(:open))
+        end
+
+        def prepend(status)
+          fail unless status.is_a? Status
+
+          return if @status_ids.include?(status.id)
+
+          @status_ids << status.id
+          status.split(window.maxx - 4)
+          status.touch!
+          scroller.item_prepended!
+          refresh
+        end
+
+        def reply
+          return if highlighted_status.nil?
+          Tweetbox.instance.compose(highlighted_status)
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when ?c
+            show_conversation
+          when ?D
+            destroy_status
+          when ?F
+            favorite
+          when ?o
+            open_link
+          when ?r
+            reply
+          when ?R
+            retweet
+          when 18
+            fetch
+          when ?U
+            show_user
+          when ?/
+            filter
+          when ?q
+            reset_filter
+          else
+            return false
+          end
+          true
+        end
+
+        def retweet
+          return if highlighted_status.nil?
+          Client.current.retweet(highlighted_status).then { refresh }
+        end
+
+        def show_conversation
+          return if highlighted_status.nil?
+          tab = Tab::Statuses::Conversation.new(highlighted_status.id)
+          TabManager.instance.add_and_show(tab)
+        end
+
+        def show_user
+          return if highlighted_status.nil?
+          user = highlighted_status.user
+          user_tab = Tab::UserTab.new(user.id)
+          TabManager.instance.add_and_show(user_tab)
+        end
+
+        def statuses
+          statuses = @status_ids.map { |id| Status.find(id) }.reject(&:nil?)
+          @status_ids = statuses.map(&:id)
+
+          if filter_query.empty?
+            statuses
+          else
+            statuses.select { |s| s.matches?(filter_query) }
+          end
+        end
+
+        def touch_statuses
+          statuses.reverse.take(100).each(&:touch!)
+        end
+
+        def total_item_count
+          filter_query.empty? ? @status_ids.count : statuses.count
+        end
+
+        def update
+          line = 0
+
+          scroller.drawable_items.each.with_index(0) do |status, i|
+            formatted_lines = status.split(window.maxx - 4).count
+            window.with_color(:black, :magenta) do
+              (formatted_lines + 1).times do |j|
+                window.setpos(line + j, 0)
+                window.addch(' ')
+              end
+            end if scroller.current_item?(i)
+
+            window.setpos(line, 2)
+
+            window.bold do
+              window.with_color(status.user.color) do
+                window.addstr(status.user.name)
+              end
+            end
+
+            window.addstr(" (@#{status.user.screen_name}) [#{status.date}] ")
+
+            unless status.retweeted_by.nil?
+              window.addstr('(retweeted by ')
+              window.bold do
+                window.addstr("@#{status.retweeted_by.screen_name}")
+              end
+              window.addstr(') ')
+            end
+
+            if status.favorited?
+              window.with_color(:black, :yellow) do
+                window.addch(' ')
+              end
+
+              window.addch(' ')
+            end
+
+            if status.retweeted?
+              window.with_color(:black, :green) do
+                window.addch(' ')
+              end
+              window.addch(' ')
+            end
+
+            if status.favorite_count > 0
+              window.with_color(:yellow) do
+                window.addstr("#{status.favorite_count}fav#{status.favorite_count > 1 ? 's' : ''}")
+              end
+              window.addch(' ')
+            end
+
+            if status.retweet_count > 0
+              window.with_color(:green) do
+                window.addstr("#{status.retweet_count}RT#{status.retweet_count > 1 ? 's' : ''}")
+              end
+              window.addch(' ')
+            end
+
+            status.split(window.maxx - 4).each do |str|
+              line += 1
+              window.setpos(line, 2)
+              window.addstr(str)
+            end
+
+            line += 2
+          end
+        end
+
+        private
+
+        def highlighted_status
+          statuses[scroller.count - scroller.index - 1]
+        end
+
+        def sort
+          @status_ids &= Status.all.map(&:id)
+          @status_ids.sort_by! { |id| Status.find(id).appeared_at }
+        end
+      end
+    end
+  end
+end