Merge pull request #9 from ping4/connection_pool_fixes

Connection pool fixes

lib/cequel/keyspace.rb

@@ -54,10 +54,10 @@ def connection_pool
       return @connection_pool if defined? @connection_pool
       if @configuration[:pool]
         options = {
-          :size => configuration[:pool],
-          :timeout => configuration[:pool_timeout]
+          :size => @configuration[:pool] || 10,
+          :timeout => @configuration[:pool_timeout] || 5
         }
-        @connection_pool = ConnectionPool.new(:size => 10, :timeout => 5) do
+        @connection_pool = ConnectionPool.new(options) do
           build_connection
         end
       else

spec/examples/keyspace_spec.rb

@@ -32,7 +32,6 @@
 APPLY BATCH
 CQL
 
-
       cequel.batch(:auto_apply => 2) do
         cequel[:posts].insert(:id => 1, :title => 'Hey')
         cequel[:posts].update(:body => 'Body')
@@ -45,6 +44,28 @@
     end
   end
 
+  describe '::connection_pool' do
+    it 'should use connection pool if pool specified' do
+      #NOTE: called one time per pool entry
+      Cequel::Keyspace.any_instance.should_receive(:build_connection).once.and_return(connection)
+      Cequel::Keyspace.any_instance.should_receive(:connection).never
+      keyspace = Cequel::Keyspace.new(:pool => 1)
+
+      keyspace.with_connection { |conn| }
+      keyspace.with_connection { |conn| }
+      keyspace.with_connection { |conn| }
+    end
+
+    it 'should not use connection pool if no pool specified' do
+      Cequel::Keyspace.any_instance.should_receive(:connection).exactly(3).times.and_return(connection)
+      keyspace = Cequel::Keyspace.new({})
+
+      keyspace.with_connection { |conn| }
+      keyspace.with_connection { |conn| }
+      keyspace.with_connection { |conn| }
+    end
+  end
+
   describe '::logger=' do
     let(:io) { StringIO.new }
     let(:logger) { Logger.new(io) }