sessionm-cassandra_object 2.4.8 → 2.4.9

data/lib/cassandra_object/async_connection.rb

@@ -59,17 +59,39 @@ module CassandraObject
         end
 
         @@schema = nil
-        @@connection_pool = nil
-        def self.connection_pool
-          @@connection_pool ||=
+        @@async_connection_pool = nil
+        @@sync_connection_pool = nil
+        def self.async_connection_pool
+          @@async_connection_pool ||=
             begin
               adapter_method = Proc.new do
-                EM.reactor_running? ? self.new_event_machine_connection : self.new_connection
+                self.new_event_machine_connection
               end
               spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-              WithConnection::ConnectionPool.new "cassandra", spec
+              WithConnection::ConnectionPool.new "async cassandra", spec
             end
         end
+        def async_connection_pool
+          self.class.async_connection_pool
+        end
+
+        def self.sync_connection_pool
+          @@sync_connection_pool ||=
+            begin
+              adapter_method = Proc.new do
+                self.new_connection
+              end
+              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
+              WithConnection::ConnectionPool.new "sync cassandra", spec
+            end
+        end
+        def sync_connection_pool
+          self.class.sync_connection_pool
+        end
+
+        def self.connection_pool
+          EM.reactor_running? ? self.async_connection_pool : self.sync_connection_pool
+        end
         def connection_pool
           self.class.connection_pool
         end
@@ -88,7 +110,14 @@ module CassandraObject
         end
 
         def self.disconnect!
-          self.connection_pool.disconnect!
+          self.async_connection_pool.disconnect! if @@async_connection_pool
+          self.sync_connection_pool.disconnect! if @@sync_connection_pool
+          @@sync_connection_pool = nil
+          @@async_connection_pool = nil
+        end
+
+        def disconnect!
+          self.class.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.8'
+  s.version = '2.4.9'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

metadata

@@ -1,75 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 4
-  - 8
-  version: 2.4.8
+version: !ruby/object:Gem::Version
+  version: 2.4.9
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Michael Koziarski
 - gotime
 - sessionm
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-04 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 9
+      - !ruby/object:Gem::Version
         version: 3.0.9
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sessionm-cassandra
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 1
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: sessionm-cassandra
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
@@ -161,41 +159,31 @@ files:
 - test/types/time_type_test.rb
 - test/types/utf8_string_type_test.rb
 - test/validations_test.rb
-has_rdoc: true
 homepage: http://github.com/sessionm/cassandra_object
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      - 2
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel
-test_files: 
+test_files:
 - test/README
 - test/active_model_test.rb
 - test/attributes_test.rb