king_konf 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05b410d3b35c4b341e2f10ec7ca684936c692f21a67452197b5e231c25c87f3
-  data.tar.gz: fc5368013c4f4b73d461c3dfabf43be74f37153208f5e0caa1d152765fb37e61
+  metadata.gz: a1627c1be992905aafc33d3af345e53506aedfccfc00fba4c525150addc21709
+  data.tar.gz: a96fdbe1265f0f05c05a4cd35e0f2ac48c880b05380971e3112bd81e1a74f7f2
 SHA512:
-  metadata.gz: '00248cac6619fde14c3a1cd29f2905aec16bf893cd99cf6b588ecfff14bef42b300296e8cb3d70914ae8df2c3729cfc0294d91e79682b188ea53f7f8c26e7ee2'
-  data.tar.gz: 38875fec1190771e9e120ad504a9f475bb11a08f437c94e3188a097870cb5e1706bd0df5bbc77c55e7050a3a8fd6e3db1fee0ad9c626f2a236370a94edf7a621
+  metadata.gz: d16e6e0f81812138d41deb63a662a804a08b67d7fc4ad3803739c6227dd707d678e9cd7dbf64a5752e2f7c1e707983daf36d474777ed8242b6cbc80f3399ad20
+  data.tar.gz: a8d59948190f2b4c26b88ed5c0a24075ca7d53ef5739b7260e1e41885a3ea7bbbc4d53c48b6c8891e3b6c44638aee0555bbb04e7c1bb27334cef67aeb1f4b379

data/lib/king_konf/config.rb

@@ -32,7 +32,7 @@ module KingKonf
         @variables.values
       end
 
-      %i(boolean integer float string list).each do |type|
+      TYPES.each do |type|
         define_method(type) do |name, default: nil, required: false, allowed_values: nil, **options|
           description, @desc = @desc, nil
           variable = Variable.new(

data/lib/king_konf/decoder.rb

@@ -1,3 +1,5 @@
+require "king_konf/duration_decoder"
+
 module KingKonf
   module Decoder
     extend self
@@ -17,6 +19,10 @@ module KingKonf
       value
     end
 
+    def symbol(value, **)
+      value.to_sym
+    end
+
     def list(value, sep: ",", items: :string)
       value.split(sep).map {|s| public_send(items, s) }
     end
@@ -30,5 +36,16 @@ module KingKonf
     def float(value, **)
       Float(value)
     end
+
+    def duration(value, **)
+      case value
+      when ""
+        nil
+      when/^\d*$/
+        value.to_i
+      else
+        DurationDecoder.decode(value)
+      end
+    end
   end
 end

data/lib/king_konf/duration_decoder.rb

@@ -0,0 +1,28 @@
+module KingKonf
+  # Decodes specially formatted duration strings.
+  module DurationDecoder
+    # Either a number or a time unit.
+    PART = /(\d+|[wdhms])/
+
+    # One or more parts, possibly separated by whitespace.
+    VALID_DURATION = /^(#{PART}\s*)+$/
+
+    UNITS = {
+      "s" => 1,
+      "m" => 60,
+      "h" => 60 * 60,
+      "d" => 60 * 60 * 24,
+      "w" => 60 * 60 * 24 * 7,
+    }
+
+    def self.decode(value)
+      if value !~ VALID_DURATION
+        raise ConfigError, "#{value.inspect} is not a duration: must be e.g. `1h 30m`"
+      end
+
+      value.scan(PART).flatten.each_slice(2).map {|number, letter|
+        number.to_i * UNITS.fetch(letter)
+      }.sum
+    end
+  end
+end

data/lib/king_konf/variable.rb

@@ -30,6 +30,7 @@ module KingKonf
       when :integer then value.is_a?(Integer) || value.nil?
       when :float then value.is_a?(Float) || value.is_a?(Integer) || value.nil?
       when :boolean then value == true || value == false
+      when :symbol then value.is_a?(Symbol)
       else raise "invalid type #{@type}"
       end
     end
@@ -42,7 +43,7 @@ module KingKonf
       Decoder.public_send(@type, value, **options)
     end
 
-    %i(boolean integer float string list).each do |type|
+    TYPES.each do |type|
       define_method("#{type}?") do
         @type == type
       end

data/lib/king_konf/version.rb

@@ -1,3 +1,3 @@
 module KingKonf
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/king_konf.rb

@@ -1,6 +1,10 @@
 require "king_konf/version"
-require "king_konf/config"
 
 module KingKonf
+  # Variable value types.
+  TYPES = %i(boolean integer float string list symbol duration)
+
   ConfigError = Class.new(StandardError)
 end
+
+require "king_konf/config"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: king_konf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/king_konf/config.rb
 - lib/king_konf/config_file_loader.rb
 - lib/king_konf/decoder.rb
+- lib/king_konf/duration_decoder.rb
 - lib/king_konf/variable.rb
 - lib/king_konf/version.rb
 homepage: https://github.com/dasch/king_konf