appfuel 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88e413bfd2d8d291a082e1ceb3fb292d919c29f4
-  data.tar.gz: 3a743055b87cf4505dcaa4d8cb27ee8e0f596179
+  metadata.gz: 54becd18e0c5c644ef511055cbea0387fb3a9358
+  data.tar.gz: 6ee40a006ed3074fbb4a9507d89c6c2c6f3ae825
 SHA512:
-  metadata.gz: dd8cadc46ee46043cd3ab4be7326e91274c38462a25d4ee33d14e3c4e23d76ab9755601e9b9402cd8d74da8f19d2c7c7fcee3317fec69777f09311ed4cee6ac6
-  data.tar.gz: d1c9b2d0d7d11322557dc1e4e3386a5fbda0976fe507f588e88fb108720036076a4396b252e0ddce0d0cdf174ba56957f7013ec2864ce0b1f8d25b903afe124b
+  metadata.gz: e97e9094b6360bc89c3567f9d3a262d5269d46a28f963e1bd3433370a53a5341ee02bed4e55a75407128ea8f08fef83296ce31db08dfe709be824bfc244859ae
+  data.tar.gz: 88dcc7b47c0393b965b0e52a75cae551afe8f0a2683375781a7bea0708d82e8063ddb27159765d7ec9e07bb3f6d634da2f8a7fa73bde7e3dc59a7c3cb08853fa

data/CHANGELOG.md

@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 # [Unreleased]
 
+
 # Releases
+## [[0.2.9]](https://github.com/rsb/appfuel/releases/tag/0.2.8) 2017-06-14
+### Changed
+- configuration now resolve to symbols as keys, children included
+
 ## [[0.2.8]](https://github.com/rsb/appfuel/releases/tag/0.2.8) 2017-06-07
 ### Fixed
 - searching configuration definitions with a symbol was failing because key was

data/appfuel.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   # when dynamically creating form validators. Not sure if it is the library
   # or the way I am using it.
   spec.add_dependency "activerecord",     "~> 5.1.0"
+  spec.add_dependency "pg",               "~> 0.20"
   spec.add_dependency "dry-types",        "0.9.2"
   spec.add_dependency "dry-container",    "~> 0.6"
   spec.add_dependency "dry-validation",   "~> 0.10.5"

data/lib/appfuel/configuration/definition_dsl.rb

@@ -62,7 +62,7 @@ module Appfuel
       # @param key Symbol|String key used config hash
       # @return Definition
       def initialize(key)
-        @key       = key.to_s
+        @key       = key.to_sym
         @defaults  = {}
         @file      = []
         @validator = nil

data/lib/appfuel/configuration/file_loader.rb

@@ -29,6 +29,7 @@ module Appfuel
       def parse_yaml(path)
         yaml_module.load_file(path)
       end
+      alias_method :parse_yml, :parse_yaml
 
       # Load file will search through a configuration's definition file
       # paths and use the first on that exists. It parse it based on
@@ -40,21 +41,27 @@ module Appfuel
       # @return [Hash]
       def load_file(definition)
         paths = definition.file
-        key   = definition.key
 
         paths.each do |path|
           ext = file_module.extname(path).strip.downcase[1..-1]
           parse_method = "parse_#{ext}"
           unless respond_to?(parse_method)
-            fail "extension (#{ext}), for (#{key}: #{path}) is not valid, " +
-                 "only yaml and json are supported"
+            fail "extension (#{ext}), for (#{definition.key}: #{path}) " +
+                 "is not valid, only yaml and json are supported"
           end
 
-          return public_send(parse_method, path) if file_module.exists?(path)
+          if file_module.exists?(path)
+            config = public_send(parse_method, path)
+            unless config.is_a?(Hash)
+              fail "[config #{parse_method}] config must be a hash"
+            end
+            config.deep_symbolize_keys!
+            return config[definition.key]
+          end
         end
 
         list = paths.join(',')
-        fail "none of :#{key} config files exist at (#{list})"
+        fail "none of :#{definition.key} config files exist at (#{list})"
       end
     end
   end

data/lib/appfuel/configuration/populate.rb

@@ -25,15 +25,11 @@ module Appfuel
 
         if file?
           config = load_file(self)
-          unless config.is_a?(Hash)
-            fail "[config populate] Failed :load_file did not " +
-              "return a hash (#{file})"
-          end
+        else
           config = config[key]
         end
 
         config ||= {}
-
         config = defaults.deep_merge(config)
         config = config.deep_merge(load_env(env_data, self))
         config = config.deep_merge(overrides || {})
@@ -60,9 +56,10 @@ module Appfuel
 
       def populate_children(child_hash, data, env_data = {})
         child_hash.each do |(def_key, definition)|
-
+          if definition.file?
+            data[def_key] = load_file(definition)
+          end
           data[def_key] ||= {}
-          data[def_key] = load_file(definition) if definition.file?
           data[def_key] = definition.defaults.deep_merge(data[def_key])
           data[def_key] = data[def_key].deep_merge(load_env(env_data, definition))
           unless definition.children.empty?

data/lib/appfuel/configuration/search.rb

@@ -29,7 +29,7 @@ module Appfuel
       # @param terms Array of definition keys
       def find(child_list, terms)
         while term = terms.shift
-          term = term.to_s
+          term = term.to_sym
           child_list.each do |(definition_key, definition)|
             next unless definition_key == term
             result = if terms.empty?

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/appfuel.rb

@@ -146,7 +146,12 @@ module Appfuel
       runlist_key = "#{namespace}.run"
       env         = container['env']
       config      = container['config']
-      runlist     = container[runlist_key]
+
+      runlist = []
+      if container.key?(runlist_key)
+        runlist = container[runlist_key]
+      end
+
       unless runlist.respond_to?(:each)
         fail "[initialize] runlist (#{runlist_key}) must implement :each"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 5.1.0
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement