easy-settings 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e67b82d33689b9d6aa1e5850e8659a72b90f429fece495dc8e89c9731edf6c09
-  data.tar.gz: 8e71adb53f05010b04f346d0dc38d6e364735fef858f5b4524d7be34c3140216
+  metadata.gz: 5afd7d986dbb859f725c01e1e9da9afbd838c29f134e9febb294e0a29d448aa4
+  data.tar.gz: cb822a2f099d7435e04dceceaa32632bf40ab2b99188b1929fa40b6f8e580c9f
 SHA512:
-  metadata.gz: 10732103fbf4d206f7eb43880cf3f1a65d8a4b9e06e042f4f1e59bc62f8661abbb886e264641567aee11d76f5edcb59f335b0cd55d08c85458cff4ac4b02699b
-  data.tar.gz: b03ce4e5ee16132c7144850f77a535a7e0e32d0c973822452dedafd6633158cc85e4667020a954e62c303f93dbd1a1b8cc760dd115753f2a3910369f7c420b78
+  metadata.gz: 0272ac7d15c94bb3184f38303e513d01e3dfc4477ef18de6e912bc93ce4d94da6ad68a6fee0a3c2f6340752771fbded5c793fa80ee09a40a79a8e0a9c2d52c40
+  data.tar.gz: bed142667f0ead59ca5b6edc9986eaa6301e63d45574e1eecdba2b2c4715442d8254219a7f6ddee708e438211f741f1e127a0e962c0adbab03982849d6ca6a81

data/lib/easy-settings/env_source.rb

@@ -1,13 +1,11 @@
-require "easy-settings/coercion"
+require "easy-settings/path_source"
 
-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 +14,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

@@ -19,13 +19,21 @@ class EasySettings::PathSource
         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
+        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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-settings
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Corin Langosch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-21 00:00:00.000000000 Z
+date: 2020-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec