ifilter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3c3826565d691dd1f2125b61351f67e7328599d
-  data.tar.gz: f98fc31feb76580b6b696b7ccc76a6eee7902eb2
+  metadata.gz: 87bc44ff9b07d7dced65ad01dc151214cf4753ff
+  data.tar.gz: e63a537acc96986989e621d51c94b06da85168af
 SHA512:
-  metadata.gz: 300473b6da810bc1c060924881e2ecc3bd3e49293eb51c35449aafc32e1e41fc397033f97bd5be826b75be72e3b3af2d8523448ab2922cf5c600e418d37d9cac
-  data.tar.gz: a9809b2d05043a1f6f0bf82b1233d3f091af9fb2f0d079cc64a84b8b22ac7192b531b748e681f4a051aa865bda180de99c39dadb2d553aa414993539a7ea87be
+  metadata.gz: 598ffac359a6728b9189d1e4c065c1ecdb62f5a4db4d9ed7c33f901b967d2817d07c42c9282f9c8440b9d058776a3c4c579600ae2622b2566885069125445e62
+  data.tar.gz: 682d6f1ccde77971b4166ff4c2687243da80266eb7cb236903d3195fb591f347f93438634a784fb3c8eeba742d56479744e82103ac198e5b9451b112bf955b71

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+vendor

data/lib/ifilter/client.rb

@@ -56,7 +56,7 @@ module Ifilter
 
     private
 
-    def update_window
+    def update_window(cursor_position: 1)
       # Initialize a window
       @window.clear
       reset_cursor_position
@@ -67,18 +67,24 @@ module Ifilter
       @outputs = filtering_by_input(@target, start_index: start_index)
 
       # Redraw the output
-      output_line(@prompt + @input.to_s)
+      output_prompt
       output_current_page
       @outputs.each do |output|
+        @window.setpos(@cursor_position, 0)
         output_line(output)
+        @cursor_position += 1
       end
-      reset_cursor_position
+
+      @cursor_position = cursor_position
+      @window.setpos(@cursor_position, 0)
+
+      highlight_cursor_position
     end
 
     def get_keycode(key)
-      Curses.constants.select do |name|
+      Curses.constants.select {|name|
         name =~ /^KEY/ && Curses.const_get(name) == key
-      end.first
+      }.first
     end
 
     def filtering_by_input(array, start_index: 0)
@@ -94,29 +100,34 @@ module Ifilter
     end
 
     def output_line(word)
-      unless @cursor_position - 1 > @window.maxy - 1
-        @window.setpos(@cursor_position - 1, 0)
-
-        if !@input.size.zero? && @cursor_position > 1 && match_pos = word =~ @input.to_regexp
-          @window << word[0, match_pos]
+      if @cursor_position > @window.maxy - 1
+        return
+      end
 
-          @window.standout
-          @window << word[match_pos, @input.size]
-          @window.standend
+      if !@input.size.zero? && match_pos = word =~ @input.to_regexp
+        @window << word[0, match_pos]
 
-          @window << word[match_pos + @input.size, word.size - match_pos + @input.size]
-        else
-          @window << word
-        end
+        @window.attrset(Curses.color_pair(3))
+        @window << word[match_pos, @input.size]
+        @window.attrunset(Curses.color_pair(3))
 
-        @cursor_position += 1
+        @window << word[match_pos + @input.size, word.size - match_pos + @input.size]
+        @window.attrset(Curses.color_pair(1))
+      else
+        @window << word
       end
     end
 
+    def output_prompt
+      @window.setpos(0, 0)
+
+      @window << @prompt + @input.to_s
+    end
+
     def output_current_page
-      word = "[#{@page_number}/#{max_page_number.zero? ? 1 : max_page_number}]"
-      @window.setpos(@cursor_position - 1, @window.maxx)
+      @window.setpos(0, @window.maxx)
 
+      word = "[#{@page_number}/#{max_page_number.zero? ? 1 : max_page_number}]"
       @window << (' ' * (@window.maxx - @prompt.size - @input.size - word.size)) + word
     end
 
@@ -124,8 +135,7 @@ module Ifilter
       if @cursor_position == 1
         scroll_prev_page
       else
-        @cursor_position -= 1
-        @window.setpos(@cursor_position, 0)
+        update_window(cursor_position: @cursor_position - 1)
       end
     end
 
@@ -133,8 +143,7 @@ module Ifilter
       if @cursor_position == @window.maxy - 1 || @cursor_position == @outputs.size
         scroll_next_page
       else
-        @cursor_position += 1
-        @window.setpos(@cursor_position, 0)
+        update_window(cursor_position: @cursor_position + 1)
       end
     end
 
@@ -146,16 +155,10 @@ module Ifilter
     def scroll_prev_page
       if @page_number == 1
         @page_number = max_page_number
-        update_window
-
-        @cursor_position = last_output_position
-        @window.setpos(@cursor_position, 0)
+        update_window(cursor_position: last_output_position)
       else
         @page_number -= 1
-        update_window
-
-        @cursor_position = @window.maxy - 1
-        @window.setpos(@cursor_position, 0)
+        update_window(cursor_position: @window.maxy - 1)
       end
     end
 
@@ -169,6 +172,12 @@ module Ifilter
       end
     end
 
+    def highlight_cursor_position
+      @window.attrset(Curses.color_pair(2))
+      output_line(@outputs[@cursor_position - 1].to_s.slice(0, @window.maxx - 1))
+      @window.attrset(Curses.color_pair(1))
+    end
+
     def max_page_number
       (filtering_by_input(@target).size.to_f / (@window.maxy - 1).to_f).ceil
     end

data/lib/ifilter/version.rb

@@ -1,3 +1,3 @@
 module Ifilter
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/ifilter/window.rb

@@ -2,16 +2,33 @@ require 'curses'
 
 module Ifilter
   class Window < Curses::Window
-    def initialize(height, width, y, x)
+    def initialize(*args)
+      @previous_colors = []
+
       Curses.init_screen
+      Curses.start_color
       Curses.crmode
       Curses.noecho
+      Curses.curs_set(0) # invisible
+      Curses.init_pair(1, Curses::COLOR_WHITE, Curses::COLOR_BLACK) # default
+      Curses.init_pair(2, Curses::COLOR_BLACK, Curses::COLOR_CYAN) # cursor position
+      Curses.init_pair(3, Curses::COLOR_BLACK, Curses::COLOR_MAGENTA) # match string
 
       super
 
       self.keypad(true)
     end
 
+    def attrset(color_pair)
+      @previous_colors << color_pair
+      super
+    end
+
+    def attrunset(color_pair)
+      @previous_colors.delete(color_pair)
+      self.attrset(@previous_colors.pop)
+    end
+
     def close
       Curses.close_screen
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifilter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Interactive Filter