twterm 1.3.0 → 2.0.0.beta1

data/lib/twterm/rest_client.rb

@@ -1,7 +1,8 @@
+require 'concurrent'
 require 'twterm/direct_message'
 require 'twterm/direct_message_manager'
 require 'twterm/publisher'
-require 'twterm/event/notification'
+require 'twterm/event/notification/success'
 
 module Twterm
   module RESTClient
@@ -10,12 +11,16 @@ module Twterm
     CONSUMER_KEY = 'vLNSVFgXclBJQJRZ7VLMxL9lA'.freeze
     CONSUMER_SECRET = 'OFLKzrepRG2p1hq0nUB9j2S9ndFQoNTPheTpmOY0GYw55jGgS5'.freeze
 
+    def add_list_member(list_id, user_id)
+      send_request { rest_client.add_list_member(list_id, user_id) }
+    end
+
     def block(*user_ids)
       send_request do
         rest_client.block(*user_ids)
       end.then do |users|
         users.each do |user|
-          Friendship.block(self.user_id, user.id)
+          friendship_repository.block(self.user_id, user.id)
         end
       end
     end
@@ -24,10 +29,10 @@ module Twterm
       send_request do
         rest_client.create_direct_message(recipient.id, text)
       end.then do |message|
-        msg = DirectMessage.new(message)
+        msg = direct_message_repository.create(message)
         direct_message_manager.add(msg.recipient, msg)
         publish(Event::DirectMessage::Fetched.new)
-        publish(Event::Notification.new(:message, 'Your message to @%s has been sent' % msg.recipient.screen_name))
+        publish(Event::Notification::Success.new('Your message to @%s has been sent' % msg.recipient.screen_name))
       end
     end
 
@@ -37,13 +42,13 @@ module Twterm
 
     def direct_messages_received
       send_request do
-        rest_client.direct_messages(count: 200).map(&DirectMessage.method(:new))
+        rest_client.direct_messages(count: 200).map { |dm| direct_message_repository.create(dm) }
       end
     end
 
     def direct_messages_sent
       send_request do
-        rest_client.direct_messages_sent(count: 200).map(&DirectMessage.method(:new))
+        rest_client.direct_messages_sent(count: 200).map { |dm| direct_message_repository.create(dm) }
       end
     end
 
@@ -51,11 +56,11 @@ module Twterm
       send_request_without_catch do
         rest_client.destroy_status(status.id)
         publish(Event::Status::Delete.new(status.id))
-        publish(Event::Notification.new(:message, 'Your tweet has been deleted'))
+        publish(Event::Notification::Success.new('Your tweet has been deleted'))
       end.catch do |reason|
         case reason
         when Twitter::Error::NotFound, Twitter::Error::Forbidden
-          publish(Event::Notification.new(:error, 'You cannot destroy that status'))
+          publish(Event::Notification::Error.new('You cannot destroy that status'))
         else
           raise reason
         end
@@ -67,10 +72,11 @@ module Twterm
 
       send_request do
         rest_client.favorite(status.id)
-      end.then do
-        status.favorite!
-        publish(Event::Notification.new(:message, 'Successfully liked: @%s "%s"' % [
-          status.user.screen_name, status.text
+      end.then do |tweet, *_|
+        status_repository.create(tweet)
+
+        publish(Event::Notification::Success.new('Successfully liked: @%s "%s"' % [
+          tweet.user.screen_name, status.text
         ]))
       end
     end
@@ -81,7 +87,7 @@ module Twterm
       send_request do
         rest_client.favorites(user_id, count: 200)
       end.then do |tweets|
-        tweets.map(&Status.method(:new))
+        tweets.map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -97,9 +103,9 @@ module Twterm
       end.then do |users|
         users.each do |user|
           if user.protected?
-            Friendship.following_requested(self.user_id, user.id)
+            friendship_repository.following_requested(self.user_id, user.id)
           else
-            Friendship.follow(self.user_id, user.id)
+            friendship_repository.follow(self.user_id, user.id)
           end
         end
       end
@@ -113,9 +119,9 @@ module Twterm
       send_request do
         rest_client.follower_ids(user_id).each_slice(100) do |user_ids|
           m.synchronize do
-            users = rest_client.users(*user_ids).map(& -> u { User.new(u) })
+            users = rest_client.users(*user_ids).map { |u| user_repository.create(u) }
             users.each do |user|
-              Friendship.follow(user.id, self.user_id)
+              friendship_repository.follow(user.id, self.user_id)
             end if user_id == self.user_id
             yield users
           end
@@ -131,7 +137,7 @@ module Twterm
       send_request do
         rest_client.friend_ids(user_id).each_slice(100) do |user_ids|
           m.synchronize do
-            yield rest_client.users(*user_ids).map(& -> u { User.new(u) })
+            yield rest_client.users(*user_ids).map { |u| user_repository.create(u) }
           end
         end
       end
@@ -140,10 +146,10 @@ module Twterm
     def home_timeline
       send_request do
         rest_client.home_timeline(count: 200)
-      end.then do |statuses|
-        statuses
+      end.then do |tweets|
+        tweets
         .select(&@mute_filter)
-        .map(&Status.method(:new))
+        .map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -151,7 +157,7 @@ module Twterm
       send_request do
         rest_client.list(list_id)
       end.then do |list|
-        List.new(list)
+        list_repository.create(list)
       end
     end
 
@@ -163,7 +169,7 @@ module Twterm
       end.then do |statuses|
         statuses
         .select(&@mute_filter)
-        .map(&Status.method(:new))
+        .map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -171,12 +177,13 @@ module Twterm
       send_request do
         rest_client.lists
       end.then do |lists|
-        lists.map { |list| List.new(list) }
+        lists.map { |list| list_repository.create(list) }
       end
     end
 
     def lookup_friendships
-      user_ids = User.ids.reject { |id| Friendship.already_looked_up?(id) }
+      repo = friendship_repository
+      user_ids = user_repository.ids.reject { |id| repo.already_looked_up?(id) }
       send_request_without_catch do
         user_ids.each_slice(100) do |chunked_user_ids|
           friendships = rest_client.friendships(*chunked_user_ids)
@@ -185,13 +192,13 @@ module Twterm
             client_id = user_id
 
             conn = friendship.connections
-            conn.include?('blocking') ? Friendship.block(client_id, id) : Friendship.unblock(client_id, id)
-            conn.include?('following') ? Friendship.follow(client_id, id) : Friendship.unfollow(client_id, id)
-            conn.include?('following_requested') ? Friendship.following_requested(client_id, id) : Friendship.following_not_requested(client_id, id)
-            conn.include?('followed_by') ? Friendship.follow(id, client_id) : Friendship.unfollow(id, client_id)
-            conn.include?('muting') ? Friendship.mute(client_id, id) : Friendship.unmute(client_id, id)
+            conn.include?('blocking') ? repo.block(client_id, id) : repo.unblock(client_id, id)
+            conn.include?('following') ? repo.follow(client_id, id) : repo.unfollow(client_id, id)
+            conn.include?('following_requested') ? repo.following_requested(client_id, id) : repo.following_not_requested(client_id, id)
+            conn.include?('followed_by') ? repo.follow(id, client_id) : repo.unfollow(id, client_id)
+            conn.include?('muting') ? repo.mute(client_id, id) : repo.unmute(client_id, id)
 
-            Friendship.looked_up!(id)
+            repo.looked_up!(id)
           end
         end
       end.catch do |e|
@@ -204,13 +211,21 @@ module Twterm
       end.catch(&show_error)
     end
 
+    def memberships(user_id, options = {})
+      send_request do
+        user_id.nil? ? rest_client.memberships(options) : rest_client.memberships(user_id, options)
+      end.then do |cursor|
+        cursor.map { |list| list_repository.create(list) }
+      end
+    end
+
     def mentions
       send_request do
         rest_client.mentions(count: 200)
       end.then do |statuses|
         statuses
         .select(&@mute_filter)
-        .map(&Status.method(:new))
+        .map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -219,11 +234,19 @@ module Twterm
         rest_client.mute(*user_ids)
       end.then do |users|
         users.each do |user|
-          Friendship.mute(self.user_id, user.id)
+          friendship_repository.mute(self.user_id, user.id)
         end
       end
     end
 
+    def owned_lists
+      send_request do
+        rest_client.owned_lists
+      end.then do |lists|
+        lists.map { |list| list_repository.create(list) }
+      end
+    end
+
     def post(text, in_reply_to = nil)
       send_request do
         if in_reply_to.is_a? Status
@@ -232,20 +255,29 @@ module Twterm
         else
           rest_client.update(text)
         end
-        publish(Event::Notification.new(:message, 'Your tweet has been posted'))
+        publish(Event::Notification::Success.new('Your tweet has been posted'))
       end
     end
 
+    def rate_limit_status
+      send_request { Twitter::REST::Request.new(rest_client, :get, '/1.1/application/rate_limit_status.json').perform }
+    end
+
+    def remove_list_member(list_id, user_id)
+      send_request { rest_client.remove_list_member(list_id, user_id) }
+    end
+
     def retweet(status)
       fail ArgumentError,
         'argument must be an instance of Status class' unless status.is_a? Status
 
       send_request_without_catch do
         rest_client.retweet!(status.id)
-      end.then do
-        status.retweet!
-        publish(Event::Notification.new(:message, 'Successfully retweeted: @%s "%s"' % [
-          status.user.screen_name, status.text
+      end.then do |tweet, *_|
+        status_repository.create(tweet)
+
+        publish(Event::Notification::Success.new('Successfully retweeted: @%s "%s"' % [
+          tweet.user.screen_name, status.text
         ]))
       end.catch do |reason|
         message =
@@ -255,15 +287,11 @@ module Twterm
           when Twitter::Error::NotFound
             'The status is not found'
           when Twitter::Error::Forbidden
-            if status.user.id == user_id  # when the status is mine
-              'You cannot retweet your own status'
-            else  # when the status is not mine
-              'The status is protected'
-            end
+            'The status is protected'
           else
             raise e
           end
-        publish(Event::Notification.new(:error, "Retweet attempt failed: #{message}"))
+        publish(Event::Notification::Error.new("Retweet attempt failed: #{message}"))
       end.catch(&show_error)
     end
 
@@ -279,7 +307,7 @@ module Twterm
       end.then do |statuses|
         statuses
         .map(&Twitter::Tweet.method(:new))
-        .map(&Status.method(:new))
+        .map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -287,7 +315,7 @@ module Twterm
       send_request do
         rest_client.status(status_id)
       end.then do |status|
-        Status.new(status)
+        status_repository.create(status)
       end
     end
 
@@ -302,7 +330,7 @@ module Twterm
           raise reason
         end
       end.catch(&show_error).then do |user|
-        user.nil? ? nil : User.new(user)
+        user.nil? ? nil : user_repository.create(user)
       end
     end
 
@@ -311,7 +339,7 @@ module Twterm
         rest_client.unblock(*user_ids)
       end.then do |users|
         users.each do |user|
-          Friendship.unblock(self.user_id, user.id)
+          friendship_repository.unblock(self.user_id, user.id)
         end
       end
     end
@@ -322,10 +350,11 @@ module Twterm
 
       send_request do
         rest_client.unfavorite(status.id)
-      end.then do
-        status.unfavorite!
-        publish(Event::Notification.new(:message, 'Successfully unliked: @%s "%s"' % [
-          status.user.screen_name, status.text
+      end.then do |tweet, *_|
+        status_repository.create(tweet)
+
+        publish(Event::Notification::Success.new('Successfully unliked: @%s "%s"' % [
+          tweet.user.screen_name, status.text
         ]))
       end
     end
@@ -335,7 +364,7 @@ module Twterm
         rest_client.unfollow(*user_ids)
       end.then do |users|
         users.each do |user|
-          Friendship.unfollow(self.user_id, user.id)
+          friendship_repository.unfollow(self.user_id, user.id)
         end
       end
     end
@@ -345,18 +374,39 @@ module Twterm
         rest_client.unmute(*user_ids)
       end.then do |users|
         users.each do |user|
-          Friendship.unmute(self.user_id, user.id)
+          friendship_repository.unmute(self.user_id, user.id)
         end
       end
     end
 
+    def unretweet(status)
+      send_request do
+        Twitter::REST::Request.new(rest_client, :post, "/1.1/statuses/unretweet/#{status.id}.json").perform
+      end
+        .then do |json, *_|
+          json[:retweet_count] -= 1
+          json[:retweeted] = false
+
+          Twitter::Tweet.new(json)
+        end
+        .then do |tweet|
+          status = status_repository.create(tweet)
+
+          publish(Event::Notification::Success.new('Successfully unretweeted: @%s "%s"' % [
+            tweet.user.screen_name, status.text
+          ]))
+
+          status
+        end
+    end
+
     def user_timeline(user_id)
       send_request do
         rest_client.user_timeline(user_id, count: 200)
       end.then do |statuses|
         statuses
         .select(&@mute_filter)
-        .map(&Status.method(:new))
+        .map { |tweet| status_repository.create(tweet) }
       end
     end
 
@@ -374,13 +424,7 @@ module Twterm
     end
 
     def send_request_without_catch(&block)
-      Promise.new do |resolve, reject|
-        begin
-          resolve.(block.call)
-        rescue Twitter::Error => reason
-          reject.(reason)
-        end
-      end
+      Concurrent::Promise.execute { block.call }
     end
 
     private
@@ -393,7 +437,7 @@ module Twterm
       proc do |e|
         case e
         when Twitter::Error
-          publish(Event::Notification.new(:error, "Failed to send request: #{e.message}"))
+          publish(Event::Notification::Error.new("Failed to send request: #{e.message}"))
         else
           raise e
         end

data/lib/twterm/screen.rb

@@ -1,16 +1,18 @@
 require 'twterm/event/screen/resize'
+require 'twterm/key_mapper'
 require 'twterm/subscriber'
 
 module Twterm
   class Screen
-    include Singleton
     include Subscriber
     include Curses
 
-    def initialize
+    def initialize(app, client)
+      @app, @client = app, client
+
       @screen = init_screen
       noecho
-      cbreak
+      raw
       curs_set(0)
       stdscr.keypad(true)
       start_color
@@ -20,21 +22,23 @@ module Twterm
     end
 
     def refresh
-      TabManager.instance.refresh_window
-      TabManager.instance.current_tab.refresh
+      app.tab_manager.refresh_window
+      app.tab_manager.current_tab.render
       Notifier.instance.show
     end
 
     def respond_to_key(key)
+      k = KeyMapper.instance
+
       case key
-      when ?n
-        Tweetbox.instance.compose
+      when k[:status, :compose]
+        app.tweetbox.compose
         return
-      when ?Q
-        App.instance.quit
-      when ??
-        tab = Tab::KeyAssignmentsCheatsheet.new
-        TabManager.instance.add_and_show tab
+      when k[:app, :quit], 3
+        app.quit
+      when k[:app, :cheatsheet]
+        tab = Tab::KeyAssignmentsCheatsheet.new(app, client)
+        app.tab_manager.add_and_show tab
       else
         return false
       end
@@ -51,6 +55,8 @@ module Twterm
 
     private
 
+    attr_reader :app, :client
+
     def resize(event)
       return if closed?
 
@@ -62,12 +68,12 @@ module Twterm
     end
 
     def scan
-      App.instance.reset_interruption_handler
+      app.reset_interruption_handler
 
       key = getch
 
-      return if TabManager.instance.current_tab.respond_to_key(key)
-      return if TabManager.instance.respond_to_key(key)
+      return if app.tab_manager.current_tab.respond_to_key(key)
+      return if app.tab_manager.respond_to_key(key)
       respond_to_key(key)
     end
   end

data/lib/twterm/search_query_window.rb

@@ -0,0 +1,139 @@
+require 'twterm/event/screen/resize'
+require 'twterm/subscriber'
+
+module Twterm
+  class SearchQueryWindow
+    include Curses
+    include Singleton
+    include Subscriber
+
+    class CancelInput < StandardError; end
+
+    attr_reader :last_query
+
+    def initialize
+      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 1, 0)
+      @searching_down = true
+      @str = ''
+      @last_query = ''
+
+      subscribe(Event::Screen::Resize, :resize)
+    end
+
+    def input
+      @str = ''
+      render_current_string
+
+      Curses.timeout = 10
+
+      chars = []
+
+      loop do
+        char = getch
+
+        if char.nil?
+          case chars.first
+          when 3, 27 # cancel with <C-c> / Esc
+            raise CancelInput
+          when 4 # cancel with <C-d> when query is empty
+            raise CancelInput if @str.empty?
+          when 10 # submit with <C-j>
+            @str = last_query.to_s if @str.empty?
+            break
+          when 127 # backspace
+            raise CancelInput if @str.empty?
+
+            @str.chop!
+            render_current_string
+          when 0..31
+            # ignore control codes (\x00 - \x1f)
+          else
+            next if chars.empty?
+            @str << chars
+              .map { |x| x.is_a?(String) ? x.ord : x }
+              .pack('c*')
+              .force_encoding('utf-8')
+            render_current_string
+          end
+
+          chars = []
+        else
+          chars << char
+        end
+      end
+
+      @last_query = @str unless @str.empty?
+      last_query
+    rescue CancelInput
+      @str = ''
+      clear
+    ensure
+      Curses.timeout = -1
+    end
+
+    def clear
+      window.clear
+      window.refresh
+    end
+
+    def render_last_query
+      render(last_query) unless last_query.empty?
+    end
+
+    def searching_backward!
+      @searching_forward = false
+    end
+
+    def searching_backward?
+      !@searching_forward
+    end
+
+    def searching_down!
+      @searching_down = true
+    end
+
+    def searching_down?
+      @searching_down
+    end
+
+    def searching_forward!
+      @searching_forward = true
+    end
+
+    def searching_forward?
+      @searching_forward
+    end
+
+    def searching_up!
+      @searching_down = false
+    end
+
+    def searching_up?
+      !@searching_down
+    end
+
+    private
+
+    attr_reader :window
+
+    def resize(event)
+      window.resize(1, stdscr.maxx)
+      window.move(stdscr.maxy - 1, 0)
+    end
+
+    def render(str)
+      window.clear
+      window.setpos(0, 0)
+      window.addstr("#{symbol}#{str}")
+      window.refresh
+    end
+
+    def render_current_string
+      render(@str)
+    end
+
+    def symbol
+      searching_down? ^ searching_forward? ? '?' : '/'
+    end
+  end
+end