sessionm-cassandra_object 2.2.48 → 2.2.49

data/lib/cassandra_object/async_connection.rb

@@ -1,54 +1,65 @@
-module CassandraObject
-  module AsyncConnection
-    extend ActiveSupport::Concern
-    
-    included do
-      class_attribute :connection_spec
+begin
+  require 'em-synchrony'
 
-      class_eval do
-        @@fiber_connections = {}
-        def self.connection()
-          @@fiber_connections[Fiber.current.object_id] ||=
-            begin
-              spec = connection_spec.dup
-              
-              if EM.reactor_running?
-                require 'thrift_client/event_machine'
-                spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
-                                     :transport_wrapper => nil)
+  module CassandraObject
+    module AsyncConnection
+      extend ActiveSupport::Concern
+      
+      included do
+        class_attribute :connection_spec
+
+        class_eval do
+          def self.connection()
+            @@connection ||=
+              begin
+                spec = connection_spec.dup
+                
+                if EM.reactor_running?
+                  require 'thrift_client/event_machine'
+                  spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
+                                       :transport_wrapper => nil)
+                end
+
+                EventMachine::Synchrony::ConnectionPool.new(:size => spec[:pool_size] || 5) do
+                  Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift].dup)
+                end.tap do |pool|
+                  class << pool
+                    def method_missing(method, *args, &blk)
+                      execute(false) do |conn|
+                        conn.send(method, *args, &blk)
+                      end
+                    end
+                  end
+                end
               end
-              
-              Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])
-            end
-        end
-        def self.connection?() !!connection end
+          end
+          def self.connection?() !!connection end
 
-        def self.disconnect!
-          @@fiber_connections.delete(Fiber.current.object_id).tap { |conn|
-            conn.disconnect! if conn
-          }
-        end
+          def self.disconnect!; end
 
-        def connection
-          defined?(@connection) ? @connection : singleton_class.connection
-        end
+          def connection
+            singleton_class.connection
+          end
 
-        def connection?
-          !!connection
+          def connection?
+            !!connection
+          end
         end
       end
-    end
 
-    module ClassMethods
-      DEFAULT_OPTIONS = {
-        servers: "127.0.0.1:9160",
-        thrift: {}
-      }
-      def establish_connection(spec)
-        spec.reverse_merge!(DEFAULT_OPTIONS)
-        spec[:thrift].symbolize_keys!
-        self.connection_spec = spec
+      module ClassMethods
+        DEFAULT_OPTIONS = {
+          servers: "127.0.0.1:9160",
+          thrift: {}
+        }
+        def establish_connection(spec)
+          spec.reverse_merge!(DEFAULT_OPTIONS)
+          spec[:thrift].symbolize_keys!
+          self.connection_spec = spec
+        end
       end
     end
   end
+rescue LoadError
+  puts "Could not define alternate em-synchrony cassandra connection" if defined?($TESTING) && $TESTING
 end

data/sessionm-cassandra_object.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.2.48
+  version: 2.2.49
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-05-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221054696540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,15 +23,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.9
+  version_requirements: *70221054696540
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221054696080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -39,15 +34,10 @@ dependencies:
         version: 0.11.3
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.11.3
+  version_requirements: *70221054696080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &70221054695620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,12 +45,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
+  version_requirements: *70221054695620
 description: Cassandra ActiveModel
 email: klange@sessionm.com
 executables: []
@@ -176,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel