config_files 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a3001450205f4734271598f6b0cd51ca6aba8808434b734d031d3f7c7851b6
-  data.tar.gz: d62a7f9bf5fc8e4f8a299b7fe9f8eba9f7f547917298a8e0e8b9c7d0944e15f1
+  metadata.gz: dabb2b8b5d0fb25738c2d55d02068fd4710f2085425b4236ad8b2da6b62a2167
+  data.tar.gz: b10790c4f63c114122a4ccd0aa2a31bbaf897ae22e926838af1ddc2363d65152
 SHA512:
-  metadata.gz: 689ac43514f81720d263e6e5f707139b451a32703a5d361937626ce653f3c0494019aeed282d5b3e7e384e6b5a217dbd3f67d1927128a3cd12180148f32aef66
-  data.tar.gz: '08c8db4aff8046683fafdfa71ef7cc4717a09b0165cac63a97a3ec660f6f344d0432c8823d7d662dddad221ea8202f83aef7d189cf06a70adc7729dc0aa86eaa'
+  metadata.gz: 742b8d8e6955a5c65dcaa5e62c789f9bd0acd24decc3957f7c58d22086d6ce16a25b29b68703ff98c769049350d7c9195deb7144391ca5d179454633de7db164
+  data.tar.gz: 623b886403b441802957faeebe5484a29b92fd9bd3b082e67c51270c6d53d5974b8ff0278699602bf2345861eb6c6788027a957677a19679e769a896b8d9ba3e

data/.gitignore

@@ -1,3 +1,5 @@
-# Created by .ignore support plugin (hsz.mobi)
-.idea/
-
+/.idea/.gitignore
+/.idea/config_files.iml
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/vcs.xml

data/lib/config_files/version.rb

@@ -1,3 +1,3 @@
 module ConfigFiles
-  VERSION='0.1.5'
+  VERSION='0.1.7'
 end

data/lib/config_files.rb

@@ -2,25 +2,34 @@ require 'config_files/file_factory'
 require 'config_files/loader_factory'
 require 'config_files/loaders'
 require 'config_files/version'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/hash/deep_merge'
 require 'active_support/core_ext/object/blank'
 
 require 'meta'
 require 'yaml'
+
+class NoDirectoryEntry < NoMethodError; end
 module ConfigFiles
 
   class << self
     def included(base)
       base.class_eval do
-        extend ClassMethods
+        extend ConfigFilesClassMethods
       end
     end
   end
 
-  module ClassMethods
+  module ConfigFilesClassMethods
     include Meta
     attr_accessor :directories
 
+    def self.extended(base)
+      base.instance_eval do
+        self.directories=default_directories
+      end
+    end
+
     def any_extension
       '*'
     end
@@ -29,8 +38,12 @@ module ConfigFiles
       :etc
     end
 
+    def default_directories
+      { :etc => ['config', 'etc', '/etc'] }
+    end
+
     def config_directories(*arr)
-      self.directories||={ :etc => ['config', 'etc', '/etc'] }
+      self.directories||=default_directories
       arr.each do |directory_list|
         directory_list.each do |key, value|
           self.directories[key]=value.map { |dir| ::File.expand_path(dir) }
@@ -40,7 +53,7 @@ module ConfigFiles
     end
 
     def merged_hash(file)
-      config_files(file).inject({}) { |master, file|  master.deep_merge(FileFactory.(file)) }
+      config_files(file).inject(::HashWithIndifferentAccess.new) { |master, file|  master.deep_merge(FileFactory.(file)) }
     end
 
     def build_combined(file)
@@ -68,7 +81,11 @@ module ConfigFiles
     end
 
     def first_directory(file, key=config_key)
-      self.directories[key]&.detect { |directory| directory_listing(directory, file).presence } || ''
+      begin
+        self.directories[key]&.detect { |directory| directory_listing(directory, file).presence } || ''
+      rescue NoMethodError=>e
+        raise NoDirectoryEntry, "Unable to find #{key} in #{self.directories}"
+      end
     end
 
     def files(file, key=config_key)

data/test/config_files_test.rb

@@ -3,12 +3,12 @@ require 'minitest/autorun'
 require 'config_files'
 class Dummy
   include ConfigFiles
-  config_directories :etc => ['etc', 'nofiles/etc']
+  config_directories etc: ['test/etc', 'test/nofiles/etc']
   static_config_files :dummy, :broken
 end
 
 class Dummy2 < Dummy
-  config_directories 'config' => ['etc', 'nofiles/etc']
+  config_directories config: ['test/etc', 'test/nofiles/etc']
   class << self
     def config_key
       "config"
@@ -16,6 +16,11 @@ class Dummy2 < Dummy
   end
 end
 
+class Defaults
+  include ConfigFiles
+  static_config_files :dummy
+end
+
 class ConfigFilesTest < MiniTest::Test
   def test_config_key
     assert_equal(:etc, Dummy.config_key)
@@ -44,4 +49,8 @@ class ConfigFilesTest < MiniTest::Test
   def test_yaml_and_config_override
     assert_equal('test', Dummy2.dummy[:config_test])
   end
+
+  def test_defaults_are_picked_up_when_no_directories_used
+    assert_equal(nil, Defaults.dummy[:config_test])
+  end
 end

data/test/etc/dummy.yml

@@ -1,2 +1,2 @@
-:config_test: test
-:only_in_yaml: yaml_file
+config_test: test
+only_in_yaml: yaml_file

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: config_files
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Paul McKibbin
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2012-11-11 00:00:00.000000000 Z
@@ -70,7 +70,7 @@ homepage: https://github.com/blackrat/config_files
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,8 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: ConfigFiles is a configuration file access tool. It parses multiple configuration
   files in multiple formats and presents a consistent block to the application with