easy-settings 1.0.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28262b3447381ef370224446b8d64871b2391aa420f3addfde0417a9b4a3c909
-  data.tar.gz: 44c4d788c7f2b49e4748062b3f48029ce331da8c55a7b920543eadd3f2da6023
+  metadata.gz: 742f94a5ea13b5a42e8e652f6b241880977efacf37b464da912c39ea28a11bec
+  data.tar.gz: 4ff117b32d32b3a180767cafbd106f4df0d5dbc69aa00183647e16f5a5e723d9
 SHA512:
-  metadata.gz: cb3b83e76da3c4ae3afa86525b35cec52f6dfe4b8809d2e080c21acad84b30cce0e3975a285daa1994d9907b629e89798ad867e6e1b8320bebd6e43ac7f16ea6
-  data.tar.gz: e4900f399e2b9d7089f5999b5b908beb5e05586a6312a8587d0f85ebab661e9a2a35e855a629a690be0b0e1263dac6fb1a5031c4fc92215583424f1963e86e53
+  metadata.gz: 3eda64f580f75b8ea81f79cae2b17e7bba85874f203a7b11a03dc9ae7231887ed4e21083624906c2174b0585e449d7d9d260701dce88de493bade556e6e31843
+  data.tar.gz: 7fc6687b0cd39502b95dd026a4b3429dec813bcbedc0e15b3ef9544239664d97508d4ebc1a25a3404640316ff8617eebdffc466250d42b126f2cc7b8e878f2c4

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/docker-compose.yml

@@ -6,3 +6,8 @@ services:
     command: bash -c 'sleep 100000'
     volumes:
       - ./:/home/web/app
+      - ~/.gem:/home/web/.gem
+      - ~/.gitconfig:/home/web/.gitconfig:ro
+      - $SSH_AUTH_SOCK:/auth-sock
+    environment:
+      - SSH_AUTH_SOCK=/auth-sock

data/lib/easy-settings.rb

@@ -1,3 +1,6 @@
+require "active_support"
+require "active_support/core_ext/module/delegation"
+
 require "easy-settings/version"
 require "easy-settings/struct"
 require "easy-settings/env_source"
@@ -7,7 +10,7 @@ require "easy-settings/yaml_source"
 class EasySettings
   delegate :respond_to?, to: :@data
 
-  def initialize(sources:, fail_on_missing: true)
+  def initialize(sources: [], fail_on_missing: true)
     @sources = sources
     @fail_on_missing = fail_on_missing
     reload!

data/lib/easy-settings/env_source.rb

@@ -1,27 +1,21 @@
-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
     {}.tap do |data|
       ENV.each do |variable, value|
         keys = variable.to_s.split(separator)
-        next unless keys.shift == prefix
+        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
-      rescue NoMethodError => e
-        raise "Invalid name converter: #{converter}"
+        assign_value(data, keys, value)
       end
     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
-      rescue NoMethodError => e
-        raise "Invalid name converter: #{converter}"
+        assign_value(data, keys, value)
       end
     end
   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.0.0"
+  VERSION = "1.3.1"
 end

metadata

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