slavery 1.1.0 → 1.1.1

data/lib/slavery.rb

@@ -83,10 +83,13 @@ module Slavery
     def slave_connection_holder
       @slave_connection_holder ||= Class.new(ActiveRecord::Base) {
         self.abstract_class = true
-        establish_connection("#{Slavery.env}_slave")
+
+        spec = ["#{Slavery.env}_slave", Slavery.env].find do |spec|
+          ActiveRecord::Base.configurations[spec]
+        end or raise Error.new("#{Slavery.env}_slave or #{Slavery.env} must exist!")
+
+        establish_connection spec
       }
-    rescue ActiveRecord::AdapterNotSpecified
-      raise Error.new("#{Slavery.env}_slave does not exist!")
     end
   end
 end

data/lib/slavery/version.rb

@@ -1,3 +1,3 @@
 module Slavery
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/spec/slavery_spec.rb

@@ -52,4 +52,32 @@ describe Slavery do
     Slavery.stub(:disabled).and_return(true)
     Slavery.on_slave { User.slaveryable?.should == false }
   end
+
+  describe 'configuration' do
+    before do
+      # Backup connection and configs
+      @old_conn = User.instance_variable_get :@slave_connection_holder
+      @old_config = ActiveRecord::Base.configurations.dup
+      User.instance_variable_set :@slave_connection_holder, nil
+    end
+
+    after do
+      # Restore connection and configs
+      User.instance_variable_set :@slave_connection_holder, @old_conn
+      ActiveRecord::Base.configurations = @old_config
+    end
+
+    it 'connects to master if slave configuration not specified' do
+      ActiveRecord::Base.configurations['test_slave'] = nil
+
+      Slavery.on_slave { User.count }.should == 2
+    end
+
+    it 'raises error when no configuration found' do
+      ActiveRecord::Base.configurations['test'] = nil
+      ActiveRecord::Base.configurations['test_slave'] = nil
+
+      expect { Slavery.on_slave { User.count } }.to raise_error(Slavery::Error)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slavery
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -98,10 +98,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Simple, conservative slave reads for ActiveRecord
 test_files:
 - spec/slavery_spec.rb
 - spec/spec_helper.rb
+has_rdoc: