twterm 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f8922ec344713188266282109b5d5a43a95948e
-  data.tar.gz: b1ac62bbd18b92a058b8f0753a1f34470b129fd0
+  metadata.gz: 6b7f3f957fa6bb231072502fd2794d212db4547e
+  data.tar.gz: 83aecc6b84ed61620f52b69f6b65c91b6d1af67b
 SHA512:
-  metadata.gz: c08ff7689bd89c875051779cd9eda592c699df11a855a56dbe83fb4ac1a67728de75477ff8152332b36b632456169f7490759c81555542fe46dc546d0125392d
-  data.tar.gz: 6f920de275acdac03b647505fe37debe4defedd67f40dfb5c3eb9b0281a4382f688bd6266e4378c86411133b9ff4bd5197badf26c163fbb1f11775d2cfd86293
+  metadata.gz: e3b1748a40af7f4a32b93568422e0cd65dbe6a9e7a12818567e8aff5142639af6396df93febdffd0f93a19afd9020bf4ac5f86ad468f60b00c5e8cdb597ee5ee
+  data.tar.gz: 6df0822a5f0d59a9f1e2e260e2e43a2b5997a7a36426f5dc786f85283514c9d44ddd9ca74dc41fd7ff1fbc83085bf2eb84a6b4af8b12f33b3438a91ec7d3438c

data/lib/twterm.rb

@@ -34,6 +34,7 @@ require 'twterm/scheduler'
 require 'twterm/status'
 require 'twterm/tab_manager'
 require 'twterm/tab/base'
+require 'twterm/tab/dumpable'
 require 'twterm/tab/exceptions'
 require 'twterm/tab/scrollable'
 require 'twterm/tab/statuses_tab'
@@ -54,6 +55,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.8'
+    REQUIRE_VERSION = '1.0.9'
   end
 end

data/lib/twterm/app.rb

@@ -19,6 +19,7 @@ module Twterm
 
       mentions_tab = Tab::MentionsTab.new(client)
       TabManager.instance.add(mentions_tab)
+      TabManager.instance.recover_tabs
 
       Screen.instance.refresh
 
@@ -37,15 +38,17 @@ module Twterm
 
     def register_interruption_handler(&block)
       fail ArgumentError, 'no block given' unless block_given?
-      Signal.trap(:INT) do
-        block.call
-      end
+      Signal.trap(:INT) { block.call }
     end
 
     def reset_interruption_handler
-      Signal.trap(:INT) do
-        exit
-      end
+      Signal.trap(:INT) { App.instance.quit }
+    end
+
+    def quit
+      Curses.close_screen
+      TabManager.instance.dump_tabs
+      exit
     end
 
     private

data/lib/twterm/client.rb

@@ -43,9 +43,7 @@ module Twterm
 
     def stream
       @stream_client.on_friends do
-        break if @stream_connected
-
-        Notifier.instance.show_message 'Connection established'
+        Notifier.instance.show_message 'Connection established' unless @stream_connected
         @stream_connected = true
       end
 
@@ -117,13 +115,19 @@ module Twterm
       end
     end
 
+    def list(list_id)
+      send_request do
+        yield List.new(@rest_client.list(list_id))
+      end
+    end
+
     def lists
       send_request do
         yield @rest_client.lists.map { |list| List.new(list) }
       end
     end
 
-    def list(list)
+    def list_timeline(list)
       fail ArgumentError, 'argument must be an instance of List class' unless list.is_a? List
       send_request do
         yield @rest_client.list_timeline(list.id, count: 100).select(&@mute_filter).map(&CREATE_STATUS_PROC)
@@ -144,11 +148,12 @@ module Twterm
 
     def show_user(query)
       send_request do
-        begin
-          user = User.new(@rest_client.user(query))
-        rescue Twitter::Error::NotFound
-          user = nil
-        end
+        user =
+          begin
+            User.new(@rest_client.user(query))
+          rescue Twitter::Error::NotFound
+            nil
+          end
         yield user
       end
     end
@@ -249,9 +254,11 @@ module Twterm
         begin
           block.call
         rescue Twitter::Error => e
-          Notifier.instance.show_error 'Failed to send request'
-          sleep 10
-          retry if e.message == 'getaddrinfo: nodename nor servname provided, or not known'
+          Notifier.instance.show_error "Failed to send request: #{e.message}"
+          if e.message == 'getaddrinfo: nodename nor servname provided, or not known'
+            sleep 10
+            retry
+          end
         end
       end
     end

data/lib/twterm/list.rb

@@ -2,8 +2,17 @@ module Twterm
   class List
     attr_reader :id, :name, :slug, :full_name, :mode, :description, :member_count, :subscriber_count
 
+    @@instances = {}
+
     def initialize(list)
       @id = list.id
+      update!(list)
+
+      @@instances[@id] = self
+      self
+    end
+
+    def update!(list)
       @name = list.name
       @slug = list.slug
       @full_name = list.full_name
@@ -11,10 +20,32 @@ module Twterm
       @description = list.description.is_a?(Twitter::NullObject) ? '' : list.description
       @member_count = list.member_count
       @subscriber_count = list.subscriber_count
+
+      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)
+    end
+
+    def self.find(id)
+      @@instances[id]
+    end
+
+    def self.find_or_fetch(id)
+      instance = find(id)
+      (yield(instance) && return) if instance
+
+      Client.current.list(id) { |list| yield list }
+    end
+
+    def self.all
+      @@instances.values
+    end
   end
 end

data/lib/twterm/screen.rb

@@ -44,7 +44,7 @@ module Twterm
         Tweetbox.instance.compose
         return
       when 'Q'
-        exit
+        App.instance.quit
       when '/'
         # filter
       else

data/lib/twterm/status.rb

@@ -89,14 +89,24 @@ module Twterm
     end
 
     def in_reply_to_status(&block)
-      block.call(nil) if @in_reply_to_status_id.nil?
+      if @in_reply_to_status_id.nil?
+        block.call(nil)
+        return
+      end
 
       status = Status.find(@in_reply_to_status_id)
-      block.call(status) unless status.nil?
+      unless status.nil?
+        block.call(status)
+        return
+      end
 
       Client.current.show_status(@in_reply_to_status_id, &block)
     end
 
+    def replies
+      Status.all.select { |s| s.in_reply_to_status_id == id }
+    end
+
     def retweeted_by
       User.find(@retweeted_by_user_id)
     end
@@ -122,6 +132,13 @@ module Twterm
         @@instances[id]
       end
 
+      def find_or_fetch(id)
+        instance = find(id)
+        (yield(instance) && return) if instance
+
+        Client.current.show_status(id) { |status| yield status }
+      end
+
       def parse_time(time)
         (time.is_a?(String) ? Time.parse(time) : time.dup).localtime
       end

data/lib/twterm/tab/base.rb

@@ -3,7 +3,7 @@ module Twterm
     module Base
       include Curses
 
-      attr_reader :title
+      attr_accessor :title
 
       def initialize
         @window = stdscr.subwin(stdscr.maxy - 5, stdscr.maxx - 30, 3, 0)

data/lib/twterm/tab/conversation_tab.rb

@@ -2,30 +2,48 @@ module Twterm
   module Tab
     class ConversationTab
       include StatusesTab
+      include Dumpable
 
       attr_reader :status
 
-      def initialize(status)
-        fail ArgumentError, 'argument must be an instance of Status class' unless status.is_a? Status
-
+      def initialize(status_id)
         @title = 'Conversation'
-
         super()
-        prepend(status)
-        Thread.new { fetch_reply(status) }
+
+        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
       end
 
-      def fetch_reply(status)
-        status.in_reply_to_status do |reply|
-          return if reply.nil?
-          append(reply)
-          fetch_reply(reply)
+      def fetch_in_reply_to_status(status)
+        status.in_reply_to_status do |in_reply_to|
+          return if in_reply_to.nil?
+          append(in_reply_to)
+          sort
+          Thread.new { fetch_in_reply_to_status(in_reply_to) }
+        end
+      end
+
+      def fetch_replies(status)
+        status.replies.each do |reply|
+          prepend(reply)
+          sort
+          Thread.new { fetch_replies(reply) }
         end
       end
 
       def ==(other)
         other.is_a?(self.class) && status == other.status
       end
+
+      def dump
+        @status.id
+      end
     end
   end
 end

data/lib/twterm/tab/dumpable.rb

@@ -0,0 +1,21 @@
+module Twterm
+  module Tab
+    module Dumpable
+      def dump
+        fail NotImplementedError 'dump method must be implemented'
+      end
+
+      def self.included(klass)
+        klass.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        def recover(title, arg)
+          tab = new(arg)
+          tab.title = title
+          tab
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/list_tab.rb

@@ -2,23 +2,25 @@ module Twterm
   module Tab
     class ListTab
       include StatusesTab
+      include Dumpable
 
       attr_reader :list
 
-      def initialize(list)
-        fail ArgumentError, 'argument must be an instance of List class' unless list.is_a? List
-
+      def initialize(list_id)
         super()
 
-        @list = list
-        @title = @list.full_name
-        fetch { move_to_top }
-        @auto_reloader = Scheduler.new(300) { fetch }
+        List.find_or_fetch(list_id) do |list|
+          @list = list
+          @title = @list.full_name
+          TabManager.instance.refresh_window
+          fetch { move_to_top }
+          @auto_reloader = Scheduler.new(300) { fetch }
+        end
       end
 
       def fetch
         client = Client.current
-        client.list(@list) do |statuses|
+        client.list_timeline(@list) do |statuses|
           statuses.reverse.each(&method(:prepend))
           sort
           yield if block_given?
@@ -26,13 +28,17 @@ module Twterm
       end
 
       def close
-        @auto_reloader.kill
+        @auto_reloader.kill if @auto_reloader
         super
       end
 
       def ==(other)
         other.is_a?(self.class) && list == other.list
       end
+
+      def dump
+        @list.id
+      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Twterm
           case key
           when 10
             return true if current_list.nil?
-            list_tab = Tab::ListTab.new(current_list)
+            list_tab = Tab::ListTab.new(current_list.id)
             TabManager.instance.switch(list_tab)
           else
             return false

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

@@ -25,8 +25,9 @@ module Twterm
 
           input_thread = Thread.new do
             close_screen
+            CompletionManager.instance.set_default_mode!
             puts "\ninput search query"
-            query = (readline('input query > ') || '').strip
+            query = (readline('> ') || '').strip
             resetter.call
 
             tab = query.nil? || query.empty? ? Tab::New::Start.new : Tab::SearchTab.new(query)

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

@@ -31,15 +31,18 @@ module Twterm
             screen_name = (readline('> @') || '').strip
             resetter.call
 
-            Client.current.show_user(screen_name) do |user|
-              if screen_name.nil? || screen_name.empty? || user.nil?
-                Notifier.instance.show_error 'User not found' if user.nil?
-                tab = Tab::New::Start.new
-              else
-                tab = Tab::UserTab.new(user)
+            if screen_name.nil? || screen_name.empty?
+              TabManager.instance.switch(Tab::New::Start.new)
+            else
+              Client.current.show_user(screen_name) do |user|
+                if user.nil?
+                  Notifier.instance.show_error 'User not found'
+                  tab = Tab::New::Start.new
+                else
+                  tab = Tab::UserTab.new(user.id)
+                end
+                TabManager.instance.switch(tab)
               end
-
-              TabManager.instance.switch(tab)
             end
           end
 

data/lib/twterm/tab/scrollable.rb

@@ -108,7 +108,7 @@ module Twterm
             0
           else
             height = @window.maxy
-            [height * (last - index + 1) / count, 1].max
+            [height * (last - offset + 1) / count, 1].max
           end
       end
 

data/lib/twterm/tab/search_tab.rb

@@ -2,6 +2,7 @@ module Twterm
   module Tab
     class SearchTab
       include StatusesTab
+      include Dumpable
 
       attr_reader :query
 
@@ -12,6 +13,7 @@ module Twterm
         @title = "\"#{@query}\""
 
         fetch { move_to_top }
+        @auto_reloader = Scheduler.new(300) { fetch }
       end
 
       def fetch
@@ -21,9 +23,18 @@ module Twterm
         end
       end
 
+      def close
+        @auto_reloader.kill if @auto_reloader
+        super
+      end
+
       def ==(other)
         other.is_a?(self.class) && query == other.query
       end
+
+      def dump
+        @query
+      end
     end
   end
 end

data/lib/twterm/tab/statuses_tab.rb

@@ -82,7 +82,7 @@ module Twterm
       def show_user
         return if highlighted_status.nil?
         user = highlighted_status.user
-        user_tab = Tab::UserTab.new(user)
+        user_tab = Tab::UserTab.new(user.id)
         TabManager.instance.add_and_show(user_tab)
       end
 
@@ -95,7 +95,7 @@ module Twterm
 
       def show_conversation
         return if highlighted_status.nil?
-        tab = Tab::ConversationTab.new(highlighted_status)
+        tab = Tab::ConversationTab.new(highlighted_status.id)
         TabManager.instance.add_and_show(tab)
       end
 
@@ -112,6 +112,8 @@ module Twterm
 
         @window.clear
 
+        return if offset < 0
+
         statuses.reverse.drop(offset).each.with_index(offset) do |status, i|
           formatted_lines = status.split(@window.maxx - 4).count
           if current_line + formatted_lines + 2 > @window.maxy

data/lib/twterm/tab/user_tab.rb

@@ -2,19 +2,21 @@ module Twterm
   module Tab
     class UserTab
       include StatusesTab
+      include Dumpable
 
       attr_reader :user
 
-      def initialize(user)
-        fail ArgumentError, 'argument must be an instance of User class' unless user.is_a? User
-
+      def initialize(user_id)
         super()
 
-        @user = user
-        @title = "@#{user.screen_name}"
+        User.find_or_fetch(user_id) do |user|
+          @user = user
+          @title = "@#{@user.screen_name}"
+          TabManager.instance.refresh_window
 
-        fetch { move_to_top }
-        @auto_reloader = Scheduler.new(120) { fetch }
+          fetch { move_to_top }
+          @auto_reloader = Scheduler.new(120) { fetch }
+        end
       end
 
       def fetch
@@ -26,13 +28,17 @@ module Twterm
       end
 
       def close
-        @auto_reloader.kill
+        @auto_reloader.kill if @auto_reloader
         super
       end
 
       def ==(other)
         other.is_a?(self.class) && user == other.user
       end
+
+      def dump
+        @user.id
+      end
     end
   end
 end

data/lib/twterm/tab_manager.rb

@@ -3,6 +3,8 @@ module Twterm
     include Singleton
     include Curses
 
+    DUMPED_TABS_FILE = "#{ENV['HOME']}/.twterm/dumped_tabs"
+
     def initialize
       @tabs = []
       @index = 0
@@ -78,6 +80,28 @@ module Twterm
       end
     end
 
+    def recover_tabs
+      return unless File.exist? DUMPED_TABS_FILE
+
+      data = YAML.load(File.read(DUMPED_TABS_FILE))
+      data.each do |klass, title, arg|
+        tab = klass.recover(title, arg)
+        add(tab)
+      end
+    rescue
+      Notifier.instance.show_error 'Failed to recover tabs'
+    end
+
+    def dump_tabs
+      data = @tabs.each_with_object([]) do |tab, arr|
+        next unless tab.is_a? Tab::Dumpable
+        arr << [tab.class, tab.title, tab.dump]
+      end
+      File.open(DUMPED_TABS_FILE, 'w', 0600) do |f|
+        f.write data.to_yaml
+      end
+    end
+
     def refresh_window
       @window.clear
       current_tab_id = current_tab.object_id

data/lib/twterm/user.rb

@@ -57,6 +57,13 @@ module Twterm
       @@instances[id]
     end
 
+    def self.find_or_fetch(id)
+      instance = find(id)
+      (yield(instance) && return) if instance
+
+      Client.current.show_user(id) { |user| yield user }
+    end
+
     def self.cleanup
       referenced_users = Status.all.map(&:user)
       referenced_users.each(&:touch!)

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Ryota Kameoka
@@ -159,6 +159,7 @@ files:
 - lib/twterm/status.rb
 - lib/twterm/tab/base.rb
 - lib/twterm/tab/conversation_tab.rb
+- lib/twterm/tab/dumpable.rb
 - lib/twterm/tab/exceptions.rb
 - lib/twterm/tab/favorites.rb
 - lib/twterm/tab/list_tab.rb