twterm 2.0.1 → 2.1.0

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/spec/fixtures/list.json

@@ -0,0 +1,69 @@
+{
+   "created_at":"Fri Nov 04 21:22:36 +0000 2011",
+   "slug":"goonies",
+   "name":"Goonies",
+   "full_name":"@kurrik\/goonies",
+   "description":"For life",
+   "mode":"public",
+   "following":false,
+   "user":{
+      "geo_enabled":true,
+      "profile_background_image_url_https":"https:\/\/si0.twimg.com\/profile_background_images\/342542280\/background7.png",
+      "profile_background_color":"8fc1ff",
+      "protected":false,
+      "default_profile":false,
+      "listed_count":127,
+      "profile_background_tile":true,
+      "created_at":"Thu Jul 19 15:58:07 +0000 2007",
+      "friends_count":291,
+      "name":"Arne Roomann-Kurrik",
+      "profile_sidebar_fill_color":"c7e0ff",
+      "notifications":false,
+      "utc_offset":-28800,
+      "profile_image_url_https":"https:\/\/si0.twimg.com\/profile_images\/24229162\/arne001_normal.jpg",
+      "description":"Developer Advocate at Twitter, practitioner of dark sandwich arts. ",
+      "display_url":"roomanna.com",
+      "following":false,
+      "verified":false,
+      "favourites_count":190,
+      "profile_sidebar_border_color":"6baeff",
+      "followers_count":1705,
+      "profile_image_url":"http:\/\/a2.twimg.com\/profile_images\/24229162\/arne001_normal.jpg",
+      "default_profile_image":false,
+      "contributors_enabled":false,
+      "deactivated_bit":false,
+      "statuses_count":1935,
+      "profile_use_background_image":true,
+      "location":"Scan Francesco",
+      "id_str":"7588892",
+      "show_all_inline_media":false,
+      "profile_text_color":"000000",
+      "screen_name":"kurrik",
+      "follow_request_sent":false,
+      "profile_background_image_url":"http:\/\/a2.twimg.com\/profile_background_images\/342542280\/background7.png",
+      "url":"http:\/\/t.co\/SSiVavc4",
+      "expanded_url":"http:\/\/roomanna.com",
+      "is_translator":false,
+      "time_zone":"Pacific Time (US & Canada)",
+      "profile_link_color":"0084B4",
+      "id":7588892,
+      "entities":{
+         "urls":[
+
+         ],
+         "user_mentions":[
+
+         ],
+         "hashtags":[
+
+         ]
+      },
+      "suspended":false,
+      "lang":"en"
+   },
+   "member_count":0,
+   "id_str":"58300198",
+   "subscriber_count":0,
+   "id":58300198,
+   "uri":"\/kurrik\/goonies"
+}

data/spec/twterm/completer/search_query_completer_spec.rb

@@ -0,0 +1,231 @@
+require 'twterm/app'
+require 'twterm/completer/search_query_completer'
+
+RSpec.describe Twterm::Completer::SearchQueryCompleter do
+  let(:app) { Twterm::App.new }
+  let(:completer) { described_class.new(app) }
+
+  describe '#complete' do
+    subject { completer.complete(query) }
+
+    context 'when the query is empty' do
+      let(:query) { '' }
+
+      it { is_expected.to contain_exactly(
+           '@',
+           'OR',
+           ':)', ':(',
+           '?',
+           'filter:', '-filter:',
+           'from:', '-from:',
+           'lang:', '-lang:',
+           'list:',
+           'since:',
+           'to:', '-to:',
+           'until:',
+           'url:', '-url:'
+      ) }
+
+    end
+
+    context 'when the query is "-"' do
+      let(:query) { '-' }
+
+      it { is_expected.to contain_exactly '-filter:', '-from:', '-lang:', '-to:', '-url:' }
+    end
+
+    context 'when the query is "-f"' do
+      let(:query) { '-f' }
+
+      it { is_expected.to contain_exactly '-filter:', '-from:' }
+    end
+
+    context 'when the query is "-filter:"' do
+      let(:query) { '-filter:' }
+
+      it { is_expected.to contain_exactly '-filter:images ', '-filter:links ', '-filter:media ', '-filter:native_video ', '-filter:periscope ', '-filter:retweets ', '-filter:safe ', '-filter:twimg ', '-filter:vine ' }
+    end
+
+    context 'when the query is "-lang"' do
+      let(:query) { '-lang' }
+
+      it { is_expected.to contain_exactly '-lang:' }
+    end
+
+    context 'when the query is "-lang:"' do
+      let(:query) { '-lang:' }
+
+      it { is_expected.not_to include '-lang:' }
+      it { is_expected.to include '-lang:de ' }
+      it { is_expected.to include '-lang:en ' }
+      it { is_expected.to include '-lang:fr ' }
+      it { is_expected.to include '-lang:ja ' }
+    end
+
+    context 'when the query is ":"' do
+      let(:query) { ':' }
+
+      it { is_expected.to contain_exactly ':) ', ':( '  }
+    end
+
+    context 'when the query is "?"' do
+      let(:query) { '?' }
+
+      it { is_expected.to contain_exactly '? ' }
+    end
+
+    context 'when the query is "f"' do
+      let(:query) { 'f' }
+
+      it { is_expected.to contain_exactly 'filter:', 'from:' }
+    end
+
+    context 'when the query is "filter"' do
+      let(:query) { 'filter' }
+
+      it { is_expected.to contain_exactly 'filter:' }
+    end
+
+    context 'when the query is "filter:"' do
+      let(:query) { 'filter:' }
+
+      it { is_expected.to contain_exactly(
+        'filter:images ',
+        'filter:links ',
+        'filter:media ',
+        'filter:native_video ',
+        'filter:periscope ',
+        'filter:retweets ',
+        'filter:safe ',
+        'filter:twimg ',
+        'filter:vine '
+      ) }
+    end
+
+    context 'when the query is "l"' do
+      let(:query) { 'l' }
+
+      it { is_expected.to contain_exactly 'lang:', 'list:' }
+    end
+
+    context 'when the query is "lang:"' do
+      let(:query) { 'lang:' }
+
+      it { is_expected.not_to include 'lang:' }
+      it { is_expected.to include 'lang:de ' }
+      it { is_expected.to include 'lang:en ' }
+      it { is_expected.to include 'lang:fr ' }
+      it { is_expected.to include 'lang:ja ' }
+    end
+
+    context 'when the query is "u"' do
+      let(:query) { 'u' }
+
+      it { is_expected.to contain_exactly 'until:', 'url:' }
+    end
+
+    context 'with users' do
+      let(:json) { JSON.parse(fixture('user.json'), symbolize_names: true) }
+
+      before do
+        json[:id] = 1
+        json[:screen_name] = 'apple'
+        app.user_repository.create(Twitter::User.new(json))
+
+        json[:id] = 2
+        json[:screen_name] = 'banana'
+        app.user_repository.create(Twitter::User.new(json))
+      end
+
+      context 'when the query is "@"' do
+        let(:query) { '@' }
+
+        it { is_expected.to include '@apple ' }
+        it { is_expected.to include '@banana ' }
+      end
+
+      context 'when the query is "@app"' do
+        let(:query) { '@app' }
+
+        it { is_expected.to include '@apple ' }
+        it { is_expected.not_to include '@banana ' }
+      end
+
+      context 'when the query is "-from:"' do
+        let(:query) { '-from:' }
+
+        it { is_expected.to contain_exactly '-from:apple ', '-from:banana ' }
+      end
+
+      context 'when the query is "-from:app"' do
+        let(:query) { '-from:app' }
+
+        it { is_expected.to contain_exactly '-from:apple ' }
+      end
+
+      context 'when the query is "from:"' do
+        let(:query) { 'from:' }
+
+        it { is_expected.to contain_exactly 'from:apple ', 'from:banana ' }
+      end
+
+      context 'when the query is "from:app"' do
+        let(:query) { 'from:app' }
+
+        it { is_expected.to contain_exactly 'from:apple ' }
+      end
+
+      context 'when the query is "-to:"' do
+        let(:query) { '-to:' }
+
+        it { is_expected.to contain_exactly '-to:apple ', '-to:banana ' }
+      end
+
+      context 'when the query is "-to:app"' do
+        let(:query) { '-to:app' }
+
+        it { is_expected.to contain_exactly '-to:apple ' }
+      end
+
+      context 'when the query is "to:"' do
+        let(:query) { 'to:' }
+
+        it { is_expected.to contain_exactly 'to:apple ', 'to:banana ' }
+      end
+
+      context 'when the query is "to:app"' do
+        let(:query) { 'to:app' }
+
+        it { is_expected.to contain_exactly 'to:apple ' }
+      end
+    end
+
+    context 'with lists' do
+      let(:json) { JSON.parse(fixture('list.json'), symbolize_names: true) }
+
+      before do
+        json[:id] = 1
+        json[:full_name] = '@central/tigers'
+        app.list_repository.create(Twitter::List.new(json))
+
+        json[:id] = 2
+        json[:full_name] = '@pacific/buffaloes'
+        app.list_repository.create(Twitter::List.new(json))
+
+        p app.list_repository.all
+      end
+
+      context 'when the query is "list:"' do
+        let(:query) { 'list:' }
+
+        it { is_expected.to contain_exactly 'list:central/tigers ' , 'list:pacific/buffaloes ' }
+      end
+
+      context 'when the query is "list:cen"' do
+        let(:query) { 'list:cen' }
+
+        it { is_expected.to contain_exactly 'list:central/tigers ' }
+      end
+    end
+  end
+end

data/twterm.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth', '~> 0.5.1'
   spec.add_dependency 'toml-rb', '~> 0.3.14'
   spec.add_dependency 'twitter', '~> 6.1.0'
-  spec.add_dependency 'twitter-text', '~> 1.14.0'
+  spec.add_dependency 'twitter-text', '1.14.5'
 
   spec.add_development_dependency 'bundler', '~> 1.8'
   spec.add_development_dependency 'hashie', '~> 3.5.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -98,16 +98,16 @@ dependencies:
   name: twitter-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.14.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.14.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +185,11 @@ files:
 - lib/twterm/auth.rb
 - lib/twterm/client.rb
 - lib/twterm/color_manager.rb
-- lib/twterm/completion_mamanger.rb
+- lib/twterm/completer/abstract_completer.rb
+- lib/twterm/completer/default_completer.rb
+- lib/twterm/completer/screen_name_completer.rb
+- lib/twterm/completer/search_query_completer.rb
+- lib/twterm/completion_manager.rb
 - lib/twterm/config.rb
 - lib/twterm/direct_message.rb
 - lib/twterm/direct_message_composer.rb
@@ -268,6 +272,7 @@ files:
 - lib/twterm/tab/scrollable.rb
 - lib/twterm/tab/searchable.rb
 - lib/twterm/tab/statuses/base.rb
+- lib/twterm/tab/statuses/cacheable.rb
 - lib/twterm/tab/statuses/conversation.rb
 - lib/twterm/tab/statuses/favorites.rb
 - lib/twterm/tab/statuses/home.rb
@@ -287,11 +292,13 @@ files:
 - lib/twterm/utils.rb
 - lib/twterm/version.rb
 - lib/twterm/view.rb
+- spec/fixtures/list.json
 - spec/fixtures/status.json
 - spec/fixtures/user.json
 - spec/resources/config
 - spec/spec_helper.rb
 - spec/supports/shared_examples/abstract_key_mapper.rb
+- spec/twterm/completer/search_query_completer_spec.rb
 - spec/twterm/config_spec.rb
 - spec/twterm/event/screen/resize_spec.rb
 - spec/twterm/event_dispatcher_spec.rb
@@ -334,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A full-featured TUI Twitter client

data/lib/twterm/completion_mamanger.rb

@@ -1,42 +0,0 @@
-module Twterm
-  class CompletionManager
-    def initialize(app)
-      @app = app
-
-      Readline.basic_word_break_characters = " \t\n\"\\'`$><=;|&{("
-      Readline.completion_case_fold = false
-    end
-
-    def set_default_mode!
-      Readline.completion_append_character = ' '
-
-      Readline.completion_proc = proc do |str|
-        if str.start_with?('#')
-          app.hashtag_repository.all
-          .map { |tag| "##{tag}" }
-          .select { |tag| tag.start_with?(str) }
-        elsif str.start_with?('@')
-          app.user_repository.all
-          .map { |user| "@#{user.screen_name}" }
-          .select { |name| name.start_with?(str) }
-        else
-          []
-        end
-      end
-    end
-
-    def set_screen_name_mode!
-      Readline.completion_append_character = ''
-
-      Readline.completion_proc = proc do |str|
-        app.user_repository.all
-          .map { |user| user.screen_name }
-          .select { |name| name.start_with?(str) }
-      end
-    end
-
-    private
-
-    attr_reader :app
-  end
-end