fancy_gets 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85562fc1f81a32285fc7ba1c55fddab5c682788c
-  data.tar.gz: 7efd1dc42d0d741651089706c1afcf2b3103dbe3
+  metadata.gz: 41007873e8755595379093dbcd5f1764b73148ab
+  data.tar.gz: 633febcbd5720208eceeef1ca32c975ec7257eac
 SHA512:
-  metadata.gz: 3050f1d78127a725ce2fe2cd83129ca4334e215e93a76388ac1c87ac8842a874a70bda4cddc4194b4eb642598f85a46a940be38abde99bd25d773c78988476cb
-  data.tar.gz: 72c1fa9893d5fe8021f203df3883c2beb0d9a1eafc1719f3c5a4d0a031d9ce6862661b640c05a0e3d25669632a3f0f151d69a2f9ce6f2042ac022d6afd2a52bd
+  metadata.gz: 2a86edaed276de4def2109e9aa9acf6f40abbb956358c8255175ba3d3a614a184a80548acf1b82f969ef6b6d238ad63cf9d418c4fa96f6cde3a6312eef75c332
+  data.tar.gz: aac9199698385c4724f159335aebccf5574e28eea79feac353a617f47c3b39a17b919f05818aa27dd19a7b753e79d09f61e1e8d597695802c017cbab61b8270a

data/lib/fancy_gets/version.rb

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

data/lib/fancy_gets.rb

@@ -11,31 +11,49 @@ module FancyGets
   end
 
   # 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 = [], prefix = "> ", postfix = " <", info = nil)
-    # Trying to supply parameters but left out a "true" for is_multiple?
-    if is_multiple.is_a?(Array)
-      chosen = is_multiple
-      is_multiple = true
-    end
-    if is_multiple.is_a?(String) || is_multiple.is_a?(Fixnum)
-      chosen = is_multiple
-      is_multiple = false
+  def gets_list(words, is_multiple = false, chosen = nil, prefix = "> ", postfix = " <", info = nil, height = nil)
+    if words.is_a? Hash
+      is_multiple = words[:is_multiple] || false
+      chosen = words[:chosen]
+      prefix = words[:prefix] || "> "
+      postfix = words[:postfix] || " <"
+      info = words[:info]
+      height = words[:height] || nil
+      words = words[:words]
+    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)
+        chosen = is_multiple
+        is_multiple = false
+      end
     end
-    is_multiple = true if chosen.is_a?(Array) && chosen.length > 1
-    height = words.length
-    winheight = IO.console.winsize.first - 3
-    height = winheight if height > winheight
+    # 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)
   end
 
   # The internal routine that makes all the magic happen
-  def self.gets_internal_core(is_list, is_password, words = nil, chosen = [], 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)
     # OK -- second parameter, is_password, means is_multiple when is_list is true
     is_multiple = is_list & is_password
-    words.sort! unless words.nil? || is_list
-    string = chosen if chosen.is_a?(String)
+    unless word_objects.nil? || is_list
+      word_objects.sort! {|wo1, wo2| wo1.to_s <=> wo2.to_s}
+    end
+    words = word_objects.map(&:to_s)
+    if is_multiple
+      chosen ||= [0] unless is_multiple
+    else
+      if chosen.is_a?(Enumerable)
+        # Maybe find first string or object that matches the stuff they have sequenced in the chosen array
+        string = chosen.first.to_s
+      else
+        string = chosen.to_s
+      end
+    end
     position = 0
-    height ||= words.length
+    height = words.length unless !height.nil? && height.is_a?(Numeric) && height > 2
+    winheight = IO.console.winsize.first - 3
+    height = winheight if height > winheight
     offset = (height < words.length) ? 0 : nil
     sugg = ""
     prev_sugg = ""
@@ -79,21 +97,77 @@ module FancyGets
       print "\b" * (uncolor.call(word).length + pre_post_length) if is_end_at_front
     end
 
+    arrow_down = lambda do
+      if position < words.length - 1
+        is_shift = false
+        # Now moving down past the bottom of the shown window?
+        if !offset.nil? && position >= offset + (height - 3)
+          print "\b" * (uncolor.call(words[position]).length + pre_post_length)
+          print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
+          offset += 1
+          # Add 1 if offset + height == (words.length - 1)
+          (offset...(offset + height - 4)).each do |i|
+            end_fill = max_word_length - uncolor.call(words[i]).length
+            puts (is_multiple && chosen.include?(i)) ? "#{prefix}#{words[i]}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{words[i]}#{" " * (end_fill + uncolor.call(postfix).length)}"
+          end
+          is_shift = true
+        end
+        make_select.call(chosen.include?(position) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
+        w1 = uncolor.call(words[position]).length
+        position += 1
+        print 27.chr + 91.chr + 66.chr
+        if is_shift || !is_multiple
+          make_select.call((chosen.include?(position) && is_shift) || !is_multiple)
+        else
+          w2 = uncolor.call(words[position]).length
+          print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
+        end
+      end
+    end
+
+    arrow_up = lambda do
+      if position > 0
+        is_shift = false
+        # Now moving up past the top of the shown window?
+        if position <= (offset || 0)
+          print "\b" * (uncolor.call(words[position]).length + pre_post_length)
+          offset -= 1
+          # print (27.chr + 91.chr + 65.chr) if offset == 0
+          (offset...(offset + height - 2)).each do |i|
+            end_fill = max_word_length - uncolor.call(words[i]).length
+            puts (is_multiple && chosen.include?(i)) ? "#{prefix}#{words[i]}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{words[i]}#{" " * (end_fill + uncolor.call(postfix).length)}"
+          end
+          print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
+          is_shift = true
+        end
+        make_select.call(chosen.include?(position) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
+        w1 = uncolor.call(words[position]).length
+        position -= 1
+        print 27.chr + 91.chr + 65.chr
+        if is_shift || !is_multiple
+          make_select.call((chosen.include?(position) && is_shift) || !is_multiple)
+        else
+          w2 = uncolor.call(words[position]).length
+          print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
+        end
+      end
+    end
+
     if is_list
       # Maybe confirm the height is adequate by checking out IO.console.winsize
       case chosen.class.name
       when "Fixnum"
-        chosen = [words[chosen]]
+        chosen = [chosen]
       when "String"
         if words.include?(chosen)
-          chosen = [chosen]
+          chosen = [words.index(chosen)]
         else
           chosen = []
         end
       end
       chosen ||= []
-      chosen = [words[0]] if chosen == [] && !is_multiple
-      position = words.index(chosen.first) if chosen.length > 0
+      chosen = [0] if chosen == [] && !is_multiple
+      position = chosen.first if chosen.length > 0
       # If there's more options than we can fit at once
       unless offset.nil?
         # ... put the chosen one a third of the way down the screen
@@ -109,7 +183,7 @@ module FancyGets
       # Maybe we can fit it all
       last_word = words.length if last_word > words.length
       # Write all the visible words
-      words[(offset || 0)...last_word].each { |word| puts chosen.include?(word) ? "#{prefix}#{word}#{postfix}" : "#{" " * uncolor.call(prefix).length}#{word}" }
+      ((offset || 0)...last_word).each { |i| puts chosen.include?(i) ? "#{prefix}#{words[i]}#{postfix}" : "#{" " * uncolor.call(prefix).length}#{words[i]}" }
       # Can't fit it all?
       #   was: if last_word < (words.length - top_bottom_reserved)
       puts "#{" " * uncolor.call(prefix).length}#{"↓" * max_word_length}" if height < words.length
@@ -167,66 +241,22 @@ module FancyGets
         when 91 # Arrow keys
           case ch = STDIN.getch.ord
           when 68 # Arrow left
-            if position > 0
+            if !is_list && position > 0
               print "\b" # 27.chr + 91.chr + 68.chr
               position -= 1
             end
           when 67 # Arrow right
-            if position < string.length
+            if !is_list && position < string.length
               print 27.chr + 91.chr + 67.chr
               position += 1
             end
           when 66 # - down
-            if is_list && position < words.length - 1
-              is_shift = false
-              # Now moving down past the bottom of the shown window?
-              if !offset.nil? && position >= offset + (height - 3)
-                print "\b" * (uncolor.call(words[position]).length + pre_post_length)
-                print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
-                offset += 1
-                # Add 1 if offset + height == (words.length - 1)
-                words[offset...(offset + height - 4)].each do |word|
-                  end_fill = max_word_length - uncolor.call(word).length
-                  puts (is_multiple && chosen.include?(word)) ? "#{prefix}#{word}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{word}#{" " * (end_fill + uncolor.call(postfix).length)}"
-                end
-                is_shift = true
-              end
-              make_select.call(chosen.include?(words[position]) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
-              w1 = uncolor.call(words[position]).length
-              position += 1
-              print 27.chr + 91.chr + 66.chr
-              if is_shift || !is_multiple
-                make_select.call((chosen.include?(words[position]) && is_shift) || !is_multiple)
-              else
-                w2 = uncolor.call(words[position]).length
-                print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
-              end
+            if is_list
+              arrow_down.call
             end
           when 65 # - up
-            if is_list && position > 0
-              is_shift = false
-              # Now moving up past the top of the shown window?
-              if position <= (offset || 0)
-                print "\b" * (uncolor.call(words[position]).length + pre_post_length)
-                offset -= 1
-                # print (27.chr + 91.chr + 65.chr) if offset == 0
-                words[offset...(offset + height - 2)].each do |word|
-                  end_fill = max_word_length - uncolor.call(word).length
-                  puts (is_multiple && chosen.include?(word)) ? "#{prefix}#{word}#{postfix}#{" " * end_fill}" : "#{" " * uncolor.call(prefix).length}#{word}#{" " * (end_fill + uncolor.call(postfix).length)}"
-                end
-                print (27.chr + 91.chr + 65.chr) * (height - (offset > 0 ? 3 : 3))
-                is_shift = true
-              end
-              make_select.call(chosen.include?(words[position]) && is_shift && is_multiple, true, true) if is_shift || !is_multiple
-              w1 = uncolor.call(words[position]).length
-              position -= 1
-              print 27.chr + 91.chr + 65.chr
-              if is_shift || !is_multiple
-                make_select.call((chosen.include?(words[position]) && is_shift) || !is_multiple)
-              else
-                w2 = uncolor.call(words[position]).length
-                print (w1 > w2 ? "\b" : (27.chr + 91.chr + 67.chr)) * (w1 - w2).abs
-              end
+            if is_list
+              arrow_up.call
             end
           when 51 # - Delete forwards?
           else
@@ -260,16 +290,22 @@ module FancyGets
         end
       else # Insert character
         if is_list
-          if is_multiple && ch == " "
-            # Toggle this entry
-            word = words[position]
-            does_include = chosen.include?(word)
-            if does_include
-              chosen -= [word]
-            else
-              chosen += [word]
+          case ch
+          when " "
+            if is_multiple
+              # Toggle this entry
+              does_include = chosen.include?(position)
+              if does_include
+                chosen -= [position]
+              else
+                chosen += [position]
+              end
+              make_select.call(!does_include, true)
             end
-            make_select.call(!does_include, true)
+          when "j"  # Down
+            arrow_down.call
+          when "k"  # Up
+            arrow_up.call
           end
         else
           string = string[0...position] + ch + string[position..-1]
@@ -288,10 +324,9 @@ module FancyGets
 
     if is_list
       # Put chosen stuff in same order as it's listed in the words array
-      chosen = words.select { |word| chosen.include?(word) }
-      is_multiple ? chosen : words[position]
+      is_multiple ? chosen.map {|c| word_objects[c] } : word_objects[position]
     else
-      sugg.empty? ? string : sugg
+      sugg.empty? ? string : word_objects[words.index(sugg)]
     end
   end
 end

metadata

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