fancy_gets 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41007873e8755595379093dbcd5f1764b73148ab
-  data.tar.gz: 633febcbd5720208eceeef1ca32c975ec7257eac
+  metadata.gz: 77bf7ba22ad95c65d42649eb16261214fb9ae5eb
+  data.tar.gz: 00e074cd4911c829b20128c3da56ff5f48c1e9ab
 SHA512:
-  metadata.gz: 2a86edaed276de4def2109e9aa9acf6f40abbb956358c8255175ba3d3a614a184a80548acf1b82f969ef6b6d238ad63cf9d418c4fa96f6cde3a6312eef75c332
-  data.tar.gz: aac9199698385c4724f159335aebccf5574e28eea79feac353a617f47c3b39a17b919f05818aa27dd19a7b753e79d09f61e1e8d597695802c017cbab61b8270a
+  metadata.gz: dc71e4648a88261ecbeaa3239e3bef66c91d1e85a80d7645b5db6a8b6fb72cd24c35723f6143a7cb638c3fbc351d68942ca1c1031b1211013180c4cda290c6b5
+  data.tar.gz: 68b1d41ee9817c6784022595a0299562d92b57984f3320c9d5ed91df7013829d06613b2634a1ab04659aee592b3d052650ebd599cd323e9d333248ad816274e0

data/lib/fancy_gets/version.rb

@@ -1,3 +1,3 @@
 module FancyGets
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/fancy_gets.rb

@@ -12,6 +12,8 @@ module FancyGets
 
   # Show a list of stuff, potentially some highlighted, and allow people to up-down arrow around and pick stuff
   def gets_list(words, is_multiple = false, chosen = nil, prefix = "> ", postfix = " <", info = nil, height = nil)
+    on_change = nil
+    on_select = nil
     if words.is_a? Hash
       is_multiple = words[:is_multiple] || false
       chosen = words[:chosen]
@@ -19,7 +21,9 @@ module FancyGets
       postfix = words[:postfix] || " <"
       info = words[:info]
       height = words[:height] || nil
-      words = words[:words]
+      on_change = words[:on_change]
+      on_select = words[:on_select]
+      words = words[:list]
     else
       # Trying to supply parameters but left out a "true" for is_multiple?
       if is_multiple.is_a?(Enumerable) || is_multiple.is_a?(String) || is_multiple.is_a?(Fixnum)
@@ -29,11 +33,11 @@ module FancyGets
     end
     # Slightly inclined to ditch this in case the things they're choosing really are Enumerable
     is_multiple = true if chosen.is_a?(Enumerable)
-    FancyGets.gets_internal_core(true, is_multiple, words, chosen, prefix, postfix, info, height)
+    FancyGets.gets_internal_core(true, is_multiple, words, chosen, prefix, postfix, info, height, on_change, on_select)
   end
 
   # The internal routine that makes all the magic happen
-  def self.gets_internal_core(is_list, is_password, word_objects = nil, chosen = nil, prefix = "> ", postfix = " <", info = nil, height = nil)
+  def self.gets_internal_core(is_list, is_password, word_objects = nil, chosen = nil, prefix = "> ", postfix = " <", info = nil, height = nil, on_change = nil, on_select = nil)
     # OK -- second parameter, is_password, means is_multiple when is_list is true
     is_multiple = is_list & is_password
     unless word_objects.nil? || is_list
@@ -80,7 +84,7 @@ module FancyGets
     # Used for dropdown select / deselect
     clear_dropdown_info = lambda do
       print "\b" * (uncolor.call(words[position]).length + pre_post_length)
-      print (27.chr + 91.chr + 66.chr) * (words.length - position)
+      print (27.chr + 91.chr + 66.chr) * (height - (position - (offset || 0)) - (height < words.length ? 1 : 0))
       info_length = uncolor.call(info).length
       print " " * info_length + "\b" * info_length
     end
@@ -97,8 +101,50 @@ module FancyGets
       print "\b" * (uncolor.call(word).length + pre_post_length) if is_end_at_front
     end
 
+    write_info = lambda do |new_info|
+      # Put the response into the info line, as long as it's short enough!
+      new_info.gsub!("\n", " ")
+      new_info_length = uncolor.call(new_info).length
+      console_width = IO.console.winsize.last
+      # Might have to trim if it's a little too wide
+      new_info = new_info[0...console_width] if console_width < new_info_length
+      # Arrow down to the info line
+      print (27.chr + 91.chr + 66.chr) * (height - (position - (offset || 0)) - (height < words.length ? 1 : 0))
+      # To start of info line
+      word_length = uncolor.call(words[position]).length + pre_post_length
+      print "\b" * word_length
+      # Write out the new response
+      prev_info_length = uncolor.call(info).length
+      difference = prev_info_length - new_info_length
+      difference = 0 if difference < 0
+      print new_info + " " * difference
+      info = new_info
+      # Go up to where we originated
+      print (27.chr + 91.chr + 65.chr) * (height - (position - (offset || 0)) - (height < words.length ? 1 : 0))
+      # Arrow left or right to get to the right spot again
+      new_info_length += difference
+      print (new_info_length > word_length ? "\b" : (27.chr + 91.chr + 67.chr)) * (new_info_length - word_length).abs
+    end
+
+    handle_on_select = lambda do |focused|
+      if on_select.is_a? Proc
+        response = on_select.call({chosen: chosen, focused: focused})
+        new_info = nil
+        if response.is_a? Hash
+          chosen = response[:chosen] || chosen
+          new_info = response[:info]
+        elsif response.is_a? String
+          new_info = response
+        end
+        unless new_info.nil?
+          write_info.call(new_info)
+        end
+      end
+    end
+
     arrow_down = lambda do
       if position < words.length - 1
+        handle_on_select.call(word_objects[position + 1])
         is_shift = false
         # Now moving down past the bottom of the shown window?
         if !offset.nil? && position >= offset + (height - 3)
@@ -127,6 +173,7 @@ module FancyGets
 
     arrow_up = lambda do
       if position > 0
+        handle_on_select.call(word_objects[position - 1])
         is_shift = false
         # Now moving up past the top of the shown window?
         if position <= (offset || 0)
@@ -164,6 +211,24 @@ module FancyGets
         else
           chosen = []
         end
+      when "Array"
+        chosen.each_with_index do |item, i|
+          case item.class.name
+          when "String"
+            chosen[i] = words.index(item)
+          when "Fixnum"
+            chosen[i] = nil if item < 0 || item >= words.length
+          else
+            chosen[i] = word_objects.index(item)
+          end
+        end
+        chosen.select{|item| !item.nil?}.uniq
+      else
+        if word_objects.include?(chosen)
+          chosen = [word_objects.index(chosen)]
+        else
+          chosen = []
+        end
       end
       chosen ||= []
       chosen = [0] if chosen == [] && !is_multiple
@@ -295,12 +360,29 @@ module FancyGets
             if is_multiple
               # Toggle this entry
               does_include = chosen.include?(position)
-              if does_include
-                chosen -= [position]
-              else
-                chosen += [position]
+              is_rejected = false
+              if on_change.is_a? Proc
+                response = on_change.call({chosen: chosen, changed: word_objects[position], is_chosen: !does_include})
+                new_info = nil
+                if response.is_a? Hash
+                  is_rejected = response[:is_rejected]
+                  chosen = response[:chosen] || chosen
+                  new_info = response[:info]
+                elsif response.is_a? String
+                  new_info = response
+                end
+                unless new_info.nil?
+                  write_info.call(new_info)
+                end
+              end
+              unless is_rejected
+                if does_include
+                  chosen -= [position]
+                else
+                  chosen += [position]
+                end
+                make_select.call(!does_include, true)
               end
-              make_select.call(!does_include, true)
             end
           when "j"  # Down
             arrow_down.call

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fancy_gets
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler