optparse-range 0.0.2 → 0.0.3

data/README.markdown

@@ -45,35 +45,43 @@ When only one argument passed, it will be handled as both start and end:
     opts #=> {"port"=>8080..8080}
 
 You can replace `OptionParser::DecimalIntegerRange` in above example with other type of `Range`.
-Currently provided:
+See below for types currently provided.
 
-### `OptionParser::DecimalIntegerRange` ###
+### Supported Types ###
+
+#### `OptionParser::DecimalIntegerRange` ####
 
 * decimal `Integer` range
 * `--number=1-5` => `1..5`
 *  only zero or positive integers are supported currently
 
-### `OptionParser::FloatRange` ###
+#### `OptionParser::FloatRange` ####
 
 * `Float` range
 * `--ratio=1.2-1.5` => `1.2..1.5`
 * only zero or positive floats are supported currently
 
-### `OptionParser::DateRange` ###
+#### `OptionParser::DateRange` ####
 * `Date` range
 * `--trip=0810-0820` => `#<Date: 2012-08-10 ((2456150j,0s,0n),+0s,2299161j)>..#<Date: 2012-08-20 ((2456160j,0s,0n),+0s,2299161j)>`
+* format including hyphen is not supported currently
+  * `--trip=2012-08-10-2012-08-20` => `OptionParser::AmbiguousArgument` raised
 
-### `OptionParser::DateTimeRange` ###
+#### `OptionParser::DateTimeRange` ####
 
 * `DateTime` range
 * `--flight=0810T10:00-0810T12:20` => `#<DateTime: 2012-08-10T10:00:00+00:00 ((2456150j,36000s,0n),+0s,2299161j)>..#<DateTime: 2012-08-10T12:20:00+00:00 ((2456150j,44400s,0n),+0s,2299161j)>`
+* format including hyphen is not supported currently
+  * `--trip=2012-08-10T10:00:00-2012-08-20T19:30:00` => `OptionParser::AmbiguousArgument` raised
 
-### `OptionParser::TimeRange` ###
+#### `OptionParser::TimeRange` ####
 
 * `Time` range
 * `--flight=10:00-12:20` => `>2012-07-29 10:00:00 +0900..2012-07-29 12:20:00 +0900`
+* format including hyphen is not supported currently
+  * `--trip=2012-08-10T10:00:00-2012-08-20T19:30:00` => `OptionParser::AmbiguousArgument` raised
 
-### `OptionParser::StringRange` ###
+#### `OptionParser::StringRange` ####
 
 * `String` range
 * `--password-chars=A-Z` => `"A".."Z"`
@@ -84,9 +92,13 @@ Adding Type of Rnage
 To add a type of range, use `OptionParser.accept_range`.
 
 1. Define class which can be used as points of `Range`(`MyClass` here).
-2. Define class or `Regexp` which allows `OptionParser` to accept class above as the points of `Range`(`MyClassRange`). Class is recommended.
-3. Pass the class and `Symbol` or `Proc` which converts a command line option(`String`) to an object of point(`MyClass`). `lambda` is used here. `to_proc` will be called when `Symbol` is passed.
-4. Now, you can pass the class for range(`MyClassRange`) to `OptionParser#on` and use the option argument as `Range`.
+2. Define class or `Regexp` which allows `OptionParser` to accept class above
+   as the points of `Range`(`MyClassRange`). Class is recommended.
+3. Pass the class and block, `Symbol` or `Proc` which
+   converts a point in command line option(`String`) to an object of point(`MyClass`).
+   Block is used here. `to_proc` will be called when `Symbol` is passed.
+4. Now, you can pass the class for range(`MyClassRange`) to `OptionParser#on`
+   and use the option argument as `Range`.
 
 Example:
 
@@ -112,7 +124,9 @@ Example:
     end
     
     class MyClassRange; end
-    OptionParser.accept_range MyClassRange, lambda {|range| MyClass.parse range}
+    OptionParser.accept_range MyClassRange do |point_of_range|
+      MyClass.parse point_of_range
+    end
     
     opts = OptionParser.new do |opti|
       opti.on '--myoption=MYSTART-MYEND', MyClassRange
@@ -134,6 +148,8 @@ Todos
 * List of range(--page=1-3,6-7)
 * API for `Range` excluding the end point(`1...5` in result)
 * Range with single point, such like --age=-18(under 18) or --page=192-(all after page 192)
+* Alternate delimiters
+* Parsing `Date` such like "2012-07-23"(including "-")
 
 Contributing
 ------------
@@ -148,7 +164,7 @@ Links
 -----
 
 * [Homepage and source code][repo]
-* [Referencees][rubydoc]
+* [API Documentation][rubydoc]
 
 [optparse]:  http://rubydoc.info/stdlib/optparse/frames
 [slop]:      https://github.com/injekt/slop

data/lib/optparse/range.rb

@@ -2,12 +2,13 @@ require 'optparse'
 
 class OptionParser
   class << self
-    def accept_range(accepter, converter)
+    def accept_range(accepter, converter=nil, &block)
       accept accepter do |range,|
         return range unless range
         points = range.split('-')
         raise AmbiguousArgument if points.length > 2
         points << points.first if points.length == 1
+        converter = block if block
         Range.new *points.map(&converter)
       end
     end
@@ -21,57 +22,39 @@ class OptionParser
   FloatRange = /#{float}-#{float}/io
   accept_range FloatRange, :to_f
 
-  class DateRange
-    class << self
-      attr_reader :converter
+  class StringRange; end
+  accept_range StringRange, :to_s
+
+  class DateRange; end
+  accept_range DateRange do |date|
+    begin
+      Date.parse date
+    rescue NameError
+      retry if require 'date'
+    rescue ArgumentError
+      raise InvalidArgument, date
     end
-    @converter = lambda {|date|
-      begin
-        Date.parse date
-      rescue NameError
-        require 'date'
-        retry
-      rescue ArgumentError
-        raise InvalidArgument, date
-      end
-    }
   end
-  accept_range DateRange, DateRange.converter
 
-  class DateTimeRange
-    class << self
-      attr_reader :converter
+  class DateTimeRange; end
+  accept_range DateTimeRange do |dt|
+    begin
+      DateTime.parse dt
+    rescue NameError
+      retry if require 'date'
+    rescue ArgumentError
+      raise InvalidArgument, dt
     end
-    @converter = lambda {|dt|
-      begin
-        DateTime.parse dt
-      rescue NameError
-        require 'date'
-        retry
-      rescue ArgumentError
-        raise InvalidArgument, dt
-      end
-    }
   end
-  accept_range DateTimeRange, DateTimeRange.converter
 
-  class TimeRange
-    class << self
-      attr_reader :converter
+  class TimeRange; end
+  accept_range TimeRange do |time|
+    begin
+      Time.httpdate(time) rescue Time.parse(time)
+    rescue NoMethodError
+      retry if require 'time'
+    rescue
+      raise InvalidArgument, time
     end
-    @converter = lambda {|time|
-      begin
-        Time.httpdate(time) rescue Time.parse(time)
-      rescue NoMethodError
-        require 'time'
-        retry
-      rescue
-        raise InvalidArgument, time
-      end
-    }
   end
-  accept_range TimeRange, TimeRange.converter
-
-  class StringRange; end
-  accept_range StringRange, :to_s
 end

data/optparse-range.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "optparse-range"
-  gem.version       = '0.0.2'
+  gem.version       = '0.0.3'
   gem.authors       = ["KITAITI Makoto"]
   gem.email         = ["KitaitiMakoto@gmail.com"]
   gem.description   = %q{This RubyGem allows standard bundled `OptionParser` to accept option arguments as `Range` object.}

data/test/test_range.rb

@@ -1,4 +1,3 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'test/unit'
 require 'optparse/range'
 
@@ -41,6 +40,12 @@ class TestOptionParserRange < Test::Unit::TestCase
     assert_equal 'A'..'Z', parse_option(OptionParser::StringRange, 'A-Z')
   end
 
+  def test_ambiguous_argument
+    assert_raise OptionParser::AmbiguousArgument do
+      parse_option OptionParser::DateRange, '2012-07-31-2012-08-01'
+    end
+  end
+
   private
 
   def parse_option(accepter, arg)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optparse-range
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9890840 !ruby/object:Gem::Requirement
+  requirement: &15293440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9890840
+  version_requirements: *15293440
 description: This RubyGem allows standard bundled `OptionParser` to accept option
   arguments as `Range` object.
 email:
@@ -41,7 +41,6 @@ files:
 - lib/optparse/range.rb
 - optparse-range.gemspec
 - test/test_range.rb
-- test/test_range.rb~
 homepage: https://github.com/KitaitiMakoto/optparse-range
 licenses:
 - Ruby
@@ -58,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3406969379377498209
+      hash: -114764199510757300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -67,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3406969379377498209
+      hash: -114764199510757300
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8
@@ -76,4 +75,3 @@ specification_version: 3
 summary: Range command line arguments handling
 test_files:
 - test/test_range.rb
-- test/test_range.rb~

data/test/test_range.rb~

@@ -1 +0,0 @@
-require 'test/unit'