From f27a8d6837257217c846fc174ab77c4102771537 Mon Sep 17 00:00:00 2001
From: Jon Rowe <hello@jonrowe.co.uk>
Date: Tue, 20 Aug 2013 15:20:25 +0100
Subject: [PATCH] remove uninitialised variable warnings

---
 lib/database_cleaner/active_record/base.rb     | 6 +++---
 lib/database_cleaner/base.rb                   | 4 ++--
 lib/database_cleaner/configuration.rb          | 2 +-
 lib/database_cleaner/data_mapper/base.rb       | 2 +-
 lib/database_cleaner/mongo_mapper/base.rb      | 2 +-
 lib/database_cleaner/moped/base.rb             | 4 ++--
 lib/database_cleaner/redis/base.rb             | 2 +-
 spec/database_cleaner/moped/truncation_spec.rb | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/database_cleaner/active_record/base.rb b/lib/database_cleaner/active_record/base.rb
index 2a4fa16..6a3e3bb 100644
--- a/lib/database_cleaner/active_record/base.rb
+++ b/lib/database_cleaner/active_record/base.rb
@@ -28,7 +28,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || super
+        @db ||= super
       end
 
       def load_config
@@ -39,8 +39,8 @@ module DatabaseCleaner
       end
 
       def connection_class
-        @connection_class ||= if @db && !@db.is_a?(Symbol)
-                                @db
+        @connection_class ||= if db && !db.is_a?(Symbol)
+                                db
                               elsif connection_hash
                                 lookup_from_connection_pool || establish_connection
                               else
diff --git a/lib/database_cleaner/base.rb b/lib/database_cleaner/base.rb
index ff124fb..06ce519 100644
--- a/lib/database_cleaner/base.rb
+++ b/lib/database_cleaner/base.rb
@@ -25,7 +25,7 @@ module DatabaseCleaner
     end
 
     def db
-      @db || :default
+      @db ||= :default
     end
 
     def create_strategy(*args)
@@ -67,7 +67,7 @@ module DatabaseCleaner
     end
 
     def strategy
-      @strategy || NullStrategy
+      @strategy ||= NullStrategy
     end
 
     def orm=(desired_orm)
diff --git a/lib/database_cleaner/configuration.rb b/lib/database_cleaner/configuration.rb
index 5bebcda..da9bb03 100644
--- a/lib/database_cleaner/configuration.rb
+++ b/lib/database_cleaner/configuration.rb
@@ -37,7 +37,7 @@ module DatabaseCleaner
     end
 
     def app_root
-      @app_root || Dir.pwd
+      @app_root ||= Dir.pwd
     end
 
     def connections
diff --git a/lib/database_cleaner/data_mapper/base.rb b/lib/database_cleaner/data_mapper/base.rb
index 7481e7c..64a303c 100644
--- a/lib/database_cleaner/data_mapper/base.rb
+++ b/lib/database_cleaner/data_mapper/base.rb
@@ -13,7 +13,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
     end
diff --git a/lib/database_cleaner/mongo_mapper/base.rb b/lib/database_cleaner/mongo_mapper/base.rb
index 4ea7be7..fa8179b 100644
--- a/lib/database_cleaner/mongo_mapper/base.rb
+++ b/lib/database_cleaner/mongo_mapper/base.rb
@@ -13,7 +13,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
     end
   end
diff --git a/lib/database_cleaner/moped/base.rb b/lib/database_cleaner/moped/base.rb
index 1b917e2..18f13aa 100644
--- a/lib/database_cleaner/moped/base.rb
+++ b/lib/database_cleaner/moped/base.rb
@@ -14,7 +14,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
       def host_port=(desired_host)
@@ -22,7 +22,7 @@ module DatabaseCleaner
       end
 
       def host
-        @host || '127.0.0.1:27017'
+        @host ||= '127.0.0.1:27017'
       end
 
       private
diff --git a/lib/database_cleaner/redis/base.rb b/lib/database_cleaner/redis/base.rb
index 2e0e054..9bbc7f3 100644
--- a/lib/database_cleaner/redis/base.rb
+++ b/lib/database_cleaner/redis/base.rb
@@ -14,7 +14,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
       alias url db
diff --git a/spec/database_cleaner/moped/truncation_spec.rb b/spec/database_cleaner/moped/truncation_spec.rb
index 43f612a..e84ae84 100644
--- a/spec/database_cleaner/moped/truncation_spec.rb
+++ b/spec/database_cleaner/moped/truncation_spec.rb
@@ -8,7 +8,7 @@ module DatabaseCleaner
 
     describe Truncation do
       let(:args) {{}}
-      let(:truncation) { described_class.new(args).tap { |t| t.db=@db } }
+      let(:truncation) { described_class.new(args) }
       #doing this in the file root breaks autospec, doing it before(:all) just fails the specs
       before(:all) do
         @test_db = 'database_cleaner_specs'