sessionm-cassandra_object 2.4.7 → 2.4.8

data/lib/cassandra_object/async_connection.rb

@@ -1,3 +1,5 @@
+require 'with_connection'
+
 module CassandraObject
   module AsyncConnection
     extend ActiveSupport::Concern
@@ -6,15 +8,6 @@ module CassandraObject
       class_attribute :connection_spec
 
       class_eval do
-        @@fiber_connections = {}
-        def self.fiber_connections
-          @@fiber_connections
-        end
-
-        def fiber_connections
-          self.class.fiber_connections
-        end
-
         def self.new_event_machine_connection
           spec = connection_spec.dup
               
@@ -66,22 +59,36 @@ module CassandraObject
         end
 
         @@schema = nil
-        def self.connection()
-          @@fiber_connections[Fiber.current.object_id] ||=
+        @@connection_pool = nil
+        def self.connection_pool
+          @@connection_pool ||=
             begin
-              if const_defined?(:EM) && EM.reactor_running?
-                new_event_machine_connection
-              else
-                new_connection
+              adapter_method = Proc.new do
+                EM.reactor_running? ? self.new_event_machine_connection : self.new_connection
               end
+              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
+              WithConnection::ConnectionPool.new "cassandra", spec
             end
         end
+        def connection_pool
+          self.class.connection_pool
+        end
+
+        def self.connection()
+          self.connection_pool.connection
+        end
         def self.connection?() !!connection end
 
+        def self.with_connection(&block)
+          self.connection_pool.with_connection(&block)
+        end
+
+        def with_connection(&block)
+          self.class.with_connection(&block)
+        end
+
         def self.disconnect!
-          @@fiber_connections.delete(Fiber.current.object_id).tap { |conn|
-            conn.disconnect! if conn
-          }
+          self.connection_pool.disconnect!
         end
 
         def connection

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.4.7'
+  s.version = '2.4.8'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 4
-  - 7
-  version: 2.4.7
+  - 8
+  version: 2.4.8
 platform: ruby
 authors: 
 - Michael Koziarski
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-03 00:00:00 -04:00
+date: 2013-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency