twterm 1.3.0 → 2.0.0.beta1

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

@@ -13,18 +13,21 @@ module Twterm
         end
 
         def fetch
-          Client.current.friends(user_id) do |users|
+          client.friends(user_id) do |users|
             @user_ids.concat(users.map(&:id)).uniq!
-            refresh
+            render
           end
         end
 
-        def initialize(user_id)
-          super()
+        def initialize(app, client, user_id)
+          super(app, client)
 
           @user_id = user_id
 
-          fetch { move_to_top }
+          fetch.then do
+            initially_loaded!
+            move_to_top
+          end
         end
 
         def title
@@ -34,7 +37,7 @@ module Twterm
         private
 
         def user
-          User.find(user_id)
+          app.user_repository.find(user_id)
         end
       end
     end

data/lib/twterm/tab_manager.rb

@@ -2,10 +2,10 @@ require 'twterm/event/screen/resize'
 require 'twterm/publisher'
 require 'twterm/subscriber'
 require 'twterm/utils'
+require 'twterm/view'
 
 module Twterm
   class TabManager
-    include Singleton
     include Curses
     include Publisher
     include Subscriber
@@ -31,7 +31,7 @@ module Twterm
     def add_and_show(tab)
       result = add(tab)
       @index = @tabs.count - 1 if result
-      current_tab.refresh
+      current_tab.render
       refresh_window
       result
     end
@@ -42,10 +42,10 @@ module Twterm
       @history.delete_if { |n| n == @index }
       @history = @history.map { |i| i > @index ? i - 1 : i }
       @index = @history.first
-      current_tab.refresh
+      current_tab.render
       refresh_window
     rescue Tab::NotClosableError
-      publish(Event::Notification.new(:error, 'this tab cannot be closed'))
+      publish(Event::Notification::Warning.new('this tab cannot be closed'))
     end
 
     def current_tab
@@ -69,7 +69,9 @@ module Twterm
       end
     end
 
-    def initialize
+    def initialize(app, client)
+      @app, @client = app, client
+
       @tabs = []
       @index = 0
       @history = []
@@ -80,71 +82,83 @@ module Twterm
     end
 
     def open_my_profile
-      current_user_id = Client.current.user_id
-      tab = Tab::UserTab.new(current_user_id)
+      current_user_id = client.user_id
+      tab = Tab::UserTab.new(app, client, current_user_id)
       add_and_show(tab)
     end
 
     def open_new
-      tab = Tab::New::Start.new
+      tab = Tab::New::Start.new(app, client)
       add_and_show(tab)
     end
 
     def recover_tabs
       unless File.exist? DUMPED_TABS_FILE
-        tab = Tab::KeyAssignmentsCheatsheet.new
+        tab = Tab::KeyAssignmentsCheatsheet.new(app, client)
         add(tab)
         return
       end
 
       data = YAML.load(File.read(DUMPED_TABS_FILE))
       data.each do |klass, title, arg|
-        tab = klass.recover(title, arg)
+        tab = klass.recover(app, client, title, arg)
         add(tab)
       end
     rescue
-      publish(Event::Notification.new(:error, 'Failed to recover tabs'))
+      publish(Event::Notification::Error.new('Failed to recover tabs'))
     end
 
     def refresh_window
       @window.clear
-      current_tab_id = current_tab.object_id
+      view.render
+      @window.refresh
+    end
 
-      @window.setpos(1, 1)
-      @window.addstr('|  ')
-      @tabs.each do |tab|
-        if tab.object_id == current_tab_id
-          @window.bold do
-            @window.addstr(tab.title)
-          end
-        else
-          @window.addstr(tab.title)
-        end
-        @window.addstr('  |  ')
-      end
+    def view
+      wss = Image.string('  ')
+      pipe = Image.string('|')
 
-      @window.refresh
+      image = @tabs
+        .map { |t| [t, Image.string(t.title)] }
+        .map { |t, r| t.equal?(current_tab) ? !r : r }
+        .reduce(pipe) { |acc, x| acc - wss - x - wss - pipe }
+
+      View.new(@window, image).at(1, 1)
     end
 
     def respond_to_key(key)
+      k = KeyMapper.instance
+
       case key
-      when ?1..?9
-        @index = key.to_i - 1 if @tabs.count >= key.to_i
-        current_tab.refresh
-        refresh_window
-      when ?0
-        @index = @tabs.count - 1
-        current_tab.refresh
-        refresh_window
-      when ?h, 2, Key::LEFT
+      when k[:tab, :'1st']
+        show_nth_tab(0)
+      when k[:tab, :'2nd']
+        show_nth_tab(1)
+      when k[:tab, :'3rd']
+        show_nth_tab(2)
+      when k[:tab, :'4th']
+        show_nth_tab(3)
+      when k[:tab, :'5th']
+        show_nth_tab(4)
+      when k[:tab, :'6th']
+        show_nth_tab(5)
+      when k[:tab, :'7th']
+        show_nth_tab(6)
+      when k[:tab, :'8th']
+        show_nth_tab(7)
+      when k[:tab, :'9th']
+        show_nth_tab(8)
+      when k[:tab, :last]
+        show_nth_tab(@tabs.count - 1)
+      when k[:general, :left], Curses::Key::LEFT
         show_previous
-      when ?l, 6, Key::RIGHT
+      when k[:general, :right], Curses::Key::RIGHT
         show_next
-      when ?P
+      when k[:app, :me]
         open_my_profile
-      when ?N
+      when k[:tab, :new]
         open_new
-      when ?w
+      when k[:tab, :close]
         close
       else
         return false
@@ -154,13 +168,21 @@ module Twterm
 
     def show_next
       @index = (@index + 1) % @tabs.count
-      current_tab.refresh
+      current_tab.render
+      refresh_window
+    end
+
+    def show_nth_tab(n)
+      return unless n < @tabs.count
+
+      @index = n
+      current_tab.render
       refresh_window
     end
 
     def show_previous
       @index = (@index - 1) % @tabs.count
-      current_tab.refresh
+      current_tab.render
       refresh_window
     end
 
@@ -171,6 +193,8 @@ module Twterm
 
     private
 
+    attr_reader :app, :client
+
     def resize(event)
       @window.resize(3, stdscr.maxx)
       @window.move(0, 0)

data/lib/twterm/tweetbox.rb

@@ -1,4 +1,5 @@
 require 'twterm/publisher'
+require 'twterm/event/notification/error'
 
 module Twterm
   class Tweetbox
@@ -6,24 +7,28 @@ module Twterm
     class InvalidCharactersError < StandardError; end
     class TextTooLongError < StandardError; end
 
-    include Singleton
     include Readline
     include Curses
     include Publisher
 
+    def initialize(app, client)
+      @app, @client = app, client
+    end
+
     def compose(in_reply_to = nil)
       @text = ''
 
-      if in_reply_to.is_a? Status
-        @in_reply_to = in_reply_to
+      @in_reply_to, screen_name =
+        if in_reply_to.is_a?(Status)
+          [in_reply_to, app.user_repository.find(in_reply_to.user_id).screen_name]
       else
-        @in_reply_to = nil
+        [nil, nil]
       end
 
       resetter = proc do
         reset_prog_mode
         sleep 0.1
-        Screen.instance.refresh
+        app.screen.refresh
       end
 
       thread = Thread.new do
@@ -32,14 +37,14 @@ module Twterm
         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}\""
+          puts "\nReply to @#{screen_name}'s tweet: \"#{in_reply_to.text}\""
         end
 
-        CompletionManager.instance.set_default_mode!
+        app.completion_manager.set_default_mode!
 
         loop do
           loop do
-            msg = in_reply_to.nil? || !text.empty? ? '> ' : "> @#{in_reply_to.user.screen_name} "
+            msg = in_reply_to.nil? || !text.empty? ? '> ' : "> @#{screen_name} "
             line = (readline(msg, true) || '').strip
             break if line.empty?
 
@@ -72,7 +77,7 @@ module Twterm
         post
       end
 
-      App.instance.register_interruption_handler do
+      app.register_interruption_handler do
         thread.kill
         clear
         puts "\nCanceled"
@@ -84,7 +89,7 @@ module Twterm
 
     private
 
-    attr_reader :in_reply_to
+    attr_reader :app, :client, :in_reply_to
 
     def clear
       @text = ''
@@ -93,13 +98,13 @@ module Twterm
 
     def post
       validate_text!
-      Client.current.post(text, in_reply_to)
+      client.post(text, in_reply_to)
     rescue EmptyTextError
       # do nothing
     rescue InvalidCharactersError
-      publish(Event::Notification.new(:error, 'Text contains invalid characters'))
+      publish(Event::Notification::Error.new('Text contains invalid characters'))
     rescue TextTooLongError
-      publish(Event::Notification.new(:error, "Text is too long (#{text_length} / 140 characters)"))
+      publish(Event::Notification::Error.new("Text is too long (#{text_length} / 140 characters)"))
     ensure
       clear
     end

data/lib/twterm/uri_opener.rb

@@ -3,6 +3,7 @@ require 'singleton'
 require 'twterm/event/open_uri'
 require 'twterm/publisher'
 require 'twterm/subscriber'
+require 'twterm/event/notification/warning'
 
 module Twterm
   class URIOpener
@@ -19,7 +20,7 @@ module Twterm
     def open(uri)
       Launchy.open(uri)
     rescue Launchy::CommandNotFoundError
-      publish(Event::Notification.new(:error, 'Browser not found'))
+      publish(Event::Notification::Warning.new('Browser not found'))
     end
   end
 end

data/lib/twterm/user.rb

@@ -2,70 +2,22 @@ module Twterm
   class User
     attr_reader :color, :description, :favorites_count, :followers_count,
                 :friends_count, :id, :location, :name, :protected,
-                :screen_name, :statuses_count, :touched_at, :verified, :website
+                :screen_name, :statuses_count, :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)
       @color = COLORS[@id % 6]
-      touch!
-
-      @@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
 
     def update!(user)
-      return self if recently_updated?
-
       @name = user.name
       @screen_name = user.screen_name
-      @description = user.description || ''
+      @description = user.description.is_a?(Twitter::NullObject) ? '' : user.description
       @location = user.location.is_a?(Twitter::NullObject) ? '' : user.location
       @website = user.website
       @protected = user.protected?
@@ -75,67 +27,7 @@ module Twterm
       @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
-
-      @updated_at = Time.now
-
       self
     end
-
-    def self.all
-      @@instances.values
-    end
-
-    def self.find(id)
-      @@instances[id]
-    end
-
-    def self.find_or_fetch(id)
-      Promise.new do |resolve, reject|
-        instance = find(id)
-        (resolve.(instance) && next) if instance
-
-        Client.current.show_user(id).then do |user|
-          resolve.(user)
-        end
-      end
-    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 = Hash[user_ids.zip(users)]
-    end
-
-    def self.ids
-      @@instances.keys
-    end
-
-    def self.new(user)
-      instance = find(user.id)
-      instance.nil? ? super : instance.update!(user)
-    end
-
-    private
-
-    def recently_updated?
-      !@updated_at.nil? && @updated_at + 60 > Time.now
-    end
   end
 end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.3.0'
+  VERSION = '2.0.0.beta1'
 end

data/lib/twterm/view.rb

@@ -0,0 +1,30 @@
+module Twterm
+  class View
+    def initialize(window, image)
+      @window, @image = window, image
+    end
+
+    def at(line, column)
+      @line, @column = line, column
+
+      self
+    end
+
+    def render
+      @image.at(line, column).render(@window)
+      @window.refresh
+
+      self
+    end
+
+    private
+
+    def column
+      @column || 0
+    end
+
+    def line
+      @line || 0
+    end
+  end
+end

data/lib/twterm.rb

@@ -19,20 +19,14 @@ require 'twterm/client'
 require 'twterm/color_manager'
 require 'twterm/completion_mamanger'
 require 'twterm/config'
+require 'twterm/extensions/array'
 require 'twterm/extensions/curses/window'
 require 'twterm/extensions/enumerator/lazy'
-require 'twterm/extensions/integer'
 require 'twterm/extensions/string'
-require 'twterm/filter_query_window'
-require 'twterm/filterable_list'
+require 'twterm/search_query_window'
 require 'twterm/friendship'
-require 'twterm/history/base'
-require 'twterm/history/savable'
-require 'twterm/history/hashtag'
-require 'twterm/history/screen_name'
 require 'twterm/list'
 require 'twterm/notifier'
-require 'twterm/promise'
 require 'twterm/screen'
 require 'twterm/scheduler'
 require 'twterm/status'
@@ -64,6 +58,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.3.0'
+    REQUIRE_VERSION = '1.1.1'
   end
 end

data/spec/fixtures/status.json

@@ -0,0 +1,107 @@
+{
+  "coordinates": null,
+  "favorited": false,
+  "truncated": false,
+  "created_at": "Wed Jun 06 20:07:10 +0000 2012",
+  "id_str": "210462857140252672",
+  "entities": {
+    "urls": [
+      {
+        "expanded_url": "/terms/display-guidelines",
+        "url": "https://t.co/Ed4omjYs",
+        "indices": [
+          76,
+          97
+        ],
+        "display_url": "dev.twitter.com/terms/display-\u2026"
+      }
+    ],
+    "hashtags": [
+      {
+        "text": "Twitterbird",
+        "indices": [
+          19,
+          31
+        ]
+      }
+    ],
+    "user_mentions": [
+
+    ]
+  },
+  "in_reply_to_user_id_str": null,
+  "contributors": [
+    14927800
+  ],
+  "text": "Along with our new #Twitterbird, we've also updated our Display Guidelines: https://t.co/Ed4omjYs  ^JC",
+  "retweet_count": 66,
+  "in_reply_to_status_id_str": null,
+  "id": 210462857140252672,
+  "geo": null,
+  "retweeted": true,
+  "possibly_sensitive": false,
+  "in_reply_to_user_id": null,
+  "place": null,
+  "user": {
+    "profile_sidebar_fill_color": "DDEEF6",
+    "profile_sidebar_border_color": "C0DEED",
+    "profile_background_tile": false,
+    "name": "Twitter API",
+    "profile_image_url": "http://a0.twimg.com/profile_images/2284174872/7df3h38zabcvjylnyfe3_normal.png",
+    "created_at": "Wed May 23 06:01:13 +0000 2007",
+    "location": "San Francisco, CA",
+    "follow_request_sent": false,
+    "profile_link_color": "0084B4",
+    "is_translator": false,
+    "id_str": "6253282",
+    "entities": {
+      "url": {
+        "urls": [
+          {
+            "expanded_url": null,
+            "url": "",
+            "indices": [
+              0,
+              22
+            ]
+          }
+        ]
+      },
+      "description": {
+        "urls": [
+
+        ]
+      }
+    },
+    "default_profile": true,
+    "contributors_enabled": true,
+    "favourites_count": 24,
+    "url": "",
+    "profile_image_url_https": "https://si0.twimg.com/profile_images/2284174872/7df3h38zabcvjylnyfe3_normal.png",
+    "utc_offset": -28800,
+    "id": 6253282,
+    "profile_use_background_image": true,
+    "listed_count": 10774,
+    "profile_text_color": "333333",
+    "lang": "en",
+    "followers_count": 1212963,
+    "protected": false,
+    "notifications": null,
+    "profile_background_image_url_https": "https://si0.twimg.com/images/themes/theme1/bg.png",
+    "profile_background_color": "C0DEED",
+    "verified": true,
+    "geo_enabled": true,
+    "time_zone": "Pacific Time (US & Canada)",
+    "description": "The Real Twitter API. I tweet about API changes, service issues and happily answer questions about Twitter and our API. Don't get an answer? It's on my website.",
+    "default_profile_image": false,
+    "profile_background_image_url": "http://a0.twimg.com/images/themes/theme1/bg.png",
+    "statuses_count": 3333,
+    "friends_count": 31,
+    "following": true,
+    "show_all_inline_media": false,
+    "screen_name": "twitterapi"
+  },
+  "in_reply_to_screen_name": null,
+  "source": "web",
+  "in_reply_to_status_id": null
+}