- [bugfix] report argument name when option argument is missing

- [bugfix] enhacner class name was not reported when not found (Ruby 1.9.1)
- [change] add _error_test() to 'test-main.rb'

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/erubis/main.rb b/lib/erubis/main.rb
index 58084d8..34f1091 100644
--- a/lib/erubis/main.rb
+++ b/lib/erubis/main.rb
@@ -326,7 +326,7 @@ module Erubis
             elsif arg_required.include?(optchar)
               arg = optstr.empty? ? argv.shift : optstr
               unless arg
-                mesg = "-#{optchar}: #{@option_args[optchar]} required."
+                mesg = "-#{optchar}: #{@option_names[optchar]} required."
                 raise CommandOptionError.new(mesg)
               end
               options[optchar] = arg
@@ -395,7 +395,8 @@ module Erubis
       enhancers = []
       shortname = nil
       begin
-        enhancer_names.split(/,/).each do |shortname|
+        enhancer_names.split(/,/).each do |name|
+          shortname = name
           enhancers << Erubis.const_get("#{shortname}Enhancer")
         end
       rescue NameError