cassanity 0.6.0.beta2 → 0.6.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee509bb367d05f910d105796eeb15a6a9d3e3ec
-  data.tar.gz: f25ef46dc1e27af16144642fdf9e50e43a2a717e
+  metadata.gz: f55c2651855af2b3beae8140f050e24ffce99b92
+  data.tar.gz: 03ebc3e813d4e4b5875516fbb2dba386d965a1b6
 SHA512:
-  metadata.gz: b4a973ccb47b4a3e244ab33fcd4ca2bceffeada294ad865a92c6fb850065d5466de26a3067b01dd6328ca867c034040697d1f7c15bdf3af95b576c42a7c0b04c
-  data.tar.gz: 63750d81f4656e692606d9b81d4504341cccfa626d7a637a15446a1768327f52b2e8d846fedd35ef1bae81b5851b395b909e5905a7b443d818d7b1505199ad2c
+  metadata.gz: a53e35e81287014b86092ae6269ba89929610d3234194cf1c9d42d1af9a7d0ea99370a7022eab777c0bfb89f2541fe3e910482afad2a4f8dbe086393b35d9959
+  data.tar.gz: b4aee0161df84024daff56121d12aa67810a08aa66f535ca79447bbb49dc11789d8d9b4181d93add6aed69d60701d8988139e2e826208e5288bd3d9999d1e599

data/lib/cassanity/client.rb

@@ -1,5 +1,6 @@
 require 'forwardable'
 require 'cql'
+require 'cassanity/cql/reconnectable_driver'
 require 'cassanity/executors/cql_rb'
 require 'cassanity/connection'
 
@@ -35,14 +36,7 @@ module Cassanity
       @instrumenter   = @options.delete(:instrumenter)
       @retry_strategy = @options.delete(:retry_strategy)
 
-      connect
-    end
-
-    # Connect or reconnect to cassandra
-    def connect
-      disconnect
-
-      @driver = Cql::Client.connect(@options)
+      @driver = Cassanity::Cql::ReconnectableDriver.connect(@options)
       @executor = Cassanity::Executors::CqlRb.new({
         driver: @driver,
         instrumenter: @instrumenter,
@@ -53,9 +47,14 @@ module Cassanity
       })
     end
 
+    # Reconnect to cassandra.
+    def connect
+      @driver.connect
+    end
+
     # Disconnect from cassandra.
     def disconnect
-      @driver.close if @driver
+      @driver.disconnect
     end
 
     # Methods on client that should be delegated to connection.

data/lib/cassanity/cql/reconnectable_driver.rb

@@ -0,0 +1,34 @@
+require 'delegate'
+
+module Cassanity
+  module Cql
+    # Internal: An intermediate driver for cql-rb that supports reconnecting
+    # by recycling the underlying Cql::Client instance.
+    #
+    # Reconnecting is important when using a forking web server like unicorn,
+    # but cql-rb does not allow a Cql::Client instances that has been
+    # disconnected to be reconnected.
+    class ReconnectableDriver
+      extend Forwardable
+      def_delegators :@driver, :use, :execute, :keyspace
+
+      def self.connect(cql_options = {})
+        new(cql_options).tap(&:connect)
+      end
+
+      # cql_options: Options for constructing a Cql::Client
+      def initialize(cql_options = {})
+        @cql_options = cql_options
+      end
+
+      def connect
+        disconnect
+        @driver = ::Cql::Client.connect(@cql_options)
+      end
+
+      def disconnect
+        @driver.close if @driver
+      end
+    end
+  end
+end

data/lib/cassanity/retry_strategies/retry_strategy.rb

@@ -25,7 +25,7 @@ module Cassanity
           begin
             payload[:attempts] = attempt unless payload.nil?
             return yield
-          rescue Cql::CqlError => e
+          rescue ::Cql::CqlError => e
             fail(attempt, e)
           end
         end

data/lib/cassanity/version.rb

@@ -1,3 +1,3 @@
 module Cassanity
-  VERSION = "0.6.0.beta2"
+  VERSION = "0.6.0.beta3"
 end

data/spec/support/cassanity_helpers.rb

@@ -36,6 +36,6 @@ module CassanityHelpers
   end
 
   def cassandra_error(err)
-    Cql::CqlError.new(err)
+    ::Cql::CqlError.new(err)
   end
 end

data/spec/unit/cassanity/client_spec.rb

@@ -6,26 +6,26 @@ describe Cassanity::Client do
 
   before do
     # Ensure that we never hit cassandra for real here.
-    Cql::Client.stub(:connect => driver)
+    Cassanity::Cql::ReconnectableDriver.stub(:connect => driver)
   end
 
   describe "#initialize" do
     it "passes arguments to cassandra cql database instance" do
-      Cql::Client.should_receive(:connect).
+      Cassanity::Cql::ReconnectableDriver.should_receive(:connect).
         with(hash_including(hosts: ['localhost'], port: 1234, some: 'option'))
 
       described_class.new(['localhost'], 1234, some: 'option')
     end
 
     it "defaults servers if not present" do
-      Cql::Client.should_receive(:connect).
+      Cassanity::Cql::ReconnectableDriver.should_receive(:connect).
         with(hash_including(hosts: ['127.0.0.1'], port: 9042))
 
       described_class.new
     end
 
     it "defaults servers if nil" do
-      Cql::Client.should_receive(:connect).
+      Cassanity::Cql::ReconnectableDriver.should_receive(:connect).
         with(hash_including(hosts: ['127.0.0.1'], port: 9042))
 
       described_class.new(nil)
@@ -36,7 +36,7 @@ describe Cassanity::Client do
       driver = double('Driver')
       executor = double('Executor')
 
-      Cql::Client.should_receive(:connect).
+      Cassanity::Cql::ReconnectableDriver.should_receive(:connect).
         with(hash_not_including(instrumenter: instrumenter)).
         and_return(driver)
 
@@ -57,7 +57,7 @@ describe Cassanity::Client do
       executor = double('Executor')
       connection = double('Connection')
 
-      Cql::Client.should_receive(:connect).and_return(driver)
+      Cassanity::Cql::ReconnectableDriver.should_receive(:connect).and_return(driver)
 
       Cassanity::Executors::CqlRb.should_receive(:new).
         with(hash_including(driver: driver)).
@@ -118,7 +118,7 @@ describe Cassanity::Client do
 
   describe "#disconnect" do
     it "allows the connection to be terminated" do
-      driver.should_receive(:close)
+      driver.should_receive(:disconnect)
 
       client = described_class.new
       client.disconnect

data/spec/unit/cassanity/cql/reconnectable_driver_spec.rb

@@ -0,0 +1,42 @@
+require 'helper'
+
+describe Cassanity::Cql::ReconnectableDriver do
+  let(:client) { double('Cql::Client') }
+
+  describe '.connect' do
+    it 'constructs a CQL client using the provided options' do
+      Cql::Client.should_receive(:connect).with(:foo => "bar") { client }
+      driver = described_class.connect(:foo => "bar")
+    end
+  end
+
+  describe '#disconnect' do
+    it 'closes the underlying driver' do
+      Cql::Client.stub(:connect => client)
+      driver = described_class.connect(:foo => "bar")
+
+      client.should_receive(:close)
+      driver.disconnect
+    end
+  end
+
+  describe '#use' do
+    it 'forwards the message to the underlying driver' do
+      Cql::Client.stub(:connect => client)
+      driver = described_class.connect(:foo => "bar")
+
+      client.should_receive(:use).with("keyspace")
+      driver.use("keyspace")
+    end
+  end
+
+  describe '#execute' do
+    it 'forwards the message to the underlying driver' do
+      Cql::Client.stub(:connect => client)
+      driver = described_class.connect(:foo => "bar")
+
+      client.should_receive(:execute).with("query")
+      driver.execute("query")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.6.0.beta2
+  version: 0.6.0.beta3
 platform: ruby
 authors:
 - John Nunemaker
@@ -98,6 +98,7 @@ files:
 - lib/cassanity/column.rb
 - lib/cassanity/column_family.rb
 - lib/cassanity/connection.rb
+- lib/cassanity/cql/reconnectable_driver.rb
 - lib/cassanity/decrement.rb
 - lib/cassanity/error.rb
 - lib/cassanity/executors/cql_rb.rb
@@ -173,6 +174,7 @@ files:
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/column_spec.rb
 - spec/unit/cassanity/connection_spec.rb
+- spec/unit/cassanity/cql/reconnectable_driver_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
 - spec/unit/cassanity/increment_spec.rb
@@ -262,6 +264,7 @@ test_files:
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/column_spec.rb
 - spec/unit/cassanity/connection_spec.rb
+- spec/unit/cassanity/cql/reconnectable_driver_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
 - spec/unit/cassanity/increment_spec.rb