config_files 0.1.0 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69666324c397bf59a18efef190d2660ce376143b246bda3752409af21fe1b51b
-  data.tar.gz: 79c42d11ba5617e182e6b6cdb56074036c99f7bcd32fe0f5f0d0022b971f3194
+  metadata.gz: 0e601554ecea9bc4ad625f62936f005413b5cc13e76c25776a6abd1455dca6ff
+  data.tar.gz: 91b7f6eeb1e07b2646c3086d4ef008b91ee04d63fee1b7b6ccb9a73c8adfd67a
 SHA512:
-  metadata.gz: e53a814869eaebf6ed6b6ecc55425dedbaca918434168720e96eed9812a84bce6b64f0818c5b751343b20ce4adc42d7d23ab3b01b857542443fb8da68a5a7eca
-  data.tar.gz: 72ea7cc041cf8405429244a42c96a5a2f275de969b9fd183b62bca9423271847d38a43ae3970b23b64679643a3acdc26ff594c82a75456509c9a7a94cb76e830
+  metadata.gz: d086ca2975a90d9035a7e81eac2a7ddaadfcbd42ca61a3cb33fbde4675b42c226bfd181c48a9dcc6206f6fd6167e26b016af977fee61b2ab02d5bb132c67da53
+  data.tar.gz: 84211ae6ba278ebec36df53a7e0f7275b35430118b135ae6ecc5e73f3ad5ca02833691e4655e38f61f67857c62beb7a041189d3b00a3395e33526f96730c1520

data/Gemfile.lock

@@ -0,0 +1,34 @@
+PATH
+  remote: .
+  specs:
+    config_files (0.1.5)
+      activesupport (>= 2.2.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (6.0.3.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.2)
+    rake (13.0.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.7)
+      thread_safe (~> 0.1)
+    zeitwerk (2.4.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  config_files!
+  rake
+
+BUNDLED WITH
+   1.16.1

data/config_files.gemspec

@@ -20,5 +20,6 @@ SUMMARY
   spec.license     = 'MIT'
   spec.date        = '2012-11-11'
 
-  spec.add_dependency 'activesupport'
+  spec.add_runtime_dependency 'activesupport', '>=2.2.1'
+  spec.add_development_dependency 'rake'
 end

data/lib/config_files.rb

@@ -3,23 +3,32 @@ require 'config_files/loader_factory'
 require 'config_files/loaders'
 require 'config_files/version'
 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
@@ -28,11 +37,15 @@ module ConfigFiles
       :etc
     end
 
+    def default_directories
+      { :etc => ['config', 'etc', '/etc'] }
+    end
+
     def config_directories(*arr)
-      self.directories||={ :etc => ['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) }
+          self.directories[key]=value.map { |dir| ::File.expand_path(dir) }
           meta_def("#{key}_dir") { @directories[key] }
         end
       end
@@ -43,7 +56,7 @@ module ConfigFiles
     end
 
     def build_combined(file)
-      JSON.parse(merged_hash(file).to_json, object_class: OpenStruct)
+      merged_hash(file)
     end
 
     def static_config_files(*arr)
@@ -62,12 +75,20 @@ module ConfigFiles
     alias_method :config_files, :dynamic_config_files
 
     private
+    def directory_listing(directory, file)
+      ::Dir.glob(::File.join(directory, "#{file}.*"))
+    end
+
     def first_directory(file, key=config_key)
-      self.directories[key]&.detect { |directory| Dir.glob(File.join(directory, "#{file}.*")) } || (raise Errno::ENOENT, "No #{file}.* in #{self.directories[key]}")
+      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)
-      Dir.glob(File.join(first_directory(file, key), "#{file}.*"))
+      directory_listing(first_directory(file, key), file)
     end
 
     def config_files(file, key=config_key)

data/lib/config_files/file_factory.rb

@@ -8,7 +8,7 @@ module ConfigFiles
 
       public
       def call(file_name, options={})
-        loader(file_name, options).(file_name, object_class: ::Hash)
+        loader(file_name, options).(file_name)
       end
     end
   end

data/lib/config_files/loaders/json.rb

@@ -4,8 +4,8 @@ module ConfigFiles
   module Loaders
     class Json
       class << self
-        def call(file_name, object_class: ::OpenStruct)
-          ::JSON.load(file_name, nil, {object_class: object_class})
+        def call(file_name, object_class: ::Hash)
+          ::JSON.load(::File.open(file_name), nil, {object_class: object_class, quirks_mode: true})
         end
       end
     end

data/lib/config_files/loaders/yaml.rb

@@ -2,8 +2,8 @@ module ConfigFiles
   module Loaders
     class Yaml
       class << self
-        def call(file_name, object_class: OpenStruct)
-          JSON.parse(::YAML.load_file(file_name).to_json, object_class: object_class)
+        def call(file_name)
+          ::YAML.load_file(file_name)
         end
       end
     end

data/lib/config_files/version.rb

@@ -1,3 +1,3 @@
 module ConfigFiles
-  VERSION='0.1.0'
+  VERSION='0.1.6'
 end

data/test/config_files_test.rb

@@ -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)
@@ -38,10 +43,14 @@ class ConfigFilesTest < MiniTest::Test
   end
 
   def test_empty_for_missing_files
-    assert_equal({}, Dummy.broken.to_h)
+    assert_equal({}, Dummy.broken)
   end
 
   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('test', Defaults.dummy[:config_test])
+  end
 end

data/test/etc/dummy.json

@@ -0,0 +1,13 @@
+{
+  "testId": "123123-323-radasd",
+  "testTitle": "string",
+  "testNest": [
+    {
+      "hash": {
+        "innerId": "27811a4c-9cb5-4e6d-a069-5c19288fae58",
+        "personGivenName": "Paul",
+        "personFamilyName": "Mak"
+      }
+    }
+  ]
+}

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: config_files
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.6
 platform: ruby
 authors:
 - Paul McKibbin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2012-11-11 00:00:00.000000000 Z
@@ -16,9 +16,23 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.1
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -34,6 +48,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENCE.txt
 - README.md
 - Rakefile
@@ -49,13 +64,14 @@ files:
 - lib/meta.rb
 - test/config_files_test.rb
 - test/etc/dummy.conf
+- test/etc/dummy.json
 - test/etc/dummy.yml
 - test/loader_factory_test.rb
 homepage: https://github.com/blackrat/config_files
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -70,9 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+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
@@ -80,5 +95,6 @@ summary: ConfigFiles is a configuration file access tool. It parses multiple con
 test_files:
 - test/config_files_test.rb
 - test/etc/dummy.conf
+- test/etc/dummy.json
 - test/etc/dummy.yml
 - test/loader_factory_test.rb