opto 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c17af78afd9307b68d06babe18dad864243b49cc
-  data.tar.gz: 9a5308abf16ccbce6be3d4990299f0e98912fdd0
+  metadata.gz: f09e214d197378f18e8573fa1ad516ed9d1bb178
+  data.tar.gz: cdd5f570d25b5f353537e1858de1f36d883ccd36
 SHA512:
-  metadata.gz: f501e625f4623dcfc6d5df42a970d94de78ea4a2940ac61460595d4cff84524083eb0ffbbfebeb70ec0ed16bd8f5ea53321604661a7aab99f745006c6a9ab445
-  data.tar.gz: eabe54c4414169478697f0b35bcb18c5adc0bf7e856a4e51ac54dc75cd41f8027d9e6aed70631c71a169cded64b149394b921a80d23d9d823c16ace82c3ee0de
+  metadata.gz: a56379fd1e8d728367041daf2cd8a40f40e3ea5b7d0d46791e377e57cf987afd88861902464bca5d1c9321065c81db557caabf8a75a39beb891fffec3f2226e0
+  data.tar.gz: f90133ea4e15a9213ea16e9e82da3fae9f61693f54ca24ce7d389dae18424863ae2981db9487d6e1f71ca0ad89d6129f77a99fc6b69f40b7add8f7f113ff4664

data/README.md

@@ -465,6 +465,15 @@ Hint is the value that gets passed to the resolver when doing for example: `env:
 ### env
 Hint is the environment variable name to read from. Defaults to the option's name.
 
+To try multiple env variables, use:
+
+```yaml
+from:
+  env:
+    - KEY1
+    - KEY2
+```
+
 ### file
 Hint can be a string containing a path to the file, or a hash that defines `path: 'file_path', ignore_errors: true`
 

data/lib/opto/extensions/hash_string_or_symbol_key.rb

@@ -4,21 +4,30 @@ module Opto
     module HashStringOrSymbolKey
       refine Hash do
         def [](key)
-          return nil if key.nil?
-          super(key.to_s) || super(key.to_sym)
+          return super(nil) if key.nil?
+
+          [key, key.to_s, key.to_sym].each do |k|
+            val = super(k)
+            return val unless val.nil?
+          end
+          super(key)
         end
 
         def has_key?(key)
-          if key.nil?
-            super(nil)
-          else
-            super(key.to_s) || super(key.to_sym)
+          return super(nil) if key.nil?
+          [key, key.to_s, key.to_sym].each do |k|
+            return true if super(k)
           end
+          false
         end
 
         def delete(key)
           return nil if key.nil?
-          super(key) || super(key.to_s) || super(key.to_sym)
+          [key, key.to_s, key.to_sym].each do |k|
+            val = super(k)
+            return val unless val.nil?
+          end
+          nil
         end
       end
     end

data/lib/opto/extensions/symbolize_keys.rb

@@ -1,7 +1,6 @@
 module Opto
   module Extension
-    # Refines String to have .snakecase method that turns
-    # StringLikeThis into a string_like_this
+    # Refines hash to have #symbolize_keys which symbolizes all keys.
     module SymbolizeKeys
       refine Hash do
         def symbolize_keys

data/lib/opto/group.rb

@@ -38,7 +38,6 @@ module Opto
       else
         @options = []
       end
-
     end
 
     # Are all options valid? (Option value passes validation)
@@ -181,7 +180,6 @@ module Opto
       end
     end
 
-
-    def_delegators :@options, *(::Array.instance_methods - [:__send__, :object_id, :to_h, :to_a, :is_a?, :kind_of?, :instance_of?])
+    def_delegators :@options, *(::Array.instance_methods - [:__send__, :object_id, :to_h, :to_a, :is_a?, :kind_of?, :instance_of?, :self, :inspect, :nil?])
   end
 end

data/lib/opto/resolvers/environment_variable.rb

@@ -9,15 +9,19 @@ module Opto
 
       def resolve
         raise ArgumentError, "Environment variable name not set" if hint.nil?
-        val = ENV[hint.to_s]
-        return nil if val.nil?
-        case val
-        when /\A\d+\z/ then val.to_i
-        when /\Atrue\z/ then true
-        when /\Afalse\z/ then false
-        when /\A(?:null|nil)\z/ then nil
-        else val
+        Array(hint).each do |hint|
+          val = ENV[hint.to_s]
+          val = case val
+          when NilClass then nil
+          when /\A\d+\z/ then val.to_i
+          when /\Atrue\z/ then true
+          when /\Afalse\z/ then false
+          when /\A(?:null|nil)\z/ then nil
+          else val
+          end
+          return val unless val.nil?
         end
+        nil
       end
     end
   end

data/lib/opto/resolvers/random_string.rb

@@ -55,7 +55,7 @@ module Opto
           if hint[:length].nil?
             raise ArgumentError, "Invalid settings for random string. Required: length, optional: charset. Charsets : numbers, letters, alphanumeric, hex, base64, ascii_printable and X-Y range."
           end
-        elsif (hint.kind_of?(String) && hint.to_i > 0) || hint.kind_of?(Fixnum)
+        elsif (hint.kind_of?(String) && hint.to_i > 0) || hint.kind_of?(0.class)
           self.hint = { length: hint.to_i }
         else
           raise ArgumentError, "Missing settings for random string."

data/lib/opto/types/boolean.rb

@@ -44,7 +44,7 @@ module Opto
       sanitizer :output do |value|
         case options[:as].to_s.strip.downcase
         when 'integer'
-          value ? (options[:true].kind_of?(Fixnum) ? options[:true] : 1) : (options[:false].kind_of?(Fixnum) ? options[:false] : 0)
+          value ? (options[:true].kind_of?(0.class) ? options[:true] : 1) : (options[:false].kind_of?(Fixnum) ? options[:false] : 0)
         when 'boolean'
           value
         else

data/lib/opto/types/enum.rb

@@ -84,7 +84,7 @@ module Opto
               end
             end
             options
-          when ::String, Fixnum
+          when ::String, ( 0.class == Integer ? Integer : Fixnum )
             options.map do |opt|
               { value: opt, description: opt, label: opt }
             end

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler