twterm 1.1.0.beta1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21bc4a036d064d1a1a4755eb3655f187ebca6514
-  data.tar.gz: 03be117b59f4775d71aaad2fef2384f916eb4c92
+  metadata.gz: 6899ab95b0be06317c390cbb3a0a8638f73b1ead
+  data.tar.gz: 5414fbb91b92079b03f2f4f001ac49e9379357ad
 SHA512:
-  metadata.gz: 096afbe0caffeaa8d861e8119b8f35144c93e5ff116e996c4f93c67e8e06eff3a3b9bddf46575441c3f777b222760a4867f78d48f1832773886d4a48c94a429e
-  data.tar.gz: 29a3516e9f86141dea2b74c4b76ebafcd8f3b68cef94284809d3d17507462a6f60f4c7ba832f3df8bfc6b4129081ecd0eafcde46d26750eae493fda29613a45d
+  metadata.gz: b0b7bfcaa4aea696889614b2c7e804fb873c5abd25ab288093005dfcbd8e1037a05b2bb0137c26bda64fcefa60cb647c38ab6f9276e172a755345025ee9a8be7
+  data.tar.gz: b47ef4cb13b9c371d15287e328e7c5b1701dc10446ffd9e054af8aa8d90878d8e5b33506f7abc465d8458ba92128d16e0f24ce03b9fb100d420591e20203c75b

data/lib/twterm/filter_query_window.rb

@@ -9,15 +9,63 @@ module Twterm
 
     def input
       clear
-
-      echo
       stdscr.setpos(stdscr.maxy - 1, 0)
       stdscr.addch '/'
 
-      query = getstr.chomp
-      noecho
+      Curses.timeout = 10
+      raw
+
+      chars = []
+      str = ''
+
+      loop do
+        char = getch
+
+        if char.nil?
+          case chars.first
+          when 3, 27 # cancel with <C-c> / Esc
+            str = ''
+            clear
+            break
+          when 4 # cancel with <C-d> when query is empty
+            if str.empty?
+              clear
+              break
+            end
+          when 10 # submit with <C-j>
+            break
+          when 127 # backspace
+            if str.empty?
+              clear
+              break
+            end
+
+            str.chop!
+            chars = []
+            clear
+            stdscr.setpos(stdscr.maxy - 1, 0)
+            stdscr.addstr("/#{str}")
+          when 0..31
+            # ignore control codes (\x00 - \x1f)
+          else
+            str << chars
+              .map { |x| x.is_a?(String) ? x.ord : x }
+              .pack('c*')
+              .force_encoding('utf-8')
+            chars = []
+          end
+        else
+          chars << char
+        end
+
+        stdscr.setpos(stdscr.maxy - 1, 1)
+        stdscr.addstr(str)
+      end
+
+      Curses.timeout = 0
+      cbreak
 
-      query || ''
+      str
     end
 
     def clear

data/lib/twterm/tab/key_assignments_cheatsheet.rb

@@ -19,26 +19,27 @@ module Twterm
           '[Q]'               => 'Quit twterm'
         },
         'Tabs' => {
-          '[h] [C-b] [LEFT]'  => 'Show previous tab',
-          '[l] [C-f] [RIGHT]' => 'Show next tab',
-          '[N]'               => 'Open new tab',
+          '[h] [C-b] [LEFT]'  => 'Previous tab',
+          '[l] [C-f] [RIGHT]' => 'Next tab',
+          '[N]'               => 'New tab',
           '[C-R]'             => 'Reload',
           '[w]'               => 'Close tab',
-          '[q]'               => 'Quit filtering mode',
-          '[/]'               => 'Filter items in tab'
+          '[q]'               => 'Quit filter mode',
+          '[/]'               => 'Filter mode'
         },
         'Tweets' => {
-          '[D]'               => 'Delete tweet',
+          '[c]'               => 'Conversation',
+          '[D]'               => 'Delete',
           '[F]'               => 'Add to favorite',
-          '[n]'               => 'Compose new tweet',
-          '[o]'               => 'Open URLs in tweet',
+          '[n]'               => 'New tweet',
+          '[o]'               => 'Open URLs',
           '[r]'               => 'Reply',
           '[R]'               => 'Retweet',
-          '[U]'               => 'Show user'
+          '[U]'               => 'User'
         },
         'Others' => {
-          '[P]'               => 'View my profile',
-          '[?]'               => 'Open key assignments cheatsheet'
+          '[P]'               => 'My profile',
+          '[?]'               => 'Key assignments cheatsheet'
         }
       }
 
@@ -48,7 +49,7 @@ module Twterm
 
       def initialize
         super
-        scroller.set_cursor_free!
+        scroller.set_no_cursor_mode!
       end
 
       def respond_to_key(key)

data/lib/twterm/tab/scrollable.rb

@@ -43,14 +43,14 @@ module Twterm
           index == offset + i
         end
 
-        def cursor_free?
-          !!@cursor_free
+        def no_cursor_mode?
+          !!@no_cursor_mode
         end
 
         def initialize
           @index = 0
           @offset = 0
-          @cursor_free_mode = false
+          @no_cursor_mode = false
         end
 
         def drawable_items
@@ -73,7 +73,7 @@ module Twterm
           # return when there are no items or cursor is at the bottom
 
           @index += 1
-          @offset += 1 if (cursor_free? || cursor_on_the_downside?) && !last_item_shown?
+          @offset += 1 if (no_cursor_mode? || cursor_on_the_downside?) && !last_item_shown?
 
           hook :after_move
         end
@@ -132,8 +132,8 @@ module Twterm
           true
         end
 
-        def set_cursor_free!
-          @cursor_free = true
+        def set_no_cursor_mode!
+          @no_cursor_mode = true
         end
 
         private

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

@@ -69,6 +69,8 @@ module Twterm
           status = highlighted_status
           urls = status.urls.map(&:expanded_url) + status.media.map(&:expanded_url)
           urls.each(&Launchy.method(:open))
+        rescue Launchy::CommandNotFoundError
+          Notifier.instance.show_error 'Cannot find web browser'
         end
 
         def prepend(status)

data/lib/twterm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twterm
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryota Kameoka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-09 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -223,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7