use-config 0.2.0 → 0.2.1

data/lib/use_config/configuration.rb

@@ -147,8 +147,9 @@ module UseConfig
     #
     # Options:
     #
-    # * +:empty: - Create empty object, don't read configuration from file.
-    # * No other options yet.
+    # * +:empty:+ - Create empty object, don't read configuration from file.
+    # * +:file:+ - Load configuration from given file. Use full name.
+    # * +:path_insert:+ - Insert the value into the config files search path.
     #
     # Notes:
     #
@@ -166,13 +167,24 @@ module UseConfig
       end
       instance_properties.name = name.to_s
       instance_properties.used_by = []
+      if options[:path_insert]
+        if options[:path_insert].is_a? Array
+          options[:path_insert].reverse.each do |dir|
+            instance_properties['path'].unshift(dir)
+          end
+        else
+          instance_properties['path'].unshift(options[:path_insert])
+        end
+      end
       if options[:empty]
         instance_properties.use_file = false
       end
-      if instance_properties.use_file and instance_properties.file.nil?
-        config_file_find
+      if instance_properties.use_file
         if instance_properties.file.nil?
-          raise "Configuration file not found"
+          config_file_find
+          if instance_properties.file.nil?
+            raise "Configuration file not found"
+          end
         end
         load_configuration
       end

data/lib/use_config/version.rb

@@ -1,4 +1,4 @@
 module UseConfig
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end
 

data/spec/use_config_configuration_spec.rb

@@ -42,8 +42,16 @@ describe UseConfig::Configuration, "instance public interface" do
       context "when option :file given" do
         it "loads configuration from file" do
           c = UseConfig::Configuration.new :the_first_conf,
-            :file => 'first_conf.yaml'
-          c.core.name.should = 'first_conf'
+            :file => "spec/config/first_conf.yaml"
+          c.core.name.should == 'first_conf'
+        end
+      end
+
+      context "when option :path_insert given" do
+        it "loads configuration from file from given path" do
+          c = UseConfig::Configuration.new :config,
+            :path_insert => "spec/config_insert"
+          c.confname.should == 'config_insert_conf'
         end
       end
     end

data/spec/use_config_spec.rb

@@ -9,7 +9,7 @@ describe UseConfig do
   before :each do
     UseConfig::Configuration.reset!
     UseConfig::Configuration.configure do |c|
-      c.path << "#{File.dirname(__FILE__)}/config"
+      c.path << "spec/config"
     end
   end
 
@@ -31,6 +31,11 @@ describe UseConfig do
       Sample.use_config :first_conf
       Sample.first_conf.core.name.should == 'first_conf'
     end
+
+    it "loads configuration from :path_insert directory" do
+      Sample.use_config :config, :path_insert => 'spec/config_insert'
+      Sample.config.confname.should == 'config_insert_conf'
+    end
   end
 
   context "Samle class instance" do

metadata

@@ -2,7 +2,7 @@
 name: use-config
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Svetoslav Chernobay
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +03:00
+date: 2011-03-30 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency