tarot 0.1.1 → 0.1.2

data/generators/templates/initializer.rb

@@ -1,4 +1,4 @@
-TAROT = Tarot::Config.new(File.join(Rails.root, "config", "tarot.yml"), Rails.env)
+Config = Tarot::Config.new(File.join(Rails.root, "config", "tarot.yml"), Rails.env)
 def config *args
-  TAROT.get *args
+  Config.get *args
 end

data/lib/tarot.rb

@@ -3,10 +3,16 @@ require "active_support/core_ext"
 
 module Tarot
   class Config
-    attr_accessor :config_file, :yaml, :env
-    def initialize(file, env)
-      @config_file = file
-      @yaml = YAML::load(File.open(file).read.untaint).stringify_keys!
+    attr_accessor :config_files, :yaml, :env
+    def initialize(files, env)
+      @config_files = files
+      @config_files = [@config_files] if @config_files.is_a? String
+      @yaml = {}
+      @config_files.each do |file|
+        yaml = YAML::load(File.open(file).read.untaint).stringify_keys!
+        recursive_merge @yaml, yaml
+      end
+      add_mm @yaml
       @config_cache = {}
       @env = env
     end
@@ -15,5 +21,42 @@ module Tarot
       @config_cache[env] ||= {}
       @config_cache[env][key] ||= key.split('.').inject(@yaml[env || @env]) {|e, part| e.try(:[], part) } || default
     end
+
+    private
+
+    def recursive_merge(left, right)
+      left.merge!(right) do |key, oldval, newval|
+        oldval.class == left.class ? recursive_merge(oldval, newval) : newval
+      end
+    end
+
+    def add_mm(hsh)
+      hsh.instance_eval do
+        def method_missing(method, *args)
+          self[method.to_s] || args.first
+        end
+      end
+
+      hsh.each do |key, val|
+        if val.class == hsh.class
+          add_mm val
+        end
+      end
+    end
+
+    def method_missing(method, *args)
+      @yaml[args[1] || @env].send method, *args
+    end
+  end
+
+  module MethodMissingForHash
+    def self.included(obj)
+      obj.each do |key, val|
+        if obj.class == val.class
+          val.extend MethodMissingForHash
+        end
+      end
+    end
+
   end
 end

data/lib/tarot/version.rb

@@ -1,3 +1,3 @@
 module Tarot
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/data/recursive.yml

@@ -0,0 +1,4 @@
+---
+development:
+  foo: fizzle
+  mah: rizzle

data/spec/tarot_spec.rb

@@ -1,27 +1,46 @@
 require 'spec_helper'
 
 describe Tarot do
-  before :all do
-    @tarot = Tarot::Config.new("spec/data/test.yml", "development")
-  end
+  context "Given a single file" do
+    before :all do
+      @tarot = Tarot::Config.new("spec/data/test.yml", "development")
+    end
 
-  it "should load a YAML file" do
-    @tarot.should_not == nil
-    @tarot.yaml.should be_a(Hash)
-  end
+    it "should load a YAML file from a string" do
+      @tarot.should_not == nil
+      @tarot.yaml.should be_a(Hash)
+      @tarot.config_files.should == ["spec/data/test.yml"]
+    end
+
+    it "should accept a default value for a key" do
+      @tarot.get("bad key").should == nil
+      @tarot.get("bad key", "with default").should == "with default"
+    end  
+
+    it "should walk a nested tree" do
+      @tarot.get( "nested.tree.with.value" ).should == 42
+      @tarot.get( "nested.tree.with.bad.key" ).should == nil
+    end
 
-  it "should accept a default value for a key" do
-    @tarot.get("bad key").should == nil
-    @tarot.get("bad key", "with default").should == "with default"
-  end  
+    it "should accept an override environment" do
+      @tarot.get("fizz").should == "buzz"
+      @tarot.get("fizz", nil, "production").should == "bang"
+    end
 
-  it "should walk a nested tree" do
-    @tarot.get( "nested.tree.with.value" ).should == 42
-    @tarot.get( "nested.tree.with.bad.key" ).should == nil
+    it "should accept a method_missing chain" do
+      @tarot.nested.tree.with.value.should == 42
+      @tarot.nested.tree.with.bad_value(1234).should == 1234
+      @tarot.fizz.should == "buzz"
+      @tarot.fizz(nil, "production").should == "bang"
+    end
   end
 
-  it "should accept an override environment" do
-    @tarot.get("fizz").should == "buzz"
-    @tarot.get("fizz", nil, "production").should == "bang"
+  context "Given multiple config files" do
+    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
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tarot
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Heald
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-28 00:00:00 -07:00
+date: 2011-06-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,6 +53,7 @@ files:
 - generators/templates/initializer.rb
 - lib/tarot.rb
 - lib/tarot/version.rb
+- spec/data/recursive.yml
 - spec/data/test.yml
 - spec/spec_helper.rb
 - spec/tarot_spec.rb
@@ -92,6 +93,7 @@ signing_key:
 specification_version: 3
 summary: Tarot is a small, concise configuration library for Rails apps.
 test_files: 
+- spec/data/recursive.yml
 - spec/data/test.yml
 - spec/spec_helper.rb
 - spec/tarot_spec.rb