twterm 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e8728be1c9bd555f0354eb36822c8d01156911
-  data.tar.gz: 03799091452f4954c392253206977513e8a66f9f
+  metadata.gz: 47e25077b5997ac024770d29a7faa63b0367d200
+  data.tar.gz: 752e5cc8daf0a00ab054602a2bc1c437f98b80e1
 SHA512:
-  metadata.gz: 14af06eb721896713d982419195c28e64c22cfe6eace3746fb299cbbc849d5382a1c37a4fe527899ccb5aa6d89ee13dea1ce9d3027da34865af8955fbfd7787b
-  data.tar.gz: 99e220ffd485f2d8b7d2909a0b9689dd2e06ef52528c600da85e201657304f693d5bab38f5410afd7135b8e49de134ceac4908056d6223fda7d4900df8990a43
+  metadata.gz: 40f134f4fd0eeaaed2998883330a9d132b4e99862c0aeebeb2a57326be3c76b08ed2899c83d9366172f82cc8c7b871226e284751645b4bd45df145e9416ac60c
+  data.tar.gz: 7cba404740e73eefec2a29b5c64368d1cfd2882e58e9847c6aae858470bcca7e27c7b9fb7cbcbc588e206c7188df7b3b92fb0dae1ab15c4f27305ffde82057a8

data/lib/twterm/app.rb

@@ -51,7 +51,10 @@ module Twterm
     private
 
     def run_periodic_cleanup
-      Scheduler.new(300) { Status.cleanup }
+      Scheduler.new(300) do
+        Status.cleanup
+        User.cleanup
+      end
     end
   end
 end

data/lib/twterm/client.rb

@@ -32,6 +32,10 @@ module Twterm
     end
 
     def stream
+      @stream_client.on_friends do
+        Notifier.instance.show_message 'Connection established'
+      end
+
       @stream_client.on_timeline_status do |tweet|
         status = Status.new(tweet)
         invoke_callbacks(:timeline_status, status)
@@ -57,18 +61,16 @@ module Twterm
 
     def connect_stream
       @stream_client.stop_stream
-      @streaming_thread.kill if @streaming_thread.is_a? Thread
 
-      Notifier.instance.show_message 'Trying to connect to Twitter...'
       @streaming_thread = Thread.new do
         begin
+          Notifier.instance.show_message 'Trying to connect to Twitter...'
           @stream_client.userstream
         rescue EventMachine::ConnectionError
           Notifier.instance.show_error 'Connection failed'
           sleep 30
           retry
         end
-        Notifier.instance.show_message 'Connection established'
       end
     end
 

data/lib/twterm/notification/base.rb

@@ -4,7 +4,7 @@ module Twterm
       attr_reader :time, :fg_color, :bg_color
 
       def initialize(message)
-        @message = message
+        @message = CGI.unescapeHTML(message)
         @time = Time.now
       end
 

data/lib/twterm/scheduler.rb

@@ -7,8 +7,10 @@ class Scheduler
     @paused = false
 
     @thread = Thread.new do
-      sleep @interval
-      run
+      loop do
+        sleep @interval
+        run
+      end
     end
   end
 

data/lib/twterm/status.rb

@@ -1,8 +1,8 @@
 module Twterm
   class Status
-    MAX_CACHED_STATUSES_COUNT = 1000
+    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, :retweeted_by, :urls, :media, :touched_at
+    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
     alias_method :favorited?, :favorited
     alias_method :retweeted?, :retweeted
 
@@ -15,7 +15,8 @@ module Twterm
 
     def initialize(tweet)
       unless tweet.retweeted_status.is_a? Twitter::NullObject
-        @retweeted_by = User.new(tweet.user)
+        @retweeted_by_user_id = tweet.user.id
+        User.create(tweet.user)
         retweeted_at = Status.parse_time(tweet.created_at)
         tweet = tweet.retweeted_status
       end
@@ -34,7 +35,8 @@ module Twterm
       @media = tweet.media
       @urls = tweet.urls
 
-      @user = User.new(tweet.user)
+      @user_id = tweet.user.id
+      User.create(tweet.user)
 
       @splitted_text = {}
 
@@ -95,15 +97,27 @@ module Twterm
       Client.current.show_status(@in_reply_to_status_id, &block)
     end
 
+    def retweeted_by
+      User.find(@retweeted_by_user_id)
+    end
+
     def touch!
       @touched_at = Time.now
     end
 
+    def user
+      User.find(user_id)
+    end
+
     def ==(other)
       other.is_a?(self.class) && id == other.id
     end
 
     class << self
+      def all
+        @@instances.values
+      end
+
       def find(id)
         @@instances[id]
       end
@@ -113,13 +127,11 @@ module Twterm
       end
 
       def cleanup
-        count = MAX_CACHED_STATUSES_COUNT
-        return if @@instances.count < count
-
         TabManager.instance.each_tab do |tab|
           tab.touch_statuses if tab.is_a?(Tab::StatusesTab)
         end
-        statuses = @@instances.values.sort_by(&:touched_at).take(count)
+        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

data/lib/twterm/tab/statuses_tab.rb

@@ -104,7 +104,7 @@ module Twterm
       end
 
       def touch_statuses
-        statuses.take(100).each(&:touch!)
+        statuses.reverse.take(100).each(&:touch!)
       end
 
       def update
@@ -246,6 +246,7 @@ module Twterm
       end
 
       def sort
+        @status_ids &= Status.all.map(&:id)
         @status_ids.sort_by! { |id| Status.find(id).created_at_for_sort }
       end
 

data/lib/twterm/user.rb

@@ -1,17 +1,21 @@
 module Twterm
   class User
-    attr_reader :id, :name, :screen_name, :description, :location, :website, :following, :protected, :statuses_count, :friends_count, :followers_count
-    attr_reader :color
+    attr_reader :id, :name, :screen_name, :description, :location, :website,
+                :following, :protected, :statuses_count, :friends_count,
+                :followers_count, :touched_at, :color
     alias_method :following?, :following
     alias_method :protected?, :protected
+    class << self
+      alias_method :create, :new
+    end
 
+    MAX_CACHED_TIME = 3600
     COLORS = [:red, :blue, :green, :cyan, :yellow, :magenta]
 
-    @@instances = []
+    @@instances = {}
 
     def self.new(user)
-      detector = -> (instance) { instance.id == user.id }
-      instance = @@instances.find(&detector)
+      instance = find(user.id)
       instance.nil? ? super : instance.update!(user)
     end
 
@@ -19,8 +23,13 @@ module Twterm
       @id = user.id
       update!(user)
       @color = COLORS[@id % 6]
+      touch!
+
+      @@instances[@id] = self
+    end
 
-      @@instances << self
+    def touch!
+      @touched_at = Time.now
     end
 
     def update!(user)
@@ -39,5 +48,23 @@ module Twterm
 
       self
     end
+
+    def self.all
+      @@instances.values
+    end
+
+    def self.find(id)
+      @@instances[id]
+    end
+
+    def self.cleanup
+      referenced_users = Status.all.map(&:user)
+      referenced_users.each(&:touch!)
+
+      cond = -> (user) { user.touched_at > Time.now - MAX_CACHED_TIME }
+      users = all.select(&cond)
+      user_ids = users.map(&:id)
+      @@instances = user_ids.zip(users).to_h
+    end
   end
 end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-12 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses