cequel 0.5.3 → 0.5.4

data/lib/cequel/keyspace.rb

@@ -54,10 +54,10 @@ module Cequel
       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

data/lib/cequel/model/dictionary.rb

@@ -81,6 +81,7 @@ module Cequel
         @deleted_columns.each_slice(batch_size) do |slice|
           scope.delete(*slice.to_a) if slice.any?
         end
+        @row.clear unless @loaded
         @changed_columns.clear
         @deleted_columns.clear
         self

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/spec/examples/keyspace_spec.rb

@@ -32,7 +32,6 @@ DELETE FROM posts
 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 @@ CQL
     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) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-03 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -142,7 +142,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rocco
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -157,22 +157,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: ! 'Cequel is a lightweight query abstraction layer for Cassandra''s CQL
   language. It
 
@@ -261,7 +245,7 @@ files:
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
 - spec/shared/readable_dictionary.rb
-homepage: 
+homepage: https://github.com/brewster/cequel
 licenses:
 - MIT
 post_install_message: 
@@ -283,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Cassandra 1.0+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Query abstraction layer and object-row mapper for Cassandra and CQL