ifilter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87bc44ff9b07d7dced65ad01dc151214cf4753ff
-  data.tar.gz: e63a537acc96986989e621d51c94b06da85168af
+  metadata.gz: 75be2e647b9ebaf3c9652b9891e1ad4697c0df59
+  data.tar.gz: 5358032cc2dd7af4e0e80488699e75d8780f80e6
 SHA512:
-  metadata.gz: 598ffac359a6728b9189d1e4c065c1ecdb62f5a4db4d9ed7c33f901b967d2817d07c42c9282f9c8440b9d058776a3c4c579600ae2622b2566885069125445e62
-  data.tar.gz: 682d6f1ccde77971b4166ff4c2687243da80266eb7cb236903d3195fb591f347f93438634a784fb3c8eeba742d56479744e82103ac198e5b9451b112bf955b71
+  metadata.gz: f910a4502e01599dd89757f3d6812ed0f966beabdcbc972c188bb475c086d025fda143218b6f4817969fa399be7fa99ae3e5a2d186cf416884be444d5418d06d
+  data.tar.gz: c520dc8568894a315cfac375978c4d54de9f01606988e9ab04d1fe5bd014d8b4fca0154bcd9f5ab54aa791e8c9cb6a6ca06c7478e4b793fbb1f683166c7f8b8f

data/lib/ifilter/client.rb

@@ -25,9 +25,13 @@ module Ifilter
 
         if key.class == String
           @input << key
+          @filtered_result = nil
+          @page_number = 1
 
         elsif key == 127 # <BS>
           @input.backspace!
+          @filtered_result = nil
+          @page_number = 1
 
         elsif keycode == :KEY_CTRL_J # <CR>
           break if @outputs.size >= @cursor_position
@@ -40,8 +44,7 @@ module Ifilter
           up_cursor_position unless @outputs.empty?
           next
 
-        # Ignore other keys
-        else
+        else # Ignore other keys
           next
         end
 
@@ -64,12 +67,13 @@ module Ifilter
       # A flag of the output for paging
       start_index = (@window.maxy - 1) * (@page_number - 1)
       # Update @outputs
-      @outputs = filtering_by_input(@target, start_index: start_index)
+      @outputs = filtered_result[start_index, filtered_result.size]
 
       # Redraw the output
-      output_prompt
-      output_current_page
+      output_header
       @outputs.each do |output|
+        break if @cursor_position > @window.maxy - 1
+
         @window.setpos(@cursor_position, 0)
         output_line(output)
         @cursor_position += 1
@@ -87,23 +91,7 @@ module Ifilter
       }.first
     end
 
-    def filtering_by_input(array, start_index: 0)
-      array.each_with_object([]).with_index do |(str, outputs), index|
-        next if index < start_index
-
-        regex = @input.to_regexp
-
-        if !regex.nil? && regex =~ str
-          outputs << str
-        end
-      end
-    end
-
     def output_line(word)
-      if @cursor_position > @window.maxy - 1
-        return
-      end
-
       if !@input.size.zero? && match_pos = word =~ @input.to_regexp
         @window << word[0, match_pos]
 
@@ -111,20 +99,18 @@ module Ifilter
         @window << word[match_pos, @input.size]
         @window.attrunset(Curses.color_pair(3))
 
-        @window << word[match_pos + @input.size, word.size - match_pos + @input.size]
+        @window << word[match_pos + @input.size, (@window.maxx - 1) - (match_pos + @input.size)]
         @window.attrset(Curses.color_pair(1))
       else
-        @window << word
+        @window << word[0, @window.maxx - 1]
       end
     end
 
-    def output_prompt
+    def output_header
       @window.setpos(0, 0)
 
       @window << @prompt + @input.to_s
-    end
 
-    def output_current_page
       @window.setpos(0, @window.maxx)
 
       word = "[#{@page_number}/#{max_page_number.zero? ? 1 : max_page_number}]"
@@ -155,7 +141,7 @@ module Ifilter
     def scroll_prev_page
       if @page_number == 1
         @page_number = max_page_number
-        update_window(cursor_position: last_output_position)
+        update_window(cursor_position: filtered_result.size % (@window.maxy - 1))
       else
         @page_number -= 1
         update_window(cursor_position: @window.maxy - 1)
@@ -174,16 +160,16 @@ module Ifilter
 
     def highlight_cursor_position
       @window.attrset(Curses.color_pair(2))
-      output_line(@outputs[@cursor_position - 1].to_s.slice(0, @window.maxx - 1))
+      output_line(@outputs[@cursor_position - 1].to_s)
       @window.attrset(Curses.color_pair(1))
     end
 
     def max_page_number
-      (filtering_by_input(@target).size.to_f / (@window.maxy - 1).to_f).ceil
+      (filtered_result.size.to_f / (@window.maxy - 1).to_f).ceil
     end
 
-    def last_output_position
-      filtering_by_input(@target).size % (@window.maxy - 1)
+    def filtered_result
+      @filtered_result ||= @input.filter(@target)
     end
   end
 end

data/lib/ifilter/input.rb

@@ -27,5 +27,15 @@ module Ifilter
     rescue
       nil
     end
+
+    def filter(array)
+      array.each_with_object([]) do |str, outputs|
+        regexp = self.to_regexp
+
+        if !regexp.nil? && regexp =~ str
+          outputs << str
+        end
+      end
+    end
   end
 end

data/lib/ifilter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifilter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses