slop 2.3.1 → 2.4.0

data/CHANGES.md

@@ -1,3 +1,10 @@
+2.4.0 (2011-11-26)
+------------------
+
+* Avoid `define_method` for checking an options presence (and caching it) #37
+* Ensure the short option allows an appended `=` for accepting arguments
+* Implement `respond_to?`
+
 2.3.1 (2011-11-11)
 ------------------
 

data/lib/slop.rb

@@ -2,7 +2,7 @@ class Slop
   include Enumerable
 
   # @return [String] The current version string
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 
   # Slops standard Error class. All exception classes should
   # inherit from this class
@@ -98,8 +98,7 @@ class Slop
       self.forced = false
       self.count = 0
 
-      @callback = blk if block_given?
-      @callback ||= @options[:callback]
+      @callback = block_given? ? blk : @options[:callback]
 
       if long_flag && long_flag.size > @slop.longest_flag
         @slop.longest_flag = long_flag.size
@@ -114,7 +113,7 @@ class Slop
 
     # @return [Boolean] true if this option accepts an optional argument
     def accepts_optional_argument?
-      @options[:optional]
+      @options[:optional] || @options[:optional_argument]
     end
 
     # @return [String] either the long or short flag for this option
@@ -183,8 +182,9 @@ class Slop
     # @return [Boolean] true if this options `:unless` argument exists
     #   inside *items*
     def omit_exec?(items)
-      string = @options[:unless].to_s.sub(/\A--?/, '')
-      items.any? { |i| i.to_s.sub(/\A--?/, '') == string }
+      items.any? do |item|
+        item.to_s.sub(/\A--?/, '') == @options[:unless].to_s.sub(/\A--?/, '')
+      end
     end
 
     # This option in a nice pretty string, including a short flag, long
@@ -303,7 +303,7 @@ class Slop
     lines.each do |line|
       opt, description = line.split(' ', 2)
       short, long = opt.split(',').map { |s| s.sub(/\A--?/, '') }
-      argument = long && long[/\=$/]
+      argument = long && long[-1] == ?$
       long.sub!(/\=$/, '') if argument
       opts.on short, long, description, argument
     end
@@ -515,7 +515,6 @@ class Slop
   # @return [Slop::Option]
   def option(*args, &block)
     options = args.last.is_a?(Hash) ? args.pop : {}
-
     short, long, desc, arg, extras = clean_options(args)
 
     options.merge!(extras)
@@ -675,7 +674,7 @@ class Slop
   # @return [Array] A list of options missing from the parsed string
   # @since 2.1.0
   def missing
-    @options.select { |opt| not present?(opt.key) }.map { |opt| opt.key }
+    @options.select { |opt| not present?(opt.key) }.map(&:key)
   end
 
   # Allows you to check whether an option was specified in the parsed list
@@ -689,14 +688,22 @@ class Slop
   # @see Slop#present?
   # @return [Boolean] true if this option is present, false otherwise
   def method_missing(meth, *args, &block)
-    super unless meth.to_s[-1, 1] == '?'
-    present = present? meth.to_s.chomp('?')
-
-    (class << self; self; end).instance_eval do
-      define_method(meth) { present }
+    meth = meth.to_s
+    if meth[-1] == ??
+      present?(meth.chop)
+    else
+      super
     end
+  end
 
-    present
+  # Override this method so we can check if an option? method exists
+  def respond_to?(method)
+    method = method.to_s
+    if method[-1] == ?? and @options.any? { |o| o.key == method.chop }
+      true
+    else
+      super
+    end
   end
 
   # Check if an option is specified in the parsed list
@@ -988,11 +995,18 @@ class Slop
   def clean_options(args)
     options = []
     extras = {}
-    extras[:as] = args.find { |c| c.is_a? Class }
-    args.delete(extras[:as])
-    extras.delete(:as) if extras[:as].nil?
+
+    if klass = args.find { |a| a.is_a?(Class) }
+      extras[:as] = klass
+      args.delete klass
+    end
 
     short = args.first.to_s.sub(/\A--?/, '')
+    if short.size == 2 && short[-1, 1] == '='
+      extras[:argument] = true
+      short.chop!
+    end
+
     if short.size == 1
       options.push short
       args.shift
@@ -1001,18 +1015,21 @@ class Slop
     end
 
     long = args.first
-    boolean = [true, false].include? long
-
-    if not boolean and long.to_s =~ /\A(?:--?)?[a-z_-]+\s[A-Z\s\[\]]+\z/
-      arg, help = args.shift.split(/ /, 2)
-      options.push arg.sub(/\A--?/, '')
-      extras[:optional] = help[0, 1] == '[' && help[-1, 1] == ']'
-      extras[:help] = help
-    elsif not boolean and long.to_s =~ /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\z/
-      extras[:argument] = true if long.to_s[-1, 1] == '='
-      options.push args.shift.to_s.sub(/\A--?/, '').sub(/\=\z/, '')
-    else
+    if long.is_a?(TrueClass) || long.is_a?(FalseClass)
       options.push nil
+    else
+      case long.to_s
+      when /\A(?:--?)?[a-z_-]+\s[A-Z\s\[\]]+\z/
+        arg, help = args.shift.split(/ /, 2)
+        extras[:optional] = help[0, 1] == '[' && help[-1, 1] == ']'
+        extras[:help] = help
+        options.push arg.sub(/\A--?/, '')
+      when /\A(?:--?)?[a-zA-Z][a-zA-Z0-9_-]+\=?\z/
+        extras[:argument] = true if long.to_s[-1, 1] == '='
+        options.push args.shift.to_s.sub(/\A--?/, '').sub(/\=\z/, '')
+      else
+        options.push nil
+      end
     end
 
     options.push args.first.respond_to?(:to_sym) ? args.shift : nil

data/slop.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'slop'
-  s.version = '2.3.1'
+  s.version = '2.4.0'
   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

@@ -28,6 +28,7 @@ class OptionTest < TestCase
   test 'expects an argument if long option is suffixed with =' do
     assert option(:f, :foo=).expects_argument?
     assert option('f', 'foo=').expects_argument?
+    assert option(:f=).expects_argument?
   end
 
   test 'accepts an optional argument if optional is true' do

data/test/slop_test.rb

@@ -424,6 +424,22 @@ class SlopTest < TestCase
     assert_raises(Slop::MissingArgumentError) { slop.parse %w/-f --bar/ }
   end
 
+  test 'respond_to?' do
+    slop = Slop.new { on :f, :foo }
+    assert slop.respond_to?('foo?')
+    refute slop.respond_to?('foo')
+  end
+
+  test 'reusable slop object (ie not using define_method for present?())' do
+    slop = Slop.new { on :f, :foo }
+
+    slop.parse %w()
+    assert_equal false, slop.foo?
+
+    slop.parse %w( --foo )
+    assert_equal true, slop.foo?
+  end
+
   test 'custom IO object' do
     io = StringIO.new
     slop = Slop.new(:help => true, :io => io)

metadata

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