easy-settings 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e67b82d33689b9d6aa1e5850e8659a72b90f429fece495dc8e89c9731edf6c09
-  data.tar.gz: 8e71adb53f05010b04f346d0dc38d6e364735fef858f5b4524d7be34c3140216
+  metadata.gz: 9186867548fd27da53f287246d749505b239cd8f3d55e86450725448aafb9f8c
+  data.tar.gz: abf1596640e87eabccd9227146d50ab02867e4e44142a367991ec89d38b11942
 SHA512:
-  metadata.gz: 10732103fbf4d206f7eb43880cf3f1a65d8a4b9e06e042f4f1e59bc62f8661abbb886e264641567aee11d76f5edcb59f335b0cd55d08c85458cff4ac4b02699b
-  data.tar.gz: b03ce4e5ee16132c7144850f77a535a7e0e32d0c973822452dedafd6633158cc85e4667020a954e62c303f93dbd1a1b8cc760dd115753f2a3910369f7c420b78
+  metadata.gz: dfb7190c8a8bc10544952206b1452c87c3feaae5dcc15e585663d613f4460b18f44e793be55b55b5cda8a2ee6ba5e1a95742b1eb8703fbaed7b7bdc88cc99934
+  data.tar.gz: 7e2223474a0cbddc639cccd5459d35b89b7887aa9af8430f382f18545f070f1ed5a129040a385c19d4591beebf5be4d8f1338a138fd308ef1148f46d6b7d5f40

data/README.rdoc

@@ -4,7 +4,7 @@ Inspired by the mc-settings and config gems, but with a simpler code base and mo
 
 == Installation
 
-Just include the screwdriver gem in your Bundler Gemfile
+Just include the easy-settings gem in your Bundler Gemfile
 
   gem "easy-settings"
 

data/lib/easy-settings.rb

@@ -5,6 +5,7 @@ require "easy-settings/version"
 require "easy-settings/struct"
 require "easy-settings/env_source"
 require "easy-settings/path_source"
+require "easy-settings/certificate_manager_source"
 require "easy-settings/yaml_source"
 
 class EasySettings

data/lib/easy-settings/certificate_manager_source.rb

@@ -0,0 +1,33 @@
+require "easy-settings/coercion"
+
+class EasySettings::CertificateManagerSource < EasySettings::PathSource
+  def initialize(base_path, settings_root: ["certificates"], separator: "__", converter: :downcase)
+    super(base_path, settings_root: settings_root, separator: separator, converter: converter, parse_values: false)
+  end
+
+  def load
+    {}.tap do |data|
+      Dir["#{base_path}/*"].each do |path|
+        next unless File.directory?(path)
+        next unless valid_folder?(path)
+
+        variable = path.gsub("#{base_path}/", "")
+        keys = settings_root + variable.to_s.split(separator)
+
+        filenames.each do |filename, key|
+          value = File.binread("#{path}/#{filename}").strip
+          assign_value(data, keys + [key], value)
+        end
+      end
+    end
+  end
+
+  def valid_folder?(path)
+    # ensure the folder contains all the files we expect
+    (filenames.keys - Dir["#{path}/*"].map{ |path| File.basename(path) }).none?
+  end
+
+  def filenames
+    {"ca.crt" => "ca", "tls.crt" => "crt", "tls.key" => "key"}
+  end
+end

data/lib/easy-settings/env_source.rb

@@ -1,13 +1,12 @@
-require "easy-settings/coercion"
+require "easy-settings/path_source"
+require "active_support/core_ext/object"
 
-class EasySettings::EnvSource
-  attr_reader :prefix, :separator, :converter, :parse_values
+class EasySettings::EnvSource < EasySettings::PathSource
+  attr_reader :prefix
 
   def initialize(prefix, separator: "__", converter: :downcase, parse_values: true)
     @prefix = prefix
-    @separator = separator
-    @converter = converter
-    @parse_values = parse_values
+    super(nil, separator: separator, converter: converter, parse_values: parse_values)
   end
 
   def load
@@ -16,13 +15,8 @@ class EasySettings::EnvSource
         keys = variable.to_s.split(separator)
         next if prefix.present? && keys.shift != prefix
 
-        keys.map!{ |key| key.send(converter) } if converter
-
-        leaf = keys[0...-1].inject(data){ |h, key| h[key] ||= {} }
-        leaf[keys.last] = parse_values ? EasySettings::Coercion.new(value).run : value
+        assign_value(data, keys, value)
       end
     end
-  rescue NoMethodError => e
-    raise "Invalid name converter: #{converter}"
   end
 end

data/lib/easy-settings/path_source.rb

@@ -1,10 +1,11 @@
 require "easy-settings/coercion"
 
 class EasySettings::PathSource
-  attr_reader :base_path, :separator, :converter, :parse_values
+  attr_reader :base_path, :settings_root, :separator, :converter, :parse_values
 
-  def initialize(base_path, separator: "__", converter: :downcase, parse_values: true)
+  def initialize(base_path, settings_root: [], separator: "__", converter: :downcase, parse_values: true)
     @base_path = base_path.to_s
+    @settings_root = settings_root
     @separator = separator
     @converter = converter
     @parse_values = parse_values
@@ -16,16 +17,23 @@ class EasySettings::PathSource
         next unless File.file?(path)
 
         variable = path.gsub("#{base_path}/", "")
-        value = File.read(path).strip
-
-        keys = variable.to_s.split(separator)
-        keys.map!{ |key| key.send(converter) } if converter
-
-        leaf = keys[0...-1].inject(data){ |h, key| h[key] ||= {} }
-        leaf[keys.last] = parse_values ? EasySettings::Coercion.new(value).run : value
+        keys = settings_root + variable.to_s.split(separator)
+        value = File.binread(path).strip
+        assign_value(data, keys, value)
       end
     end
-  rescue NoMethodError => e
-    raise "Invalid name converter: #{converter}"
+  end
+
+  def assign_value(data, keys, value)
+    keys.map! do |key|
+      next key.to_i if key =~ /^\d+/
+      next key.send(converter) if converter
+      key
+    rescue NoMethodError => e
+      raise "Invalid name converter: #{converter}"
+    end
+
+    leaf = keys[0...-1].each_with_index.inject(data){ |h, (key, i)| h[key] ||= keys[i + 1].is_a?(Integer) ? [] : {} }
+    leaf[keys.last] = parse_values ? EasySettings::Coercion.new(value).run : value
   end
 end

data/lib/easy-settings/struct.rb

@@ -24,15 +24,15 @@ class EasySettings::Struct
   end
 
   def [](property)
-    @properties.fetch(property){ raise_unknown_property(property) }
+    @properties.fetch(property.to_s){ raise_unknown_property(property) }
   end
 
   def []=(property, value)
-    @properties[property] = value
+    @properties[property.to_s] = value
   end
 
   def try(property)
-    @properties[property]
+    @properties[property.to_s]
   end
 
   def to_h

data/lib/easy-settings/version.rb

@@ -1,3 +1,3 @@
 class EasySettings
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-settings
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Corin Langosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -68,6 +68,7 @@ files:
 - docker-compose.yml
 - easy-settings.gemspec
 - lib/easy-settings.rb
+- lib/easy-settings/certificate_manager_source.rb
 - lib/easy-settings/coercion.rb
 - lib/easy-settings/env_source.rb
 - lib/easy-settings/path_source.rb