twterm 1.0.12 → 1.1.0.beta1

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

@@ -0,0 +1,90 @@
+module Twterm
+  module Tab
+    module Users
+      module Base
+        include Tab::Base
+        include FilterableList
+        include Scrollable
+
+        attr_reader :user_ids
+
+        def drawable_item_count
+          (window.maxy - 6).div(3)
+        end
+
+        def close
+          @instance_keeper.kill
+          super
+        end
+
+        def fetch; end
+
+        def initialize
+          super()
+          @user_ids = []
+
+          @instance_keeper = Scheduler.new(300) { items.each(&:touch!) }
+        end
+
+        def items
+          users = user_ids.map { |id| User.find(id) }.reject(&:nil?)
+          filter_query.empty? ? users : users.select { |user| user.matches?(filter_query) }
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10, ?U
+            show_user
+          when 18
+            fetch
+          when ?q
+            reset_filter
+          when ?/
+            filter
+          else
+            return false
+          end
+
+          true
+        end
+
+        def title
+          'User list'
+        end
+
+        private
+
+        def show_user
+          user = current_item
+          tab = Tab::UserTab.new(user.id)
+          TabManager.instance.add_and_show(tab)
+        end
+
+        def update
+          window.setpos(2, 3)
+          window.bold { window.addstr(title) }
+
+          drawable_items.each.with_index(0) do |user, i|
+            window.with_color(:black, :magenta) do
+              window.setpos(i * 3 + 5, 3)
+              window.addch(' ')
+              window.setpos(i * 3 + 6, 3)
+              window.addch(' ')
+            end if scroller.current_item?(i)
+
+            window.setpos(i * 3 + 5, 5)
+            window.bold { window.with_color(user.color) { window.addstr(user.name) } }
+            window.addstr(" (@#{user.screen_name})")
+            window.with_color(:yellow) { window.addstr(' [protected]') } if user.protected?
+            window.with_color(:cyan) { window.addstr(' [verified]') } if user.verified?
+            window.setpos(i * 3 + 6, 7)
+            bio_chunks = user.description.gsub(/[\n\r]/, ' ').split_by_width(window.maxx - 10)
+            window.addstr(bio_chunks[0] + (bio_chunks[1].nil? ? '' : '...'))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/users/followers.rb

@@ -0,0 +1,41 @@
+module Twterm
+  module Tab
+    module Users
+      class Followers
+        include Base
+        include Dumpable
+
+        attr_reader :user_id
+
+        def dump
+          user_id
+        end
+
+        def fetch
+          Client.current.followers(user_id) do |users|
+            @user_ids.concat(users.map(&:id)).uniq!
+            refresh
+          end
+        end
+
+        def initialize(user_id)
+          super()
+
+          @user_id = user_id
+
+          fetch { move_to_top }
+        end
+
+        def title
+          user.nil? ? 'Loading...' : "@#{user.screen_name} followers"
+        end
+
+        private
+
+        def user
+          User.find(user_id)
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab/users/friends.rb

@@ -0,0 +1,41 @@
+module Twterm
+  module Tab
+    module Users
+      class Friends
+        include Base
+        include Dumpable
+
+        attr_reader :user_id
+
+        def dump
+          user_id
+        end
+
+        def fetch
+          Client.current.friends(user_id) do |users|
+            @user_ids.concat(users.map(&:id)).uniq!
+            refresh
+          end
+        end
+
+        def initialize(user_id)
+          super()
+
+          @user_id = user_id
+
+          fetch { move_to_top }
+        end
+
+        def title
+          user.nil? ? 'Loading...' : "@#{user.screen_name} following"
+        end
+
+        private
+
+        def user
+          User.find(user_id)
+        end
+      end
+    end
+  end
+end

data/lib/twterm/tab_manager.rb

@@ -66,7 +66,13 @@ module Twterm
       @index = 0
       @history = []
 
-      @window = stdscr.subwin(3, stdscr.maxx - 30, 0, 0)
+      @window = stdscr.subwin(3, stdscr.maxx, 0, 0)
+    end
+
+    def open_my_profile
+      current_user_id = Client.current.user_id
+      tab = Tab::UserTab.new(current_user_id)
+      add_and_show(tab)
     end
 
     def open_new
@@ -112,13 +118,15 @@ module Twterm
 
     def respond_to_key(key)
       case key
-      when 'h', 2, Key::LEFT
+      when ?h, 2, Key::LEFT
         show_previous
-      when 'l', 6, Key::RIGHT
+      when ?l, 6, Key::RIGHT
         show_next
-      when 'N'
+      when ?P
+        open_my_profile
+      when ?N
         open_new
-      when 'w'
+      when ?w
         close
       else
         return false

data/lib/twterm/user.rb

@@ -1,16 +1,40 @@
 module Twterm
   class User
-    attr_reader :id, :name, :screen_name, :description, :location, :website,
-                :following, :protected, :statuses_count, :friends_count,
-                :followers_count, :touched_at, :color
-    alias_method :following?, :following
+    attr_reader :color, :description, :favorites_count, :followers_count,
+                :friends_count, :id, :location, :name, :protected,
+                :screen_name, :statuses_count, :touched_at, :verified, :website
     alias_method :protected?, :protected
+    alias_method :verified?, :verified
 
     MAX_CACHED_TIME = 3600
     COLORS = [:red, :blue, :green, :cyan, :yellow, :magenta]
 
     @@instances = {}
 
+    def blocked_by?(user_id)
+      Friendship.blocking?(user_id, id)
+    end
+
+    def blocking?(user_id)
+      Friendship.blocking?(id, user_id)
+    end
+
+    def followed_by?(user_id)
+      Friendship.following?(user_id, id)
+    end
+
+    def following?(user_id)
+      Friendship.following?(id, user_id)
+    end
+
+    def following_requested?(user_id)
+      Friendship.following_requested?(id, user_id)
+    end
+
+    def following_requested_by?(user_id)
+      Friendship.following_requested?(user_id, id)
+    end
+
     def initialize(user)
       @id = user.id
       update!(user)
@@ -20,6 +44,18 @@ module Twterm
       @@instances[@id] = self
     end
 
+    def matches?(query)
+      [name, screen_name, description, website].any? { |x| x.to_s.downcase.include? query.downcase }
+    end
+
+    def muted_by?(user_id)
+      Friendship.muting?(user_id, id)
+    end
+
+    def muting?(user_id)
+      Friendship.muting?(id, user_id)
+    end
+
     def touch!
       @touched_at = Time.now
     end
@@ -30,11 +66,26 @@ module Twterm
       @description = user.description || ''
       @location = user.location.is_a?(Twitter::NullObject) ? '' : user.location
       @website = user.website
-      @following = user.following?
       @protected = user.protected?
       @statuses_count = user.statuses_count
+      @favorites_count = user.favorites_count
       @friends_count = user.friends_count
       @followers_count = user.followers_count
+      @verified = user.verified?
+
+      client_id = Client.current.user_id
+
+      if user.following?
+        Friendship.follow(client_id, user.id)
+      else
+        Friendship.unfollow(client_id, user.id)
+      end
+
+      if user.follow_request_sent?
+        Friendship.following_requested(client_id, user.id)
+      else
+        Friendship.following_not_requested(client_id, user.id)
+      end
 
       History::ScreenName.instance.add(user.screen_name)
 
@@ -50,10 +101,14 @@ module Twterm
     end
 
     def self.find_or_fetch(id)
-      instance = find(id)
-      (yield(instance) && return) if instance
+      Promise.new do |resolve, reject|
+        instance = find(id)
+        (resolve.(instance) && next) if instance
 
-      Client.current.show_user(id) { |user| yield user }
+        Client.current.show_user(id).then do |user|
+          resolve.(user)
+        end
+      end
     end
 
     def self.cleanup
@@ -66,6 +121,10 @@ module Twterm
       @@instances = user_ids.zip(users).to_h
     end
 
+    def self.ids
+      @@instances.keys
+    end
+
     def self.new(user)
       instance = find(user.id)
       instance.nil? ? super : instance.update!(user)

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.12'
+  VERSION = '1.1.0.beta1'
 end

data/spec/twterm/friendship_spec.rb

@@ -0,0 +1,104 @@
+describe Twterm::Friendship do
+  describe '.already_looked_up?' do
+    before do
+      described_class.looked_up!(1)
+    end
+
+    it 'returns true when the user is already looked up' do
+      expect(described_class.already_looked_up?(1)).to be true
+    end
+
+    it 'returns false when the user is not looked up yet' do
+      expect(described_class.already_looked_up?(2)).to be false
+    end
+  end
+
+  describe '.blocking?' do
+    before do
+      described_class.block(1, 2)
+    end
+
+    it 'returns true when user 1 blocks user 2' do
+      expect(described_class.blocking?(1, 2)).to be true
+    end
+
+    it 'returns false when user 1 does not block user 2' do
+      expect(described_class.blocking?(2, 1)).to be false
+    end
+  end
+
+  describe '.following?' do
+    before do
+      described_class.follow(1, 2)
+    end
+
+    it 'returns true when user 1 follows user 2' do
+      expect(described_class.following?(1, 2)).to be true
+    end
+
+    it 'returns false when user 1 does not follow user 2' do
+      expect(described_class.following?(2, 1)).to be false
+    end
+  end
+
+  describe '.following_requested?' do
+    before do
+      described_class.following_requested(1, 2)
+    end
+
+    it 'returns true when user 1 have sent following request to user 2' do
+      expect(described_class.following_requested?(1, 2)).to be true
+    end
+
+    it 'returns false when user 1 have not sent following request to user 2' do
+      expect(described_class.following_requested?(2, 1)).to be false
+    end
+  end
+
+  describe '.muting?' do
+    before do
+      described_class.mute(1, 2)
+    end
+
+    it 'returns true when user 1 mutes user 2' do
+      expect(described_class.muting?(1, 2)).to be true
+    end
+
+    it 'returns false when user 1 does not mute user 2' do
+      expect(described_class.muting?(2, 1)).to be false
+    end
+  end
+
+  describe '.unblock' do
+    before do
+      described_class.block(1, 2)
+    end
+
+    it 'works' do
+      described_class.unblock(1, 2)
+      expect(described_class.blocking?(1, 2)).to be false
+    end
+  end
+
+  describe '.unfollow' do
+    before do
+      described_class.follow(1, 2)
+    end
+
+    it 'works' do
+      described_class.unfollow(1, 2)
+      expect(described_class.following?(1, 2)).to be false
+    end
+  end
+
+  describe '.unmute' do
+    before do
+      described_class.mute(1, 2)
+    end
+
+    it 'works' do
+      described_class.unmute(1, 2)
+      expect(described_class.muting?(1, 2)).to be false
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -164,6 +164,7 @@ files:
 - lib/twterm/extensions/string.rb
 - lib/twterm/filter_query_window.rb
 - lib/twterm/filterable_list.rb
+- lib/twterm/friendship.rb
 - lib/twterm/history/base.rb
 - lib/twterm/history/hashtag.rb
 - lib/twterm/history/screen_name.rb
@@ -172,34 +173,40 @@ files:
 - lib/twterm/notification/error.rb
 - lib/twterm/notification/message.rb
 - lib/twterm/notifier.rb
+- lib/twterm/promise.rb
 - lib/twterm/scheduler.rb
 - lib/twterm/screen.rb
 - lib/twterm/status.rb
 - lib/twterm/tab/base.rb
-- lib/twterm/tab/conversation_tab.rb
 - lib/twterm/tab/dumpable.rb
 - lib/twterm/tab/exceptions.rb
 - lib/twterm/tab/favorites.rb
 - lib/twterm/tab/key_assignments_cheatsheet.rb
-- lib/twterm/tab/list_tab.rb
-- lib/twterm/tab/mentions_tab.rb
 - 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
-- lib/twterm/tab/timeline_tab.rb
+- lib/twterm/tab/statuses/base.rb
+- lib/twterm/tab/statuses/conversation.rb
+- lib/twterm/tab/statuses/favorites.rb
+- lib/twterm/tab/statuses/home.rb
+- lib/twterm/tab/statuses/list_timeline.rb
+- lib/twterm/tab/statuses/mentions.rb
+- lib/twterm/tab/statuses/search.rb
+- lib/twterm/tab/statuses/user_timeline.rb
 - lib/twterm/tab/user_tab.rb
+- lib/twterm/tab/users/base.rb
+- lib/twterm/tab/users/followers.rb
+- lib/twterm/tab/users/friends.rb
 - lib/twterm/tab_manager.rb
 - lib/twterm/tweetbox.rb
 - lib/twterm/user.rb
-- lib/twterm/user_window.rb
 - lib/twterm/version.rb
 - spec/resources/config
 - spec/spec_helper.rb
 - spec/twterm/config_spec.rb
+- spec/twterm/friendship_spec.rb
 - twterm.gemspec
 homepage: http://twterm.ryota-ka.me/
 licenses:
@@ -216,9 +223,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7