sunspot-rails-failover 0.0.3 → 0.0.4

data/README.md

@@ -15,9 +15,10 @@ Your config/sunspot.yml file should look something like this:
 
     development:
       master_solr:
-        url: http://localhost:8984/solr
+        host: ...
+        port: ...
       solr:
-        url: http://localhost:8985/solr
+        host: ...
         
 NOTE: You do *not* have to have a master session. If a master session is
 not detected, sunspot-rails-failover will default to what sunspot_rails

data/lib/sunspot-rails-failover.rb

@@ -11,7 +11,8 @@ module Sunspot
         def setup
           Sunspot.session = if Sunspot::Rails.configuration.has_master?
             Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy.new(
-              Sunspot::Session.new(master_config), Sunspot::Session.new(slave_config)
+              SessionProxy::ThreadLocalSessionProxy.new(master_config),
+              SessionProxy::ThreadLocalSessionProxy.new(slave_config)
             )
           else
             Sunspot::SessionProxy::ThreadLocalSessionProxy.new(slave_config)
@@ -21,17 +22,11 @@ module Sunspot
       private
       
         def slave_config
-          build_config('solr', 'url')
+          Sunspot::Rails.send :slave_config, Sunspot::Rails.configuration
         end
         
         def master_config
-          build_config('master_solr', 'url')
-        end
-        
-        def build_config(*keys)
-          Sunspot::Configuration.build.tap do |config|
-            config.solr.url = Sunspot::Rails.configuration.send :user_configuration_from_key, *keys
-          end
+          Sunspot::Rails.send :master_config, Sunspot::Rails.configuration
         end
       end
     end

data/lib/sunspot-rails-failover/version.rb

@@ -1,7 +1,7 @@
 module Sunspot
   module Rails
     module Failover
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

data/spec/sunspot-rails-failover_spec.rb

@@ -3,21 +3,34 @@ require 'spec_helper'
 describe Sunspot::Rails::Failover do
   describe '.setup' do
     let(:configuration) { double('configuration') }
+    let(:slave_config) { double('slave_config') }
+    let(:master_config) { double('master_config') }
     
     before do
       Sunspot::Rails.stub(:configuration).and_return(configuration)
-      configuration.should_receive(:user_configuration_from_key).with('solr', 'url')
+      Sunspot::Rails.stub(:slave_config).and_return(slave_config)
+      Sunspot::Rails.stub(:master_config).and_return(master_config)
     end
     
     context 'with a master configuration' do
       before do
         configuration.should_receive(:has_master?).and_return(true)
-        configuration.should_receive(:user_configuration_from_key).with('master_solr', 'url')
       end
       
-      it 'sets the session to master/slave with failover support' do
+      let(:proxy)          { double('master_slave_failover_proxy') }
+      let(:master_session) { double('master_session') }
+      let(:slave_session)  { double('slave_session') }
+      
+      it 'sets the session to master/slave with failover support' do        
+        Sunspot::SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(master_config).and_return(master_session)
+        Sunspot::SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(slave_config).and_return(slave_session)
+        
+        Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy.should_receive(:new).with(
+          master_session, slave_session
+        ).and_return(proxy)
+        
         described_class.setup
-        Sunspot.session.should be_an_instance_of(Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy)
+        Sunspot.session.should eq(proxy)
       end
     end
     
@@ -25,10 +38,14 @@ describe Sunspot::Rails::Failover do
       before do
         configuration.should_receive(:has_master?).and_return(false)
       end
+      
+      let(:proxy) { double('thread_local_proxy') }
           
-      it 'sets the session to the default' do
+      it 'sets the session to the default proxy' do
+        Sunspot::SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(slave_config).and_return(proxy)
+        
         described_class.setup
-        Sunspot.session.should be_an_instance_of(Sunspot::SessionProxy::ThreadLocalSessionProxy)
+        Sunspot.session.should eq(proxy)
       end
     end
     

metadata

@@ -2,7 +2,7 @@
 name: sunspot-rails-failover
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Justin Ko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 -05:00
+date: 2011-05-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency