twterm 2.0.0.beta4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '00415181902d737f2283de4a54152889cffc54ab'
-  data.tar.gz: '009bd013a8832bc161b1e3613b6a00bea98df2a7'
+  metadata.gz: d44d4efd89253159a5b3999aab7c1600c455f446
+  data.tar.gz: 05db8e2c2a8d665dad0c256113ba479f9d471d36
 SHA512:
-  metadata.gz: '066976acf5219459f6c018153d97745c7138a98a1928061f780cc29520943e30afd5e2505a9d2f39eb018be6e1287e4b84b70ff5a6b39534b64bcc2ccc50b6fa'
-  data.tar.gz: 956676d43c5ee57370ad7ed17520b83789bb71b1bf2e96d20700d5604be7879d833d52004936a8b31b6612717aa970e460a74185be239d3c1aee36f11328babf
+  metadata.gz: 9cf75c3584cf79a4028434df82525b17a7df990a7bada78ec925e140e5f3ff2f5ced14ab0f373d5f45accb2ae8f232abef31e797e39cb2beb08b7392f52d6634
+  data.tar.gz: b15698fad09a15ab42d11b03400883c5165bac3e290348f3b926145ef4bf7882a5e2f8734bd9bed50174a4d7b10dd6eba60e9fca955afd90813f0ae081af204b

data/README.md

@@ -2,9 +2,7 @@
 
 A full-featured TUI Twitter client
 
-## Screenshot
-
-![screenshot](http://twterm.ryota-ka.me/screenshot.png)
+![screencast](http://twterm.ryota-ka.me/screencast.gif)
 
 ## Requirements
 

data/lib/twterm/repository/abstract_expirable_entity_repository.rb

@@ -19,8 +19,10 @@ module Twterm
       end
 
       def find(id)
-        touch(id)
-        super
+        instance = super
+        touch(id) if !instance.nil? && should_keep?(instance)
+
+        instance
       end
 
       def expire(threshold)
@@ -38,6 +40,10 @@ module Twterm
         raise NotImplementedError, '`garbage_collection_event_class` must be implemented'
       end
 
+      def should_keep?(instance)
+        raise NotImplementedError, '`should_keep?` method must be implemented'
+      end
+
       def touch(id)
         @touched_at[id] = Time.now
       end

data/lib/twterm/repository/status_repository.rb

@@ -31,6 +31,20 @@ module Twterm
         repository.values.select { |s| s.in_reply_to_status_id == id }
       end
 
+      def expire(threshold)
+        now = Time.now
+        ids = repository
+          .to_a
+          .sort_by { |_, status| status.created_at }
+          .reverse
+          .drop(keep_minimum)
+          .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
+
       def ids
         repository.keys
       end
@@ -41,6 +55,14 @@ module Twterm
         Event::StatusGarbageCollected
       end
 
+      def keep_minimum
+        1000
+      end
+
+      def should_keep?(status)
+        Time.now - status.created_at > 86400
+      end
+
       def type
         Status
       end

data/lib/twterm/repository/user_repository.rb

@@ -19,6 +19,10 @@ module Twterm
         Event::UserGarbageCollected
       end
 
+      def should_keep?(_)
+        true
+      end
+
       def type
         User
       end

data/lib/twterm/tab/base.rb

@@ -107,13 +107,6 @@ 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/new/search.rb

@@ -110,8 +110,6 @@ module Twterm
         end
 
         def update_saved_search
-          return unless @@queries.empty?
-
           client.saved_search.then do |searches|
             @@queries = searches.map(&:query)
             initially_loaded!

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

@@ -32,6 +32,7 @@ module Twterm
 
         def delete(status_id)
           app.status_repository.delete(status_id)
+          @status_ids.delete(status_id)
           render
         end
 
@@ -188,7 +189,7 @@ module Twterm
         end
 
         def total_item_count
-          search_query.empty? ? @status_ids.count : statuses.count
+          statuses.count
         end
 
         private
@@ -235,11 +236,22 @@ module Twterm
             .reduce(Image.empty, :|)
         end
 
+        def reload
+          fetch.then do |statuses|
+            statuses.each { |s| append(s) }
+            sort
+          end
+        end
+
         def sort
           return if items.empty? || scroller.current_item.nil?
 
           formerly_selected_status_id = scroller.current_item.id
 
+          repo = app.status_repository
+
+          @status_ids.sort_by! { |status_id| repo.find(status_id).created_at }.reverse!
+
           unless formerly_selected_status_id.nil?
             new_index = @status_ids.index(formerly_selected_status_id)
             scroller.move_to(new_index) unless new_index.nil?

data/lib/twterm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta4
+  version: 2.0.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -329,9 +329,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.11