Flipper 1.0 → 1.1

data/README

@@ -22,7 +22,8 @@ database on the fly for each HTTP requests. This is what Flipper does.
 
 == Status
 
-The current status is quite good. Flipper is currently used on a daily basis on commercial projects.
+The current status is quite good. Flipper is currently used on a daily basis on
+commercial projects. 
 
 
 == Installation
@@ -48,7 +49,7 @@ To use flipper just include the <code>Flipper</code> module and add a before fil
 The collection PER COLLECTION is licensed as follows:
 
   Ruby Facets
-  Copyright (c) 2004-2006 Thomas Sawyer
+  Copyright (c) 2007 Philippe Hanrigou & Dan Manges
 
   Distributed under the terms of the Ruby license.
 

data/Rakefile

@@ -29,7 +29,7 @@ Gem::manage_gems
 specification = Gem::Specification.new do |s|
 	s.name   = "Flipper"
   s.summary = "Switch your Rails database on the fly for each HTTP request. Useful for integration and acceptance testing (test isolation & state management)."
-	s.version = "1.0"
+	s.version = "1.1"
 	s.author = 'Philippe Hanrigou & Dan Manges'
 	s.description = s.summary
 	s.email = 'flipper-developer@rubyforge.org'
@@ -43,6 +43,9 @@ specification = Gem::Specification.new do |s|
   s.autorequire = 'flipper'
   s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*$', 'Rakefile'].to_a
 	s.test_file = "test/all_tests.rb"
+
+  s.add_dependency('dust', '>= 1.0.5')
+  s.add_dependency('mocha', '>= 0.5.5')
 end
 
 Rake::GemPackageTask.new(specification) do |package|

data/lib/flipper.rb

@@ -4,7 +4,7 @@
 #  class ApplicationController < ActionController::Base
 #    include Flipper
 #
-#    before_filter :switch_database  # if RAILS_ENV == "selenium"
+#    before_filter :switch_database  # unless RAILS_ENV == "production"
 #
 #    ...
 #  end
@@ -20,7 +20,7 @@ module Flipper
   # If anything goes wrong while switching database, attempts to rollback to the previous database configuration
   # before raising an exception.
   def switch_database
-    database_configuration = params[:flipper_db_config] || session[:flipper_db_config]
+    database_configuration = flipper_database_configuration
     return unless database_configuration
     
     prior_configuration = ActiveRecord::Base.connection.instance_variable_get(:@config)
@@ -33,5 +33,15 @@ module Flipper
       raise
     end
   end
+
+  protected
+
+  def flipper_database_configuration
+    if params[:flipper_db_config]
+      params[:flipper_db_config][:port] = params[:flipper_db_config][:port].to_i if params[:flipper_db_config][:port]
+      return params[:flipper_db_config]
+    end
+    session[:flipper_db_config]
+  end
   
 end

data/test/flipper_test.rb

@@ -17,36 +17,17 @@ unit_tests do
     @controller = Class.new { include Flipper }.new
   end
   
-  test "controller establishes new db connection and clears active connection when receiving database_connection from params" do
+  test "controller establishes new db connection and clears active connection when there is a flipper specific database_connection" do
     @controller.stubs(:session).returns({})
-    @controller.stubs(:params).returns(:flipper_db_config => :connection_hash)
-    ActiveRecord::Base.stubs(:connection).returns(stub_everything)
-    ActiveRecord::Base.expects(:clear_active_connections!)
-    ActiveRecord::Base.expects(:establish_connection).with(:connection_hash)
-    @controller.send(:switch_database)
-  end
-
-  test "controller establishes new db connection and clears active connection when receiving database_connection from session" do
-    @controller.stubs(:session).returns(:flipper_db_config => :connection_hash)
-    @controller.stubs(:params).returns(:flipper_db_config => nil)
+    @controller.stubs(:flipper_database_configuration).returns(:connection_hash)
     ActiveRecord::Base.stubs(:connection).returns(stub_everything)
     ActiveRecord::Base.expects(:clear_active_connections!)
     ActiveRecord::Base.expects(:establish_connection).with(:connection_hash)
     @controller.send(:switch_database)
   end
   
-  test "controller checks for database configuration in params before session" do
-    @controller.stubs(:session).returns(:flipper_db_config => :session_connection_hash)
-    @controller.stubs(:params).returns(:flipper_db_config => :params_connection_hash)
-    ActiveRecord::Base.stubs(:connection).returns(stub_everything)
-    ActiveRecord::Base.expects(:clear_active_connections!)
-    ActiveRecord::Base.expects(:establish_connection).with(:params_connection_hash)
-    @controller.send(:switch_database)
-  end
-
-  test "controller does not establish a new db connection nor clears active connection when there is no database_connection neither in params nor in session" do
-    @controller.stubs(:session).returns({})
-    @controller.stubs(:params).returns(:flipper_db_config => nil)
+  test "controller does not establish a new db connection nor clears active connection when there is no flipper specific database_connection" do
+    @controller.stubs(:flipper_database_configuration).returns(nil)
     ActiveRecord::Base.stubs(:connection).returns(stub_everything)
     ActiveRecord::Base.expects(:clear_active_connections!).never
     ActiveRecord::Base.expects(:establish_connection).never
@@ -54,18 +35,17 @@ unit_tests do
   end
 
   test "database configuration is stored in session after passed in through params" do
-    @controller.stubs(:session).returns(session = {})
-    @controller.stubs(:params).returns(:flipper_db_config => :connection_hash)
+    @controller.stubs(:session).returns({})
+    @controller.stubs(:flipper_database_configuration).returns(:connection_hash)
     ActiveRecord::Base.stubs(:connection).returns(stub_everything)
     ActiveRecord::Base.stubs(:clear_active_connections!)
     ActiveRecord::Base.stubs(:establish_connection)
     @controller.send(:switch_database)
-    assert_equal :connection_hash, session[:flipper_db_config]
+    assert_equal :connection_hash, @controller.session[:flipper_db_config]
   end
 
   test "controller restores original db connection and raises exception when establishing a new database_connection fails" do
-    @controller.stubs(:session).returns({})
-    @controller.stubs(:params).returns(:flipper_db_config => :connection_hash)
+    @controller.stubs(:flipper_database_configuration).returns(:connection_hash)
     ActiveRecord::Base.stubs(:connection).returns(connection = stub)
     connection.instance_variable_set "@config", :old_configuration
     ActiveRecord::Base.expects(:clear_active_connections!)
@@ -75,4 +55,37 @@ unit_tests do
     assert_raises(RuntimeError) { @controller.send(:switch_database) }
   end
 
+  test "flipper_database_configuration returns nil when no configuration is defined in params or session" do
+    @controller.stubs(:session).returns({})
+    @controller.stubs(:params).returns({})
+    assert_nil @controller.send :flipper_database_configuration
+  end
+  
+  test "flipper_database_configuration returns flipper_db_config parameters when receiving database_connection from params" do
+    the_config = { :foo => :bar }
+    @controller.stubs(:session).returns({})
+    @controller.stubs(:params).returns(:flipper_db_config => the_config )
+    assert_equal the_config, @controller.send(:flipper_database_configuration)
+  end
+
+  test "flipper_database_configuration returns configuration defined in session when not specified in HTTP parameters" do
+    @controller.stubs(:session).returns({ :flipper_db_config => :connection_hash })
+    @controller.stubs(:params).returns({})
+    assert_equal :connection_hash, @controller.send(:flipper_database_configuration)
+  end
+
+  test "flipper_database_configuration convert port to integer when specified in HTTP parameters database configuration" do
+    @controller.stubs(:session).returns({})
+    @controller.stubs(:params).returns(:flipper_db_config => { :port => "1234" })
+    config = @controller.send(:flipper_database_configuration)
+    assert_equal 1234, config[:port]
+  end
+  
+  test "database configuration defined in parameters overrides any configuration defined in session" do
+    the_config = { :foo => :bar }
+    @controller.stubs(:session).returns({ :flipper_db_config => :session_connection_hash })
+    @controller.stubs(:params).returns({ :flipper_db_config => the_config })
+    assert_equal the_config, @controller.send(:flipper_database_configuration)
+  end
+  
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: Flipper
 version: !ruby/object:Gem::Version 
-  version: "1.0"
-date: 2007-09-15 00:00:00 -04:00
+  version: "1.1"
+date: 2007-11-07 00:00:00 -05:00
 summary: Switch your Rails database on the fly for each HTTP request. Useful for integration and acceptance testing (test isolation & state management).
 require_paths: 
 - lib
@@ -50,5 +50,22 @@ extensions: []
 
 requirements: []
 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: dust
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.5
+    version: