seamless_database_pool 1.0.0 → 1.0.1

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s| 
   s.name = "seamless_database_pool"
-  s.version = "1.0.0"
+  s.version = "1.0.1"
   s.author = "Brian Durand"
   s.platform = Gem::Platform::RUBY
   s.summary = "Support for master/slave database clusters in ActiveRecord"
@@ -40,4 +40,4 @@ end
  
 Rake::GemPackageTask.new(spec) do |pkg| 
   pkg.need_tar = true 
-end
+end

data/lib/seamless_database_pool/controller_filter.rb

@@ -70,7 +70,12 @@ module SeamlessDatabasePool
     end
     
     def perform_action_with_seamless_database_pool
-      read_pool_method = session.delete(:next_request_db_connection) if session
+      read_pool_method = nil
+      if session
+        read_pool_method = session[:next_request_db_connection]
+        session[:next_request_db_connection] = nil
+      end
+      
       read_pool_method ||= seamless_database_pool_options[action_name.to_sym] || seamless_database_pool_options[:all]
       if read_pool_method
         SeamlessDatabasePool.set_read_only_connection_type(read_pool_method) do

data/spec/filter_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
+require 'cgi'
 
 describe "SeamlessDatabasePool::ControllerFilter" do
   
@@ -6,8 +7,9 @@ describe "SeamlessDatabasePool::ControllerFilter" do
     class TestApplicationController
       attr_reader :action_name, :session
       
-      def initialize(action, session = {})
+      def initialize(action, session = nil)
         @action_name = action
+        session ||= CGI::Session.new(CGI.new)
         @session = session
       end
       
@@ -87,7 +89,7 @@ describe "SeamlessDatabasePool::ControllerFilter" do
   end
   
   it "should be able to force using the master connection on the next request" do
-    session = {}
+    session = CGI::Session.new(CGI.new)
     
     # First request
     controller = SeamlessDatabasePool::TestOtherController.new('read', session)
@@ -114,7 +116,7 @@ describe "SeamlessDatabasePool::ControllerFilter" do
   end
   
   it "should force the master connection on the next request for a redirect in master connection block" do
-    session = {}
+    session = CGI::Session.new(CGI.new)
     controller = SeamlessDatabasePool::TestOtherController.new('redirect_master_action', session)
     controller.perform_action.should == {:action => :read}
     
@@ -123,7 +125,7 @@ describe "SeamlessDatabasePool::ControllerFilter" do
   end
 
   it "should not force the master connection on the next request for a redirect not in master connection block" do
-    session = {}
+    session = CGI::Session.new(CGI.new)
     controller = SeamlessDatabasePool::TestOtherController.new('redirect_read_action', session)
     controller.perform_action.should == {:action => :read}
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamless_database_pool
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-24 00:00:00 -05:00
+date: 2008-07-25 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -23,13 +23,13 @@ extra_rdoc_files:
 - README
 files: 
 - lib/active_record
-- lib/seamless_database_pool
-- lib/seamless_database_pool.rb
 - lib/active_record/connection_adapters
 - lib/active_record/connection_adapters/seamless_database_pool_adapter.rb
+- lib/seamless_database_pool
 - lib/seamless_database_pool/connect_timeout.rb
 - lib/seamless_database_pool/connection_statistics.rb
 - lib/seamless_database_pool/controller_filter.rb
+- lib/seamless_database_pool.rb
 - init.rb
 - MIT-LICENSE
 - Rakefile
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - rspec 1.0.8 or higher is needed to run the tests
 rubyforge_project: seamlessdbpool
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Support for master/slave database clusters in ActiveRecord