twterm 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328dc78c5c22745104e0ea848f685dd24a38f023
-  data.tar.gz: e9a4bcc86da9eec70a2fe4f7f97b243985ebecc6
+  metadata.gz: b83f1b22f92cf279b15fdb70358d86dca32a00d9
+  data.tar.gz: ea0d20227e837aa606fa27d73aaa0cad87e2d0ba
 SHA512:
-  metadata.gz: 1e323c03dd2a056f0d0ec4465f06ed0aba8fec49b82fd4b3fe2e8b76134edaea3dc895991c1e00b8f23fcee0753e3288aa14aa5ea7c6d49dd5f5c702006aa3a6
-  data.tar.gz: 7047e7dfa1e48612ed8be4e9df8c69ee0895dbf63915dbb754b66ac3e82c03b13d65f754580f1d1a56e15da59de15384c0e8711d9ad5d64f479da976686d86fc
+  metadata.gz: aad2fda4667c871c79b556360280a160ee4bbbced590bc5bb6e18938c9e0949bd2f454e65c2c97e5c1a99bc016ee80e348426544d8bc50ccc5276dee89784af7
+  data.tar.gz: e90142ebc46ec3c38ed1bb9e7a8ea5f09030b6c1306e2823865ae916aee5cca6c65a1a0fe9220aaa9c812d85fda982b4a22213de7056159059996e313f8f75d7

data/bin/twterm

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'twterm'
+require './lib/twterm'
 
 Twterm::App.instance.run

data/lib/twterm.rb

@@ -36,6 +36,7 @@ require 'twterm/tab/mentions_tab'
 require 'twterm/tab/new/start'
 require 'twterm/tab/new/list'
 require 'twterm/tab/new/search'
+require 'twterm/tab/new/user'
 require 'twterm/tab/search_tab'
 require 'twterm/tab/timeline_tab'
 require 'twterm/tab/user_tab'
@@ -46,6 +47,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.0'
+    REQUIRE_VERSION = '1.0.2'
   end
 end

data/lib/twterm/app.rb

@@ -25,6 +25,8 @@ module Twterm
     end
 
     def run
+      run_periodic_cleanup
+
       Screen.instance.wait
       Screen.instance.refresh
     end
@@ -41,5 +43,16 @@ module Twterm
         exit
       end
     end
+
+    private
+
+    def run_periodic_cleanup
+      Thread.new do
+        loop do
+          sleep 300
+          Status.cleanup
+        end
+      end
+    end
   end
 end

data/lib/twterm/auth.rb

@@ -7,8 +7,13 @@ module Twterm
         site: 'https://api.twitter.com'
       )
       request_token = consumer.get_request_token
-      Launchy.open request_token.authorize_url
-      print 'input PIN: '
+      url = request_token.authorize_url
+      begin
+        Launchy.open(url)
+      rescue Launchy::CommandNotFoundError
+        puts "Open the following URL to authorize yourself: #{url}"
+      end
+      print 'Input PIN: '
       pin = (STDIN.gets || '').strip
       access_token = request_token.get_access_token(oauth_verifier: pin)
 

data/lib/twterm/client.rb

@@ -85,19 +85,19 @@ module Twterm
 
     def home_timeline
       send_request do
-        yield @rest_client.home_timeline(count: 200).map(&CREATE_STATUS_PROC)
+        yield @rest_client.home_timeline(count: 100).map(&CREATE_STATUS_PROC)
       end
     end
 
     def mentions
       send_request do
-        yield @rest_client.mentions(count: 200).map(&CREATE_STATUS_PROC)
+        yield @rest_client.mentions(count: 100).map(&CREATE_STATUS_PROC)
       end
     end
 
     def user_timeline(user_id)
       send_request do
-        yield @rest_client.user_timeline(user_id, count: 200).map(&CREATE_STATUS_PROC)
+        yield @rest_client.user_timeline(user_id, count: 100).map(&CREATE_STATUS_PROC)
       end
     end
 
@@ -110,7 +110,7 @@ module Twterm
     def list(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: 200).map(&CREATE_STATUS_PROC)
+        yield @rest_client.list_timeline(list.id, count: 100).map(&CREATE_STATUS_PROC)
       end
     end
 
@@ -126,6 +126,17 @@ module Twterm
       end
     end
 
+    def show_user(query)
+      send_request do
+        begin
+          user = User.new(@rest_client.user(query))
+        rescue Twitter::Error::NotFound
+          user = nil
+        end
+        yield user
+      end
+    end
+
     def favorite(status)
       return false unless status.is_a? Status
 

data/lib/twterm/status.rb

@@ -1,14 +1,15 @@
 module Twterm
   class Status
-    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
+    MAX_CACHED_STATUSES_COUNT = 1000
+
+    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
     alias_method :favorited?, :favorited
     alias_method :retweeted?, :retweeted
 
-    @@instances = []
+    @@instances = {}
 
     def self.new(tweet)
-      detector = -> (instance) { instance.id == tweet.id }
-      instance = @@instances.find(&detector)
+      instance = find(tweet.id)
       instance.nil? ? super : instance.update!(tweet)
     end
 
@@ -39,7 +40,9 @@ module Twterm
 
       expand_url!
 
-      @@instances << self
+      @touched_at = Time.now
+
+      @@instances[id] = self
     end
 
     def update!(tweet)
@@ -79,24 +82,37 @@ module Twterm
     def in_reply_to_status(&block)
       block.call(nil) if @in_reply_to_status_id.nil?
 
-      status = Status.find_by_in_reply_to_status_id(@in_reply_to_status_id)
+      status = Status.find(@in_reply_to_status_id)
       block.call(status) unless status.nil?
 
       Client.current.show_status(@in_reply_to_status_id, &block)
     end
 
+    def touch!
+      @touched_at = Time.now
+    end
+
     def ==(other)
       other.is_a?(self.class) && id == other.id
     end
 
     class << self
-      def find_by_in_reply_to_status_id(in_reply_to_status_id)
-        @@instances.find { |status| status.id == in_reply_to_status_id }
+      def find(id)
+        @@instances[id]
       end
 
       def parse_time(time)
         (time.is_a?(String) ? Time.parse(time) : time.dup).localtime
       end
+
+      def cleanup
+        count = MAX_CACHED_STATUSES_COUNT
+        return if @@instances.count < count
+
+        statuses = @@instances.values.sort_by(&:touched_at).take(count)
+        status_ids = statuses.map(&:id)
+        @@instances = status_ids.zip(statuses).to_h
+      end
     end
   end
 end

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

@@ -19,6 +19,10 @@ module Twterm
             tab = Tab::New::Search.new
             TabManager.instance.switch(tab)
             tab.invoke_input
+          when 'U'
+            tab = Tab::New::User.new
+            TabManager.instance.switch(tab)
+            tab.invoke_input
           else
             return false
           end
@@ -53,10 +57,17 @@ module Twterm
             @window.addstr('[S]')
           end
 
-          @window.setpos(9, 3)
+          @window.setpos(8, 5)
+          @window.addstr('- [U] Open user tab')
+          @window.bold do
+            @window.setpos(8, 7)
+            @window.addstr('[U]')
+          end
+
+          @window.setpos(11, 3)
           @window.addstr('To cancel opening a new tab, just press [w] to close this tab.')
           @window.bold do
-            @window.setpos(9, 43)
+            @window.setpos(11, 43)
             @window.addstr('[w]')
           end
           @window.refresh

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

@@ -0,0 +1,60 @@
+module Twterm
+  module Tab
+    module New
+      class User
+        include Base
+        include Readline
+
+        def initialize
+          super
+
+          @title = 'New tab'
+          @window.refresh
+        end
+
+        def respond_to_key(_)
+          false
+        end
+
+        def invoke_input
+          resetter = proc do
+            reset_prog_mode
+            sleep 0.1
+            Screen.instance.refresh
+          end
+
+          input_thread = Thread.new do
+            close_screen
+            puts "\nSearch user"
+            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)
+              end
+
+              TabManager.instance.switch(tab)
+            end
+          end
+
+          App.instance.register_interruption_handler do
+            input_thread.kill
+            resetter.call
+            tab = Tab::New::Start.new
+            TabManager.instance.switch(tab)
+          end
+
+          input_thread.join
+        end
+
+        private
+
+        def update; end
+      end
+    end
+  end
+end

data/lib/twterm/tab/statuses_tab.rb

@@ -8,16 +8,30 @@ module Twterm
       def initialize
         super
 
-        @statuses = []
+        @status_ids = []
+
+        Thread.new do
+          loop do
+            statuses.take(100).each(&:touch!)
+            sleep 60
+          end
+        end
+      end
+
+      def statuses
+        statuses = @status_ids.map { |id| Status.find(id) }.reject(&:nil?)
+        @status_ids = statuses.map(&:id)
+        statuses
       end
 
       def prepend(status)
         fail unless status.is_a? Status
 
-        return if @statuses.any? { |s| s.id == status.id }
+        return if @status_ids.include?(status.id)
 
-        @statuses << status
+        @status_ids << status.id
         status.split(@window.maxx - 4)
+        status.touch!
         item_prepended
         refresh
       end
@@ -25,10 +39,11 @@ module Twterm
       def append(status)
         fail ArgumentError, 'argument must be an instance of Status class' unless status.is_a? Status
 
-        return if @statuses.any? { |s| s == status }
+        return if @status_ids.include?(status.id)
 
-        @statuses.unshift(status)
+        @status_ids.unshift(status.id)
         status.split(@window.maxx - 4)
+        status.touch!
         item_appended
         refresh
       end
@@ -59,8 +74,7 @@ module Twterm
       end
 
       def delete_status(status_id)
-        detector = -> (status) { status.id == status_id }
-        @statuses.delete_if(&detector)
+        @status_ids.delete(status_id)
         refresh
       end
 
@@ -93,7 +107,7 @@ module Twterm
 
         @window.clear
 
-        @statuses.reverse.drop(offset).each.with_index(offset) do |status, i|
+        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
             @scrollable_last = i
@@ -202,18 +216,19 @@ module Twterm
       private
 
       def highlighted_status
-        @statuses[count - index - 1]
+        id = @status_ids[count - index - 1]
+        Status.find(id)
       end
 
       def count
-        @statuses.count
+        @status_ids.count
       end
 
       def offset_from_bottom
         return @offset_from_bottom unless @offset_from_bottom.nil?
 
         height = 0
-        @statuses.each.with_index(-1) do |status, i|
+        statuses.each.with_index(-1) do |status, i|
           height += status.split(@window.maxx - 4).count + 2
           if height >= @window.maxy
             @offset_from_bottom = i
@@ -224,7 +239,7 @@ module Twterm
       end
 
       def sort
-        @statuses.sort_by!(&:created_at_for_sort)
+        @status_ids.sort_by! { |id| Status.find(id).created_at_for_sort }
       end
 
       def show_help

data/lib/twterm/tab/user_tab.rb

@@ -24,6 +24,10 @@ module Twterm
           yield if block_given?
         end
       end
+
+      def ==(other)
+        other.is_a?(self.class) && user == other.user
+      end
     end
   end
 end

data/lib/twterm/tweetbox.rb

@@ -23,7 +23,11 @@ module Twterm
 
       thread = Thread.new do
         close_screen
-        puts "\ncompose new tweet:"
+        if @in_reply_to.nil?
+          puts "\nCompose new tweet:"
+        else
+          puts "\nReply to @#{@in_reply_to.user.screen_name}'s tweet: \"#{@in_reply_to.text}\""
+        end
         @status = readline(@in_reply_to.nil? ? '> ' : " @#{in_reply_to.user.screen_name} ", true)
         resetter.call
         post

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -146,6 +146,7 @@ files:
 - lib/twterm/tab/new/list.rb
 - lib/twterm/tab/new/search.rb
 - lib/twterm/tab/new/start.rb
+- lib/twterm/tab/new/user.rb
 - lib/twterm/tab/scrollable.rb
 - lib/twterm/tab/search_tab.rb
 - lib/twterm/tab/statuses_tab.rb