profigure 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 0
 :major: 0
-:patch: 2
+:minor: 0
+:build: 
+:patch: 3

data/lib/profigure/profigure.rb

@@ -1,25 +1,35 @@
 class Profigure
   class << self
     def load(configs_dir, environment=nil)
-      hash = YAML.load(file_contents("defaults", configs_dir))
+      hash = file_contents("defaults", configs_dir)
       if environment
-        contents = file_contents(environment, configs_dir)
-        yaml_result = YAML.load(contents)
-        hash.recursive_merge! yaml_result
+        yaml_result = file_contents(environment, configs_dir)
+        merged_with_reference = load_referenced_config_from configs_dir, yaml_result
+        hash.recursive_merge! merged_with_reference
       end
       hash["environment"] = environment
       MoStash.new hash
     end 
 
+    private
+
     def file_contents(environment, configs_dir)
       file = "#{configs_dir}/#{environment}.yml"
       content = run_erb IO.read(file)
+      YAML.load content
     end 
 
     def run_erb(data)
       ERB.new( data ).result
     end
 
+    def load_referenced_config_from( configs_dir, config_hash )
+      config_like_file = config_hash["profigure_like"] || config_hash[:profigure_like]
+      return config_hash unless config_like_file
+      config_like = file_contents( config_like_file, configs_dir )
+      config_like.recursive_merge! config_hash
+    end
+
   end
 end
 

data/profigure.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{profigure}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joel Friedman"]
-  s.date = %q{2010-05-12}
+  s.date = %q{2010-05-18}
   s.description = %q{profigure aims to be a drop in replacement for configuring your apps in a railsy way.}
   s.email = %q{asher.friedman@gmail.com}
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "spec/test_config/arrays.yml",
      "spec/test_config/defaults.yml",
      "spec/test_config/erb.yml",
+     "spec/test_config/like_nested.yml",
      "spec/test_config/nested.yml",
      "spec/test_config/overrides.yml",
      "spec/test_config/test.yml"

data/spec/profigure_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Profigure" do
-  before do
+  before :all do
     @config_dir = File.join(File.dirname(__FILE__), "test_config")
   end
 
@@ -61,4 +61,27 @@ describe "Profigure" do
 
     config[:user].should == ENV["USER"]
   end
+
+  context "profiguring like another yml" do
+    before :all do
+      @config = Profigure.load @config_dir, "like_nested"
+    end
+
+    it "should have the default settings" do
+      @config.foo.should == "bar"
+    end
+
+    it "should have settings it's file" do
+      @config.new_config.should == "yes_i_am"
+    end
+
+    it "should have settings from config referenced by 'profigure_like'" do
+      @config.marco.should == "polo"
+    end
+
+    it "should override configs from refrerenced with actual file" do
+      @config.top_level.second_level.third_level.bar.should == "foo"
+    end
+
+  end
 end

data/spec/test_config/like_nested.yml

@@ -0,0 +1,8 @@
+profigure_like: nested
+
+top_level:
+  second_level:
+    third_level:
+      bar: foo
+
+new_config: yes_i_am

data/spec/test_config/nested.yml

@@ -3,3 +3,5 @@ top_level:
     third_level:
       bar: baz
       time: now
+
+marco: polo

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Joel Friedman
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -05:00
+date: 2010-05-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - spec/test_config/arrays.yml
 - spec/test_config/defaults.yml
 - spec/test_config/erb.yml
+- spec/test_config/like_nested.yml
 - spec/test_config/nested.yml
 - spec/test_config/overrides.yml
 - spec/test_config/test.yml