app_config_for 0.0.3 → 0.0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fffc63810437848a24a9e6f1d8cf02081060a0fe2d348bd8e7bb14c5917ca2ec
-  data.tar.gz: 76c6787ebe99d673214fdd9e9bba7f4e0ff003c18308214444bdd48e38736023
+  metadata.gz: 228991a28438bec90c4aa9f06b33850a5ee4034b01a7ec87a33c90fa77ace37d
+  data.tar.gz: eed01754e58c59c3ea8d58c23e809f8d9c3ae1b6fe5a3b24958a1a173f01a87c
 SHA512:
-  metadata.gz: 142a9d57a16dcb0951ae39da4103138dd9b8d6b9d53b52bf4776d4ae4701290f0d00b6b36e773ac1af95d69bc150dade305bf43353a49a1072e715253c6fd034
-  data.tar.gz: '0499b786cade8df74b4adc315f231fcbb3ef1c7f0b91cd74bdb430d8d779451edd4dfba7fd509cbe2e8af2daec00f6ad7ad1b1a78b287211016eda55bfb623d3'
+  metadata.gz: d05a93814a9b8162890151e89f2e83e99f29c58478e371aeef49c63c29713a01d1c86ab3b4a28ee320d2eb639dd51879d107dd820c9f173c3bae958c626396b9
+  data.tar.gz: b9dc3d8224b2e0c05167da273faf7df940c1397022d22768af8cce85101de32993a56cc2e13bca5b2d8cb656e7885251a962486856388ad1871be9163784816e

data/lib/app_config_for/gem_version.rb

@@ -0,0 +1,16 @@
+module AppConfigFor
+
+  def self.gem_version
+    Gem::Version.new(VERSION::STRING)
+  end
+
+  module VERSION
+    MAJOR = 0
+    MINOR = 0
+    TINY  = 4
+    PRE = 1
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  end
+
+end

data/lib/app_config_for/legacy_support.rb

@@ -0,0 +1,45 @@
+require 'active_support/core_ext/string/inflections'
+name = File.basename(__dir__).classify
+STDERR.puts "#{name}: Warning! Outdated version of ActiveSupport active! To avoid security issues, please upgrade your version of ActiveSupport to at least 6.1.4."
+if ActiveSupport.gem_version < Gem::Version.new('6.1.0')
+  puts "#{name}: Loading legacy support for ActiveSupport version #{ActiveSupport.gem_version}."
+
+  # Quick and dirty backport. This won't be here long. Just enough to support AppConfigFor during some legacy upgrades.
+  require "active_support/string_inquirer"
+  require "erb"
+  require "yaml"
+
+  module ActiveSupport
+    class EnvironmentInquirer < StringInquirer
+
+      Environments = %w(development test production)
+
+      def initialize(env)
+        super(env)
+        Environments.each { |e| instance_variable_set(:"@#{e}", env == e) }
+      end
+
+      Environments.each { |e| define_method("#{e}?") { instance_variable_get("@#{e}") }}
+    end
+
+    class ConfigurationFile
+      def initialize(file_name)
+        @file_name = file_name
+        @config = File.read(file_name)
+        warn(file_name + ' contains invisible non-breaking spaces.') if @config.match?("\u00A0")
+      end
+
+      def self.parse(file_name)
+        new(file_name).parse
+      end
+
+      def parse
+        YAML.load(ERB.new(@config).result) || {}
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing #{@file_name}. Error: #{e.message}"
+      end
+    end
+
+  end
+
+end

data/lib/app_config_for/version.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
+require_relative "gem_version"
 
 module AppConfigFor
-  VERSION = "0.0.3"
+
+  def self.version
+    gem_version
+  end
+
 end

data/lib/app_config_for.rb

@@ -2,11 +2,18 @@
 
 require_relative "app_config_for/version"
 require_relative "app_config_for/errors"
-require 'active_support/environment_inquirer'
-require 'active_support/configuration_file'
+
+require 'active_support/gem_version'
+if ActiveSupport.gem_version >= Gem::Version.new('6.1.4')
+  require 'active_support/environment_inquirer'
+  require 'active_support/configuration_file'
+else
+  require_relative 'app_config_for/legacy_support'
+end
+
 require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string/inflections'
-require "active_support/core_ext/hash/indifferent_access"
+require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/ordered_options'
 require 'active_support/core_ext/object/try'
 
@@ -23,9 +30,18 @@ module AppConfigFor
     env_prefixes(false, false).send(at_beginning ? :unshift : :push, AppConfigFor.prefix_from(prefix || self)).uniq!
   end
 
+  def add_config_directory(new_directory)
+    (additional_config_directories << Pathname.new(new_directory).expand_path).uniq!
+  end
+
+  def additional_config_directories
+    @additional_config_directories ||= []
+  end
+
   def config_directories
     directories = ['Rails'.safe_constantize&.application&.paths, try(:paths)].compact.map { |root| root["config"].existent.first }.compact
-    directories.map! { |directory| Pathname.new(directory) }
+    directories.map! { |directory| Pathname.new(directory).expand_path }
+    directories.concat additional_config_directories
     directories.push(Pathname.getwd + 'config')
     directories.uniq
   end
@@ -39,7 +55,7 @@ module AppConfigFor
   end
 
   def config_files(name = nil)
-    name = AppConfigFor.yml_name_from(name || self)
+    name = AppConfigFor.yml_name_from(name || config_name)
     config_directories.map { |directory| directory + name }
   end
 
@@ -59,17 +75,26 @@ module AppConfigFor
     config
   end
 
+  def config_name
+    @config_name ||= self
+  end
+
+  def config_name=(new_config_name)
+    @config_name = new_config_name
+  end
+
   def config_options(name = nil)
     file = name.is_a?(Pathname) ? name : config_file(name)
     ActiveSupport::ConfigurationFile.parse(file.to_s).deep_symbolize_keys
   rescue SystemCallError => exception
     raise ConfigNotFound.new(name.is_a?(Pathname) ? name : config_files(name), exception)
   rescue => exception
-    raise LoadError.new(file, exception)
+    raise file ? LoadError.new(file, exception) : exception
   end
 
-  def configured(env: nil)
-    config_for(self, env: env)
+  def configured(reload = false, env: nil)
+    @configured = config_for(nil, env: env) if reload || @configured.nil?
+    @configured
   end
 
   def env(reload = false)
@@ -170,7 +195,7 @@ module AppConfigFor
 
     def progenitor_of(object, style = nil)
       style = verified_style!(style, object)
-      command = {namespace: :namespace_of, class: :parent_of}[style]
+      command = {namespace: :namespace_of, class: :parent_of}[style] # Todo, deal with the other styles by doing nothing and not crashing or something.
       object && command && send(command, object).yield_self { |n| n && (n.respond_to?(:env_prefixes) ? n : progenitor_of(n)) }
     end
 
@@ -220,14 +245,20 @@ module AppConfigFor
 
     private
 
+    def prep_base(base)
+      base.add_env_prefix
+      gem = Gem.loaded_specs[base.name.underscore]
+      base.add_config_directory(gem.gem_dir + '/config') if gem
+    end
+
     def extended(base)
       # Todo: Add the ability to check the default environments directly from base if the methods don't yet exist.
       # ie: base.development? is the same as base.env.development?
-      base.add_env_prefix
+      prep_base(base)
     end
 
     def included(base)
-      base.add_env_prefix
+      prep_base(base)
     end
 
   end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: app_config_for
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4.1
 platform: ruby
 authors:
 - Frank Hall
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +78,8 @@ files:
 - Rakefile
 - lib/app_config_for.rb
 - lib/app_config_for/errors.rb
+- lib/app_config_for/gem_version.rb
+- lib/app_config_for/legacy_support.rb
 - lib/app_config_for/version.rb
 - sig/app_config_for.rbs
 homepage: https://github.com/ChapterHouse/app_config_for
@@ -79,8 +87,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/ChapterHouse/app_config_for
-  source_code_uri: https://github.com/ChapterHouse/app_config_for/tree/v0.0.3
-  changelog_uri: https://github.com/ChapterHouse/app_config_for/blob/v0.0.3/CHANGELOG.md
+  source_code_uri: https://github.com/ChapterHouse/app_config_for/tree/v0.0.4.1
+  changelog_uri: https://github.com/ChapterHouse/app_config_for/blob/v0.0.4.1/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -89,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="