lib/lita-github/general.rb in lita-github-0.0.13 vs lib/lita-github/general.rb in lita-github-0.0.14

@@ -19,42 +19,48 @@
 module LitaGithub
   # Github handler common-use methods
   #
   # @author Tim Heckman <[e-mail]>
   module General
-    # Parse the options in the command using the standard option regex
+    # Convert the value of parameter 1 to an Integer if it looks like it should be one
     #
     # @author Tim Heckman <[e-mail]>
-    # @param cmd [String] the full command line provided to Lita
-    # @return [Hash] the key:value pairs that were in the command string
-    def opts_parse(cmd)
-      o = {}
-      cmd.scan(LitaGithub::R::OPT_REGEX).flatten.each do |opt|
-        k, v = opt.strip.split(':')
-        k = k.to_sym
-        o[k] = v unless o.key?(k)
-      end
-      o
+    # @param value [String] the value to see if it should be an Integer
+    # @return [Integer] if the String <tt>value</tt> looks like an Integer (<tt>/^\d+$/</tt>), return it as one
+    # @return [String] if the String <tt>value</tt> is not an Integer, return as is
+    def to_i_if_numeric(value)
+      /^\d+$/.match(value) ? value.to_i : value
     end
 
-    # Parse the options in the command using the extended option regex
+    # For use when parsing options using <tt>opt_parse()</tt>, this method converts the key to a downcased symbol
+    # for use within the option Hash.
     #
     # @author Tim Heckman <[e-mail]>
+    # @param k [String] the key
+    # @param v [Any] the value
+    # @return [Array] the first element is <tt>key</tt> as a downcased symbol, the second is <tt>v</tt> with no changes
+    def symbolize_opt_key(k, v)
+      [k.downcase.to_sym, v]
+    end
+
+    # Parse the options in the command using the option regex
+    #
+    # @author Tim Heckman <[e-mail]>
     # @param cmd [String] the full command line provided to Lita
     # @return [Hash] the key:value pairs that were in the command string
-    def e_opts_parse(cmd)
+    def opts_parse(cmd)
       o = {}
-      cmd.scan(LitaGithub::R::E_OPT_REGEX).flatten.each do |opt|
-        k, v = opt.strip.split(':')
-        k = k.to_sym
+      cmd.scan(LitaGithub::R::OPT_REGEX).flatten.each do |opt|
+        k, v = symbolize_opt_key(*opt.strip.split(':'))
+        next if o.key?(k)
 
         # if it looks like we're using the extended option (first character is a " or '):
         #   slice off the first and last character of the string
         # otherwise:
         #   do nothing
         v = v.slice!(1, (v.length - 2)) if %w(' ").include?(v.slice(0))
 
-        o[k] = v unless o.key?(k)
+        o[k] = to_i_if_numeric(v)
       end
       o
     end
   end
 end