optopus 0.2.2 → 0.2.3

data/lib/optopus.rb

@@ -186,34 +186,43 @@ module Optopus
 
           next unless value
 
-          value = orig_val = value.to_s
+          check_block = lambda do |unit|
+            unit = orig_val = unit.to_s
 
-          if type = args.find {|i| i.kind_of?(Class) }
-            pat, conv =  OptionParser::DefaultList.atype[type]
+            if type = args.find {|i| i.kind_of?(Class) }
+              pat, conv =  OptionParser::DefaultList.atype[type]
 
-            if pat and pat !~ value
-              raise OptionParser::InvalidArgument.new(v, "(#{key}: #{value})")
+              if pat and pat !~ unit
+                raise OptionParser::InvalidArgument.new(v, "(#{key}: #{unit})")
+              end
+
+              unit = conv.call(unit) if conv
+            elsif type = args.find {|i| i.kind_of?(Array) }
+              unless type.map {|i| i.to_s }.include?(unit.to_s)
+                raise OptionParser::InvalidArgument.new(key, unit)
+              end
+
+              unit = unit.to_s.to_sym
             end
 
-            value = conv.call(value) if conv
-          elsif type = args.find {|i| i.kind_of?(Array) }
-            unless type.map {|i| i.to_s }.include?(value.to_s)
-              raise OptionParser::InvalidArgument.new(key, value)
+            if unit and block
+              begin
+                CheckerContext.evaluate(v, unit, &block)
+              rescue OptionParser::ParseError => e
+                errmsg = "#{e.message}: #{key}=#{orig_val}"
+                raise OptionParser::ParseError, errmsg
+              end
             end
 
-            value = value.to_s.to_sym
+            return unit
           end
 
-          if value and block
-            begin
-              CheckerContext.evaluate(v, value, &block)
-            rescue OptionParser::ParseError => e
-              errmsg = "#{e.message}: #{key}=#{orig_val}"
-              raise OptionParser::ParseError, errmsg
-            end
+          if multiple
+            value = [value] unless value.kind_of?(Array)
+            options[name] = value.map {|i| check_block.call(i) }
+          else
+            options[name] = check_block.call(value)
           end
-
-          options[name] = value
         end
       end # file_args_checker
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: optopus
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - winebarrel
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-26 00:00:00 Z
+date: 2012-01-06 00:00:00 +09:00
+default_executable: 
 dependencies: []
 
 description: 
@@ -29,6 +30,7 @@ extra_rdoc_files: []
 files: 
 - README
 - lib/optopus.rb
+has_rdoc: true
 homepage: https://bitbucket.org/winebarrel/optopus
 licenses: []
 
@@ -58,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: optopus is an easy-to-use option purser.