slop 0.1.6 → 0.1.7

data/README.md

@@ -3,9 +3,6 @@ Slop
 
 Slop is a simple option collector with an easy to remember syntax and friendly API.
 
-**NOTE** This software is still unstable, it contains bugs and lacks core
-features
-
 Installation
 ------------
 
@@ -17,8 +14,14 @@ Installation
 
     git clone git://github.com/injekt/slop.git
     cd slop
-    gem build slop.gemspec
-    gem install slop-<version>.gem
+    rake install
+
+Features Overview
+-----------------
+
+ - Callbacks
+ - Casting
+ - Lists
 
 Usage
 -----
@@ -86,14 +89,6 @@ you can pass the `:as` attribute to your option.
     end
     s.value_for(:age) #=> 20 # not "20"
 
-Slop will also check your default attributes type to see if it can cast the new
-value to the same type.
-
-    s = Slop.parse("--port 110") do
-      opt(port, true, :default => 80)
-    end
-    s.value_for(:port) #=> 110
-
 Lists
 -----
 

data/lib/slop.rb

@@ -3,7 +3,9 @@ require 'set'
 require 'slop/option'
 
 class Slop
-  VERSION = '0.1.6'
+  include Enumerable
+
+  VERSION = '0.1.7'
 
   # Raised when an option expects an argument and none is given
   class MissingArgumentError < ArgumentError; end
@@ -36,16 +38,9 @@ class Slop
       raise ArgumentError, "Argument size must be no more than 4"
     end
 
-    args.unshift nil if args.first.size > 1
-    args.push nil if args.size == 2
-    args.push false if args.size == 3
-
-    args[2..3] = [nil, true] if args[2] == true
-
     attributes = [:flag, :option, :description, :argument]
-    options = Hash[attributes.zip(args)]
+    options = Hash[attributes.zip(pad_options(args))]
     options.merge!(opts)
-    options[:as] = options[:default].class if options.key?(:default)
     options[:callback] = blk if block_given?
 
     @options << Option.new(options)
@@ -127,7 +122,7 @@ class Slop
   #
   # @return [Option] the option flag or label
   def option_for(flag)
-    @options.find do |opt|
+    find do |opt|
       opt.has_flag?(flag) || opt.has_option?(flag)
     end
   end
@@ -142,17 +137,31 @@ class Slop
   #
   #   s.value_for(:name) #=> "Lee"
   #
-  #
   def value_for(flag)
     return unless option = option_for(flag)
     option.argument_value
   end
   alias :[] :value_for
 
+  # Implement #each so our options set is enumerable
+  def each
+    return enum_for(:each) unless block_given?
+    @options.each { |opt| yield opt }
+  end
+
   private
 
   def flag_or_option?(flag)
     return unless flag
     flag[1, 2].include?('-')
   end
+
+  def pad_options(args)
+    args.unshift nil if args.first.nil? || args.first.size > 1
+    args.push nil if args.size < 2
+    args.push nil if args.size == 2
+    args.push false if args.size == 3
+    args[2..3] = [nil, true] if args[2] == true
+    args
+  end
 end

data/lib/slop/option.rb

@@ -58,10 +58,10 @@ class Slop
       @argument_value ||= @default
       return unless @argument_value
 
-      case @as.to_s
-      when 'array',   'Array'; @argument_value.split(@delimiter, @limit)
-      when 'integer', 'int', 'Integer'; @argument_value.to_i
-      when 'symbol',  'sym', 'Symbol' ; @argument_value.to_sym
+      case @as.to_s.downcase[0, 3]
+      when 'arr'; @argument_value.split(@delimiter, @limit)
+      when 'int'; @argument_value.to_i
+      when 'sym'; @argument_value.to_sym
       else
         @argument_value
       end

data/spec/slop_spec.rb

@@ -7,6 +7,12 @@ describe Slop do
     end
   end
 
+  it "is enumerable" do
+    Enumerable.instance_methods.each do |meth|
+      @slop.respond_to?(meth).should be_true
+    end
+  end
+
   describe "::options" do
     it "should return the last set of options" do
       s = Slop.new { option(:f, :foo, "foo") }
@@ -116,4 +122,27 @@ describe Slop do
     end
   end
 
-end
+  describe "pad_options (private method)" do
+    before(:all) do
+      @args = [
+        [:n], [:n, :name], [:n, :name, "Desc"], [:n, :name, "Desc", true],
+        [:name], [:n, "Desc"], [:n, true], [:name, "Desc"], [:name, true]
+      ]
+    end
+
+    it "always returns an array of 4 elements" do
+      @args.each do |arr|
+        args = @slop.send(:pad_options, arr)
+        args.should be_kind_of(Array)
+        args.size.should == 4
+      end
+    end
+
+    it "ends with a true or false class object" do
+      @args.each do |arr|
+        [true, false].include?(@slop.send(:pad_options, arr).last).should be_true
+      end
+    end
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Lee Jarvis
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-04 00:00:00 +00:00
+date: 2010-12-09 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency