ifilter 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7e4cde2b995806bf2a780146335ad8e94877b4e
-  data.tar.gz: e7879569f0c8d8dca9f2b2244c88c7d929691586
+  metadata.gz: 9509ccf24f4affbe68d0e5a0999fa72a0439feb9
+  data.tar.gz: 9a69c46beb85427d81a71122af6e80f0c28a091f
 SHA512:
-  metadata.gz: 94e89319444b5ca2c17ea5914e68b96b45facd753400007140b84454cb3a63f5104156df073fcae5a56a9af2441d336f4c3aa7b1018853f4c22d4d5c3192ce94
-  data.tar.gz: 94b52882ecccee76ee079fab228734e917a305d1da31954da8e514b282282f346e947b763b488e42c9ce77b9d5dbfec9a67c5e885f316679c41f5e7a52065655
+  metadata.gz: 3141cf7cc4070d2b09c73a397d4ccd4db6afe33393fd78170df07aed0fb835dc11fd440207f01861a032d6241998fb9c08753622dc5287e27465908fb58c8a8d
+  data.tar.gz: 6bcc424ea886a0aa1294d987260774454f0b9684d83c3f6eb097760d141a1656565ca813ab85bb60fa9b40b3080b1bdfbfafff9d3f499d66cba9080dae92efd2

data/lib/ifilter.rb

@@ -12,8 +12,8 @@ module Ifilter
       STDOUT.reopen('/dev/tty')
     end
 
-    ifilter = Interface.new(name, array)
-    result = ifilter.grep
+    ifilter = Interface.new(name)
+    result = ifilter.grep(array)
 
     unless isatty
       STDOUT.flush

data/lib/ifilter/interface.rb

@@ -2,13 +2,14 @@ require 'curses'
 
 module Ifilter
   class Interface
-    def initialize(name, array)
+    def initialize(name)
       @prompt = "#{name}> "
-      @targets = array
+      @target = []
 
       @input = Input.new
       @outputs = []
       @cursor_position = 1
+      @page_number = 1
 
       Curses.init_screen
       Curses.crmode
@@ -17,10 +18,10 @@ module Ifilter
       @window.keypad(true)
     end
 
-    def grep
-      output_line(@prompt)
-      output_choises
-      reset_cursor_position
+    def grep(array)
+      @target = array
+
+      update_window
 
       loop do
         key = @window.getch
@@ -29,24 +30,18 @@ module Ifilter
         if key.class == String
           @input << key
 
-        # <BS>
-        elsif key == 127
+        elsif key == 127 # <BS>
           @input.backspace!
 
-        # <CR>
-        elsif keycode == :KEY_CTRL_J
-          if @outputs.size >= @cursor_position && @cursor_position >= 1
-            break
-          else
-            next
-          end
+        elsif keycode == :KEY_CTRL_J # <CR>
+          break if @outputs.size >= @cursor_position
 
         elsif keycode == :KEY_DOWN
-          down_cursor_position
+          down_cursor_position unless @outputs.empty?
           next
 
         elsif keycode == :KEY_UP
-          up_cursor_position
+          up_cursor_position unless @outputs.empty?
           next
 
         # Ignore other keys
@@ -54,56 +49,64 @@ module Ifilter
           next
         end
 
-        # Initialize a window
-        @outputs = []
-        @window.clear
-        reset_cursor_position
-
-        output_line(@prompt + @input.to_s)
-        output_choises
-        reset_cursor_position
+        update_window
       end
 
       Curses.close_screen
       @outputs[@cursor_position - 1]
 
-    # <C-c>
-    rescue Interrupt
+    rescue Interrupt # <C-c>
       Curses.close_screen
     end
 
     private
 
+    def update_window
+      # Initialize a window
+      @window.clear
+      reset_cursor_position
+
+      start_index = (@window.maxy - 1) * (@page_number - 1)
+      # Update @outputs
+      @outputs = filtering_by_input(@target, start_index: start_index)
+
+      # Redraw the output
+      output_line(@prompt + @input.to_s)
+      @outputs.each do |output|
+        output_line(output)
+      end
+      reset_cursor_position
+    end
+
     def get_keycode(key)
       Curses.constants.select do |name|
         /^KEY/ =~ name && Curses.const_get(name) == key
       end.first
     end
 
-    def output_choises
-      # Filtering
-      @targets.each do |target|
+    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_regex
 
-        if !regex.nil? && regex =~ target
-          @outputs << target
+        if !regex.nil? && regex =~ str
+          outputs << str
         end
       end
-
-      @outputs.each { |output| output_line(output) }
     end
 
     def output_line(word)
-      @window.setpos(@cursor_position - 1, 0)
-      @cursor_position += 1
+      unless @cursor_position - 1 > @window.maxy - 1
+        @window.setpos(@cursor_position - 1, 0)
+        @cursor_position += 1
 
-      @window << word
+        @window << word
+      end
     end
 
     def up_cursor_position
       if @cursor_position == 1
-        @window.setpos(@outputs.size, 0)
-        @cursor_position = @outputs.size
+        scroll_prev_page
       else
         @window.setpos(@cursor_position - 1, 0)
         @cursor_position -= 1
@@ -111,9 +114,8 @@ module Ifilter
     end
 
     def down_cursor_position
-      if @cursor_position == @outputs.size
-        @window.setpos(1, 0)
-        @cursor_position = 1
+      if @cursor_position == @window.maxy - 1 || @cursor_position == @outputs.size
+        scroll_next_page
       else
         @window.setpos(@cursor_position + 1, 0)
         @cursor_position += 1
@@ -124,5 +126,38 @@ module Ifilter
       @window.setpos(1, 0)
       @cursor_position = 1
     end
+
+    def scroll_prev_page
+      if @page_number == 1
+        @page_number = max_page_number
+        update_window
+
+        @window.setpos(last_output_position, 0)
+        @cursor_position = last_output_position
+      else
+        @page_number -= 1
+        update_window
+
+        @window.setpos(@window.maxy - 1, 0)
+        @cursor_position = @window.maxy - 1
+      end
+    end
+
+    def scroll_next_page
+      if @page_number == max_page_number
+        @page_number = 1
+      else
+        @page_number += 1
+      end
+      update_window
+    end
+
+    def max_page_number
+      (filtering_by_input(@target, start_index: 0).size.to_f / (@window.maxy - 1).to_f).ceil
+    end
+
+    def last_output_position
+      filtering_by_input(@target, start_index: 0).size % (@window.maxy - 1)
+    end
   end
 end

data/lib/ifilter/version.rb

@@ -1,3 +1,3 @@
 module Ifilter
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ifilter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kaihar4
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses