sunspot-rails-failover 0.0.4 → 0.0.5

data/lib/sunspot-rails-failover.rb

@@ -1,34 +1 @@
-require 'sunspot'
-require 'sunspot-rails-failover/master_slave_with_failover_session_proxy'
-require 'sunspot-rails-failover/exception_handler_adapter'
-
-module Sunspot
-  module Rails
-    module Failover
-      class << self
-        attr_accessor :exception_handler
-        
-        def setup
-          Sunspot.session = if Sunspot::Rails.configuration.has_master?
-            Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy.new(
-              SessionProxy::ThreadLocalSessionProxy.new(master_config),
-              SessionProxy::ThreadLocalSessionProxy.new(slave_config)
-            )
-          else
-            Sunspot::SessionProxy::ThreadLocalSessionProxy.new(slave_config)
-          end
-        end
-        
-      private
-      
-        def slave_config
-          Sunspot::Rails.send :slave_config, Sunspot::Rails.configuration
-        end
-        
-        def master_config
-          Sunspot::Rails.send :master_config, Sunspot::Rails.configuration
-        end
-      end
-    end
-  end
-end
+require 'sunspot/rails/failover'

data/lib/sunspot/rails/failover.rb

@@ -0,0 +1,34 @@
+require 'sunspot'
+require 'sunspot/session_proxy/master_slave_with_failover_session_proxy'
+require 'sunspot/rails/failover/exception_handler_adapter'
+
+module Sunspot
+  module Rails
+    module Failover
+      class << self
+        attr_accessor :exception_handler
+        
+        def setup
+          Sunspot.session = if Rails.configuration.has_master?
+            SessionProxy::MasterSlaveWithFailoverSessionProxy.new(
+              SessionProxy::ThreadLocalSessionProxy.new(master_config),
+              SessionProxy::ThreadLocalSessionProxy.new(slave_config)
+            )
+          else
+            SessionProxy::ThreadLocalSessionProxy.new(slave_config)
+          end
+        end
+        
+      private
+      
+        def slave_config
+          Rails.send :slave_config, Rails.configuration
+        end
+        
+        def master_config
+          Rails.send :master_config, Rails.configuration
+        end
+      end
+    end
+  end
+end

data/lib/{sunspot-rails-failover → sunspot/rails/failover}/version.rb

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

data/lib/{sunspot-rails-failover → sunspot/session_proxy}/master_slave_with_failover_session_proxy.rb

@@ -1,7 +1,6 @@
 module Sunspot
   module SessionProxy
-    class MasterSlaveWithFailoverSessionProxy < MasterSlaveSessionProxy
-      
+    class MasterSlaveWithFailoverSessionProxy < MasterSlaveSessionProxy  
       attr_accessor :exception
       
       def commit
@@ -21,7 +20,7 @@ module Sunspot
       def with_exception_handling
         yield
       rescue Exception => exception
-        Sunspot::Rails::Failover::ExceptionHandlerAdapter.handle(exception)
+        Rails::Failover::ExceptionHandlerAdapter.handle(exception)
         self.exception = exception
         false
       end

data/spec/sunspot/rails/failover/exception_handler_adapter_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+require 'hoptoad_notifier'
+
+shared_examples_for 'a hoptoad handler' do
+  it 'uses the api' do
+    HoptoadNotifier.should_receive(:notify).with(exception)
+    described_class.handle(exception)
+  end
+end 
+
+module Sunspot
+  module Rails
+    module Failover
+      describe ExceptionHandlerAdapter do
+        describe '.handle' do
+          let(:exception) { Exception.new }
+    
+          context 'with exception_handler not set (default)' do
+            it_should_behave_like 'a hoptoad handler'
+          end
+    
+          context 'with exception_handler set to :hoptoad' do
+            before { Failover.exception_handler = :hoptoad }
+            it_should_behave_like 'a hoptoad handler'
+          end
+  
+          context 'with exception_handler set to a custom class' do
+            before { Failover.exception_handler = MyExceptionHandler }
+      
+            it 'passes the exception to #handle' do
+              MyExceptionHandler.should_receive(:handle).with(exception)
+              described_class.handle(exception)
+            end
+          end
+          
+        end
+      end
+    end
+  end
+end

data/spec/sunspot/rails/failover_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module Sunspot
+  module Rails
+    describe Failover do
+      describe '.setup' do
+        let(:configuration) { double('configuration') }
+        let(:slave_config) { double('slave_config') }
+        let(:master_config) { double('master_config') }
+    
+        before do
+          Rails.stub(:configuration).and_return(configuration)
+          Rails.stub(:slave_config).and_return(slave_config)
+          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)
+          end
+      
+          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        
+            SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(master_config).and_return(master_session)
+            SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(slave_config).and_return(slave_session)
+        
+            SessionProxy::MasterSlaveWithFailoverSessionProxy.should_receive(:new).with(
+              master_session, slave_session
+            ).and_return(proxy)
+        
+            described_class.setup
+            Sunspot.session.should eq(proxy)
+          end
+        end
+    
+        context 'with no master configuration' 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 proxy' do
+            SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(slave_config).and_return(proxy)
+        
+            described_class.setup
+            Sunspot.session.should eq(proxy)
+          end
+        end
+    
+      end
+    end
+  end
+end

data/spec/sunspot/session_proxy/master_slave_with_failover_session_proxy_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+module Sunspot
+  module SessionProxy
+    describe MasterSlaveWithFailoverSessionProxy do
+      let(:master) { Session.new }
+      let(:slave) { Session.new }
+      let(:proxy) { SessionProxy::MasterSlaveWithFailoverSessionProxy.new(master, slave) }
+  
+      let(:exception_handler_adapter) { Rails::Failover::ExceptionHandlerAdapter }
+  
+      describe '#commit' do
+        context 'with no error' do
+          it 'calls on the master session' do
+            master.should_receive(:commit)
+            proxy.commit
+          end
+        end
+    
+        context 'with an error' do
+          it 'passes the exception to the exception handler adapter' do
+            exception = Exception.new
+            exception_handler_adapter.should_receive(:handle).with(exception)
+            master.should_receive(:commit).and_raise(exception)
+            proxy.commit
+          end
+        end
+      end
+  
+      describe '#search' do
+        context 'with no error' do
+          it 'calls on the slave session' do
+            slave.should_receive(:search).and_return(true)
+            master.should_not_receive(:search)
+            proxy.search
+          end
+        end
+    
+        context 'with an error on the slave session' do
+          it 'calls on the master session' do
+            exception = Exception.new
+            slave.should_receive(:search).and_raise(exception)
+            exception_handler_adapter.should_receive(:handle).with(exception)
+            master.should_receive(:search).and_return(true)
+            proxy.search
+          end
+        end
+    
+        context 'with an error on the slave and master sessions' do
+          it 'raises the error with no handling' do
+            exception = Exception.new
+            slave.should_receive(:search).and_raise(exception)
+            master.should_receive(:search).and_raise(exception)
+            exception_handler_adapter.should_receive(:handle).with(exception).twice
+            proxy.should_receive(:raise).with(exception)
+            proxy.search
+          end
+        end
+      end
+      
+    end
+  end
+end

data/sunspot-rails-failover.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
-require 'sunspot-rails-failover/version'
+require 'sunspot/rails/failover/version'
 
 Gem::Specification.new do |s|
   s.name        = 'sunspot-rails-failover'

metadata

@@ -2,7 +2,7 @@
 name: sunspot-rails-failover
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Justin Ko
@@ -62,13 +62,14 @@ files:
 - README.md
 - Rakefile
 - lib/sunspot-rails-failover.rb
-- lib/sunspot-rails-failover/exception_handler_adapter.rb
-- lib/sunspot-rails-failover/master_slave_with_failover_session_proxy.rb
-- lib/sunspot-rails-failover/version.rb
+- lib/sunspot/rails/failover.rb
+- lib/sunspot/rails/failover/exception_handler_adapter.rb
+- lib/sunspot/rails/failover/version.rb
+- lib/sunspot/session_proxy/master_slave_with_failover_session_proxy.rb
 - spec/spec_helper.rb
-- spec/sunspot-rails-failover/exception_handler_adapter_spec.rb
-- spec/sunspot-rails-failover/master_slave_with_failover_session_proxy_spec.rb
-- spec/sunspot-rails-failover_spec.rb
+- spec/sunspot/rails/failover/exception_handler_adapter_spec.rb
+- spec/sunspot/rails/failover_spec.rb
+- spec/sunspot/session_proxy/master_slave_with_failover_session_proxy_spec.rb
 - spec/support/my_exception_handler.rb
 - sunspot-rails-failover.gemspec
 has_rdoc: true
@@ -101,7 +102,7 @@ specification_version: 3
 summary: If the Sunspot slave session goes down, reads *and* writes are called upon the master session
 test_files: 
 - spec/spec_helper.rb
-- spec/sunspot-rails-failover/exception_handler_adapter_spec.rb
-- spec/sunspot-rails-failover/master_slave_with_failover_session_proxy_spec.rb
-- spec/sunspot-rails-failover_spec.rb
+- spec/sunspot/rails/failover/exception_handler_adapter_spec.rb
+- spec/sunspot/rails/failover_spec.rb
+- spec/sunspot/session_proxy/master_slave_with_failover_session_proxy_spec.rb
 - spec/support/my_exception_handler.rb

data/spec/sunspot-rails-failover/exception_handler_adapter_spec.rb

@@ -1,34 +0,0 @@
-require 'spec_helper'
-
-require 'hoptoad_notifier'
-
-shared_examples_for 'a hoptoad handler' do
-  it 'uses the api' do
-    HoptoadNotifier.should_receive(:notify).with(exception)
-    described_class.handle(exception)
-  end
-end 
-
-describe Sunspot::Rails::Failover::ExceptionHandlerAdapter do
-  describe '.handle' do
-    let(:exception) { Exception.new }
-    
-    context 'with exception_handler not set (default)' do
-      it_should_behave_like 'a hoptoad handler'
-    end
-    
-    context 'with exception_handler set to :hoptoad' do
-      before { Sunspot::Rails::Failover.exception_handler = :hoptoad }
-      it_should_behave_like 'a hoptoad handler'
-    end
-  
-    context 'with exception_handler set to a custom class' do
-      before { Sunspot::Rails::Failover.exception_handler = MyExceptionHandler }
-      
-      it 'passes the exception to #handle' do
-        MyExceptionHandler.should_receive(:handle).with(exception)
-        described_class.handle(exception)
-      end
-    end
-  end
-end

data/spec/sunspot-rails-failover/master_slave_with_failover_session_proxy_spec.rb

@@ -1,59 +0,0 @@
-require 'spec_helper'
-
-describe Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy do
-  let(:master) { Sunspot::Session.new }
-  let(:slave) { Sunspot::Session.new }
-  let(:proxy) { Sunspot::SessionProxy::MasterSlaveWithFailoverSessionProxy.new(master, slave) }
-  
-  let(:exception_handler_adapter) { Sunspot::Rails::Failover::ExceptionHandlerAdapter }
-  
-  describe '#commit' do
-    context 'with no error' do
-      it 'calls on the master session' do
-        master.should_receive(:commit)
-        proxy.commit
-      end
-    end
-    
-    context 'with an error' do
-      it 'passes the exception to the exception handler adapter' do
-        exception = Exception.new
-        exception_handler_adapter.should_receive(:handle).with(exception)
-        master.should_receive(:commit).and_raise(exception)
-        proxy.commit
-      end
-    end
-  end
-  
-  describe '#search' do
-    context 'with no error' do
-      it 'calls on the slave session' do
-        slave.should_receive(:search).and_return(true)
-        master.should_not_receive(:search)
-        proxy.search
-      end
-    end
-    
-    context 'with an error on the slave session' do
-      it 'calls on the master session' do
-        exception = Exception.new
-        slave.should_receive(:search).and_raise(exception)
-        exception_handler_adapter.should_receive(:handle).with(exception)
-        master.should_receive(:search).and_return(true)
-        proxy.search
-      end
-    end
-    
-    context 'with an error on the slave and master sessions' do
-      it 'raises the error with no handling' do
-        exception = Exception.new
-        slave.should_receive(:search).and_raise(exception)
-        master.should_receive(:search).and_raise(exception)
-        exception_handler_adapter.should_receive(:handle).with(exception).twice
-        proxy.should_receive(:raise).with(exception)
-        proxy.search
-      end
-    end
-  end
-  
-end

data/spec/sunspot-rails-failover_spec.rb

@@ -1,53 +0,0 @@
-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)
-      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)
-      end
-      
-      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 eq(proxy)
-      end
-    end
-    
-    context 'with no master configuration' 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 proxy' do
-        Sunspot::SessionProxy::ThreadLocalSessionProxy.should_receive(:new).with(slave_config).and_return(proxy)
-        
-        described_class.setup
-        Sunspot.session.should eq(proxy)
-      end
-    end
-    
-  end
-end