opto 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5546d31ee73e05adce64402dca900e55ef7159fcb277327fedf8bee0db2d00
-  data.tar.gz: 8dcaaf5040b306b4997f01124f2597a500c230f0a32d2ca5071c9d80e2bb536c
+  metadata.gz: a64054a280e97bf680cda42784fe3711caeab601e8e9a84fa75ef23f0b7d3f8d
+  data.tar.gz: 95098c398edc70eb404074a6cba9991bd352aabfd4f457f813929342e0ce8ce8
 SHA512:
-  metadata.gz: 683dd71495e9ea808933e58416d81fb8ebc815ec0b34834bf14e4d4a7595ce478417287369184928033b6b309ff89797a39a4da0418f5f324a314b09308e7fe0
-  data.tar.gz: b4012a61a1a01b1a0ba7ef545956435939d329cd60400f37966b700a4ccc7e0f10c7223b19dd1a985a6383f5ce1b2d399c9914a411cdeb2d15b22597e4a383c9
+  metadata.gz: dbf5d705f3ac8e27c1bdb42ba7be5f60d63bb32389542ed3bbeea96516fb0eb3fcbb349e275d7b8381aa2765a9fc1277a1a89d4b6ece3b6c99751cc85ed11cd3
+  data.tar.gz: 5bd30b91d1684a57970ca7a6fb6d11f19c0cf840b58a799ae5cead141f05e8d1237adecd7e68debd36e0c307ef7eec727a4ec1ce2b3ab016a577e37628aa5fc1

data/lib/opto/group.rb

@@ -77,15 +77,15 @@ module Opto
 
     # Convert Group to an Array of Hashes (by calling .to_h on each member)
     # @return [Array<Hash>]
-    def to_a(with_errors: false, with_value: false)
-      options.map {|opt| opt.to_h(with_errors: with_errors, with_value: with_value) }
+    def to_a(with_errors: false, with_values: false)
+      options.map {|opt| opt.to_h(with_errors: with_errors, with_value: with_values) }
     end
 
     # Convert a Group to a hash that has { option_name => option_value }
     # @return [Hash]
     def to_h(values_only: false, with_values: false, with_errors: false)
       if values_only
-        Hash[*options.flat_map {|opt| [opt.name, opt.value]}]
+        Hash[*options.flat_map {|opt| [opt.name, opt.type == 'group' ? opt.value.to_h(values_only: true) : opt.value]}]
       else
         Hash[*options.flat_map {|opt| [opt.name, opt.to_h(with_value: with_values, with_errors: with_errors).reject {|k,_| k==:name}]}]
       end

data/lib/opto/option.rb

@@ -138,7 +138,13 @@ module Opto
       hash[:skip_if] = skip_if if skip_if
       hash[:only_if] = only_if if only_if
       hash[:errors]  = errors  if with_errors
-      hash[:value]   = value   if with_value
+      if with_value
+        if type == 'group'
+          hash[:value]   = value.to_h(with_values: true, with_errors: with_errors)
+        else
+          hash[:value] = value
+        end
+      end
       hash
     end
 

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.9.0"
+  VERSION = "1.9.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler