sessionm-cassandra_object 2.4.9 → 2.5.0

data/lib/cassandra_object.rb

@@ -5,7 +5,6 @@ module CassandraObject
 
   autoload :Base
   autoload :Configuration
-  autoload :AsyncConnection
   autoload :Connection
   autoload :Attributes
   autoload :Dirty

data/lib/cassandra_object/base.rb

@@ -31,7 +31,7 @@ module CassandraObject
     extend ActiveSupport::DescendantsTracker
 
     include Configuration
-    include Fiber.respond_to?(:current) ? AsyncConnection : Connection
+    include Connection
     include Consistency
     include RowTTL
     include Identity

data/lib/cassandra_object/connection.rb

@@ -1,9 +1,140 @@
+require 'with_connection'
+
 module CassandraObject
   module Connection
     extend ActiveSupport::Concern
     
     included do
-      class_attribute :connection
+      class_attribute :connection_spec
+
+      class_eval do
+        def self.new_event_machine_connection
+          spec = connection_spec.dup
+              
+          require 'thrift_client/event_machine'
+          spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
+                               :transport_wrapper => nil)
+              
+          Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift]).tap do |conn|
+            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
+            if spec[:cache_schema]
+              if @@schema
+                conn.instance_variable_set '@schema', @@schema
+              else
+                begin
+                  @@schema = conn.schema
+                rescue CassandraThrift::InvalidRequestException => e
+                  # initially the schema doesn't exists
+                end
+              end
+            end
+          end
+        end
+
+        def new_event_machine_connection
+          self.class.new_event_machine_connection
+        end
+
+        def self.new_connection
+          spec = connection_spec.dup
+              
+          Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift]).tap do |conn|
+            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
+            if spec[:cache_schema]
+              if @@schema
+                conn.instance_variable_set '@schema', @@schema
+              else
+                begin
+                  @@schema = conn.schema
+                rescue CassandraThrift::InvalidRequestException => e
+                  # initially the schema doesn't exists
+                end
+              end
+            end
+          end
+        end
+
+        def new_connection
+          self.class.new_connection
+        end
+
+        @@schema = nil
+        @@async_connection_pool = nil
+        @@sync_connection_pool = nil
+        def self.async_connection_pool
+          @@async_connection_pool ||=
+            begin
+              adapter_method = Proc.new do
+                self.new_event_machine_connection
+              end
+              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
+              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
+
+        if defined?(EM)
+          def self.connection_pool
+            EM.reactor_running? ? self.async_connection_pool : self.sync_connection_pool
+          end
+        else
+          def self.connection_pool
+            self.sync_connection_pool
+          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!
+          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
+          defined?(@connection) ? @connection : singleton_class.connection
+        end
+
+        def connection?
+          !!connection
+        end
+      end
     end
 
     module ClassMethods
@@ -18,12 +149,10 @@ module CassandraObject
       def establish_connection(config)
         spec = config.reverse_merge(DEFAULT_OPTIONS)
 
-        spec[:thrift] = (spec[:thrift].try(:symbolize_keys) || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
+        spec[:thrift] = (spec[:thrift] || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
         spec[:thrift][:exception_class_overrides] = spec[:thrift][:exception_class_overrides].map(&:constantize)
 
-        self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])
-        self.connection.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
-        self.connection
+        self.connection_spec = spec
       end
     end
   end

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '2.4.9'
+  s.version = '2.5.0'
   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.4.9
+  version: 2.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -79,7 +79,6 @@ files:
 - lib/cassandra_object/associations.rb
 - lib/cassandra_object/associations/one_to_many.rb
 - lib/cassandra_object/associations/one_to_one.rb
-- lib/cassandra_object/async_connection.rb
 - lib/cassandra_object/attributes.rb
 - lib/cassandra_object/base.rb
 - lib/cassandra_object/batches.rb

data/lib/cassandra_object/async_connection.rb

@@ -1,152 +0,0 @@
-require 'with_connection'
-
-module CassandraObject
-  module AsyncConnection
-    extend ActiveSupport::Concern
-    
-    included do
-      class_attribute :connection_spec
-
-      class_eval do
-        def self.new_event_machine_connection
-          spec = connection_spec.dup
-              
-          require 'thrift_client/event_machine'
-          spec[:thrift].merge!(:transport => Thrift::EventMachineTransport,
-                               :transport_wrapper => nil)
-              
-          Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift]).tap do |conn|
-            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
-            if spec[:cache_schema]
-              if @@schema
-                conn.instance_variable_set '@schema', @@schema
-              else
-                begin
-                  @@schema = conn.schema
-                rescue CassandraThrift::InvalidRequestException => e
-                  # initially the schema doesn't exists
-                end
-              end
-            end
-          end
-        end
-
-        def new_event_machine_connection
-          self.class.new_event_machine_connection
-        end
-
-        def self.new_connection
-          spec = connection_spec.dup
-              
-          Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift]).tap do |conn|
-            conn.disable_node_auto_discovery! if spec[:disable_node_auto_discovery]
-            if spec[:cache_schema]
-              if @@schema
-                conn.instance_variable_set '@schema', @@schema
-              else
-                begin
-                  @@schema = conn.schema
-                rescue CassandraThrift::InvalidRequestException => e
-                  # initially the schema doesn't exists
-                end
-              end
-            end
-          end
-        end
-
-        def new_connection
-          self.class.new_connection
-        end
-
-        @@schema = nil
-        @@async_connection_pool = nil
-        @@sync_connection_pool = nil
-        def self.async_connection_pool
-          @@async_connection_pool ||=
-            begin
-              adapter_method = Proc.new do
-                self.new_event_machine_connection
-              end
-              spec = ActiveRecord::Base::ConnectionSpecification.new self.connection_spec, adapter_method
-              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
-
-        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!
-          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
-          defined?(@connection) ? @connection : singleton_class.connection
-        end
-
-        def connection?
-          !!connection
-        end
-      end
-    end
-
-    module ClassMethods
-      DEFAULT_OPTIONS = {
-        servers: "127.0.0.1:9160",
-      }
-      DEFAULT_THRIFT_OPTIONS = {
-        exception_class_overrides: [],
-      }
-
-      # This doesn't open a connection. It merely conifgures the connection object.
-      def establish_connection(config)
-        spec = config.reverse_merge(DEFAULT_OPTIONS)
-
-        spec[:thrift] = (spec[:thrift] || {}).reverse_merge(DEFAULT_THRIFT_OPTIONS)
-        spec[:thrift][:exception_class_overrides] = spec[:thrift][:exception_class_overrides].map(&:constantize)
-
-        self.connection_spec = spec
-      end
-    end
-  end
-end