configloader 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/configloader.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configloader}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vinicius Teles"]

data/lib/config_loader.rb

@@ -42,7 +42,9 @@ module ConfigLoader
   #     db_config = ConfigLoader.load('database', 'production')
   #     db_config = ConfigLoader.load('database', 'test', '/home/user/my_special_project_root')  
   def self.load(file_name, running_env = Rails.env, project_root = RAILS_ROOT)
-    ConfigLoader::Map.new(file_name, running_env, project_root).populate
+    map = ConfigLoader::Map.new(file_name, running_env, project_root)
+    map.populate
+    map
   end
   
 end

data/spec/config_loader/map_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'yaml'
 
 module ConfigLoader
   

data/spec/config_loader_spec.rb

@@ -6,24 +6,27 @@ describe "ConfigLoader" do
     
     def prepare_mocks(running_env, project_root)
       Rails.stub!(:env).and_return(running_env)
-      map_mock = mock('ConfigLoader::Map')
-      map_mock.should_receive(:populate).and_return('result')
-      ConfigLoader::Map.should_receive(:new).with('database', running_env, project_root).and_return(map_mock)
+      ConfigLoader::Map.should_receive(:new).with('database', running_env, project_root).and_return(@map_mock)
+      @map_mock.should_receive(:populate)
+    end
+    
+    before(:each) do
+      @map_mock = mock('ConfigLoader::Map')
     end
     
     it "should delegate to ConfigLoader::Map.populate" do
       prepare_mocks('development', '/home/user/project')      
-      ConfigLoader.load('database').should == 'result'
+      ConfigLoader.load('database').should == @map_mock
     end
     
     it "should delegate to ConfigLoader::Map.populate with the given running_env" do
       prepare_mocks('production', '/home/user/project')      
-      ConfigLoader.load('database', 'production').should == 'result'
+      ConfigLoader.load('database', 'production').should == @map_mock
     end
 
     it "should delegate to ConfigLoader::Map.populate with the given project_root" do
       prepare_mocks('development', '/home/user/another_project')      
-      ConfigLoader.load('database', 'development', '/home/user/another_project').should == 'result'
+      ConfigLoader.load('database', 'development', '/home/user/another_project').should == @map_mock
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Vinicius Teles