lib/cliprompt/optionset.rb in cliprompt-0.0.1 vs lib/cliprompt/optionset.rb in cliprompt-0.0.2

@@ -10,20 +10,22 @@
     def initialize(options = nil)
       @choices = []
       @default = nil
       @boolean = false
       @envdefault = nil
-      unless options.nil?
-        meth = "parse_#{options.class.name.downcase}".to_sym
-        if respond_to? meth
-          send(meth, options)
-        else
-          fail OptionException, "Undefined parser ::#{meth}"
-        end
+      @type = options.class.name.downcase
+      meth = "parse_#{@type}".to_sym
+      if respond_to? meth
+        send(meth, options)
+      else
+        fail OptionException, "Undefined parser ::#{meth}"
       end
     end
 
+    def parse_nilclass(args)
+    end
+
     def parse_hash(args)
       @choices = args[:choices] || args['choices'] || []
       parse_array @choices
       if args[:default] == false || args['default'] == false
         @default ||= false
@@ -34,19 +36,27 @@
       @default = true if (@boolean && @default.nil?)
       @envdefault = args[:env] || args['env']
     end
 
     def parse_array(args)
-      @choices = args.map do |a|
+      @choices = args.map(&:to_s).map do |a|
         if a[0] && a[0] == '='
           @default = a[1..-1]
         else
           a
         end
       end
     end
 
+    def parse_fixnum(arg)
+      @default = arg.to_s
+    end
+
+    def parse_float(arg)
+      @default = arg.to_s
+    end
+
     def parse_string(arg)
       if arg.downcase.match /^y(es)?(\/)?n(o)?/
         @boolean = true
         if /y(es)?(\/)?N/.match arg
           @default = false
@@ -56,14 +66,10 @@
       else
         @default = arg
       end
     end
 
-    def boolean?
-      @boolean
-    end
-
     def display
       back = ''
       if @boolean
         back = @default ? "[Y/n]" : "[y/N]"
       else
@@ -71,9 +77,42 @@
           back += "(#{@choices.join(' / ')})"
         end
         back += "[#{@default}]" if @default
       end
       return back
+    end
+
+    def validate(question, answer)
+      if answer == ''
+        check_default question
+      elsif @boolean
+        check_boolean question, answer
+      elsif @choices.count > 0
+        check_choices question, answer
+      else
+        answer
+      end
+    end
+
+    def check_default(question)
+      return ask_again(question, Cliprompt::MSG_MANDATORY_TEXT) if @default.nil?
+      @default
+    end
+
+    def check_boolean(question, answer)
+      answer.downcase!
+      return ask_again(question, Cliprompt::MSG_YES_OR_NO) unless /^(y(es)?|n(o)?)$/.match(answer)
+      !/^y(es)?$/.match(answer).nil?
+    end
+
+    def check_choices(question, answer)
+      return ask_again(question, Cliprompt::MSG_CHOSE_IN_LIST) unless @choices.include?(answer)
+      answer
+    end
+
+    def ask_again(question, msg)
+      Cliprompt.shout msg
+      Cliprompt.ask question, self
     end
 
   end
 end