multi_config 0.0.1 → 0.1.0

data/.gitignore

@@ -16,5 +16,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-spec/support/*db*
+spec/support/db/*db*
 .rbenv*

data/lib/multi_config/orms/active_record.rb

@@ -3,7 +3,7 @@ module MultiConfig
     module ActiveRecord
       def self.included(mod)
         mod.extend ClassMethods
-        mod.send(:class_variable_set, :'@@db_configs', [])
+        mod.send(:class_variable_set, :'@@db_configs', Hash.new { |h, k| h[k] = [] })
       end
 
       module ClassMethods
@@ -11,36 +11,37 @@ module MultiConfig
           file_name += '.yml' unless File.extname(file_name).eql? '.yml'
           unless file_name == 'database.yml'
             namespace = File.basename(file_name, '.yml')
-            add_to_db_configs(file_name, namespace)
-            raise "Configuration for #{::Rails.env} environment not defined in #{config_path file_name}" unless
-                configurations.include? "#{namespace}_#{::Rails.env}"
+            add_db_config(file_name, namespace)
+            raise "Configuration for #{::Rails.env} environment not defined in #{Config.path file_name}" unless configurations.include? "#{namespace}_#{::Rails.env}"
             establish_connection "#{namespace}_#{::Rails.env}"
           end
         end
 
         private
-
-        def add_to_db_configs(file_name, namespace)
+        def add_db_config(file_name, namespace)
           db_configs = class_variable_get(:'@@db_configs')
           unless db_configs.include?(namespace)
-            configurations.merge!(config(file_name, namespace))
-            db_configs << namespace
+            configurations.merge!(Config.load(file_name, namespace))
+            db_configs[namespace] << name
           end
         end
+      end
 
-        def config_path(file_name)
+      module Config
+        def self.path(file_name)
           File.join(Rails.root, 'config', file_name)
         end
 
-        def config(file_name, namespace)
+        def self.load(file_name, namespace)
           begin
-            YAML.load(ERB.new(File.read(config_path(file_name))).result).inject({}) do |hash,(k,v)|
+            require 'erb'
+            YAML.load(ERB.new(IO.read(path(file_name))).result).inject({}) do |hash, (k, v)|
               hash["#{namespace}_#{k}"]=v
               hash
             end
           rescue Exception => exc
-            raise "File #{config_path file_name} does not exist in config" unless File.exists?(config_path(file_name))
-            raise "Invalid config file #{config_path file_name}"
+            raise "File #{path file_name} does not exist in config" unless File.exists?(path(file_name))
+            raise "Invalid config file #{path file_name}"
           end
         end
       end

data/lib/multi_config/version.rb

@@ -1,3 +1,3 @@
 module MultiConfig
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/active_record_spec.rb

@@ -14,7 +14,7 @@ describe ActiveRecord::Base, "methods" do
   end
 
   it "should have @@db_config class variable set" do
-    ActiveRecord::Base.send(:class_variable_get, '@@db_configs').should == []
+    ActiveRecord::Base.send(:class_variable_get, '@@db_configs').should == {}
   end
 
 end

data/spec/models/uses_other_yml_spec.rb

@@ -9,4 +9,8 @@ describe UsesOtherYml do
   it "should be connected to the default database" do
     UsesOtherYml.connection.instance_variable_get(:@config)[:database].split('/').last.should == "other_db"
   end
+
+  it "the @@db_configs should have entry for this class" do
+    UsesOtherYml.send(:class_variable_get,:'@@db_configs').should == {"other" => ["UsesOtherYml"]}
+  end
 end

data/spec/multi_config_spec.rb

@@ -5,6 +5,7 @@ describe MultiConfig::ORMs::ActiveRecord do
   let!(:other_config){ load_namespaced_config('other.yml') }
   before(:each) do
     @test_class = Class.new
+    @test_class.stub_chain(:name).and_return('test_class')
     @test_class.stub(:configurations).and_return({})
     @test_class.stub(:establish_connection)
     @test_class.send(:include, MultiConfig::ORMs::ActiveRecord)
@@ -32,11 +33,11 @@ describe MultiConfig::ORMs::ActiveRecord do
 
     describe "should modify class variable @@db_configs" do
       before do
-        test_class.send(:class_variable_get, '@@db_configs').should == []
+        test_class.send(:class_variable_get, '@@db_configs').should == {}
         test_class.config_file = 'other'
       end
       subject {test_class.send(:class_variable_get, '@@db_configs')}
-      it{should == ['other']}
+      it{should == {"other" => ["test_class"]}}
     end
 
     describe "should modify .configurations" do
@@ -86,9 +87,9 @@ describe MultiConfig::ORMs::ActiveRecord do
     describe "should not do anything if database.yml specified" do
       before do
         test_class.should_not_receive(:establish_connection)
-        test_class.should_not_receive(:add_to_db_configs)
-        test_class.should_not_receive(:config_path)
-        test_class.should_not_receive(:config)
+        test_class.should_not_receive(:add_db_config)
+        MultiConfig::ORMs::ActiveRecord::Config.should_not_receive(:path)
+        MultiConfig::ORMs::ActiveRecord::Config.should_not_receive(:load)
         expect {
           test_class.config_file = 'database'
         }.not_to change(test_class, :configurations)

data/spec/support/config/database.yml

@@ -1,5 +1,5 @@
 development: &development
-  database: db
+  database: db/db
   host: localhost
   adapter: sqlite3
 

data/spec/support/config/other.yml

@@ -1,5 +1,5 @@
 development: &development
-  database: other_db
+  database: db/other_db
   host: localhost
   adapter: sqlite3
 

data/spec/support/config_helper.rb

@@ -1,5 +1,5 @@
 def load_namespaced_config(file)
   namespace = File.basename(file, File.extname(file))
-  config = YAML.load(ERB.new(File.read(File.expand_path("../config/#{file}", __FILE__))).result)
+  config = YAML.load(ERB.new(IO.read(File.expand_path("../config/#{file}", __FILE__))).result)
   config.inject({}){|h,(k,v)| h["#{namespace}_#{k}"]=v;h}
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: multi_config
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Shadab Ahmed
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-08 00:00:00 Z
+date: 2012-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -134,7 +134,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_record_config.rb
 - spec/support/config/database.yml
-- spec/support/config/db
 - spec/support/config/invalid.yml
 - spec/support/config/other.yml
 - spec/support/config_helper.rb
@@ -181,7 +180,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/active_record_config.rb
 - spec/support/config/database.yml
-- spec/support/config/db
 - spec/support/config/invalid.yml
 - spec/support/config/other.yml
 - spec/support/config_helper.rb