dynamic_configuration 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/dynamic_configuration.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynamic_configuration}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jarosław Rzeszótko}]

data/lib/dynamic_configuration.rb

@@ -7,12 +7,15 @@ module DynamicConfiguration
   
   private
 
-  class ConfigFactory
+  class ConfigFactory   
     def create_config(const_name, config_file_name)
-      setup_config(const_name, config_file_name)
+      @rails_loaded = Object.const_defined?(:Rails)
+      
+      config = setup_config(const_name, config_file_name)
       load_main_configuration_files
-      load_per_environment_configuration_files if Object.const_defined?(:Rails)
+      load_per_environment_configuration_files if @rails_loaded
       load_local_configuration_files
+      config.freeze
 
       return @config
     end
@@ -52,7 +55,7 @@ module DynamicConfiguration
 
     def load_local_configuration_files
       local_settings_exist = FileTest.directory?(@config_path.to_s + "/local")
-      rails_test_env = Object.const_defined?(:Rails) && Rails.env == 'test'
+      rails_test_env = @rails_loaded && Rails.env == 'test'
       return if !local_settings_exist || rails_test_env
 
       local_mod_files_dir = @config_path + Pathname.new("local/")
@@ -65,7 +68,7 @@ module DynamicConfiguration
     end
   end
 
-  class Config < ::BlankSlate
+  class Config < ::BlankSlate    
     def initialize(const_name, config_path)
       @const_name, @config_path = const_name, config_path
     end
@@ -78,14 +81,7 @@ module DynamicConfiguration
       @modules[mod_name.intern].instance_eval(::IO.read(file_pathname.to_s))
 
       @settings ||= {}
-      @settings[mod_name.intern] ||= Settings.new(@modules[mod_name.intern].settings)
-    end
-
-    def finalize
-      ::ActiveSupport::Dependencies.autoload_paths << @config_path.to_s
-      ::ActiveSupport::Dependencies.explicitly_unloadable_constants << @const_name.to_s
-      
-      self.freeze
+      @settings[mod_name.intern] ||= Settings.new(@const_name, mod_name, @modules[mod_name.intern].settings)
     end
 
     def method_missing(name, *args, &block)
@@ -106,18 +102,22 @@ module DynamicConfiguration
 
     def method_missing(name, value)
       @settings[name] = value
+      @settings[name].freeze
     end
   end
 
   class Settings < ::BlankSlate
-    def initialize(settings)
+    def initialize(const_name, module_name, settings)
+      @const_name = const_name
+      @module_name = module_name
       @settings = settings
     end
 
     def method_missing(name, *args)
-      @settings[name]
+      @settings.fetch(name) { raise MissingSettingException.new("Setting '#{@const_name}.#{@module_name}.#{name}' is not defined") }
     end
   end
 
   class MissingSubmoduleException < StandardError; end
+  class MissingSettingException < StandardError; end
 end

data/spec/dynamic_configuration_spec.rb

@@ -1,33 +1,49 @@
 require_relative '../spec_helper'
 require_relative '../lib/dynamic_configuration'
 
-describe DynamicConfiguration do
-  let(:path) { "#{File.dirname(__FILE__)}/options" }
-  
+describe DynamicConfiguration do    
   before(:each) do
-    Object.instance_eval { remove_const :Settings if const_defined?(:Settings) } 
-  end  
+    Object.instance_eval { remove_const :Settings if const_defined?(:Settings) }    
+  end
+
+  let(:path) { "#{File.dirname(__FILE__)}/options" }
 
   it "should create valid configurations" do
     DynamicConfiguration::create(:Settings, path)
-
     Settings.main.setting_one.should   == 'Some string'
     Settings.main.setting_two.should   == 123456
   end
 
   it "should make per-environment settings take precedence over main configuration" do
-    Rails = mock(:env => 'test')
-
+    Rails = mock(:env => 'test').as_null_object
     DynamicConfiguration::create(:Settings, path)
-
     Settings.main.setting_three.should == [3, 2, 1]
-
     Object.instance_eval { remove_const :Rails }
   end
 
   it "should make local settings take precedence even over per-environment settings" do
     DynamicConfiguration::create(:Settings, path)
-
     Settings.main.setting_four.should == 'overwrite-again'
   end
+
+  it "should freeze the created configuration" do
+    lambda {
+      DynamicConfiguration::create(:Settings, path)
+      Settings.main.setting_three << 4
+    }.should raise_error(RuntimeError)
+  end
+
+  it "should raise an exception if trying to use a submodule that is not defined" do
+    lambda {
+      DynamicConfiguration::create(:Settings, path)
+      Settings.xyz.setting_three
+    }.should raise_error(DynamicConfiguration::MissingSubmoduleException)
+  end
+
+  it "should raise an exception if trying to use a setting that is not defined" do
+    lambda {
+      DynamicConfiguration::create(:Settings, path)
+      Settings.main.xyz
+    }.should raise_error(DynamicConfiguration::MissingSettingException)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_configuration
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: