args_parser 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.8 2012-09-27
+
+* validator and filter tested
+
 === 0.0.7 2012-09-26
 
 * add function ArgsParser#argv

data/Manifest.txt

@@ -6,8 +6,9 @@ README.rdoc
 Rakefile
 lib/args_parser.rb
 lib/args_parser/config.rb
-lib/args_parser/parser.rb
+lib/args_parser/error.rb
 lib/args_parser/filter.rb
+lib/args_parser/parser.rb
 lib/args_parser/styles/default.rb
 lib/args_parser/styles/equal.rb
 lib/args_parser/validator.rb
@@ -18,4 +19,6 @@ script/destroy
 script/generate
 test/test_args_parser.rb
 test/test_args_parser_style_equal.rb
+test/test_filter.rb
 test/test_helper.rb
+test/test_validator.rb

data/README.rdoc

@@ -22,7 +22,7 @@ parse ARGV
     arg :help, 'show help', :alias => :h
 
     filter :url do |v|
-      v.strip
+      v.to_s.strip
     end
 
     validate :url, "invalid URL" do |v|

data/lib/args_parser.rb

@@ -4,10 +4,11 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'args_parser/parser'
 require 'args_parser/styles/default'
 require 'args_parser/styles/equal'
+require 'args_parser/error'
 require 'args_parser/filter'
 require 'args_parser/validator'
 require 'args_parser/config'
 
 module ArgsParser
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/args_parser/error.rb

@@ -0,0 +1,4 @@
+module ArgsParser
+  class ValidationError < StandardError
+  end
+end

data/lib/args_parser/parser.rb

@@ -35,13 +35,22 @@ module ArgsParser
       @aliases = {}
       @filter = Filter.new
       @validator = Validator.new
-      instance_eval(&block)
+
       filter do |v|
         (v.kind_of? String and v =~ /^\d+$/) ? v.to_i : v
       end
       filter do |v|
         (v.kind_of? String and v =~ /^\d+\.\d+$/) ? v.to_f : v
       end
+      on_filter_error do |err, name, value|
+        raise err
+      end
+      on_validate_error do |err, name, value|
+        STDERR.puts "Error: #{err.message} (--#{name} #{value})"
+        exit 1
+      end
+
+      instance_eval(&block)
     end
 
     def arg(name, description, opts={})
@@ -58,12 +67,28 @@ module ArgsParser
       end
     end
 
+    def on_filter_error(err=nil, name=nil, value=nil, &block)
+      if block_given?
+        @on_filter_error = block
+      else
+        @on_filter_error.call(err, name, value) if @on_filter_error
+      end
+    end
+
     def validate(name, message, &block)
       if block_given?
         @validator.add name, message, block
       end
     end
 
+    def on_validate_error(err=nil, name=nil, value=nil, &block)
+      if block_given?
+        @on_validate_error = block
+      else
+        @on_validate_error.call(err, name, value) if @on_validate_error
+      end
+    end
+
     def args
       params.keys
     end
@@ -72,11 +97,18 @@ module ArgsParser
       method("parse_style_#{@config[:style]}".to_sym).call(argv)
       params.each do |name, param|
         next if [nil, true].include? param[:value]
-        param[:value] = @filter.filter name, param[:value]
-        msg = @validator.validate name, param[:value]
+        begin
+          param[:value] = @filter.filter name, param[:value]
+        rescue => e
+          on_filter_error e, name, param[:value]
+        end
+        begin
+          msg = @validator.validate name, param[:value]
+        rescue => e
+          on_validate_error e, name, param[:value]
+        end
         if msg
-          STDERR.puts "Error: #{msg} (--#{name} #{param[:value]})"
-          exit 1
+          on_validate_error ValidationError.new(msg), name, param[:value]
         end
       end
     end

data/lib/args_parser/styles/equal.rb

@@ -3,6 +3,11 @@ module ArgsParser
   class Parser
 
     def parse_style_equal(argv)
+      on_validate_error do |err, name, value|
+        STDERR.puts "Error: #{err.message} (--#{name}=#{value})"
+        exit 1
+      end
+
       is_option = /^-+([^-=\s]+)$/
       is_param = /^-+([^-=\s]+)=([^=\s]+)$/
       argv.each_with_index do |arg, i|

data/samples/download_webpage.rb

@@ -12,7 +12,7 @@ parser = ArgsParser.parse ARGV do
   arg :help, 'show help', :alias => :h
 
   filter :url do |v|
-    v.strip
+    v.to_s.strip
   end
 
   validate :url, "invalid URL" do |v|

data/samples/twitter_timeline.rb

@@ -15,7 +15,7 @@ parser = ArgsParser.parse ARGV, :style => :equal do
   arg :help, 'show help', :alias => :h
 
   filter :user do |v|
-    v.strip
+    v.to_s.strip
   end
 
   validate :user, "invalid twitter screen_name" do |v|

data/test/test_filter.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestArgsParserFilter < Test::Unit::TestCase
+  def setup
+    @argv = ['--count', '35']
+    @@err = nil
+    @@name = nil
+    @@value = nil
+    @parser = ArgsParser.parse @argv do
+      arg :count, 'number'
+
+      filter :count do |v|
+        raise NoMethodError, 'error!!'
+      end
+
+      on_filter_error do |err, name, value|
+        @@err = err
+        @@name = name
+        @@value = value
+      end
+    end
+  end
+
+  def test_filter_error
+    assert @@name == :count
+    assert @@value == '35'
+    assert @@err.class == NoMethodError
+  end
+end

data/test/test_validator.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+class TestArgsParserValidator < Test::Unit::TestCase
+  def setup
+    @argv = ['--url', 'hptt://shokai.org']
+    @@err = nil
+    @@name = nil
+    @@value = nil
+    @parser = ArgsParser.parse @argv do
+      arg :url, 'URL'
+
+      validate :url, 'invalid URL' do |v|
+        v =~ Regexp.new("^https?://.+$")
+      end
+      
+      on_validate_error do |err, name, value|
+        @@err = err
+        @@name = name
+        @@value = value
+      end
+    end
+  end
+
+  def test_validate_error
+    assert @@name == :url
+    assert @@value == 'hptt://shokai.org'
+    assert @@err.class == ArgsParser::ValidationError
+  end
+end

metadata

@@ -1,74 +1,62 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: args_parser
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-- !ruby/object:Gem::Dependency
-  name: newgem
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
+      - !ruby/object:Gem::Version 
+        version: "3.10"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: newgem
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+      - !ruby/object:Gem::Version 
+        version: "3.1"
+  type: :development
+  version_requirements: *id003
 description: ARGV parser - Parse args from command line.
-email:
+email: 
 - hashimoto@shokai.org
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - Manifest.txt
 - README.rdoc
-files:
+files: 
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -77,8 +65,9 @@ files:
 - Rakefile
 - lib/args_parser.rb
 - lib/args_parser/config.rb
-- lib/args_parser/parser.rb
+- lib/args_parser/error.rb
 - lib/args_parser/filter.rb
+- lib/args_parser/parser.rb
 - lib/args_parser/styles/default.rb
 - lib/args_parser/styles/equal.rb
 - lib/args_parser/validator.rb
@@ -89,38 +78,41 @@ files:
 - script/generate
 - test/test_args_parser.rb
 - test/test_args_parser_style_equal.rb
+- test/test_filter.rb
 - test/test_helper.rb
+- test/test_validator.rb
 - .gemtest
 homepage: http://github.com/shokai/args_parser
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3917309846175452703
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: args_parser
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: ARGV parser - Parse args from command line.
-test_files:
+test_files: 
 - test/test_args_parser.rb
 - test/test_args_parser_style_equal.rb
+- test/test_filter.rb
 - test/test_helper.rb
+- test/test_validator.rb