opto 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dedbddd78ab84c43366135f15133aaa367044e7
-  data.tar.gz: 48e32fd24ef67476c171115dca96de827f2c90ce
+  metadata.gz: 6025b403553a3ecfb777534995962166273d72be
+  data.tar.gz: a947fa23c88021c9f83eba1e925d478bcaf44dae
 SHA512:
-  metadata.gz: 7ea855a635ab51af7342cccf8b1f7aee5ae26def1564bf878c15e5316c116221d7097d6e0ed4276aa7d7591839f4c2e76acdec1924c0e7b0c63bc787a996f6f7
-  data.tar.gz: 3de6ee644c94c10a4570d370fb4a64609faa6bb940debc785a5bb1394a163243e475c944ea9df704707974f84aff2991b9a6384eb3533d56c4122cafd7e85714
+  metadata.gz: e16e7b5ca1c943dbeb4df9da7c40196f9f6eb5e85fcc02e18985be15c301c748bd30218377e9088a5a0dd096a7ea10e01cec6abfbe72d5a04a4f1f1c41a693d6
+  data.tar.gz: 7bc3b7d16d8cc8f88a259049509086dc652e1195cc54b60ee744393d14eb91e8845f89ae9428b3aca6cc73a28cc314c31b0239f0d54f6f7bfabd3d0394f02d5f

data/.travis.yml

@@ -4,7 +4,6 @@ rvm:
   - 2.2.3
   - 2.3.3
   - 2.4.0
-  - jruby-9.1.5.0
 env:
   - secure: "bCu1bVzr6SP+gAbMo88GvcHHbhO3LcnJtWp+YuSZ5qW4EHhdBw+DOQeOlzoKHtYhNhptmb/65pZZctRTE6jOOSZzpOUHaeqaqHZpELldkCMu7rE8bXuCV4OfhG0CKWvURS0x5p5F5onEx1a1sjiu+MVEUqktAPDAcdTBNBW1irRwvnSifgjcZRLzfm1aRs1fqzBJpHaAXyD++2GQaWyXDtQsEsc/Eyhmnkac5Y2cTeQiYlDluqBeB885q9K16ruLp2NWx/rnR8RGMP1LSnrye/GEo2mRWOWy1MyIEwNDcVaA6MVDY2GBIQUoXg4PBrZAleVIsO3LzwR4oorFCaSgWxzqYI67g5Kb2zn8fW9Yu5lDcFEJKIHQAwBrlq3n3Mi5it/IxGQDWXQ/2fjBxCwuilvI0WTzOH0m4g8Uf6jHaQLFC6ahdWDjfs6aCzdPpbJls26/r39NIB5k/6ZO29NZkxGBsQ7E7m4wurr7a9ksLODgPOyPiB8/4Txu35Llp+IuJpbshrlkRIMwEIFVWiLi6MZhRBkxaRzlkJQ0bS3RD9W4z9UJyoBujmgXMrv0eHNTGCOC+/4tvrA+pXzJwmFQJA6TnenoDl9hc6o03gyfH/YvmMgrtJLbJ8rGoLRaY8HsQwHWgimpCl1o043kO8/UkhhS7J4wyQXYwqGnA2PC/j0="
 before_install: gem install bundler -v 1.12.5

data/lib/opto/group.rb

@@ -117,7 +117,7 @@ module Opto
         []
       when ::Array
         ifs.map do |iff|
-          lambda { |grp| !grp.value_of(iff).nil? }
+          lambda { |grp| grp.option(iff).true?  }
         end
       when Hash
         ifs.each_with_object([]) do |(k, v), arr|
@@ -175,7 +175,7 @@ module Opto
           end
         end
       when String, Symbol
-        [lambda { |grp| !grp.value_of(ifs.to_s).nil? }]
+        normalize_ifs([ifs])
       else
         raise TypeError, "Invalid syntax for conditional"
       end

data/lib/opto/option.rb

@@ -233,6 +233,10 @@ module Opto
       handler.valid?(value)
     end
 
+    def true?
+      handler.truthy?(value)
+    end
+
     # Validation errors
     # @return [Hash]
     def errors

data/lib/opto/type.rb

@@ -70,6 +70,11 @@ module Opto
         raise TypeError, "Block required" unless block_given?
         sanitizers << define_method("sanitize_#{name}", &block)
       end
+
+      def true_when(&block)
+        raise TypeError, "Block required" unless block_given?
+        define_method(:truthy?, &block)
+      end
     end
 
     # The default :in validator, returns an error unless the

data/lib/opto/types/array.rb

@@ -26,6 +26,10 @@ module Opto
         compact: false
       }
 
+      true_when do |value|
+        value.kind_of?(::Array) && !value.empty
+      end
+
       sanitizer :split do |value|
         if value.kind_of?(::Array)
           value

data/lib/opto/types/boolean.rb

@@ -22,9 +22,13 @@ module Opto
         blank_is: false,
         false: 'false',
         true: 'true',
-        as: 'string'
+        as: 'boolean'
       }
 
+      true_when do |value|
+        sanitize_to_bool(value)
+      end
+
       sanitizer :to_bool do |value|
         if value.nil?
           options[:nil_is]

data/lib/opto/types/enum.rb

@@ -1,6 +1,7 @@
 require_relative '../type'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
+require 'opto/types/boolean'
 
 module Opto
   module Types
@@ -42,6 +43,10 @@ module Opto
         in: []
       }
 
+      true_when do |value|
+        Opto::Types::Boolean.new(options).sanitize_to_bool(value)
+      end
+
       def initialize(options={})
         opts = normalize_opts(options.delete(:options))
         super(options)

data/lib/opto/types/integer.rb

@@ -19,6 +19,10 @@ module Opto
         nil_is_zero: false
       }
 
+      true_when do |value|
+        !value.nil?
+      end
+
       sanitizer :to_i do |value|
         value.nil? ? (options[:nil_is_zero] ? 0 : nil) : value.to_i
       end

data/lib/opto/types/string.rb

@@ -2,6 +2,7 @@ require_relative '../type'
 require 'base64'
 require 'opto/extensions/snake_case'
 require 'opto/extensions/hash_string_or_symbol_key'
+require 'opto/types/boolean'
 
 module Opto
   module Types
@@ -33,6 +34,9 @@ module Opto
         decode_64: false
       }.merge(Hash[*TRANSFORMATIONS.flat_map {|tr| [tr, false]}])
 
+      true_when do |value|
+        !value.nil? && !value.strip.empty? && value != 'false'
+      end
 
       sanitizer :encode_64 do |value|
         (options[:encode_64] && value) ? Base64.encode64(value) : value

data/lib/opto/types/uri.rb

@@ -16,6 +16,10 @@ module Opto
         schemes: [ 'http', 'https' ]
       }
 
+      true_when do |value|
+        !value.to_s.strip.empty?
+      end
+
       validator :scheme do |value|
         return nil if options[:schemes].nil? || options[:schemes].empty?
         scheme = uri(value).scheme

data/lib/opto/version.rb

@@ -1,3 +1,3 @@
 module Opto
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opto
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Kimmo Lehto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler