twterm 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 484c724ac71bd898288537ded6bdb4ba7abe4560
-  data.tar.gz: ed536081055851cca20e82ae28fde3b0a1a7ab82
+  metadata.gz: a822edd0e5719ca957ab183b1859bd6ec01113ca
+  data.tar.gz: ecec2ab95f599a575226d0a3239f1b93ef63a4f9
 SHA512:
-  metadata.gz: e6d52bbeaf7b332a561b3faecb0a9ddcef375bcf2ffbb0ca2eeaf1c4f6dcc1e0b0a7e252241a0ff6e35f34790ef687ea267183d102e2e822d1293d38db9a26cc
-  data.tar.gz: 7b28a087c4ff51c27f48276fda91b2e3376110dbac0ec85aafc5cdf5138b5a7a782d6330af9092736b6d061f6d472c741b322722c1e47dfa4bdee6172d08f976
+  metadata.gz: 1608685c830f8f614bc6549b498c271b7851deb05ee2e7054b62857ff89dae64f0d17f9f3d1fc22338493644aa35c9d4beb78c7ee2f6054eecd939108255d216
+  data.tar.gz: f188471c3974d031c257b2a6fd9169926d1350b663d4b71ce4ee180d20e6d63a2a61657c1755e019c01ca38f1402493d386b53cb4e4e90b752051969e184ecf0

data/lib/twterm.rb

@@ -17,7 +17,7 @@ require 'twterm/app'
 require 'twterm/auth'
 require 'twterm/client'
 require 'twterm/color_manager'
-require 'twterm/completion_mamanger'
+require 'twterm/completion_manager'
 require 'twterm/config'
 require 'twterm/extensions/array'
 require 'twterm/extensions/curses/window'

data/lib/twterm/app.rb

@@ -1,6 +1,6 @@
 require 'curses'
 
-require 'twterm/completion_mamanger'
+require 'twterm/completion_manager'
 require 'twterm/direct_message_composer'
 require 'twterm/event/screen/resize'
 require 'twterm/repository/direct_message_repository'
@@ -22,7 +22,7 @@ module Twterm
     DATA_DIR = "#{ENV['HOME']}/.twterm".freeze
 
     def completion_manager
-      @completion_mamanger ||= CompletionManager.new(self)
+      @completion_manager ||= CompletionManager.new(self)
     end
 
     def direct_message_composer

data/lib/twterm/completer/abstract_completer.rb

@@ -0,0 +1,25 @@
+module Twterm
+  module Completer
+    class AbstractCompleter
+      def initialize(app)
+        @app = app
+      end
+
+      def basic_word_break_characters
+        " \t\n\"\\'`$><=;|&{("
+      end
+
+      def complete(_query)
+        raise NotImplementedError, '`complete` method must be implemented'
+      end
+
+      def completion_append_character
+        ' '
+      end
+
+      private
+
+      attr_reader :app
+    end
+  end
+end

data/lib/twterm/completer/default_completer.rb

@@ -0,0 +1,21 @@
+require 'twterm/completer/abstract_completer'
+
+module Twterm
+  module Completer
+    class DefaultCompleter < AbstractCompleter
+      def complete(query)
+        if query.start_with?('#')
+          app.hashtag_repository.all
+          .map { |tag| "##{tag}" }
+          .select { |tag| tag.start_with?(query) }
+        elsif query.start_with?('@')
+          app.user_repository.all
+          .map { |user| "@#{user.screen_name}" }
+          .select { |name| name.start_with?(query) }
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/twterm/completer/screen_name_completer.rb

@@ -0,0 +1,17 @@
+require 'twterm/completer/abstract_completer'
+
+module Twterm
+  module Completer
+    class ScreenNameCompleter < AbstractCompleter
+      def complete(query)
+        app.user_repository.all
+          .map { |user| user.screen_name }
+          .select { |name| name.start_with?(query) }
+      end
+
+      def completion_append_character
+        ''
+      end
+    end
+  end
+end

data/lib/twterm/completer/search_query_completer.rb

@@ -0,0 +1,180 @@
+require 'twterm/completer/abstract_completer'
+
+module Twterm
+  module Completer
+    class SearchQueryCompleter < AbstractCompleter
+      def completion_append_character
+        ''
+      end
+
+      def complete(q)
+        possible_operators = possible_operators_for_query(q)
+
+        if q.empty?
+          operators
+        elsif q.start_with?('#')
+          app.hashtag_repository.all
+          .map { |tag| "##{tag} " }
+          .select { |tag| tag.start_with?(q) }
+        elsif q.start_with?('@')
+          app.user_repository.all
+          .map { |user| "@#{user.screen_name} " }
+          .select { |name| name.start_with?(q) }
+        elsif !possible_operators.empty?
+          possible_operators
+        elsif q.start_with?('-from:')
+          app.user_repository.all
+            .map { |user| "-from:#{user.screen_name} " }
+            .select { |name| name.start_with?(q) }
+        elsif q.start_with?('from:')
+          app.user_repository.all
+            .map { |user| "from:#{user.screen_name} " }
+            .select { |name| name.start_with?(q) }
+        elsif q.start_with?('-to:')
+          app.user_repository.all
+            .map { |user| "-to:#{user.screen_name} " }
+            .select { |name| name.start_with?(q) }
+        elsif q.start_with?('to:')
+          app.user_repository.all
+            .map { |user| "to:#{user.screen_name} " }
+            .select { |name| name.start_with?(q) }
+        elsif q.start_with?('filter:')
+          filters.map { |f| "filter:#{f} " }.select { |f| f.start_with?(q) }
+        elsif q.start_with?('-filter:')
+          filters.map { |f| "-filter:#{f} " }.select { |f| f.start_with?(q) }
+        elsif q.start_with?('lang:')
+          langs.map { |l| "lang:#{l} " }.select { |l| l.start_with?(q) }
+        elsif q.start_with?('-lang:')
+          langs.map { |l| "-lang:#{l} " }.select { |l| l.start_with?(q) }
+        elsif q.start_with?('list:')
+          app.list_repository.all
+            .map { |list| "list:#{list.full_name.sub('@', '')} " }
+            .select { |name| name.start_with?(q) }
+        else
+          []
+        end
+      end
+
+      private
+
+      def filters
+        [
+          'images',
+          'links',
+          'media',
+          'native_video',
+          'periscope',
+          'retweets',
+          'safe',
+          'twimg',
+          'vine',
+        ]
+      end
+
+      def langs
+        [
+          'am',
+          'ar',
+          'bg',
+          'bn',
+          'bo',
+          'ckb',
+          'da',
+          'de',
+          'dv',
+          'el',
+          'en',
+          'es',
+          'et',
+          'fa',
+          'fi',
+          'fr',
+          'gu',
+          'he',
+          'hi',
+          'ht',
+          'hu',
+          'hy',
+          'id',
+          'is',
+          'it',
+          'ja',
+          'ka',
+          'km',
+          'kn',
+          'ko',
+          'lo',
+          'lt',
+          'lv',
+          'ml',
+          'mr',
+          'my',
+          'ne',
+          'nl',
+          'no',
+          'or',
+          'pa',
+          'pl',
+          'ps',
+          'pt',
+          'ro',
+          'ru',
+          'sd',
+          'si',
+          'sl',
+          'sr',
+          'sv',
+          'ta',
+          'te',
+          'th',
+          'tl',
+          'tr',
+          'ug',
+          'ur',
+          'vi',
+          'zh',
+        ]
+      end
+
+      def nullary_operators
+        [
+          ':(',
+          ':)',
+          '?',
+          'OR',
+        ]
+      end
+
+      def operators
+        nullary_operators + unary_operators
+      end
+
+      def possible_operators_for_query(q)
+        (nullary_operators.map { |o| "#{o} " } + unary_operators).select { |x| x.start_with?(q) && x != q }
+      end
+
+      def substrs(str)
+        0.upto(str.length - 1).map { |n| str.slice(0...n) }
+      end
+
+      def unary_operators
+        [
+          '-filter:',
+          '-from:',
+          '-lang:',
+          '-to:',
+          '-url:',
+          '@',
+          'filter:',
+          'from:',
+          'lang:',
+          'list:',
+          'since:',
+          'to:',
+          'until:',
+          'url:',
+        ]
+      end
+    end
+  end
+end

data/lib/twterm/completion_manager.rb

@@ -0,0 +1,37 @@
+require 'twterm/completer/default_completer'
+require 'twterm/completer/screen_name_completer'
+require 'twterm/completer/search_query_completer'
+
+module Twterm
+  class CompletionManager
+    def initialize(app)
+      @app = app
+
+      Readline.completion_case_fold = false
+    end
+
+    def set_default_mode!
+      complete_with!(Completer::DefaultCompleter.new(app))
+    end
+
+    def set_screen_name_mode!
+      complete_with!(Completer::ScreenNameCompleter.new(app))
+    end
+
+    def set_search_mode!
+      complete_with!(Completer::SearchQueryCompleter.new(app))
+    end
+
+    private
+
+    attr_reader :app
+
+    def complete_with!(completer)
+      Readline.basic_word_break_characters = completer.basic_word_break_characters
+      Readline.completion_append_character = completer.completion_append_character
+      Readline.completion_proc = -> q { completer.complete(q) }
+
+      self
+    end
+  end
+end

data/lib/twterm/key_mapper.rb

@@ -74,9 +74,15 @@ module Twterm
       exit
     end
 
+    def complete_missing_commands!(dict)
+      completed_dict = default_mappings.merge(dict.map { |k, v| [k, v.to_h] }.to_h) { |_, l, r| l.merge(r.to_h) }
+
+      assign_mappings!(completed_dict)
+      save!(completed_dict)
+    end
+
     def create_default_dict_file!
-      dict = TOML.dump(default_mappings).gsub("\n[", "\n\n[")
-      File.open(dict_file_path, 'w', 0644) { |f| f.write(dict) }
+      save!(default_mappings)
     end
 
     def default_mappings
@@ -122,6 +128,12 @@ Press any key to continue
       getc
     ensure
       assign_mappings!(dict || default_mappings)
+      complete_missing_commands!(dict) unless dict.nil?
+    end
+
+    def save!(mappings)
+      dict = TOML.dump(mappings).gsub("\n[", "\n\n[")
+      File.open(dict_file_path, 'w', 0644) { |f| f.write(dict) }
     end
   end
 end

data/lib/twterm/key_mapper/abstract_key_mapper.rb

@@ -5,14 +5,17 @@ require 'twterm/key_mapper/no_such_key'
 module Twterm
   class KeyMapper
     class AbstractKeyMapper
-      def initialize(mappings)
+      def initialize(dict)
         commands = self.class.commands
 
-        mappings.keys.each do |k|
+        dict ||= {}
+
+        dict.keys.each do |k|
           raise NoSuchCommand.new(self.class.category, k) unless commands.include?(k)
         end
 
-        @mappings = Hash[mappings.map { |k, v| [k, translate(v)] }]
+        @mappings = Hash[dict.map { |k, v| [k, translate(v)] }]
+        @dict = dict
       end
 
       def [](key)
@@ -20,6 +23,10 @@ module Twterm
         @mappings[key]
       end
 
+      def to_h
+        @dict
+      end
+
       private
 
       def translate(key)

data/lib/twterm/key_mapper/status_key_mapper.rb

@@ -7,6 +7,7 @@ class Twterm::KeyMapper::StatusKeyMapper < Twterm::KeyMapper::AbstractKeyMapper
     destroy: 'D',
     like: 'F',
     open_link: 'o',
+    quote: 'Q',
     reply: 'r',
     retweet: 'R',
     user: 'U',

data/lib/twterm/repository/abstract_entity_repository.rb

@@ -5,6 +5,10 @@ require 'twterm/repository/abstract_repository'
 module Twterm
   module Repository
     class AbstractEntityRepository < AbstractRepository
+      def all
+        repository.values
+      end
+
       def create(*args)
         invoke_callbacks(:before_create, *args)
 

data/lib/twterm/repository/status_repository.rb

@@ -5,11 +5,8 @@ require 'twterm/status'
 module Twterm
   module Repository
     class StatusRepository < AbstractExpirableEntityRepository
-      def all
-        repository.values
-      end
-
-      def create(tweet, is_retweeted_status = false)
+      def create(tweet, is_referred_status = false)
+        create(tweet.quoted_status, true) unless tweet.quoted_status.is_a?(Twitter::NullObject)
         create(tweet.retweeted_status, true) unless tweet.retweeted_status.is_a?(Twitter::NullObject)
         super
       end
@@ -23,10 +20,15 @@ module Twterm
         status = super
 
         touch(status.retweeted_status_id) if !status.nil? && status.retweet?
+        touch(status.quoted_status_id) if !status.nil? && status.quote?
 
         status
       end
 
+      def find_quotes_for(id)
+        repository.values.select { |s| s.quoted_status_id == id }
+      end
+
       def find_replies_for(id)
         repository.values.select { |s| s.in_reply_to_status_id == id }
       end

data/lib/twterm/repository/user_repository.rb

@@ -5,10 +5,6 @@ require 'twterm/user'
 module Twterm
   module Repository
     class UserRepository < AbstractExpirableEntityRepository
-      def all
-        repository.values
-      end
-
       def ids
         repository.keys
       end