cql-rb 1.1.0.pre0 → 1.1.0.pre1

data/spec/cql/client/synchronous_client_spec.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'spec_helper'
-require 'cql/client/client_shared'
 
 
 module Cql
@@ -99,6 +98,30 @@ module Cql
           client.async.should equal(async_client)
         end
       end
+
+      context 'when exceptions are raised' do
+        it 'replaces the backtrace of the asynchronous call to make it less confusing' do
+          error = CqlError.new('Bork')
+          error.set_backtrace(['Hello', 'World'])
+          future.stub(:get).and_raise(error)
+          async_client.stub(:execute).and_return(future)
+          begin
+            client.execute('SELECT * FROM something')
+          rescue CqlError => e
+            e.backtrace.first.should match(%r{/synchronous_client.rb:\d+:in `execute'})
+          end
+        end
+
+        it 'does not replace the backtrace of non-CqlError errors' do
+          future.stub(:get).and_raise('Bork')
+          async_client.stub(:execute).and_return(future)
+          begin
+            client.execute('SELECT * FROM something')
+          rescue => e
+            e.backtrace.first.should_not match(%r{/synchronous_client.rb:\d+:in `execute'})
+          end
+        end
+      end
     end
   end
 end

data/spec/cql/client/synchronous_prepared_statement_spec.rb

@@ -60,6 +60,30 @@ module Cql
           statement.async.should equal(async_statement)
         end
       end
+
+      context 'when exceptions are raised' do
+        it 'replaces the backtrace of the asynchronous call to make it less confusing' do
+          error = CqlError.new('Bork')
+          error.set_backtrace(['Hello', 'World'])
+          future.stub(:get).and_raise(error)
+          async_statement.stub(:execute).and_return(future)
+          begin
+            statement.execute('SELECT * FROM something')
+          rescue CqlError => e
+            e.backtrace.first.should match(%r{/synchronous_prepared_statement.rb:\d+:in `execute'})
+          end
+        end
+
+        it 'does not replace the backtrace of non-CqlError errors' do
+          future.stub(:get).and_raise('Bork')
+          async_statement.stub(:execute).and_return(future)
+          begin
+            statement.execute('SELECT * FROM something')
+          rescue => e
+            e.backtrace.first.should_not match(%r{/synchronous_prepared_statement.rb:\d+:in `execute'})
+          end
+        end
+      end
     end
   end
 end

data/spec/cql/future_spec.rb

@@ -223,6 +223,60 @@ module Cql
       end
     end
 
+    describe '.first' do
+      context 'it returns a new future which' do
+        it 'is complete when the first of the source futures is complete' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = Future.new
+          ff = Future.first(f1, f2, f3)
+          f2.complete!
+          ff.should be_complete
+        end
+
+        it 'completes with the value of the first source future' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = Future.new
+          ff = Future.first(f1, f2, f3)
+          f2.complete!('foo')
+          ff.get.should == 'foo'
+        end
+
+        it 'is unaffected by the completion of the other futures' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = Future.new
+          ff = Future.first(f1, f2, f3)
+          f2.complete!
+          f1.complete!
+          f3.complete!
+        end
+
+        it 'fails if all of the source futures fail' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = Future.new
+          ff = Future.first(f1, f2, f3)
+          f2.fail!(StandardError.new('bork'))
+          f1.fail!(StandardError.new('bork'))
+          f3.fail!(StandardError.new('bork'))
+          ff.should be_failed
+        end
+
+        it 'fails with the error of the last future to fail' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = Future.new
+          ff = Future.first(f1, f2, f3)
+          f2.fail!(StandardError.new('bork2'))
+          f1.fail!(StandardError.new('bork1'))
+          f3.fail!(StandardError.new('bork3'))
+          expect { ff.get }.to raise_error('bork3')
+        end
+      end
+    end
+
     describe '#map' do
       context 'returns a new future that' do
         it 'will complete with the result of the given block' do
@@ -271,6 +325,86 @@ module Cql
       end
     end
 
+    describe '#recover' do
+      context 'returns a new future that' do
+        it 'completes with a value when the source future fails' do
+          f1 = Future.new
+          f2 = f1.recover { 'foo' }
+          f1.fail!(StandardError.new('Bork!'))
+          f2.get.should == 'foo'
+        end
+
+        it 'yields the error to the block' do
+          f1 = Future.new
+          f2 = f1.recover { |e| e.message }
+          f1.fail!(StandardError.new('Bork!'))
+          f2.get.should == 'Bork!'
+        end
+
+        it 'completes with the value of the source future when the source future is successful' do
+          f1 = Future.new
+          f2 = f1.recover { 'foo' }
+          f1.complete!('bar')
+          f2.get.should == 'bar'
+        end
+
+        it 'fails with the error raised in the given block' do
+          f1 = Future.new
+          f2 = f1.recover { raise 'Snork!' }
+          f1.fail!(StandardError.new('Bork!'))
+          expect { f2.get }.to raise_error('Snork!')
+        end
+      end
+    end
+
+    describe '#fallback' do
+      context 'returns a new future that' do
+        it 'completes with the value of the fallback future when the source future fails' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = f1.fallback { f2 }
+          f1.fail!(StandardError.new('Bork!'))
+          f2.complete!('foo')
+          f3.get.should == 'foo'
+        end
+
+        it 'yields the error to the block' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = f1.fallback do |error|
+            Future.completed(error.message)
+          end
+          f1.fail!(StandardError.new('Bork!'))
+          f3.get.should == 'Bork!'
+        end
+
+        it 'completes with the value of the source future when the source future succeeds' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = f1.fallback { f2 }
+          f2.complete!('bar')
+          f1.complete!('foo')
+          f3.get.should == 'foo'
+        end
+
+        it 'fails when the block raises an error' do
+          f1 = Future.new
+          f2 = f1.fallback { raise 'Bork!' }
+          f1.fail!(StandardError.new('Splork!'))
+          expect { f2.get }.to raise_error('Bork!')
+        end
+
+        it 'fails when the fallback future fails' do
+          f1 = Future.new
+          f2 = Future.new
+          f3 = f1.fallback { f2 }
+          f2.fail!(StandardError.new('Bork!'))
+          f1.fail!(StandardError.new('Fnork!'))
+          expect { f3.get }.to raise_error('Bork!')
+        end
+      end
+    end
+
     describe '.completed' do
       let :future do
         described_class.completed('hello world')

data/spec/cql/protocol/cql_protocol_handler_spec.rb

@@ -41,6 +41,13 @@ module Cql
         end
       end
 
+      describe '#[]/#[]=' do
+        it 'is thread safe storage for arbitrary data' do
+          protocol_handler[:host_id] = 42
+          protocol_handler[:host_id].should == 42
+        end
+      end
+
       describe '#send_request' do
         before do
           connection.stub(:write).and_yield(buffer)

data/spec/support/fake_io_reactor.rb

@@ -10,20 +10,29 @@ class FakeIoReactor
     @default_host = nil
     @connection_listeners = []
     @started_future = Cql::Future.new
-    @startup_delay = 0
+    @before_startup_handler = nil
+    @down_nodes = []
   end
 
-  def startup_delay=(n)
-    @startup_delay = n
+  def node_down(hostname)
+    @down_nodes << hostname
+  end
+
+  def before_startup(&handler)
+    @before_startup_handler = handler
   end
 
   def connect(host, port, timeout)
-    connection = FakeConnection.new(host, port, timeout)
-    @connections << connection
-    @connection_listeners.each do |listener|
-      listener.call(connection)
+    if @down_nodes.include?(host)
+      Cql::Future.failed(Cql::Io::ConnectionError.new('Node down'))
+    else
+      connection = FakeConnection.new(host, port, timeout)
+      @connections << connection
+      @connection_listeners.each do |listener|
+        listener.call(connection)
+      end
+      Cql::Future.completed(connection)
     end
-    Cql::Future.completed(connection)
   end
 
   def on_connection(&listener)
@@ -32,8 +41,13 @@ class FakeIoReactor
 
   def start
     @running = true
-    Thread.start do
-      sleep(@startup_delay)
+    if @before_startup_handler
+      @before_startup_handler = nil
+      Thread.start do
+        @before_startup_handler.call
+        @started_future.complete!(self)
+      end
+    elsif !(@started_future.complete? || @started_future.failed?)
       @started_future.complete!(self)
     end
     @started_future
@@ -61,14 +75,28 @@ class FakeConnection
     @responses = []
     @closed = false
     @keyspace = nil
+    @data = {}
+    @request_handler = method(:default_request_handler)
+  end
+
+  def [](key)
+    @data[key]
+  end
+
+  def []=(key, value)
+    @data[key] = value
+  end
+
+  def connected?
+    !@closed
   end
 
   def close
     @closed = true
   end
 
-  def queue_response(response)
-    @responses << response
+  def handle_request(&handler)
+    @request_handler = handler
   end
 
   def send_request(request)
@@ -76,11 +104,23 @@ class FakeConnection
       Cql::Future.failed(Cql::NotConnectedError.new)
     else
       @requests << request
-      response = @responses.shift
+      response = @request_handler.call(request)
       if response.is_a?(Cql::Protocol::SetKeyspaceResultResponse)
         @keyspace = response.keyspace
       end
       Cql::Future.completed(response)
     end
   end
+
+  def default_request_handler(request)
+    response = @responses.shift
+    unless response
+      case request
+      when Cql::Protocol::StartupRequest
+        Cql::Protocol::ReadyResponse.new
+      when Cql::Protocol::QueryRequest
+        Cql::Protocol::RowsResultResponse.new([], [])
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.pre0
+  version: 1.1.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -71,7 +71,6 @@ files:
 - spec/cql/byte_buffer_spec.rb
 - spec/cql/client/asynchronous_client_spec.rb
 - spec/cql/client/asynchronous_prepared_statement_spec.rb
-- spec/cql/client/client_shared.rb
 - spec/cql/client/column_metadata_spec.rb
 - spec/cql/client/request_runner_spec.rb
 - spec/cql/client/synchronous_client_spec.rb
@@ -133,7 +132,6 @@ test_files:
 - spec/cql/byte_buffer_spec.rb
 - spec/cql/client/asynchronous_client_spec.rb
 - spec/cql/client/asynchronous_prepared_statement_spec.rb
-- spec/cql/client/client_shared.rb
 - spec/cql/client/column_metadata_spec.rb
 - spec/cql/client/request_runner_spec.rb
 - spec/cql/client/synchronous_client_spec.rb

data/spec/cql/client/client_shared.rb

@@ -1,27 +0,0 @@
-# encoding: utf-8
-
-shared_context 'client setup' do
-  let :connection_options do
-    {:host => 'example.com', :port => 12321, :io_reactor => io_reactor}
-  end
-
-  let :io_reactor do
-    FakeIoReactor.new
-  end
-
-  def connections
-    io_reactor.connections
-  end
-
-  def last_connection
-    connections.last
-  end
-
-  def requests
-    last_connection.requests
-  end
-
-  def last_request
-    requests.last
-  end
-end