slop 2.4.2 → 2.4.3

data/CHANGES.md

@@ -1,3 +1,10 @@
+HEAD
+----
+
+* Allow the `:as` option to accept an object responding to :call for
+  custom type conversions (#45)
+* Ensure negative integers are not parsed as possible options (#46)
+
 2.4.2 (2011-12-18)
 ------------------
 

data/README.md

@@ -1,7 +1,7 @@
 Slop
 ====
 
-Slop is a simple option parser with an easy to remember syntax and friendly API.
+Slop is a simple, lightweight option parser with an easy to remember syntax and friendly API.
 
 Installation
 ------------
@@ -290,4 +290,4 @@ opts = Slop.parse do
 end
 
 opts.to_hash #=> { :name => 'lee', :age => 105 }
-```
+```

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.4.2'
+  VERSION = '2.4.3'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -92,7 +92,8 @@ class Slop
 
       @delimiter = @options.fetch(:delimiter, ',')
       @limit = @options.fetch(:limit, 0)
-      @argument_type = @options[:as].to_s.downcase
+
+      @argument_type = @options[:as]
       @argument_value = nil
 
       self.forced = false
@@ -129,7 +130,7 @@ class Slop
     #
     # @param [Object] value The value to set this options argument to
     def argument_value=(value)
-      if @argument_type == 'array'
+      if @argument_type.to_s.downcase == 'array'
         @argument_value ||= []
 
         if value.respond_to?(:to_str)
@@ -144,27 +145,32 @@ class Slop
     #   according to the `:as` option
     def argument_value
       return @argument_value if forced
+      type = @argument_type.to_s.downcase
       # Check for count first to prefer 0 over nil
-      return count if @argument_type == 'count'
+      return count if type == 'count'
 
       value = @argument_value || @options[:default]
       return if value.nil?
 
-      case @argument_type
-      when 'array'
-        arg_value(@argument_value)
-      when 'range'
-        arg_value(value_to_range(value))
-      when 'float'
-        arg_value(value.to_s.to_f)
-      when 'string', 'str'
-        arg_value(value.to_s)
-      when 'symbol', 'sym'
-        arg_value(value.to_s.to_sym)
-      when 'integer', 'int'
-        arg_value(value.to_s.to_i)
+      if @argument_type.respond_to?(:call)
+        @argument_type.call(value)
       else
-        value
+        case type
+        when 'array'
+          arg_value(@argument_value)
+        when 'range'
+          arg_value(value_to_range(value))
+        when 'float'
+          arg_value(value.to_s.to_f)
+        when 'string', 'str'
+          arg_value(value.to_s)
+        when 'symbol', 'sym'
+          arg_value(value.to_s.to_sym)
+        when 'integer', 'int'
+          arg_value(value.to_s.to_i)
+        else
+          value
+        end
       end
     end
 
@@ -802,7 +808,6 @@ class Slop
     end
 
     trash = []
-    ignore_all = false
 
     items.each_with_index do |item, index|
       item = item.to_s
@@ -810,14 +815,13 @@ class Slop
 
       if item == '--'
         trash << index
-        ignore_all = true
+        break
       end
 
-      next if ignore_all
       autocreate(flag, index, items) if @autocreate
       option, argument = extract_option(item, flag)
 
-      if @multiple_switches and item[/\A-[^-]/] and not option
+      if @multiple_switches and item[/\A-[^-][A-Za-z]/] and not option
         trash << index
         next
       end

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.4.2'
+  s.version = '2.4.3'
   s.summary = 'Option gathering made easy'
   s.description = 'A simple DSL for gathering options and parsing the command line'
   s.author = 'Lee Jarvis'

data/test/option_test.rb

@@ -86,6 +86,9 @@ class OptionTest < TestCase
     assert_equal 1, option_value(%w/--verbose/, :v, :verbose, :as => :count)
     assert_equal 2, option_value(%w/--verbose -v/, :v, :verbose, :as => :count)
     assert_equal 3, option_value(%w/-vvv/, :v, :verbose, :as => :count)
+
+    assert_equal 1, option_value(%w/-i 1/, :i, true, :as => proc { |x| x.to_i })
+    assert_equal "oof", option_value(%w/-i foo/, :i, true, :as => proc { |x| x.reverse })
   end
 
   test 'casting should return nil for optionless arguments' do

data/test/slop_test.rb

@@ -587,4 +587,10 @@ class SlopTest < TestCase
     assert opts.verbose?
     assert_equal 'enable quiet mode', opts.options[:quiet].description
   end
+
+  test "negative integers should not be processed as options and removed" do
+    items = %w(-1)
+    Slop.parse!(items)
+    assert_equal %w(-1), items
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slop
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies: []
 description: A simple DSL for gathering options and parsing the command line
 email: lee@jarvis.co