twterm 1.3.0 → 2.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 224b8dc2d3619a2042816816273a0526a7cb9666
-  data.tar.gz: f1e33882f1154a83dfb5c744d1d613f4844aba48
+  metadata.gz: 064c6b973d192af1687649528910f091550c24ed
+  data.tar.gz: e7c65c16eb7c113e68b3f8aa9d03fcfafbe703d4
 SHA512:
-  metadata.gz: 57087dc1e7f65520af3ab90af85e7d8511855ca40696709173e8797aa2d1a004fba09dd2eebcb6ce8dd03cceaf03d530a8f5ad827a6ed318e05fb5940db644ee
-  data.tar.gz: 204684237b545673c87f0edb02fbf80b7c077095b59531ba5b1c43ff1055ccee7585354d9612dee02cf54fa88ebbaca72d250f81418c2d4a3c8d6153d1aa63ae
+  metadata.gz: eaa76b8503cd6749d4df7ac6e261ebeb13b1a59cef56d5aba5e327e0946013e46a180a3c5d424cbb8590adba4440e91be3234b78e91564b35e6555afa942c9e2
+  data.tar.gz: 6c92404ae8e51b1867efe30d93bf5bbd2a51ee4dfb06d6e02d8449913222b5d6bda82f7a98fac416718ac19bfad75743e6a428c54fd86fd816e6e0f968eed679

data/README.md

@@ -1,6 +1,6 @@
 # twterm
 
-A full-featured CLI Twitter client
+A full-featured TUI Twitter client
 
 ## Screenshot
 
@@ -8,8 +8,8 @@ A full-featured CLI Twitter client
 
 ## Requirements
 
-- Ruby (>= 2.1, compiled with C Curses and Readline)
-- C curses
+- Ruby (>= 2.1, compiled with ncurses and Readline)
+- ncurses
 - Readline
 
 ## Installation
@@ -26,25 +26,21 @@ To launch twterm, just type in your console:
 $ twterm
 ```
 
-### Basic key assignments
+### Default key assignments
+
+Key assignments can be configured by editing `~/.twterm/keys.toml`
 
 key | operation
 --- | ---
-`F` | add to favorite
-`d` `C-d` | scroll down
-`h` `C-b` `←` | show previous tab
-`j` `C-n` `↓` | move down
-`k` `C-p` `↑` | move up
-`l` `C-f` `→` | show next tab
-`n` | compose new tweet
-`N` | open new tab
-`r` | reply
-`R` | retweet
+`h` `←` | previous tab
+`j` `↓` | move down
+`k` `↑` | move up
+`l` `→` | next tab
+`^N` | new tweet
+`^T` | new tab
 `w` | close current tab
-`Q` | quit
-`?` | open key assignments cheatsheet
-
-Type `?` key to see the full list of key assignments.
+`F10` | quit
+`F1` | key assignments cheatsheet
 
 ## License
 

data/bin/twterm

@@ -6,5 +6,5 @@ if ARGV.count == 1 && (%w(-v --version).include?(ARGV.first))
   exit
 else
   require 'twterm'
-  Twterm::App.instance.run
+  Twterm::App.new.run
 end

data/lib/twterm/app.rb

@@ -1,55 +1,120 @@
 require 'curses'
+
+require 'twterm/completion_mamanger'
+require 'twterm/direct_message_composer'
 require 'twterm/event/screen/resize'
+require 'twterm/repository/direct_message_repository'
+require 'twterm/repository/friendship_repository'
+require 'twterm/repository/hashtag_repository'
+require 'twterm/repository/list_repository'
+require 'twterm/repository/status_repository'
+require 'twterm/repository/user_repository'
+require 'twterm/tab_manager'
+require 'twterm/tweetbox'
 require 'twterm/uri_opener'
 
 module Twterm
   class App
     include Publisher
-    include Singleton
+
+    attr_reader :screen
 
     DATA_DIR = "#{ENV['HOME']}/.twterm".freeze
 
-    def initialize
+    def completion_manager
+      @completion_mamanger ||= CompletionManager.new(self)
+    end
+
+    def direct_message_composer
+      @direct_message_composer ||= DirectMessageComposer.new(self, client)
+    end
+
+    def direct_message_repository
+      @direct_messages_repository ||= Repository::DirectMessageRepository.new
+    end
+
+    def friendship_repository
+      @friendship_repository ||= Repository::FriendshipRepository.new
+    end
+
+    def hashtag_repository
+      @hashtag_repository ||= Repository::HashtagRepository.new
+    end
+
+    def list_repository
+      @list_repository ||= Repository::ListRepository.new
+    end
+
+    def run
       Dir.mkdir(DATA_DIR, 0700) unless File.directory?(DATA_DIR)
 
       Auth.authenticate_user(config) if config[:user_id].nil?
 
-      Screen.instance
-      FilterQueryWindow.instance
+      KeyMapper.instance
 
-      timeline = Tab::Statuses::Home.new(client)
-      TabManager.instance.add_and_show(timeline)
+      @screen = Screen.new(self, client)
 
-      mentions_tab = Tab::Statuses::Mentions.new(client)
+      SearchQueryWindow.instance
 
-      TabManager.instance.add(mentions_tab)
-      TabManager.instance.recover_tabs
+      timeline = Tab::Statuses::Home.new(self, client)
+      tab_manager.add_and_show(timeline)
 
-      Screen.instance.refresh
+      mentions_tab = Tab::Statuses::Mentions.new(self, client)
+
+      tab_manager.add(mentions_tab)
+      tab_manager.recover_tabs
+
+      screen.refresh
 
       client.connect_user_stream
 
       reset_interruption_handler
 
+      Signal.trap(:WINCH) { on_resize }
+      Scheduler.new(60) { on_resize }
+
       URIOpener.instance
 
-      resize = proc do
-        next if Curses.closed?
+      Scheduler.new(300) do
+        status_repository.expire(3600)
 
-        lines = `tput lines`.to_i
-        cols = `tput cols`.to_i
-        publish(Event::Screen::Resize.new(lines, cols))
+        _ = status_repository.all.map { |user_id| user_repository.find(user_id) }
+        user_repository.expire(3600)
       end
 
-      Signal.trap(:WINCH, &resize)
-      Scheduler.new(60, &resize)
-    end
+      direct_message_repository.before_create do |dm|
+        user_repository.create(dm.recipient)
+        user_repository.create(dm.sender)
+      end
 
-    def run
-      run_periodic_cleanup
+      user_repository.before_create do |user|
+        client_id = client.user_id
+
+        if user.following?
+          friendship_repository.follow(client_id, user.id)
+        else
+          friendship_repository.unfollow(client_id, user.id)
+        end
+
+        if user.follow_request_sent?
+          friendship_repository.following_requested(client_id, user.id)
+        else
+          friendship_repository.following_not_requested(client_id, user.id)
+        end
+      end
 
-      Screen.instance.wait
-      Screen.instance.refresh
+      status_repository.before_create do |tweet|
+        user_repository.create(tweet.user)
+      end
+
+      status_repository.before_create do |tweet|
+        tweet.hashtags.each do |hashtag|
+          hashtag_repository.create(hashtag.text)
+        end
+      end
+
+      screen.wait
+      screen.refresh
     end
 
     def register_interruption_handler(&block)
@@ -58,15 +123,31 @@ module Twterm
     end
 
     def reset_interruption_handler
-      Signal.trap(:INT) { App.instance.quit }
+      Signal.trap(:INT) { quit }
     end
 
     def quit
       Curses.close_screen
-      TabManager.instance.dump_tabs
+      tab_manager.dump_tabs
       exit
     end
 
+    def status_repository
+      @status_repository ||= Repository::StatusRepository.new
+    end
+
+    def tab_manager
+      @tab_manager ||= TabManager.new(self, client)
+    end
+
+    def tweetbox
+      @tweetbox = Tweetbox.new(self, client)
+    end
+
+    def user_repository
+      @user_repository ||= Repository::UserRepository.new
+    end
+
     private
 
     def client
@@ -74,7 +155,15 @@ module Twterm
         config[:user_id].to_i,
         config[:screen_name],
         config[:access_token],
-        config[:access_token_secret]
+        config[:access_token_secret],
+        {
+          friendship: friendship_repository,
+          direct_message: direct_message_repository,
+          hashtag: hashtag_repository,
+          list: list_repository,
+          status: status_repository,
+          user: user_repository,
+        }
       )
     end
 
@@ -82,11 +171,12 @@ module Twterm
       @config ||= Config.new
     end
 
-    def run_periodic_cleanup
-      Scheduler.new(300) do
-        Status.cleanup
-        User.cleanup
-      end
+    def on_resize
+      return if Curses.closed?
+
+      lines = `tput lines`.to_i
+      cols = `tput cols`.to_i
+      publish(Event::Screen::Resize.new(lines, cols))
     end
   end
 end

data/lib/twterm/client.rb

@@ -8,12 +8,17 @@ module Twterm
 
     attr_reader :user_id, :screen_name
 
-    @@instances = []
-
-    def initialize(user_id, screen_name, access_token, access_token_secret)
+    def initialize(user_id, screen_name, access_token, access_token_secret, repositories)
       @user_id, @screen_name = user_id, screen_name
       @access_token, @access_token_secret = access_token, access_token_secret
 
+      @friendship_repository = repositories[:friendship]
+      @direct_message_repository = repositories[:direct_message]
+      @hashtag_repository = repositories[:hashtag]
+      @list_repository = repositories[:list]
+      @status_repository = repositories[:status]
+      @user_repository = repositories[:user]
+
       @callbacks = {}
 
       @mute_filter = -> _ { true }
@@ -26,18 +31,10 @@ module Twterm
       end
 
       direct_message_manager
-
-      @@instances << self
     end
 
-    def self.new(user_id, screen_name, token, secret)
-      detector = -> (instance) { instance.user_id == user_id }
-      instance = @@instances.find(&detector)
-      instance.nil? ? super : instance
-    end
+    private
 
-    def self.current
-      @@instances[0]
-    end
+    attr_reader :friendship_repository, :direct_message_repository, :hashtag_repository, :list_repository, :status_repository, :user_repository
   end
 end

data/lib/twterm/completion_mamanger.rb

@@ -1,8 +1,8 @@
 module Twterm
   class CompletionManager
-    include Singleton
+    def initialize(app)
+      @app = app
 
-    def initialize
       Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{("
       Readline.completion_case_fold = false
     end
@@ -12,12 +12,12 @@ module Twterm
 
       Readline.completion_proc = proc do |str|
         if str.start_with?('#')
-          History::Hashtag.instance.history
+          app.hashtag_repository.all
           .map { |tag| "##{tag}" }
           .select { |tag| tag.start_with?(str) }
         elsif str.start_with?('@')
-          History::ScreenName.instance.history
-          .map { |name| "@#{name}" }
+          app.user_repository.all
+          .map { |user| "@#{user.screen_name}" }
           .select { |name| name.start_with?(str) }
         else
           []
@@ -29,9 +29,14 @@ module Twterm
       Readline.completion_append_character = ''
 
       Readline.completion_proc = proc do |str|
-        History::ScreenName.instance.history
+        app.user_repository.all
+          .map { |user| user.screen_name }
           .select { |name| name.start_with?(str) }
       end
     end
+
+    private
+
+    attr_reader :app
   end
 end

data/lib/twterm/direct_message.rb

@@ -3,15 +3,11 @@ require 'twterm/utils'
 
 module Twterm
   class DirectMessage
-    attr_reader :id, :created_at, :recipient, :sender, :text
-
-    @@instances = {}
+    attr_reader :id, :created_at, :recipient_id, :sender_id, :text
 
     def initialize(message)
       @id = message.id
       update!(message)
-
-      @@instances[id] = self
     end
 
     def ==(other)
@@ -23,18 +19,10 @@ module Twterm
       @created_at.strftime(format)
     end
 
-    def matches?(q)
-      [
-        sender.name,
-        sender.screen_name,
-        text
-      ].map(&:downcase).any? { |x| x.include?(q) }
-    end
-
     def update!(message)
       @created_at = message.created_at.dup.localtime
-      @recipient = User.new(message.recipient)
-      @sender = User.new(message.sender)
+      @recipient_id = message.recipient.id
+      @sender_id = message.sender.id
       @text = message.text
 
       self
@@ -43,12 +31,10 @@ module Twterm
     class Conversation
       include Utils
 
-      attr_reader :collocutor, :messages
+      attr_reader :collocutor_id, :messages
 
-      def initialize(collocutor)
-        check_type User, collocutor
-
-        @collocutor = collocutor
+      def initialize(collocutor_id)
+        @collocutor_id = collocutor_id
         @messages = []
       end
 
@@ -59,14 +45,6 @@ module Twterm
         self
       end
 
-      def matches?(q)
-        [
-          collocutor.screen_name,
-          collocutor.name,
-          preview
-        ].map(&:downcase).any? { |x| x.include?(q.downcase) }
-      end
-
       def preview
         messages.sort_by(&:created_at).last.text.gsub("\n", ' ')
       end

data/lib/twterm/direct_message_composer.rb

@@ -4,12 +4,15 @@ require 'twterm/utils'
 
 module Twterm
   class DirectMessageComposer
-    include Singleton
     include Readline
     include Curses
     include Publisher
     include Utils
 
+    def initialize(app, client)
+      @app, @client = app, client
+    end
+
     def compose(recipient)
       check_type User, recipient
 
@@ -18,7 +21,7 @@ module Twterm
       resetter = proc do
         reset_prog_mode
         sleep 0.1
-        Screen.instance.refresh
+        app.screen.refresh
       end
 
       thread = Thread.new do
@@ -26,7 +29,7 @@ module Twterm
 
         puts "\nCompose new message to @%s:" % recipient.screen_name
 
-        CompletionManager.instance.set_default_mode!
+        app.completion_manager.set_default_mode!
 
         loop do
           line = (readline('> ', true) || '').strip
@@ -46,7 +49,7 @@ module Twterm
         send(recipient) unless text.empty?
       end
 
-      App.instance.register_interruption_handler do
+      app.register_interruption_handler do
         thread.kill
         clear
         puts "\nCanceled"
@@ -58,12 +61,14 @@ module Twterm
 
     private
 
+    attr_reader :app, :client
+
     def clear
       @text = ''
     end
 
     def send(recipient)
-      Client.current.create_direct_message(recipient, text)
+      client.create_direct_message(recipient, text)
       clear
     end
 

data/lib/twterm/direct_message_manager.rb

@@ -21,22 +21,21 @@ module Twterm
       Scheduler.new(300) { fetch }
     end
 
-    def add(collocutor, message)
-      check_type User, collocutor
+    def add(collocutor_id, message)
       check_type DirectMessage, message
 
-      @conversations[collocutor.id] ||= DirectMessage::Conversation.new(collocutor)
-      @conversations[collocutor.id] << message
+      @conversations[collocutor_id] ||= DirectMessage::Conversation.new(collocutor_id)
+      @conversations[collocutor_id] << message
     end
 
     def fetch
       client.direct_messages_received.then do |messages|
-        messages.each { |m| add(m.sender, m) }
+        messages.each { |m| add(m.sender_id, m) }
         publish(Event::DirectMessage::Fetched.new)
       end
 
       client.direct_messages_sent.then do |messages|
-        messages.each { |m| add(m.recipient, m) }
+        messages.each { |m| add(m.recipient_id, m) }
         publish(Event::DirectMessage::Fetched.new)
       end
     end

data/lib/twterm/event/notification/abstract_notification.rb

@@ -0,0 +1,27 @@
+require 'twterm/event/base'
+
+module Twterm
+  module Event
+    module Notification
+      class AbstractNotification < Twterm::Event::Base
+        attr_reader :time
+
+        def initialize(message)
+          super(CGI.unescapeHTML(message))
+
+          @time = Time.now
+        end
+
+        def fields
+          {
+            message: String
+          }
+        end
+
+        def color
+          raise NotImplementedError, 'color method must be overridden'
+        end
+      end
+    end
+  end
+end

data/lib/twterm/event/notification/error.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/notification/abstract_notification'
+
+module Twterm
+  module Event
+    module Notification
+      class Error < AbstractNotification
+        def color
+          [:white, :red]
+        end
+      end
+    end
+  end
+end

data/lib/twterm/event/notification/info.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/notification/abstract_notification'
+
+module Twterm
+  module Event
+    module Notification
+      class Info < AbstractNotification
+        def color
+          [:black, :cyan]
+        end
+      end
+    end
+  end
+end

data/lib/twterm/event/notification/success.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/notification/abstract_notification'
+
+module Twterm
+  module Event
+    module Notification
+      class Success < AbstractNotification
+        def color
+          [:black, :green]
+        end
+      end
+    end
+  end
+end

data/lib/twterm/event/notification/warning.rb

@@ -0,0 +1,13 @@
+require 'twterm/event/notification/abstract_notification'
+
+module Twterm
+  module Event
+    module Notification
+      class Warning < AbstractNotification
+        def color
+          [:black, :yellow]
+        end
+      end
+    end
+  end
+end

data/lib/twterm/event_dispatcher.rb

@@ -12,7 +12,7 @@ module Twterm
 
     def dispatch(event)
       @subscriptions
-        .select { |s| s.event == event.class }
+        .select { |s| event.is_a?(s.event) }
         .map(&:callback)
         .each { |cb| cb.call(event) }
 

data/lib/twterm/extensions/array.rb

@@ -0,0 +1,5 @@
+class Array
+  def intersperse(x)
+    ([x] * length).zip(self).flatten(1).drop(1)
+  end
+end

data/lib/twterm/extensions/enumerator/lazy.rb

@@ -3,7 +3,10 @@ class Enumerator
     def scan(initial, sym = nil)
       acc = initial
 
+      @_scan_has_yielded_initial_value = false
+
       Enumerator::Lazy.new(self) do |y, x|
+        y << initial && @_scan_has_yielded_initial_value = true unless @_scan_has_yielded_initial_value
         acc = sym.nil? ? yield(acc, x) : sym.to_proc.call(acc, x)
         y << acc
       end

data/lib/twterm/extensions/string.rb

@@ -3,10 +3,6 @@ class String
     each_char.map { |c| c.bytesize == 1 ? 1 : 2 }.reduce(0, &:+)
   end
 
-  def matches?(query)
-    downcase.include?(query.downcase)
-  end
-
   def split_by_width(width)
     cnt = 0
     str = ''