tarot 0.1.3 → 0.1.4

data/lib/tarot.rb

@@ -8,10 +8,14 @@ module Tarot
       @config_files = files
       @config_files = [@config_files] if @config_files.is_a? String
       @yaml = {}
+      yaml = "---\n" + @config_files.map do |file|
+        File.open(file).read.untaint.gsub(/^---.*$/, '')
+      end.join("\n")
+      @yaml = YAML::load(yaml).stringify_keys!
       @config_files.each do |file|
-        yaml = YAML::load(File.open(file).read.untaint).stringify_keys!
-        recursive_merge @yaml, yaml
-      end
+        yaml = YAML::load(open(file).read).stringify_keys!
+        recursive_merge(@yaml, yaml)
+      end      
       add_mm @yaml
       @config_cache = {}
       @env = env
@@ -22,6 +26,13 @@ module Tarot
       @config_cache[env][key] ||= key.split('.').inject(@yaml[env || @env]) {|e, part| e.try(:[], part) } || default
     end
 
+    def with_environment(env)
+      old_env, self.env = self.env, env
+      yield if block_given?
+      self.env = old_env
+      nil
+    end
+
     private
 
     def recursive_merge(left, right)

data/lib/tarot/version.rb

@@ -1,3 +1,3 @@
 module Tarot
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/data/recursive.yml

@@ -1,4 +1,5 @@
 ---
 development:
+  <<: *inclusion
   foo: fizzle
   mah: rizzle

data/spec/data/test.yml

@@ -1,4 +1,7 @@
 ---
+inclusion: &inclusion
+  included: true
+  
 development: &development
   foo: bar
   fizz: buzz

data/spec/tarot_spec.rb

@@ -37,14 +37,29 @@ describe Tarot do
     it "should fail when method_missing follows a multi-level chain that doesn't exist" do
       lambda { @tarot.blarg.blaze }.should raise_error(NameError)
     end
+
+    it "should accept an override environment as a block" do
+      @tarot.with_environment("production") do
+        @tarot.env.should == "production"
+        @tarot.get("fizz").should == "bang"
+      end      
+      @tarot.env.should == "development"
+    end
   end
 
   context "Given multiple config files" do
+    before :all do
+        @tarot = Tarot::Config.new(["spec/data/test.yml", "spec/data/recursive.yml"], "development")
+    end
+
     it "should produce a recursively merged hash when given multiple files to load" do
-      @tarot = Tarot::Config.new(["spec/data/test.yml", "spec/data/recursive.yml"], "development")
       @tarot.get("foo").should == "fizzle"
       @tarot.get("mah").should == "rizzle"
       @tarot.get("fizz").should == "buzz"
     end
+
+    it "should accept YAML inclusions across files" do
+      @tarot.get("included").should == true
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tarot
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Chris Heald
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 -07:00
-default_executable: 
+date: 2011-07-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -58,7 +57,6 @@ files:
 - spec/spec_helper.rb
 - spec/tarot_spec.rb
 - tarot.gemspec
-has_rdoc: true
 homepage: https://github.com/cheald/tarot
 licenses: []
 
@@ -88,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tarot
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Tarot is a small, concise configuration library for Rails apps.