king_konf 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6321bc1dbb64b0256b68251f524a71bc93b3837e15950c51f8d1820b52ccd7b4
-  data.tar.gz: 426d17dc7be5cc6b68376fe572e0c34b95074c3c303bbd463a42b7ac13201402
+  metadata.gz: 7097bd818496d31561799b6756a83779daade1ff0e7b6be133d2c287ad60e646
+  data.tar.gz: fbf115254e0d7bf1a906011624cee8daa43b97fcf5a1330a35f12cc2d973b450
 SHA512:
-  metadata.gz: 5ee51b8c5fc4eefc2c33b6ced5a3a00ae627cbf206d1631c28188f0fc4032cd70a6d7475729ef0d2f6446c1fbf00e6b7875e652654086f2b37d8b7c08bebbb58
-  data.tar.gz: 4c3f255add7dd11e2ab00c8705bfa4d4271ba9ba4f2d1758cb34dc532b9a7f66ea2a11f1cc00737b7a722b08491d170a78d39bb07914374024ca38e1fb76b498
+  metadata.gz: 643c92f40690416dc179f79e83617f0ff5f8cd40aaea2dc1f04b941ccec69c4ea2217ecaba7f8af2881bf90e1fa8f1458eafc439354bdd4b7f266c55ee3a917e
+  data.tar.gz: 2d858fffd1123d9282c705dc85ba090ab95f5ffee6e0e93a3945e87801e87103768a278b93531cf87392f2f8c8b7b904a6bce900c9ebabfaf4c15d269fe916a5

data/lib/king_konf/config.rb

@@ -100,15 +100,13 @@ module KingKonf
 
       variable = self.class.variable(name)
 
-      if !variable.valid?(value)
-        raise ConfigError, "invalid value #{value.inspect} for variable `#{name}`, expected #{variable.type}"
-      end
+      cast_value = value.nil? ? nil : variable.cast(value)
 
-      if !variable.allowed?(value)
+      if !variable.allowed?(cast_value)
         raise ConfigError, "invalid value #{value.inspect} for variable `#{name}`, allowed values are #{variable.allowed_values}"
       end
 
-      instance_variable_set("@#{name}", variable.cast(value))
+      instance_variable_set("@#{name}", cast_value)
     end
 
     def validate!

data/lib/king_konf/variable.rb

@@ -10,16 +10,20 @@ module KingKonf
       @required = required
       @allowed_values = allowed_values
       @options = options
-      @default = cast(default)
+      @default = cast(default) unless default.nil?
     end
 
     def cast(value)
       case @type
-      when :float then value.is_a?(String) || value.is_a?(Integer) ? value.to_f : value
-      when :duration then value.is_a?(String) ? Decoder.duration(value) : value
-      when :symbol then value.is_a?(String) ? value.to_sym : value
+      when :boolean then [true, false].include?(value) ? value : Decoder.boolean(value, **options)
+      when :integer then Integer(value)
+      when :float then Float(value)
+      when :duration then value.is_a?(Integer) ? value : Decoder.duration(value)
+      when :symbol then value.to_sym
       else value
       end
+    rescue ArgumentError, NoMethodError
+      raise ConfigError, "invalid value #{value.inspect} for variable `#{name}`, expected #{type}"
     end
 
     def required?
@@ -27,20 +31,17 @@ module KingKonf
     end
 
     def valid?(value)
-      case @type
-      when :string then value.is_a?(String) || value.nil?
-      when :list then value.is_a?(Array)
-      when :integer then value.is_a?(Integer) || value.nil?
-      when :float then value.is_a?(Float) || value.is_a?(Integer) || value.nil?
-      when :duration then value.is_a?(Float) || value.is_a?(Integer) || value.is_a?(String) || value.nil?
-      when :boolean then value == true || value == false
-      when :symbol then value.is_a?(Symbol) || value.is_a?(String)
-      else raise "invalid type #{@type}"
-      end
+      cast(value)
+    rescue ConfigError
+      false
+    else
+      true
     end
 
     def allowed?(value)
-      allowed_values.nil? || allowed_values.include?(value)
+      allowed_values.nil? || allowed_values.include?(cast(value))
+    rescue ConfigError
+      false
     end
 
     def decode(value)

data/lib/king_konf/version.rb

@@ -1,3 +1,3 @@
 module KingKonf
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: king_konf
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler