0
@@ -57,9 +57,10 @@ module Clip
0
     # comma-separated value can be specified which will then be broken up into
0
     # separate tokens.
0
     def optional(short, long, options={}, &block)
0
+      check_args(short, long)
0
+
0
       short = short.to_sym
0
       long = long.gsub('-', '_').to_sym
0
-      check_args(short, long)
0
 
0
       var_name = "@#{long}".to_sym
0
       if block
0
@@ -104,11 +105,10 @@ module Clip
0
     # Valid options are:
0
     # * <tt>desc</tt>: Descriptive text for the flag
0
     def flag(short, long, options={})
0
-      short = short.to_sym
0
-      long = long.gsub('-', '_').to_sym
0
-
0
       check_args(short, long)
0
 
0
+      short = short.to_sym
0
+      long = long.gsub('-', '_').to_sym
0
       eval <<-EOF
0
         def flag_#{long}
0
           @#{long} = true
0
@@ -245,6 +245,18 @@ module Clip
0
 
0
     private 
0
     def check_args(short, long)
0
+      if short.size != 1
0
+        raise IllegalConfiguration.new("Short options must be a single character.")
0
+      end
0
+
0
+      if short !~ /[\w]+/
0
+        raise IllegalConfiguration.new("Illegal option: #{short}.  Option names can only use [a-zA-Z_-]")
0
+      end
0
+
0
+      if long !~ /\A\w[\w-]+\z/
0
+        raise IllegalConfiguration.new("Illegal option: #{long}'.  Parameter names can only use [a-zA-Z_-]")
0
+      end
0
+
0
       short = short.to_sym
0
       long = long.to_sym
0
 

0
@@ -241,6 +241,26 @@ describe Clip do
0
       end.should raise_error(Clip::IllegalConfiguration)
0
     end
0
 
0
+    it "should reject '-' as a short option" do
0
+      misconfig_parser { |c| c.flag '-', 'foo' }
0
+    end
0
+
0
+    it "should reject long parameters that do not start with a word character" do
0
+      misconfig_parser { |c| c.optional 'o', '-foo' }
0
+      misconfig_parser { |c| c.optional 'o', '-' }
0
+    end
0
+
0
+    it "should reject options with non-word characters '-' ok" do
0
+      misconfig_parser { |c| c.flag '#', 'count' }
0
+      misconfig_parser { |c| c.flag 'c', 'bang!' }
0
+      misconfig_parser { |c| c.optional '#', 'count' }
0
+      misconfig_parser { |c| c.optional 'c', 'bang!' }
0
+    end
0
+
0
+    it "should reject short params that aren't single characters" do
0
+      misconfig_parser { |c| c.optional 'foo', 'foo' }
0
+    end
0
+
0
     it "should reject :help as a flag name" do
0
       misconfig_parser { |c| c.flag 'x', 'help' }
0
     end