sessionm-cassandra_object 4.0.17 → 4.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed329a15a831823620ffa071ce312de25c3f375f
-  data.tar.gz: 6f818bc4fc78a4431ee347cb02744381079e4164
+  metadata.gz: f4f7695ab50cc8f809469eae9e85df59aa5e8167
+  data.tar.gz: c366e423d4218302c58b9470fabdce04fbddc5e2
 SHA512:
-  metadata.gz: e0e93509823634b57f7933c30c6b37e4dab27663bb484dfafadf23f80a329b56805f34e9cfd2ee101b4d24cdfe2c5bc1f6d6250834921d1a429a289b92bb123b
-  data.tar.gz: 48c59e303a94544bc5e668cca4377fdc78e30472a202afb2a02ada6411f4bc6e3f74d10591ac2d279d1da3317669dddc798a8d931d16af017fb68149f6624556
+  metadata.gz: 65b1137b9b00dfdcd4dabc4c1c6d4112b2d98b9a9cb039e11a11d5308c56cdd41007638b4b6210a1fdb42a649cacf50d2b3d57f05cefb48b17345038f83bdabd
+  data.tar.gz: 828a23a774fe4d56a085c376dc7673910391ef8d6a441ea440f1f6319edab25200792714486eb801ba1f32a25cf61ab51279b1526a6918f0d862e45524aa23e1

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -1,6 +1,17 @@
 module CassandraObject
   module Adapters
     class CassandraDriver
+      CLUSTER_CONFIG_OPTIONS = [
+        :credentials, :auth_provider, :compression, :hosts, :logger, :port,
+        :load_balancing_policy, :reconnection_policy, :retry_policy, :listeners,
+        :consistency, :trace, :page_size, :compressor, :username, :password,
+        :ssl, :server_cert, :client_cert, :private_key, :passphrase,
+        :connect_timeout, :futures_factory, :datacenter, :address_resolution,
+        :address_resolution_policy, :idle_timeout, :heartbeat_interval, :timeout,
+        :synchronize_schema, :schema_refresh_delay, :schema_refresh_timeout,
+        :shuffle_replicas, :client_timestamps
+      ]
+
       attr_reader :config
 
       def initialize(config)
@@ -25,14 +36,17 @@ module CassandraObject
       end
 
       def cluster_config
-        {
+        config.slice(*CLUSTER_CONFIG_OPTIONS).reverse_merge(
           :hosts => config[:servers].map { |server| server.sub /:\d+/, '' },
-          :port => config[:port] || 9042,
-          :connect_timeout => config[:thrift][:connect_timeout] || 10,
-          :timeout => config[:thrift][:timeout] || 10,
-          :logger => config[:logger] || (defined?(Rails) && Rails.logger) || Logger.new(STDOUT),
+          :port => 9042,
+          :connect_timeout => config[:thrift].try(:[], :connect_timeout) || 10,
+          :timeout => config[:thrift].try(:[], :timeout) || 10,
+          :logger => (defined?(Rails) && Rails.logger) || Logger.new(STDOUT),
+          :heartbeat_interval => nil,
+          :idle_timeout => nil
+        ).merge(
           :consistency => (config[:consistency] || {})[:write_default].try(:to_sym) || :one,
-        }
+        )
       end
 
       class SchemaCache < ActiveRecord::ConnectionAdapters::SchemaCache

data/sessionm-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.17'
+  s.version = '4.0.18'
   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: 4.0.17
+  version: 4.0.18
 platform: ruby
 authors:
 - Doug Youch
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-28 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com