twterm 2.0.0.beta2 → 2.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fa2049730342bdd24b2910b9325f63ba28bd608
-  data.tar.gz: 4b558c35428ad291487bca5ae126f86138b1188a
+  metadata.gz: 5437110c78f1fd007bdd6ce02f1c88f2d699e320
+  data.tar.gz: fc02658604bfb54ccb45edc61ac69e3c33e67dac
 SHA512:
-  metadata.gz: cc54183f0dddf1624bfda8f6edfe512d735d30491512088cff95ae8de84cbadb0ca4e17a333071fd34a1fa036d3a151d5740d217aebbda96c815c8c0d89af4b3
-  data.tar.gz: e3fcce826377a533d874c01df4eac8494ba808a0b5357a24aa160aedf94caa4c3e5b18c4163f1d1bda0437e890f1297053c612dd797993cdd0069720469d52de
+  metadata.gz: 70b852078a4f295a4c27d15ec86b67c330cbe67f5f803e243240e21dde99a5635dbb3aa1da1ad339ec3a50b1e7f778e9b8a845702daf90adee29f2fd4442fd69
+  data.tar.gz: 9dc10d8f391208aa9f40a31407fc5721ead7a6aaa7997a1371888a2bd093e43b12b3ef70b82847b99a4d155bd706d1ef5532af0683f45948f082b047c441860b

data/README.md

@@ -39,7 +39,7 @@ key | operation
 `^N` | new tweet
 `^T` | new tab
 `w` | close current tab
-`F10` | quit
+`F10` `^C` | quit
 `F1` | key assignments cheatsheet
 
 ## License

data/lib/twterm/app.rb

@@ -78,7 +78,7 @@ module Twterm
       Scheduler.new(300) do
         status_repository.expire(3600)
 
-        _ = status_repository.all.map { |user_id| user_repository.find(user_id) }
+        _ = status_repository.all.map { |status| user_repository.find(status.user_id) }
         user_repository.expire(3600)
       end
 

data/lib/twterm/event/status_garbage_collected.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/base'
+
+module Twterm
+  module Event
+    class StatusGarbageCollected < Base
+      def fields
+        {
+          id: Integer
+        }
+      end
+    end
+  end
+end

data/lib/twterm/event/user_garbage_collected.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/base'
+
+module Twterm
+  module Event
+    class UserGarbageCollected < Base
+      def fields
+        {
+          id: Integer
+        }
+      end
+    end
+  end
+end

data/lib/twterm/repository/abstract_expirable_entity_repository.rb

@@ -1,10 +1,13 @@
 require 'concurrent'
 
+require 'twterm/publisher'
 require 'twterm/repository/abstract_entity_repository'
 
 module Twterm
   module Repository
     class AbstractExpirableEntityRepository < AbstractEntityRepository
+      include Publisher
+
       def initialize
         super
         @touched_at = Concurrent::Hash.new
@@ -22,11 +25,19 @@ module Twterm
 
       def expire(threshold)
         now = Time.now
-        repository.delete_if { |id, _| !@touched_at[id] || @touched_at[id] + threshold < now }
+        ids = repository.select { |id, _| !@touched_at[id] || @touched_at[id] + threshold < now }
+
+        ids.each { |id| publish(garbage_collection_event_class.new(id)) }
+
+        repository.delete_if { |id, _| ids.include?(id) }
       end
 
       private
 
+      def garbage_collection_event_class
+        raise NotImplementedError, '`garbage_collection_event_class` must be implemented'
+      end
+
       def touch(id)
         @touched_at[id] = Time.now
       end

data/lib/twterm/repository/status_repository.rb

@@ -1,3 +1,4 @@
+require 'twterm/event/status_garbage_collected'
 require 'twterm/repository/abstract_expirable_entity_repository'
 require 'twterm/status'
 
@@ -18,6 +19,14 @@ module Twterm
         repository.delete(id)
       end
 
+      def find(id)
+        status = super
+
+        touch(status.retweeted_status_id) if !status.nil? && status.retweet?
+
+        status
+      end
+
       def find_replies_for(id)
         repository.values.select { |s| s.in_reply_to_status_id == id }
       end
@@ -28,6 +37,10 @@ module Twterm
 
       private
 
+      def garbage_collection_event_class
+        Event::StatusGarbageCollected
+      end
+
       def type
         Status
       end

data/lib/twterm/repository/user_repository.rb

@@ -1,3 +1,4 @@
+require 'twterm/event/user_garbage_collected'
 require 'twterm/repository/abstract_expirable_entity_repository'
 require 'twterm/user'
 
@@ -14,6 +15,10 @@ module Twterm
 
       private
 
+      def garbage_collection_event_class
+        Event::UserGarbageCollected
+      end
+
       def type
         User
       end

data/lib/twterm/rest_client.rb

@@ -250,7 +250,8 @@ module Twterm
     def post(text, in_reply_to = nil)
       send_request do
         if in_reply_to.is_a? Status
-          text = "@#{in_reply_to.user.screen_name} #{text}"
+          user = user_repository.find(in_reply_to.user_id)
+          text = "@#{user.screen_name} #{text}"
           rest_client.update(text, in_reply_to_status_id: in_reply_to.id)
         else
           rest_client.update(text)

data/lib/twterm/tab/base.rb

@@ -107,6 +107,13 @@ module Twterm
         )
       end
 
+      def reload
+        fetch.then do |statuses|
+          statuses.each { |s| append(s) }
+          sort
+        end
+      end
+
       def resize(event)
         window.resize(stdscr.maxy - 5, stdscr.maxx)
         window.move(3, 0)

data/lib/twterm/tab/scrollable.rb

@@ -82,7 +82,7 @@ module Twterm
           return if count == 0 || index == count - 1
 
           @index = no_cursor_mode? ? count - drawable_item_count : count - 1
-          @offset = [count - drawable_item_count + 1, 0].max
+          @offset = [count - drawable_item_count, 0].max
 
           @offset += 1 until last_item_shown?
 

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

@@ -2,6 +2,7 @@ require 'concurrent'
 
 require 'twterm/event/open_uri'
 require 'twterm/event/status/delete'
+require 'twterm/event/status_garbage_collected'
 require 'twterm/publisher'
 require 'twterm/subscriber'
 require 'twterm/tab/base'
@@ -74,6 +75,7 @@ module Twterm
           @status_ids = Concurrent::Array.new
 
           subscribe(Event::Status::Delete) { |e| delete(e.status_id) }
+          subscribe(Event::StatusGarbageCollected) { |e| @status_ids.delete(e.id) }
         end
 
         def items
@@ -138,7 +140,7 @@ module Twterm
           when k[:status, :retweet]
             retweet
           when k[:tab, :reload]
-            fetch
+            reload
           when k[:status, :user]
             show_user
           else
@@ -182,10 +184,7 @@ module Twterm
         end
 
         def statuses
-          statuses = @status_ids.map { |id| app.status_repository.find(id) }.compact
-          @status_ids = statuses.map(&:id)
-
-          statuses
+          @status_ids.map { |id| app.status_repository.find(id) }.compact
         end
 
         def total_item_count
@@ -239,11 +238,6 @@ module Twterm
         def sort
           return if items.empty? || scroller.current_item.nil?
 
-          repo = app.status_repository
-
-          @status_ids &= repo.ids
-          @status_ids.sort_by! { |id| repo.find(id).created_at }.reverse!
-
           formerly_selected_status_id = scroller.current_item.id
 
           unless formerly_selected_status_id.nil?

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

@@ -8,12 +8,20 @@ module Twterm
       class Conversation < Base
         include Dumpable
 
-        attr_reader :status
+        attr_reader :status_id
 
         def ==(other)
           other.is_a?(self.class) && status == other.status
         end
 
+        def fetch
+          find_or_fetch_status(status_id).then do |status|
+            append(status)
+            fetch_ancestor(status)
+            find_descendants(status)
+          end
+        end
+
         def fetch_ancestor(status)
           in_reply_to_status_id = status.in_reply_to_status_id
 
@@ -41,19 +49,17 @@ module Twterm
         end
 
         def dump
-          @status.id
+          @status_id
         end
 
         def initialize(app, client, status_id)
           super(app, client)
 
-          find_or_fetch_status(status_id).then do |status|
-            @status = status
+          @status_id = status_id
 
-            append(status)
+          reload.then do
             scroller.move_to_top
-            fetch_ancestor(status)
-            find_descendants(status)
+            sort
           end
         end
 

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

@@ -17,10 +17,7 @@ module Twterm
         end
 
         def fetch
-          client.favorites(@user.id).then do |statuses|
-            statuses.each { |s| append(s) }
-            sort
-          end
+          client.favorites(@user.id)
         end
 
         def initialize(app, client, user_id)
@@ -32,7 +29,7 @@ module Twterm
             @user = user
             app.tab_manager.refresh_window
 
-            fetch.then do
+            reload.then do
               initially_loaded!
               scroller.move_to_top
             end

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

@@ -15,10 +15,7 @@ module Twterm
         end
 
         def fetch
-          client.home_timeline.then do |statuses|
-            statuses.each { |s| append(s) }
-            sort
-          end
+          client.home_timeline
         end
 
         def initialize(app, client)
@@ -26,12 +23,12 @@ module Twterm
 
           subscribe(Event::Status::Timeline) { |e| prepend(e.status) }
 
-          fetch.then do
+          reload.then do
             initially_loaded!
             scroller.move_to_top
           end
 
-          @auto_reloader = Scheduler.new(180) { fetch }
+          @auto_reloader = Scheduler.new(180) { reload }
         end
 
         def title

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

@@ -18,20 +18,17 @@ module Twterm
             self.title = @list.full_name
             app.tab_manager.refresh_window
 
-            fetch.then do
+            reload.then do
               initially_loaded!
               scroller.move_to_top
             end
 
-            @auto_reloader = Scheduler.new(300) { fetch }
+            @auto_reloader = Scheduler.new(300) { reload }
           end
         end
 
         def fetch
-          client.list_timeline(@list).then do |statuses|
-            statuses.each { |s| append(s) }
-            sort
-          end
+          client.list_timeline(@list)
         end
 
         def close

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

@@ -21,7 +21,7 @@ module Twterm
 
           subscribe(Event::Status::Mention) { |e| prepend(e.status) }
 
-          fetch.then do |statuses|
+          reload.then do |statuses|
             initially_loaded!
             statuses.each { |s| append(s) }
             scroller.move_to_top
@@ -30,13 +30,6 @@ module Twterm
           @auto_reloader = Scheduler.new(300) { reload }
         end
 
-        def reload
-          fetch.then do |statuses|
-            statuses.each { |s| append(s) }
-            sort
-          end
-        end
-
         def title
           'Mentions'.freeze
         end

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

@@ -22,10 +22,7 @@ module Twterm
         end
 
         def fetch
-          client.search(@query).then do |statuses|
-            statuses.each(&method(:append))
-            sort
-          end
+          client.search(@query)
         end
 
         def initialize(app, client, query)
@@ -34,12 +31,12 @@ module Twterm
           @query = query
           @title = "\"#{@query}\""
 
-          fetch.then do
+          reload.then do
             initially_loaded!
             scroller.move_to_top
           end
 
-          @auto_reloader = Scheduler.new(300) { fetch }
+          @auto_reloader = Scheduler.new(300) { reload }
         end
       end
     end

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

@@ -22,10 +22,7 @@ module Twterm
         end
 
         def fetch
-          client.user_timeline(@user.id).then do |statuses|
-            statuses.each { |s| append(s) }
-            sort
-          end
+          client.user_timeline(@user.id)
         end
 
         def initialize(app, client, user_id)
@@ -37,12 +34,12 @@ module Twterm
             @user = user
             app.tab_manager.refresh_window
 
-            fetch.then do
+            reload.then do
               initially_loaded!
               scroller.move_to_top
             end
 
-            @auto_reloader = Scheduler.new(120) { fetch }
+            @auto_reloader = Scheduler.new(120) { reload }
           end
         end
 

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

@@ -1,5 +1,6 @@
 require 'concurrent'
 
+require 'twterm/event/user_garbage_collected'
 require 'twterm/tab/base'
 require 'twterm/tab/loadable'
 
@@ -21,6 +22,8 @@ module Twterm
         def initialize(app, client)
           super(app, client)
           @user_ids = Concurrent::Array.new
+
+          subscribe(Event::UserGarbageCollected) { |id| @user_ids.delete(id) }
         end
 
         def items

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.0.0.beta2'
+  VERSION = '2.0.0.beta3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0.beta3
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-30 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -205,6 +205,8 @@ files:
 - lib/twterm/event/status/delete.rb
 - lib/twterm/event/status/mention.rb
 - lib/twterm/event/status/timeline.rb
+- lib/twterm/event/status_garbage_collected.rb
+- lib/twterm/event/user_garbage_collected.rb
 - lib/twterm/event_dispatcher.rb
 - lib/twterm/extensions/array.rb
 - lib/twterm/extensions/curses/window.rb