twterm 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2572d3668fe0048eb79fa55c0b881a39fe130c7a
-  data.tar.gz: 8fc15104af2e69ee71861a1e903a056f3dda1f57
+  metadata.gz: 01d68a787d82a916e9db6edf8801d3b774d70b62
+  data.tar.gz: 769b6645edd66d51ff21ae54d58a66ae8412e1dd
 SHA512:
-  metadata.gz: c7f0770b2c858fee53746e64ee194218b565ff16d88d06fd336b5c3ad304716df9dc57e5a8fbd1f8eba5b377ba9ada1d97aaf580f9d68355090924de4a595451
-  data.tar.gz: 7ed7a151ce86516110461ea3426e742f271713d6b87038d5c331c78d4f06ed8995ed39b98d96257a2aab5d1eaff99e54ff3a106ff76699002df426ac8594519a
+  metadata.gz: 668fd496ea6667035ba1a839ac308a6d92d3e76daf05b67ad5b3f685e25d7fcc52642a8a66588bc2ca8c310e9e597e82f37e81784bf492005019ebaed2435c49
+  data.tar.gz: e17fbe8226c4aa0c351d6d5d11a5d4619d54a024383f217f7e46fac255b1aebc0f90a5f5854a06690e4ec1887f3cbd63c650533bdad28714ebca583781f07aaf

data/lib/twterm.rb

@@ -23,6 +23,8 @@ 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/history/base'
 require 'twterm/history/hashtag'
 require 'twterm/history/screen_name'
@@ -58,6 +60,6 @@ require 'twterm/version'
 
 module Twterm
   class Conf
-    REQUIRE_VERSION = '1.0.11'
+    REQUIRE_VERSION = '1.0.12'
   end
 end

data/lib/twterm/app.rb

@@ -10,6 +10,7 @@ module Twterm
       Auth.authenticate_user(config) if config[:screen_name].nil?
 
       Screen.instance
+      FilterQueryWindow.instance
 
       timeline = Tab::TimelineTab.new(client)
       TabManager.instance.add_and_show(timeline)

data/lib/twterm/extensions/string.rb

@@ -3,6 +3,10 @@ class String
     each_char.map { |c| c.bytesize == 1 ? 1 : 2 }.reduce(0, &:+)
   end
 
+  def matches?(query)
+    downcase.include?(query.downcase)
+  end
+
   def split_by_width(width)
     cnt = 0
     str = ''

data/lib/twterm/filter_query_window.rb

@@ -0,0 +1,32 @@
+module Twterm
+  class FilterQueryWindow
+    include Curses
+    include Singleton
+
+    def initialize
+      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 1, 0)
+    end
+
+    def input
+      clear
+
+      echo
+      stdscr.setpos(stdscr.maxy - 1, 0)
+      stdscr.addch '/'
+
+      query = getstr.chomp
+      noecho
+
+      query || ''
+    end
+
+    def clear
+      stdscr.setpos(stdscr.maxy - 1, 0)
+      stdscr.addstr(' ' * window.maxx)
+    end
+
+    private
+
+    attr_reader :window
+  end
+end

data/lib/twterm/filterable_list.rb

@@ -0,0 +1,35 @@
+module Twterm
+  module FilterableList
+    extend Forwardable
+
+    def filter
+      @filter_query = FilterQueryWindow.instance.input
+
+      if filter_query.empty?
+        reset_filter
+      elsif items.count == 0
+        query = filter_query
+        reset_filter
+        Notifier.instance.show_error "No matches found: \"#{query}\""
+      else
+        Notifier.instance.show_message "#{total_item_count} statuses found: \"#{filter_query}\""
+        scroller.move_to_top
+      end
+
+      refresh
+    end
+
+    def filter_query
+      @filter_query ||= ''
+    end
+
+    def items
+      fail NotImplementedError, 'items method must be implemented'
+    end
+
+    def reset_filter
+      FilterQueryWindow.instance.clear
+      @filter_query = ''
+    end
+  end
+end

data/lib/twterm/history/base.rb

@@ -11,7 +11,11 @@ module Twterm
           return
         end
 
-        @history = YAML.load(File.read(history_file)) || []
+        begin
+          @history = YAML.load(File.read(history_file)) || []
+        rescue
+          @history = []
+        end
       end
 
       def add(hashtag)

data/lib/twterm/list.rb

@@ -16,6 +16,10 @@ module Twterm
       self
     end
 
+    def matches?(query)
+      [full_name, description].any? { |x| x.downcase.include?(query.downcase) }
+    end
+
     def update!(list)
       @name = list.name
       @slug = list.slug

data/lib/twterm/status.rb

@@ -29,7 +29,7 @@ module Twterm
       @favorited = true
     end
 
-    def grepped_with?(query)
+    def matches?(query)
       [text, user.screen_name, user.name]
         .any? { |x| x.downcase.include?(query.downcase) }
     end

data/lib/twterm/tab/base.rb

@@ -19,14 +19,12 @@ module Twterm
       end
 
       def refresh
-        return unless refreshable?
-
         Thread.new do
           refresh_mutex.synchronize do
             window.clear
             update
             window.refresh
-          end
+          end if refreshable?
         end
       end
 

data/lib/twterm/tab/new/list.rb

@@ -3,6 +3,7 @@ module Twterm
     module New
       class List
         include Base
+        include FilterableList
         include Scrollable
 
         @@lists = nil
@@ -12,7 +13,7 @@ module Twterm
         end
 
         def drawable_item_count
-          (window.maxy - 2).div(3)
+          (window.maxy - 6).div(3)
         end
 
         def initialize
@@ -23,11 +24,13 @@ module Twterm
         end
 
         def items
-          @@lists
+          (@@lists || []).select { |l| l.matches?(filter_query) }
         end
 
         def respond_to_key(key)
           case key
+          when ?d, 4
+            10.times { scroller.move_down }
           when ?g
             scroller.move_to_top
           when ?G
@@ -40,6 +43,12 @@ module Twterm
             TabManager.instance.switch(list_tab)
           when ?k, 16, Curses::Key::UP
             scroller.move_up
+          when ?q
+            reset_filter
+          when ?u, 21
+            10.times { scroller.move_up }
+          when ?/
+            filter
           else
             return false
           end
@@ -47,13 +56,13 @@ module Twterm
         end
 
         def total_item_count
-          @@lists.nil? ? 0 : @@lists.count
+          items.count
         end
 
         private
 
         def current_list
-          @@lists.nil? ? nil : @@lists[scroller.index]
+          @@lists.nil? ? nil : items[scroller.index]
         end
 
         def show_lists

data/lib/twterm/tab/new/search.rb

@@ -4,6 +4,7 @@ module Twterm
       class Search
         include Base
         include Readline
+        include FilterableList
         include Scrollable
 
         @@queries = []
@@ -13,7 +14,7 @@ module Twterm
         end
 
         def drawable_item_count
-          (window.maxy - 2).div(3)
+          (window.maxy - 6).div(3)
         end
 
         def initialize
@@ -53,7 +54,11 @@ module Twterm
         end
 
         def items
-          ['<Input search query>'] + @@queries
+          if filter_query.empty?
+            ['<Input search query>'] + @@queries
+          else
+            @@queries.select { |q| q.matches?(filter_query) }
+          end
         end
 
         def respond_to_key(key)
@@ -72,6 +77,10 @@ module Twterm
             scroller.move_up
           when ?u, 21
             10.times { scroller.move_up }
+          when ?q
+            reset_filter
+          when ?/
+            filter
           else
             return false
           end
@@ -80,7 +89,7 @@ module Twterm
         end
 
         def total_item_count
-          @@queries.count + 1
+          items.count
         end
 
         private
@@ -90,10 +99,10 @@ module Twterm
         def open_search_tab_with_current_query
           index = scroller.index
 
-          if index == 0
+          if filter_query.empty? && index.zero?
             invoke_input
           else
-            query = @@queries[index - 1]
+            query = items[index]
             tab = Tab::SearchTab.new(query)
             TabManager.instance.switch(tab)
           end

data/lib/twterm/tab/statuses_tab.rb

@@ -2,6 +2,7 @@ module Twterm
   module Tab
     module StatusesTab
       include Base
+      include FilterableList
       include Scrollable
 
       def append(status)
@@ -50,27 +51,6 @@ module Twterm
         fail NotImplementedError, 'fetch method must be implemented'
       end
 
-      def grep
-        reset_grep
-
-        Curses.echo
-        Curses.setpos(stdscr.maxy - 1, 0)
-        Curses.stdscr.addch '/'
-        @grep_query = Curses.getstr.chomp
-        Curses.noecho
-
-        if grep_query.empty?
-          reset_grep
-        elsif total_item_count == 0
-          Notifier.instance.show_error "No matches found: \"#{grep_query}\""
-          reset_grep
-        else
-          Notifier.instance.show_message "#{total_item_count} statuses found: \"#{grep_query}\""
-          scroller.move_to_top
-          refresh
-        end
-      end
-
       def initialize
         super
 
@@ -106,15 +86,6 @@ module Twterm
         Tweetbox.instance.compose(highlighted_status)
       end
 
-      def reset_grep
-        # TODO: replace with more general way (issue #170)
-        stdscr.clear
-        Screen.instance.refresh
-
-        @grep_query = ''
-        refresh
-      end
-
       def respond_to_key(key)
         case key
         when ?c
@@ -146,9 +117,9 @@ module Twterm
         when ?U
           show_user
         when ?/
-          grep
+          filter
         when ?q
-          reset_grep
+          reset_filter
         else
           return false
         end
@@ -179,10 +150,10 @@ module Twterm
         statuses = @status_ids.map { |id| Status.find(id) }.reject(&:nil?)
         @status_ids = statuses.map(&:id)
 
-        if grep_query.empty?
+        if filter_query.empty?
           statuses
         else
-          statuses.select { |s| s.grepped_with?(grep_query) }
+          statuses.select { |s| s.matches?(filter_query) }
         end
       end
 
@@ -191,7 +162,7 @@ module Twterm
       end
 
       def total_item_count
-        grep_query.empty? ? @status_ids.count : statuses.count
+        filter_query.empty? ? @status_ids.count : statuses.count
       end
 
       def update
@@ -260,15 +231,13 @@ module Twterm
           end
 
           line += 2
+
+          UserWindow.instance.update(highlighted_status.user)
         end
       end
 
       private
 
-      def grep_query
-        @grep_query || ''
-      end
-
       def highlighted_status
         statuses[scroller.count - scroller.index - 1]
       end

data/lib/twterm/version.rb

@@ -1,3 +1,3 @@
 module Twterm
-  VERSION = '1.0.11'
+  VERSION = '1.0.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Ryota Kameoka
@@ -162,6 +162,8 @@ files:
 - lib/twterm/extensions/enumerator/lazy.rb
 - lib/twterm/extensions/integer.rb
 - lib/twterm/extensions/string.rb
+- lib/twterm/filter_query_window.rb
+- lib/twterm/filterable_list.rb
 - lib/twterm/history/base.rb
 - lib/twterm/history/hashtag.rb
 - lib/twterm/history/screen_name.rb