opto 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01abb09f30890132075384eb8ff969899b0fb168
-  data.tar.gz: 51d608217ef7b48968d66a75ae2e8515c38c4d9d
+  metadata.gz: 9b14c43a8bb5fd247a9055fad5a034cdf105a105
+  data.tar.gz: 609d7736dd12d4122767c805a6a6f359ccdee237
 SHA512:
-  metadata.gz: 66121b1275518c5023ee8e2a4633e7835f3cff613c6173bc18debe8a1b29905f0913f13a4b1579e83d46f8fd4f049ebb17a2936497660c3fda1d1c2471446a07
-  data.tar.gz: 89ecd251166c29beeae9bcb96962d7d873215d9f55225e7c6813050fa1b772b400497977289594549a182e51e0098e498887e0a8bd38c0a0b17e0c80c2d66494
+  metadata.gz: 7252a233ceb798d1215494de81c07c8b578022126afc092273ee1f5a71fa22f3c1fdec8ed80d4f801194c308e62b1e6dd6e56c77425aece2230db952ab174d6a
+  data.tar.gz: c71d75fed79a2123c5848a742e77d108fe8d5287cc24516bd29680f40d75f5d83acb8d459ee4f763214012fb037ba00bf43f5d99786b76c86409e48c1e99dc99

data/lib/opto/option.rb

@@ -93,7 +93,7 @@ module Opto
       @only_if       = opts.delete(:only_if)
       @skip_lambdas  = normalize_ifs(@skip_if)
       @only_lambdas  = normalize_ifs(@only_if)
-      @from          = { default: self }.merge(normalize_from_to(opts.delete(:from)))
+      @from          = normalize_from_to(opts.delete(:from))
       @to            = normalize_from_to(opts.delete(:to))
       @type_options  = opts
 
@@ -186,7 +186,7 @@ module Opto
     # Accessor to defined resolvers for this option.
     # @return [Array<Opto::Resolver>]
     def resolvers
-      @resolvers ||= from.map { |origin, hint| Resolver.for(origin).new(hint, self) }
+      @resolvers ||= from.merge(default: self).map { |origin, hint| Resolver.for(origin).new(hint, self) }
     end
 
     def setters

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.4.0"
+  VERSION = "1.5.0"
 end

data/opto.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kimmo Lehto"]
   spec.email         = ["info@kontena.io"]
 
-  spec.summary       = "Create validatable and resolvable options from hashes"
-  spec.description   = "Example: Opto.new(type: :string, name: 'foo, min_length: 20, from: { env: 'FOO' }).value"
+  spec.summary       = "Option validator / resolver"
+  spec.description   = "Create validatable and resolvable options from hashes or YAML. Example: Opto.new(type: :string, name: 'FOO', min_length: 20, from: :env).valid?"
   spec.homepage      = "https://github.com/kontena/opto"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,8 +52,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 'Example: Opto.new(type: :string, name: ''foo, min_length: 20, from:
-  { env: ''FOO'' }).value'
+description: 'Create validatable and resolvable options from hashes or YAML. Example:
+  Opto.new(type: :string, name: ''FOO'', min_length: 20, from: :env).valid?'
 email:
 - info@kontena.io
 executables:
@@ -115,5 +115,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Create validatable and resolvable options from hashes
+summary: Option validator / resolver
 test_files: []