downup 0.7.4 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d62e2eb0a1759c717dd5d7d265bc0953522205
-  data.tar.gz: 4c4b849657a446d334d262aeda77c14b6e3bd2b5
+  metadata.gz: 5ad502934bddada6b88d84915f3f5cff02d5edf7
+  data.tar.gz: e193c0f2b5243b0a4a7089ac1558ed02948bb5f6
 SHA512:
-  metadata.gz: 3552fad6e0d12819d4e7efb2b991605e224517741a850a48c2c4ef2a70375aaf35cb3eaee273716dd0095571d3081edb9a7dc3cbf6cc4ea4802de1f2be2ad116
-  data.tar.gz: 5e3918e403ead42633a6c5885127e37b043aaf26b744a0cf774f4d0fee7651d211c9acd7e35272ee47ce51ca49c65c027a23d6adda5a6664750f309bb8540800
+  metadata.gz: 7f927774429e6bc921e37d6376a6a6aa6683ce7e09f1d735ea80abb304b6babaf99fe7f04c1b44439a65a41c8595bb020d50dadaa6276a04da23ee0004923174
+  data.tar.gz: 75192244af7c98c91729a96b8db5432e8ec71eef23dc54dc78fdf571acd6c838f61f8d5aba77e196f7a8f7bb9e4cd7d50ab7d5f8ccc7582f42e990aa2dbc56bc

data/README.md

@@ -88,6 +88,15 @@ options = {
 
 puts Downup::Base.new(options: options).prompt
 
+# You can also specifiy a different value from display
+options = {
+  "a" => {"value" => "cat_1", "display" => "Cat"},
+  "b" => {"value" => "kangaroo_1", "display" => "Kangaroo"},
+  "c" => {"value" => "dog_1", "display" => "Dog"}
+}
+
+puts Downup::Base.new(options: options).prompt
+
 # You can also pass in the selector you would like
 # if passing in a hash
 puts Downup::Base.new(options: options, selector: "†").prompt

data/examples/basic.rb

@@ -43,3 +43,11 @@ options = {
 puts Downup::Base.new(options: options).prompt
 
 puts Downup::Base.new(options: options, selector: "†").prompt
+
+options = {
+  "a" => {"value" => "cat_1", "display" => "Cat"},
+  "b" => {"value" => "kangaroo_1", "display" => "Kangaroo"},
+  "c" => {"value" => "dog_1", "display" => "Dog"}
+}
+
+puts Downup::Base.new(options: options).prompt

data/lib/downup/options_printer.rb

@@ -0,0 +1,103 @@
+require_relative "colors"
+
+module Downup
+  class OptionsPrinter
+    using Colors
+
+    def initialize(options:,
+                   selected_position:,
+                   title: nil,
+                   default_color: :brown,
+                   selected_color: :magenta,
+                   selector: "‣",
+                   stdin: $stdout,
+                   stdout: $stdout,
+                   header_proc: Proc.new {})
+
+      @options           = options
+      @title             = title
+      @default_color     = default_color
+      @selected_position = selected_position
+      @selected_color    = selected_color
+      @selector          = selector
+      @header_proc       = header_proc
+      @stdin             = stdin
+      @stdout            = stdout
+      @colonel           = Kernel
+    end
+
+    def print_options
+      case options
+      when Array then print_array_options
+      when Hash
+        if options_has_value_and_display?
+          print_complex_hash_options
+        else
+          print_simple_hash_options
+        end
+      end
+    end
+
+    private
+
+    attr_reader :options,
+                :title,
+                :selected_position,
+                :header_proc,
+                :selected_color,
+                :selector,
+                :default_color,
+                :stdin,
+                :stdout,
+                :colonel
+
+    def print_complex_hash_options
+      options.each_with_index do |option_array, index|
+        key = option_array.first
+        value_hash = option_array.last
+        if index == selected_position
+          stdout.puts "(#{eval("selector.#{selected_color}")}) " +
+            eval("value_hash.fetch('display').#{selected_color}")
+        else
+          stdout.print "(#{eval("key.#{default_color}")}) "
+          stdout.print "#{eval("value_hash.fetch('display').#{default_color}")}\n"
+        end
+      end
+    end
+
+    def print_simple_hash_options
+      options.each_with_index do |option_array, index|
+        if index == selected_position
+          stdout.puts "(#{eval("selector.#{selected_color}")}) " +
+            eval("option_array.last.#{selected_color}")
+        else
+          stdout.print "(#{eval("option_array.first.#{default_color}")}) "
+          stdout.print "#{eval("option_array.last.#{default_color}")}\n"
+        end
+      end
+    end
+
+    def print_array_options
+      options.each_with_index do |option, index|
+        stdout.puts colorize_option(option, index)
+      end
+    end
+
+    def colorize_option(option, index)
+      if index == selected_position
+        eval("option.#{selected_color}")
+      else
+        eval("option.#{default_color}")
+      end
+    end
+
+    # Duplicated in Base, maybe move onto Hash and String with contrainsts
+    def options_has_value_and_display?
+      options.values.all? { |option|
+        option.is_a?(Hash) && option.has_key?("value")
+      } && options.values.all? { |option|
+        option.is_a?(Hash) && option.has_key?("display")
+      }
+    end
+  end
+end

data/lib/downup/version.rb

@@ -1,3 +1,3 @@
 module Downup
-  VERSION = "0.7.4"
+  VERSION = "0.8.4"
 end

data/lib/downup.rb

@@ -1,4 +1,5 @@
 require "downup/version"
+require "downup/options_printer"
 require "downup/colors"
 require "io/console"
 
@@ -11,6 +12,8 @@ module Downup
                    default_color: :brown,
                    selected_color: :magenta,
                    selector: "‣",
+                   stdin: $stdin,
+                   stdout: $stdout,
                    header_proc: Proc.new {})
 
       @options        = options
@@ -19,31 +22,37 @@ module Downup
       @selected_color = selected_color
       @selector       = selector
       @header_proc    = header_proc
-      @stdin          = STDIN
-      @stdout         = $stdout
+      @stdin          = stdin
+      @stdout         = stdout
+      @colonel        = Kernel
     end
 
     def prompt(position = 0)
       @selected_position = position_selector(position)
-      system("clear")
+      colonel.system("clear")
       header_proc.call
       print_title
-      print_options
+      Downup::OptionsPrinter.new(
+        options: options,
+        selected_position: @selected_position
+      ).print_options
       stdout.print "\n> "
-      process_input read_char
+      input = read_char
+      process_input input
     end
 
     private
 
     attr_reader :options,
-                :title,
-                :selected_position,
-                :header_proc,
-                :selected_color,
-                :selector,
-                :default_color,
-                :stdin,
-                :stdout
+      :title,
+      :selected_position,
+      :header_proc,
+      :selected_color,
+      :selector,
+      :default_color,
+      :stdin,
+      :stdout,
+      :colonel
 
     def process_input(input)
       case input
@@ -64,10 +73,22 @@ module Downup
       when Array
         options[selected_position]
       when Hash
-        options.fetch(option_keys[selected_position])
+        if options_has_value_and_display?
+          options.fetch(option_keys[selected_position]).fetch("value")
+        else
+          options.fetch(option_keys[selected_position])
+        end
       end
     end
 
+    def options_has_value_and_display?
+      options.values.all? { |option|
+        option.is_a?(Hash) && option.has_key?("value")
+      } && options.values.all? { |option|
+        option.is_a?(Hash) && option.has_key?("display")
+      }
+    end
+
     def option_keys
       options.is_a?(Array) ? [] : options.keys
     end
@@ -79,39 +100,6 @@ module Downup
       else position; end
     end
 
-    def print_options
-      case options
-      when Array then print_array_options
-      when Hash  then print_hash_options
-      end
-    end
-
-    def print_hash_options
-      options.each_with_index do |option_array, index|
-        if index == selected_position
-          stdout.puts "(#{eval("selector.#{selected_color}")}) " +
-            eval("option_array.last.#{selected_color}")
-        else
-          stdout.print "(#{eval("option_array.first.#{default_color}")}) "
-          stdout.print "#{eval("option_array.last.#{default_color}")}\n"
-        end
-      end
-    end
-
-    def print_array_options
-      options.each_with_index do |option, index|
-        stdout.puts colorize_option(option, index)
-      end
-    end
-
-    def colorize_option(option, index)
-      if index == selected_position
-        eval("option.#{selected_color}")
-      else
-        eval("option.#{default_color}")
-      end
-    end
-
     def print_title
       return if title.nil?
       stdout.puts "#{title}".red

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: downup
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.4
 platform: ruby
 authors:
 - David Begin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,11 +55,11 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- downup-0.6.4.gem
 - downup.gemspec
 - examples/basic.rb
 - lib/downup.rb
 - lib/downup/colors.rb
+- lib/downup/options_printer.rb
 - lib/downup/version.rb
 homepage: https://github.com/presidentJFK/downup
 licenses: