optbind 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 194d33bd932477ac7d450cc566424f849b34a198
-  data.tar.gz: 66a5246dab6f09d49045990eef6599b7a4a38fb7
+  metadata.gz: bf2645df5139cfb5f2da9545d463f30b5e2e7fcd
+  data.tar.gz: 19b95d76da822aa643ba5ee62ad5c00e6ab86ef4
 SHA512:
-  metadata.gz: 7a97b83b47f41d650ebfb865bf051df3309bcd6396d983034630a4969c331e4dc603ab4d9ff01bc9135f6dc67d32ebbfd77635b9b155828097bccf5d0ad4e505
-  data.tar.gz: 6132c445ebe256c2e4669b449b69a2ddeae29306102ddbb1d6348f22971c8daabc253fbe4e7166401faf6d453297e33b105dde45184acc204fd647a296127cd4
+  metadata.gz: 33129020311fbd81302a02c87c18a11e8efbfe42f2ed66335b9cfa584dd2c023620918663088365e3147a47ecffef50c3abb40d11cfae29bd128753b2e5549d5
+  data.tar.gz: 65e76a032087b2590ffa173776c04f3e284ea707c8d1cc0cbdf246794a36cf27c5757dc37dd707bd05202f8a22e7309a6eee9db477924add3b23010e77b99b8e

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.3.0
+
+*   Add support for access to assigned variables
+
+*   Fix default argument handler when encountering blank arguments 
+
+    *Pavol Zbell*
+
+## 0.2.2
+
+*   Fix default option handler when encountering blank arguments 
+
+    *Pavol Zbell*
+
 ## 0.2.1
 
 *   Fix multiple argument parsing with arrays as default values

data/lib/optbind/version.rb

@@ -1,3 +1,3 @@
 module OptBind
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/lib/optbind.rb

@@ -74,7 +74,7 @@ class OptionBinder
         @parser.abort "missing argument: #{a}=" if !r || (r.respond_to?(:empty?) && r.empty?)
       end
 
-      (handler || -> (x) { x }).call(r == nil ? default : r).tap { |x| @writer.call variable, x if bound }
+      handle! handler, r, bound, variable, default
     end
 
     (@bound_variables_with_defaults ||= {})[variable] = default if bound
@@ -106,10 +106,24 @@ class OptionBinder
     Hash[@bound_variables_with_defaults.keys.map { |v| [v, @reader.call(v)] }]
   end
 
+  def assigned_variables
+    return {} unless @assigned_variables_with_values
+    @assigned_variables_with_values.dup
+  end
+
   def default?(v)
     v = v.to_sym
-    return nil unless (@bound_variables_with_defaults || {}).has_key? v
-    @bound_variables_with_defaults[v] == @reader.call(v)
+    return nil unless bound? v
+    (@bound_variables_with_defaults[v] || {}) == @reader.call(v)
+  end
+
+  def bound?(v)
+    (@bound_variables_with_defaults || {}).has_key? v.to_sym
+  end
+
+  def assigned?(v)
+    return nil unless bound? v
+    (@assigned_variables_with_values || {}).has_key? v.to_sym
   end
 
   module Switch
@@ -200,7 +214,7 @@ class OptionBinder
       r = argv[0] ? argv.shift : default
       r = ([r].flatten + argv.shift(argv.size)) if a[:opts].include? :MULTIPLE
       @parser.abort 'missing arguments' if r.nil? && a[:opts].include?(:REQUIRED)
-      (a[:handler] || -> (_) { r }).call(r == nil ? default : r).tap { |x| @writer.call a[:variable], x if a[:bound] }
+      handle! a[:handler], r, a[:bound], a[:variable], default
       return argv if a[:opts].include? :MULTIPLE
     end
     @parser.abort 'too many arguments' if argv[0]
@@ -209,6 +223,16 @@ class OptionBinder
 
   private :parse_args, :parse_args!
 
+  def handle!(handler, raw, bound, variable, default)
+    (handler || -> (r) { r }).call(raw == nil ? default : raw).tap do |x|
+      return x unless bound
+      @writer.call variable, x
+      (@assigned_variables_with_values ||= {})[variable] = x
+    end
+  end
+
+  private :handle!
+
   module Arguable
     def binder=(bind)
       unless @optbind = bind

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: optbind
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Pavol Zbell