twterm 1.0.9 → 1.0.10

data/lib/twterm/list.rb

@@ -4,6 +4,10 @@ module Twterm
 
     @@instances = {}
 
+    def ==(other)
+      other.is_a?(self.class) && id == other.id
+    end
+
     def initialize(list)
       @id = list.id
       update!(list)
@@ -24,13 +28,8 @@ module Twterm
       self
     end
 
-    def ==(other)
-      other.is_a?(self.class) && id == other.id
-    end
-
-    def self.new(list)
-      instance = find(list.id)
-      instance.nil? ? super : instance.update!(list)
+    def self.all
+      @@instances.values
     end
 
     def self.find(id)
@@ -44,8 +43,9 @@ module Twterm
       Client.current.list(id) { |list| yield list }
     end
 
-    def self.all
-      @@instances.values
+    def self.new(list)
+      instance = find(list.id)
+      instance.nil? ? super : instance.update!(list)
     end
   end
 end

data/lib/twterm/notifier.rb

@@ -4,9 +4,8 @@ module Twterm
     include Curses
 
     def initialize
-      @window = stdscr.subwin(2, stdscr.maxx, stdscr.maxy - 2, 0)
+      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 2, 0)
       @queue = Queue.new
-      @help = ''
 
       Thread.new do
         while notification = @queue.pop
@@ -17,23 +16,16 @@ module Twterm
       end
     end
 
-    def show_message(message)
-      notification = Notification::Message.new(message)
-      @queue.push(notification)
-      self
-    end
-
     def show_error(message)
       notification = Notification::Error.new(message)
       @queue.push(notification)
       self
     end
 
-    def show_help(message)
-      return if @help == message
-
-      @help = message
-      show
+    def show_message(message)
+      notification = Notification::Message.new(message)
+      @queue.push(notification)
+      self
     end
 
     def show(notification = nil)
@@ -46,22 +38,15 @@ module Twterm
 
       if notification.is_a? Notification::Base
         @window.with_color(notification.fg_color, notification.bg_color) do
-          @window.setpos(1, 0)
+          @window.setpos(0, 0)
           @window.addstr(' ' * @window.maxx)
-          @window.setpos(1, 1)
+          @window.setpos(0, 1)
           time = notification.time.strftime('[%H:%M:%S]')
           message = notification.show_with_width(@window.maxx)
           @window.addstr("#{time} #{message}")
         end
       end
 
-      @window.with_color(:black, :green) do
-        @window.setpos(0, 0)
-        @window.addstr(' ' * @window.maxx)
-        @window.setpos(0, 1)
-        @window.addstr(@help)
-      end
-
       @window.refresh
     end
   end

data/lib/twterm/scheduler.rb

@@ -7,10 +7,7 @@ class Scheduler
     @paused = false
 
     @thread = Thread.new do
-      loop do
-        sleep @interval
-        run
-      end
+      loop { sleep(@interval) && run }
     end
   end
 
@@ -22,11 +19,11 @@ class Scheduler
     @paused = true
   end
 
-  def run
-    @block.call unless @paused
+  def resume
+    @paused = false
   end
 
-  def unpause
-    @paused = false
+  def run
+    @block.call unless @paused
   end
 end

data/lib/twterm/screen.rb

@@ -13,15 +13,6 @@ module Twterm
       use_default_colors
     end
 
-    def wait
-      @thread = Thread.new do
-        loop do
-          scan
-        end
-      end
-      @thread.join
-    end
-
     def refresh
       TabManager.instance.refresh_window
       TabManager.instance.current_tab.refresh
@@ -29,6 +20,30 @@ module Twterm
       Notifier.instance.show
     end
 
+    def respond_to_key(key)
+      case key
+      when ?n
+        Tweetbox.instance.compose
+        return
+      when ?Q
+        App.instance.quit
+      when ??
+        tab = Tab::KeyAssignmentsCheatsheet.new
+        TabManager.instance.add_and_show tab
+      else
+        return false
+      end
+
+      true
+    end
+
+    def wait
+      @thread = Thread.new do
+        loop { scan }
+      end
+      @thread.join
+    end
+
     private
 
     def scan
@@ -38,17 +53,7 @@ module Twterm
 
       return if TabManager.instance.current_tab.respond_to_key(key)
       return if TabManager.instance.respond_to_key(key)
-
-      case key
-      when 'n'
-        Tweetbox.instance.compose
-        return
-      when 'Q'
-        App.instance.quit
-      when '/'
-        # filter
-      else
-      end
+      respond_to_key(key)
     end
   end
 end

data/lib/twterm/status.rb

