simple-conf 0.0.5 → 0.0.6

data/README.md

@@ -2,6 +2,8 @@
 
 Simple configuration library for the loading yml files from the config folder.
 
+[![Build Status](https://secure.travis-ci.org/oivoodoo/simple-conf.png?branch=master)](http://travis-ci.org/oivoodoo/simple-conf)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -36,6 +38,8 @@ Create in the config folder configuration.yml file with content like:
       - test2.example.com
   production:
     domain: "production.example.com"
+    username: <%= ENV['username'] %>
+    password: <%= ENV['password'] %>
 ```
 
 Now you can use your file in the project:

data/Rakefile

@@ -1,2 +1,7 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+
+task :default do
+  system 'bundle exec rspec'
+end
+

data/lib/simple-conf/loader.rb

@@ -1,5 +1,6 @@
 require 'ostruct'
 require 'yaml'
+require 'erb'
 
 module SimpleConf
   class Loader
@@ -13,6 +14,10 @@ module SimpleConf
       yaml_file.each_pair do |key, value|
         set(key, value)
       end
+
+      yaml_file.fetch(Rails.env, {}).each_pair do |key, value|
+        set(key, value)
+      end if rails_environment_defined?
     end
 
     def path
@@ -23,7 +28,7 @@ module SimpleConf
 
     def yaml_file
       content = File.open(path).read
-      YAML.load(content)
+      YAML.load(ERB.new(content).result)
     end
 
     private
@@ -42,6 +47,13 @@ module SimpleConf
       struct = OpenStruct.new(value) rescue value
       klass.instance_variable_set(:"@#{key}", struct)
     end
+
+    def rails_environment_defined?
+      rails_klass = Module.const_get('Rails')
+      return rails_klass.is_a?(Module)
+    rescue NameError
+      return false
+    end
   end
 
   def self.included(base)

data/lib/simple-conf/version.rb

@@ -1,3 +1,3 @@
 module SimpleConf
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/simple_conf_spec.rb

@@ -1,5 +1,11 @@
 require 'spec_helper'
 
+module Rails
+  def self.env
+    "staging"
+  end
+end
+
 class Configuration
   include SimpleConf
 end
@@ -27,11 +33,52 @@ describe SimpleConf do
 
     it { Configuration.production.domain.should == "production.example.com" }
   end
-end
 
-describe SimpleConf do
   context "on include to options class generate properties with only one key and value" do
     it { Options.domain.should == "example.com" }
   end
 end
 
+describe SimpleConf do
+  context "on include properties depending on rails environment" do
+    it { Configuration.domain.should == "staging.example.com" }
+  end
+end
+
+class TestObject ; end
+
+describe SimpleConf do
+  before do
+    file = double('file', :read => attrib('test').to_yaml)
+    File.stub!(:open).and_return file
+  end
+
+  context "when we have env params in the configuration file" do
+    before { ENV['simple_conf_test_password'] = 'password' }
+
+    after { ENV['simple_conf_test_password'] = nil }
+
+    let(:loader) { SimpleConf::Loader.new(TestObject) }
+
+    context "on run loader" do
+      before { loader.run }
+
+      it "should return username" do
+        TestObject.test.username.should == 'fred'
+      end
+
+      it "should return password fetched from the environment" do
+        TestObject.test.password.should == 'password'
+      end
+    end
+  end
+
+  def attrib(environment)
+    {
+      environment => {
+          "username" => "fred",
+          "password" => "<%= ENV['simple_conf_test_password'] %>"
+      }
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake