dynamic_configuration 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76344d2157db88d0146007e521b296322d4592a1
-  data.tar.gz: 0e71321dd18c4a10b13459465ecf51c196eaebe1
+  metadata.gz: 425ae95c29d5bd5d332340549b603a14bc7763bb
+  data.tar.gz: e7238415edef3f48da4bc43137f2e543cee1823c
 SHA512:
-  metadata.gz: 60bb564937d89c96fcdebf9d0291330b024c3439d0d781d8b35db29cbc403a94c6b6f81c0ca566ec3aadfbd15f4350d8c993ce33ac688a5c03bdb6312425eedc
-  data.tar.gz: dbf4554f086be198b6ea294ddf41448c879fef4e166078a6d58966f5885414479f6a578a3f20f8a60b30608133142f397d3d521f8f5d47aa4787be7054e806ba
+  metadata.gz: d9536a059603c8568aff1c5c62ba84b24c7e6480733104e409c605ddd0cf8a2588e6386f147ee6fff0efef0bc738993955d12dad6446d294169dae19fa04ef18
+  data.tar.gz: 59e496dc3da5fab5eee01485e8a24d574b71386c1f2d637ca8c4ac193f92479dc099f5beb73faef68d908ede187adc3c78165506a4dd0bc4a7ddcabf57b44d6c

data/VERSION

@@ -1 +1 @@
-0.3.13
+0.3.14

data/dynamic_configuration.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: dynamic_configuration 0.3.13 ruby lib
+# stub: dynamic_configuration 0.3.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "dynamic_configuration"
-  s.version = "0.3.13"
+  s.version = "0.3.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Jaros\u{142}aw Rzesz\u{f3}tko"]
-  s.date = "2014-02-06"
+  s.date = "2014-02-07"
   s.description = "Flexible configuration library for Ruby and Rails applications."
   s.email = "jrzeszotko@gmail.com"
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "dynamic_configuration.gemspec",
     "lib/dynamic_configuration.rb",
+    "lib/railtie.rb",
     "spec/dynamic_configuration_spec.rb",
     "spec/options/local/main.rb",
     "spec/options/main.rb",

data/lib/dynamic_configuration.rb

@@ -1,16 +1,30 @@
 require 'blankslate'
 
 module DynamicConfiguration
-  def self.create(const_name, config_directory)
-    ConfigFactory.new.create_config(const_name, config_directory)
+  class << self
+    def create(const_name, root_file_path)
+      @config_paths.push(File.dirname(root_file_path))
+      @const_names.push(const_name)
+      ConfigFactory.new.create_config(const_name, root_file_path)
+    end
+
+    def config_paths
+      @config_paths
+    end
+
+    def const_names
+      @const_names
+    end
   end
-  
+
+  @const_names, @config_paths = [], []
+
   private
 
-  class ConfigFactory   
-    def create_config(const_name, config_directory)
+  class ConfigFactory
+    def create_config(const_name, root_file_path)
       detect_rails
-      setup_config(const_name, config_directory)
+      setup_config(const_name, root_file_path)
       load_main_configuration_files
       load_per_environment_configuration_files if @rails_loaded
       load_local_configuration_files
@@ -23,20 +37,21 @@ module DynamicConfiguration
     def detect_rails
       @rails_loaded = Object.const_defined?(:Rails)
     end
-    
-    def setup_config(const_name, config_directory)
+
+    def setup_config(const_name, root_file_path)
       @const_name = const_name
-      @config_directory = Pathname.new(config_directory)
+      @root_file_path = root_file_path
+      @config_directory = Pathname.new(File.dirname(@root_file_path))
       @config = Config.new(@const_name, @config_directory)
 
-      Object.const_set @const_name, @config
+      Object.const_set(@const_name, @config)
     end
 
     def load_main_configuration_files
       @config_directory.entries.each do |mod_file|
         next if ["..", "."].include?(mod_file.basename.to_s)
         mod_file = @config_directory + mod_file
-        next unless mod_file.file? && mod_file.basename.to_s != "#{@const_name.to_s.downcase}.rb"
+        next unless mod_file.file? && mod_file.to_s != @root_file_path
         @config.load_module(mod_file)
       end
     end
@@ -71,18 +86,13 @@ module DynamicConfiguration
 
     def finalize_config
       @config.freeze
-
-      if @rails_loaded
-        ::ActiveSupport::Dependencies.autoload_paths << @config_directory.to_s
-        ::ActiveSupport::Dependencies.explicitly_unloadable_constants << @const_name.to_s
-      end
     end
   end
 
   class Config < ::BlankSlate
     reveal :freeze
     reveal :respond_to?
-    
+
     def initialize(const_name, config_directory)
       @const_name, @config_directory = const_name, config_directory
     end
@@ -142,3 +152,5 @@ module DynamicConfiguration
   class MissingGroupException < StandardError; end
   class MissingSettingException < StandardError; end
 end
+
+require 'railtie' if defined?(Rails)

data/lib/railtie.rb

@@ -0,0 +1,15 @@
+class DynamicConfigurationRailtie < Rails::Railtie
+  config.to_prepare do
+    DynamicConfiguration.const_names.each do |const_name|
+      Object.send(:remove_const, const_name) if Object.const_defined?(const_name)
+    end
+  end
+
+  initializer "dynamic_configuration.initialize" do |app|
+    DynamicConfiguration.config_paths.each do |path|
+      unless ActiveSupport::Dependencies.autoload_paths.include?(path)
+        ActiveSupport::Dependencies.autoload_paths << path
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_configuration
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Jarosław Rzeszótko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Flexible configuration library for Ruby and Rails applications.
 email: jrzeszotko@gmail.com
@@ -26,6 +26,7 @@ files:
 - VERSION
 - dynamic_configuration.gemspec
 - lib/dynamic_configuration.rb
+- lib/railtie.rb
 - spec/dynamic_configuration_spec.rb
 - spec/options/local/main.rb
 - spec/options/main.rb