@@ -2,21 +2,57 @@ module Twterm
   class Status
     MAX_CACHED_TIME = 3600
 
-    attr_reader :id, :text, :created_at, :created_at_for_sort, :retweet_count, :favorite_count, :in_reply_to_status_id, :favorited, :retweeted, :user_id, :retweeted_by_user_id, :urls, :media, :touched_at
+    attr_reader :appeared_at, :created_at, :favorite_count, :favorited, :id,
+      :in_reply_to_status_id, :media, :retweet_count, :retweeted,
+      :retweeted_by_user_id, :text, :touched_at, :urls, :user_id
     alias_method :favorited?, :favorited
     alias_method :retweeted?, :retweeted
 
     @@instances = {}
 
-    def self.new(tweet)
-      instance = find(tweet.id)
-      instance.nil? ? super : instance.update!(tweet)
+    def ==(other)
+      other.is_a?(self.class) && id == other.id
+    end
+
+    def date
+      format = Time.now - @created_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
+      @created_at.strftime(format)
+    end
+
+    def expand_url!
+      sub = -> (x) { @text.sub!(x.url, x.display_url) }
+      (@media + @urls).each(&sub)
+    end
+
+    def favorite!
+      @favorite_count += 1
+      @favorited = true
+    end
+
+    def grepped_with?(query)
+      [text, user.screen_name, user.name]
+        .any? { |x| x.downcase.include?(query.downcase) }
+    end
+
+    def in_reply_to_status(&block)
+      if @in_reply_to_status_id.nil?
+        block.call(nil)
+        return
+      end
+
+      status = Status.find(@in_reply_to_status_id)
+      unless status.nil?
+        block.call(status)
+        return
+      end
+
+      Client.current.show_status(@in_reply_to_status_id, &block)
     end
 
     def initialize(tweet)
       unless tweet.retweeted_status.is_a? Twitter::NullObject
         @retweeted_by_user_id = tweet.user.id
-        User.create(tweet.user)
+        User.new(tweet.user)
         retweeted_at = Status.parse_time(tweet.created_at)
         tweet = tweet.retweeted_status
       end
@@ -24,7 +60,7 @@ module Twterm
       @id = tweet.id
       @text = CGI.unescapeHTML(tweet.full_text.dup)
       @created_at = Status.parse_time(tweet.created_at)
-      @created_at_for_sort = retweeted_at || @created_at
+      @appeared_at = retweeted_at || @created_at
       @retweet_count = tweet.retweet_count
       @favorite_count = tweet.favorite_count
       @in_reply_to_status_id = tweet.in_reply_to_status_id
@@ -36,7 +72,7 @@ module Twterm
       @urls = tweet.urls
 
       @user_id = tweet.user.id
-      User.create(tweet.user)
+      User.new(tweet.user)
 
       @splitted_text = {}
 
@@ -51,32 +87,8 @@ module Twterm
       @@instances[id] = self
     end
 
-    def update!(tweet)
-      @retweet_count = tweet.retweet_count
-      @favorite_count = tweet.favorite_count
-      @retweeted = tweet.retweeted?
-      @favorited = tweet.favorited?
-      self
-    end
-
-    def date
-      format = Time.now - @created_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
-      @created_at.strftime(format)
-    end
-
-    def expand_url!
-      sub = -> (x) { @text.sub!(x.url, x.display_url) }
-      (@media + @urls).each(&sub)
-    end
-
-    def favorite!
-      @favorite_count += 1
-      @favorited = true
-    end
-
-    def unfavorite!
-      @favorite_count -= 1
-      @favorited = false
+    def replies
+      Status.all.select { |s| s.in_reply_to_status_id == id }
     end
 
     def retweet!
@@ -84,74 +96,67 @@ module Twterm
       @retweeted = true
     end
 
-    def split(width)
-      @splitted_text[:width] ||= @text.split_by_width(width)
+    def retweeted_by
+      User.find(@retweeted_by_user_id)
     end
 
-    def in_reply_to_status(&block)
-      if @in_reply_to_status_id.nil?
-        block.call(nil)
-        return
-      end
-
-      status = Status.find(@in_reply_to_status_id)
-      unless status.nil?
-        block.call(status)
-        return
-      end
-
-      Client.current.show_status(@in_reply_to_status_id, &block)
+    def split(width)
+      @splitted_text[:width] ||= @text.split_by_width(width)
     end
 
-    def replies
-      Status.all.select { |s| s.in_reply_to_status_id == id }
+    def touch!
+      @touched_at = Time.now
     end
 
-    def retweeted_by
-      User.find(@retweeted_by_user_id)
+    def unfavorite!
+      @favorite_count -= 1
+      @favorited = false
     end
 
-    def touch!
-      @touched_at = Time.now
+    def update!(tweet)
+      @retweet_count = tweet.retweet_count
+      @favorite_count = tweet.favorite_count
+      @retweeted = tweet.retweeted?
+      @favorited = tweet.favorited?
+      self
     end
 
     def user
       User.find(user_id)
     end
 
-    def ==(other)
-      other.is_a?(self.class) && id == other.id
+    def self.all
+      @@instances.values
     end
 
-    class << self
-      def all
-        @@instances.values
+    def self.cleanup
+      TabManager.instance.each_tab do |tab|
+        tab.touch_statuses if tab.is_a?(Tab::StatusesTab)
       end
+      cond = -> (status) { status.touched_at > Time.now - MAX_CACHED_TIME }
+      statuses = all.select(&cond)
+      status_ids = statuses.map(&:id)
+      @@instances = status_ids.zip(statuses).to_h
+    end
 
-      def find(id)
-        @@instances[id]
-      end
+    def self.find(id)
+      @@instances[id]
+    end
 
-      def find_or_fetch(id)
-        instance = find(id)
-        (yield(instance) && return) if instance
+    def self.find_or_fetch(id)
+      instance = find(id)
+      (yield(instance) && return) if instance
 
-        Client.current.show_status(id) { |status| yield status }
-      end
+      Client.current.show_status(id) { |status| yield status }
+    end
 
-      def parse_time(time)
-        (time.is_a?(String) ? Time.parse(time) : time.dup).localtime
-      end
+    def self.new(tweet)
+      instance = find(tweet.id)
+      instance.nil? ? super : instance.update!(tweet)
+    end
 
-      def cleanup
-        TabManager.instance.each_tab do |tab|
-          tab.touch_statuses if tab.is_a?(Tab::StatusesTab)
-        end
-        cond = -> (status) { status.touched_at > Time.now - MAX_CACHED_TIME }
-        statuses = all.select(&cond)
-        status_ids = statuses.map(&:id)
-        @@instances = status_ids.zip(statuses).to_h
-      end
+    def self.parse_time(time)
+      (time.is_a?(String) ? Time.parse(time) : time.dup).localtime
     end
   end
 end

data/lib/twterm/tab/base.rb

@@ -3,35 +3,50 @@ module Twterm
     module Base
       include Curses
 
+      attr_reader :window
       attr_accessor :title
 
+      def ==(other)
+        self.equal?(other)
+      end
+
+      def close
+        window.close
+      end
+
       def initialize
         @window = stdscr.subwin(stdscr.maxy - 5, stdscr.maxx - 30, 3, 0)
       end
 
       def refresh
-        return if @refreshing || closed? || TabManager.instance.current_tab.object_id != object_id
+        return unless refreshable?
 
-        @refreshing = true
         Thread.new do
-          update
-          @refreshing = false
+          refresh_mutex.synchronize do
+            window.clear
+            update
+            window.refresh
+          end
         end
       end
 
-      def close
-        @window.close
-      end
-
       def respond_to_key(_)
         fail NotImplementedError, 'respond_to_key method must be implemented'
       end
 
-      def ==(other)
-        self.equal?(other)
+      private
+
+      def refresh_mutex
+        @refresh_mutex ||= Mutex.new
       end
 
-      private
+      def refreshable?
+        !(
+          refresh_mutex.locked? ||
+            closed? ||
+            TabManager.instance.current_tab.object_id != object_id
+        )
+      end
 
       def update
         fail NotImplementedError, 'update method must be implemented'

data/lib/twterm/tab/conversation_tab.rb

@@ -6,18 +6,8 @@ module Twterm
 
       attr_reader :status
 
-      def initialize(status_id)
-        @title = 'Conversation'
-        super()
-
-        Status.find_or_fetch(status_id) do |status|
-          @status = status
-
-          append(status)
-          move_to_top
-          Thread.new { fetch_in_reply_to_status(status) }
-          Thread.new { fetch_replies(status) }
-        end
+      def ==(other)
+        other.is_a?(self.class) && status == other.status
       end
 
       def fetch_in_reply_to_status(status)
@@ -37,13 +27,23 @@ module Twterm
         end
       end
 
-      def ==(other)
-        other.is_a?(self.class) && status == other.status
-      end
-
       def dump
         @status.id
       end
+
+      def initialize(status_id)
+        @title = 'Conversation'
+        super()
+
+        Status.find_or_fetch(status_id) do |status|
+          @status = status
+
+          append(status)
+          scroll_manager.move_to_top
+          Thread.new { fetch_in_reply_to_status(status) }
+          Thread.new { fetch_replies(status) }
+        end
+      end
     end
   end
 end

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -0,0 +1,113 @@
+module Twterm
+  module Tab
+    class KeyAssignmentsCheatsheet
+      include Base
+
+      def ==(other)
+        other.is_a?(self.class)
+      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',
+          '[?]'               => 'Open key assignments cheatsheet'
+        },
+        'Tabs' => {
+          '[h] [C-b] [LEFT]'  => 'Show previous tab',
+          '[l] [C-f] [RIGHT]' => 'Show next tab',
+          '[N]'               => 'Open new tab',
+          '[C-R]'             => 'Reload',
+          '[w]'               => 'Close tab',
+          '[q]'               => 'Quit filtering mode',
+          '[/]'               => 'Filter items in tab'
+        },
+        'Tweets' => {
+          '[D]'               => 'Delete tweet',
+          '[F]'               => 'Add to favorite',
+          '[n]'               => 'Compose new tweet',
+          '[o]'               => 'Open URLs in tweet',
+          '[r]'               => 'Reply',
+          '[R]'               => 'Retweet',
+          '[U]'               => 'Show user'
+        }
+      }
+
+      def respond_to_key(key)
+        case key
+        when ?d, 4
+          10.times { scroll_manager.move_down }
+        when ?g
+          scroll_manager.move_to_top
+        when ?G
+          scroll_manager.move_to_bottom
+        when ?j, 14, Curses::Key::DOWN
+          scroll_manager.move_down
+        when ?k, 16, Curses::Key::UP
+          scroll_manager.move_up
+        when ?u, 21
+          10.times { scroll_manager.move_up }
+        else
+          return false
+        end
+
+        true
+      end
+
+      def title
+        'Key assignments'.freeze
+      end
+
+      def update
+        top = 2 # begin drawing from line 2
+        draw_cond = -> line { top <= line && line <= window.maxy - top }
+
+        current_line = top - scroll_manager.offset
+
+        window.setpos(current_line, 3)
+        window.bold { window.addstr('Key assignments') } if draw_cond[current_line]
+
+        SHORTCUTS.each do |category, shortcuts|
+          current_line += 3
+          window.setpos(current_line, 5)
+          window.bold { window.addstr("<#{category}>") } if draw_cond[current_line]
+          current_line += 1
+
+          shortcuts.each do |key, description|
+            current_line += 1
+            next unless draw_cond[current_line]
+
+            window.setpos(current_line, 7)
+            window.bold { window.addstr(key.rjust(17)) }
+            window.setpos(current_line, 25)
+            window.addstr(": #{description}")
+          end
+        end
+      end
+
+      private
+
+      def count
+        @count ||= SHORTCUTS.count * 4 + SHORTCUTS.map(&:count).reduce(0, :+) + 1
+      end
+
+      def offset_from_bottom
+        0
+      end
+
+      def scroll_manager
+        return @scroll_manager unless @scroll_manager.nil?
+
+        @scroll_manager = ScrollManager.new
+        @scroll_manager.delegate = self
+        @scroll_manager.after_move { refresh }
+        @scroll_manager
+      end
+    end
+  end
+end

data/lib/twterm/tab/list_tab.rb

@@ -13,7 +13,7 @@ module Twterm
           @list = list
           @title = @list.full_name
           TabManager.instance.refresh_window
-          fetch { move_to_top }
+          fetch { scroll_manager.move_to_top }
           @auto_reloader = Scheduler.new(300) { fetch }
         end
       end

data/lib/twterm/tab/mentions_tab.rb

@@ -3,6 +3,18 @@ module Twterm
     class MentionsTab
       include StatusesTab
 
+      def close
+        fail NotClosableError
+      end
+
+      def fetch
+        @client.mentions do |statuses|
+          statuses.reverse.each(&method(:prepend))
+          sort
+          yield if block_given?
+        end
+      end
+
       def initialize(client)
         fail ArgumentError, 'argument must be an instance of Client class' unless client.is_a? Client
 
@@ -16,21 +28,9 @@ module Twterm
 
         @title = 'Mentions'
 
-        fetch { move_to_top }
+        fetch { scroll_manager.move_to_top }
         @auto_reloader = Scheduler.new(300) { fetch }
       end
-
-      def fetch
-        @client.mentions do |statuses|
-          statuses.reverse.each(&method(:prepend))
-          sort
-          yield if block_given?
-        end
-      end
-
-      def close
-        fail NotClosableError
-      end
     end
   end
 end