cql-rb 1.0.0.pre7 → 1.0.0.pre8

data/spec/cql/protocol/requests/options_request_spec.rb

@@ -0,0 +1,24 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe OptionsRequest do
+      describe '#encode_frame' do
+        it 'encodes an OPTIONS request frame' do
+          bytes = OptionsRequest.new.encode_frame(3)
+          bytes.should == "\x01\x00\x03\x05\x00\x00\x00\x00"
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a pretty string' do
+          request = OptionsRequest.new
+          request.to_s.should == 'OPTIONS'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/requests/prepare_request_spec.rb

@@ -0,0 +1,70 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe PrepareRequest do
+      describe '#initialize' do
+        it 'raises an error when the CQL is nil' do
+          expect { PrepareRequest.new(nil) }.to raise_error(ArgumentError)
+        end
+      end
+
+      describe '#encode_frame' do
+        it 'encodes a PREPARE request frame' do
+          bytes = PrepareRequest.new('UPDATE users SET email = ? WHERE user_name = ?').encode_frame(3)
+          bytes.should == "\x01\x00\x03\x09\x00\x00\x00\x32\x00\x00\x00\x2eUPDATE users SET email = ? WHERE user_name = ?"
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a pretty string' do
+          request = PrepareRequest.new('UPDATE users SET email = ? WHERE user_name = ?')
+          request.to_s.should == 'PREPARE "UPDATE users SET email = ? WHERE user_name = ?"'
+        end
+      end
+
+      describe '#eql?' do
+        it 'returns true when the CQL is the same' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT * FROM system.peers')
+          p1.should eql(p2)
+        end
+
+        it 'returns false when the CQL is different' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT * FROM peers')
+          p1.should_not eql(p2)
+        end
+
+        it 'does not know about CQL syntax' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT   *   FROM   system.peers')
+          p1.should_not eql(p2)
+        end
+
+        it 'is aliased as ==' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT * FROM system.peers')
+          p1.should == p2
+        end
+      end
+
+      describe '#hash' do
+        it 'has the same hash code as another identical object' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT * FROM system.peers')
+          p1.hash.should == p2.hash
+        end
+
+        it 'does not have the same hash code when the CQL is different' do
+          p1 = PrepareRequest.new('SELECT * FROM system.peers')
+          p2 = PrepareRequest.new('SELECT * FROM peers')
+          p1.hash.should_not == p2.hash
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/requests/query_request_spec.rb

@@ -0,0 +1,95 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe QueryRequest do
+      describe '#initialize' do
+        it 'raises an error when the CQL is nil' do
+          expect { QueryRequest.new(nil, :one) }.to raise_error(ArgumentError)
+        end
+
+        it 'raises an error when the consistency is nil' do
+          expect { QueryRequest.new('USE system', nil) }.to raise_error(ArgumentError)
+        end
+
+        it 'raises an error when the consistency is invalid' do
+          expect { QueryRequest.new('USE system', :hello) }.to raise_error(ArgumentError)
+        end
+      end
+
+      describe '#encode_frame' do
+        it 'encodes a QUERY request frame' do
+          bytes = QueryRequest.new('USE system', :all).encode_frame(3)
+          bytes.should == "\x01\x00\x03\x07\x00\x00\x00\x10\x00\x00\x00\x0aUSE system\x00\x05"
+        end
+
+        it 'correctly encodes queries with multibyte characters' do
+          bytes = QueryRequest.new("INSERT INTO users (user_id, first, last, age) VALUES ('test', 'ümlaut', 'test', 1)", :all).encode_frame(3)
+          bytes.should eql_bytes("\x01\x00\x03\a\x00\x00\x00Y\x00\x00\x00SINSERT INTO users (user_id, first, last, age) VALUES ('test', '\xC3\xBCmlaut', 'test', 1)\x00\x05")
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a pretty string' do
+          request = QueryRequest.new('SELECT * FROM system.peers', :local_quorum)
+          request.to_s.should == 'QUERY "SELECT * FROM system.peers" LOCAL_QUORUM'
+        end
+      end
+
+      describe '#eql?' do
+        it 'returns true when the CQL and consistency are the same' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2.should eql(q2)
+        end
+
+        it 'returns false when the consistency is different' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM system.peers', :three)
+          q1.should_not eql(q2)
+        end
+
+        it 'returns false when the CQL is different' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM peers', :two)
+          q1.should_not eql(q2)
+        end
+
+        it 'does not know about CQL syntax' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT   *   FROM   system.peers', :two)
+          q1.should_not eql(q2)
+        end
+
+        it 'is aliased as ==' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q1.should == q2
+        end
+      end
+
+      describe '#hash' do
+        it 'has the same hash code as another identical object' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q1.hash.should == q2.hash
+        end
+
+        it 'does not have the same hash code when the consistency is different' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM system.peers', :three)
+          q1.hash.should_not == q2.hash
+        end
+
+        it 'does not have the same hash code when the CQL is different' do
+          q1 = QueryRequest.new('SELECT * FROM system.peers', :two)
+          q2 = QueryRequest.new('SELECT * FROM peers', :two)
+          q1.hash.should_not == q2.hash
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/requests/register_request_spec.rb

@@ -0,0 +1,24 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe RegisterRequest do
+      describe '#encode_frame' do
+        it 'encodes a REGISTER request frame' do
+          bytes = RegisterRequest.new('TOPOLOGY_CHANGE', 'STATUS_CHANGE').encode_frame(3)
+          bytes.should == "\x01\x00\x03\x0b\x00\x00\x00\x22\x00\x02\x00\x0fTOPOLOGY_CHANGE\x00\x0dSTATUS_CHANGE"
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a pretty string' do
+          request = RegisterRequest.new('TOPOLOGY_CHANGE', 'STATUS_CHANGE')
+          request.to_s.should == 'REGISTER ["TOPOLOGY_CHANGE", "STATUS_CHANGE"]'
+        end
+      end
+    end
+  end
+end

data/spec/cql/protocol/requests/startup_request_spec.rb

@@ -0,0 +1,29 @@
+# encoding: ascii-8bit
+
+require 'spec_helper'
+
+
+module Cql
+  module Protocol
+    describe StartupRequest do
+      describe '#encode_frame' do
+        it 'encodes a STARTUP request frame' do
+          bytes = StartupRequest.new('3.0.0', 'snappy').encode_frame(3)
+          bytes.should == "\x01\x00\x03\x01\x00\x00\x00\x2b\x00\x02\x00\x0bCQL_VERSION\x00\x053.0.0\x00\x0bCOMPRESSION\x00\x06snappy"
+        end
+
+        it 'defaults to CQL 3.0.0 and no compression' do
+          bytes = StartupRequest.new.encode_frame(3)
+          bytes.should == "\x01\x00\x03\x01\x00\x00\x00\x16\x00\x01\x00\x0bCQL_VERSION\x00\x053.0.0"
+        end
+      end
+
+      describe '#to_s' do
+        it 'returns a pretty string' do
+          request = StartupRequest.new
+          request.to_s.should == 'STARTUP {"CQL_VERSION"=>"3.0.0"}'
+        end
+      end
+    end
+  end
+end

data/spec/integration/client_spec.rb

@@ -9,7 +9,7 @@ describe 'A CQL client' do
   end
 
   let :client do
-    Cql::Client.new(connection_options)
+    Cql::Client.connect(connection_options)
   end
 
   before do
@@ -37,7 +37,7 @@ describe 'A CQL client' do
   end
 
   it 'can be initialized with a keyspace' do
-    c = Cql::Client.new(connection_options.merge(:keyspace => 'system'))
+    c = Cql::Client.connect(connection_options.merge(:keyspace => 'system'))
     c.connect
     begin
       c.keyspace.should == 'system'
@@ -47,29 +47,38 @@ describe 'A CQL client' do
     end
   end
 
-  it 'prepares a statement' do
-    statement = client.prepare('SELECT * FROM system.schema_keyspaces WHERE keyspace_name = ?')
-    statement.should_not be_nil
-  end
+  context 'when using prepared statements' do
+    before do
+      client.use('system')
+    end
 
-  it 'executes a prepared statement' do
-    statement = client.prepare('SELECT * FROM system.schema_keyspaces WHERE keyspace_name = ?')
-    result = statement.execute('system')
-    result.should have(1).item
-    result = statement.execute('system', :one)
-    result.should have(1).item
+    let :statement do
+      client.prepare('SELECT * FROM schema_keyspaces WHERE keyspace_name = ?')
+    end
+
+    it 'prepares a statement' do
+      statement.should_not be_nil
+    end
+
+    it 'executes a prepared statement' do
+      result = statement.execute('system')
+      result.should have(1).item
+      result = statement.execute('system', :one)
+      result.should have(1).item
+    end
   end
 
   context 'with multiple connections' do
     let :multi_client do
       opts = connection_options.dup
       opts[:host] = ([opts[:host]] * 10).join(',')
-      Cql::Client.new(opts)
+      Cql::Client.connect(opts)
     end
 
     before do
       client.close
       multi_client.connect
+      multi_client.use('system')
     end
 
     after do
@@ -77,7 +86,6 @@ describe 'A CQL client' do
     end
 
     it 'handles keyspace changes with #use' do
-      multi_client.use('system')
       100.times do
         result = multi_client.execute(%<SELECT * FROM schema_keyspaces WHERE keyspace_name = 'system'>)
         result.should have(1).item
@@ -85,7 +93,6 @@ describe 'A CQL client' do
     end
 
     it 'handles keyspace changes with #execute' do
-      multi_client.execute('USE system')
       100.times do
         result = multi_client.execute(%<SELECT * FROM schema_keyspaces WHERE keyspace_name = 'system'>)
         result.should have(1).item
@@ -130,7 +137,7 @@ describe 'A CQL client' do
 
     it 'raises an error when the credentials are bad' do
       if authentication_enabled
-        client = Cql::Client.new(connection_options.merge(credentials: {username: 'foo', password: 'bar'}))
+        client = Cql::Client.connect(connection_options.merge(credentials: {username: 'foo', password: 'bar'}))
         expect { client.connect }.to raise_error(Cql::AuthenticationError)
       else
         pending 'authentication not configured'
@@ -144,12 +151,12 @@ describe 'A CQL client' do
     end
 
     it 'raises an error for bad consistency levels' do
-      expect { client.execute('SELECT * FROM system.peers', :helloworld) }.to raise_error(Cql::CqlError)
+      expect { client.execute('SELECT * FROM system.peers', :helloworld) }.to raise_error(ArgumentError)
     end
 
     it 'fails gracefully when connecting to the Thrift port' do
-      client = Cql::Client.new(connection_options.merge(port: 9160))
-      expect { client.connect }.to raise_error(Cql::IoError)
+      opts = connection_options.merge(port: 9160)
+      expect { Cql::Client.connect(opts) }.to raise_error(Cql::IoError)
     end
 
     it 'fails gracefully when connecting to something that does not run C*' do

data/spec/integration/protocol_spec.rb

@@ -41,7 +41,7 @@ describe 'Protocol parsing and communication' do
   end
 
   def create_keyspace!
-    query("CREATE KEYSPACE #{keyspace_name} WITH REPLICATION = {'CLASS': 'SimpleStrategy', 'replication_factor': 1}")
+    query("CREATE KEYSPACE #{keyspace_name} WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}")
   end
 
   def use_keyspace!
@@ -208,7 +208,7 @@ describe 'Protocol parsing and communication' do
         end
 
         it 'sends a CREATE KEYSPACE command' do
-          response = query("CREATE KEYSPACE #{keyspace_name} WITH REPLICATION = {'CLASS': 'SimpleStrategy', 'replication_factor': 1}")
+          response = query("CREATE KEYSPACE #{keyspace_name} WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}")
           begin
             response.change.should == 'CREATED'
             response.keyspace.should == keyspace_name

data/spec/integration/regression_spec.rb

@@ -9,7 +9,7 @@ describe 'Regressions' do
   end
 
   let :client do
-    Cql::Client.new(connection_options)
+    Cql::Client.connect(connection_options)
   end
 
   before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre7
+  version: 1.0.0.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-15 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -19,6 +19,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cql/byte_buffer.rb
+- lib/cql/client/asynchronous_client.rb
+- lib/cql/client/asynchronous_prepared_statement.rb
+- lib/cql/client/column_metadata.rb
+- lib/cql/client/query_result.rb
+- lib/cql/client/result_metadata.rb
+- lib/cql/client/synchronous_client.rb
+- lib/cql/client/synchronous_prepared_statement.rb
 - lib/cql/client.rb
 - lib/cql/future.rb
 - lib/cql/io/io_reactor.rb
@@ -26,8 +33,7 @@ files:
 - lib/cql/io.rb
 - lib/cql/protocol/decoding.rb
 - lib/cql/protocol/encoding.rb
-- lib/cql/protocol/request_body.rb
-- lib/cql/protocol/request_frame.rb
+- lib/cql/protocol/request.rb
 - lib/cql/protocol/requests/credentials_request.rb
 - lib/cql/protocol/requests/execute_request.rb
 - lib/cql/protocol/requests/options_request.rb
@@ -35,7 +41,7 @@ files:
 - lib/cql/protocol/requests/query_request.rb
 - lib/cql/protocol/requests/register_request.rb
 - lib/cql/protocol/requests/startup_request.rb
-- lib/cql/protocol/response_body.rb
+- lib/cql/protocol/response.rb
 - lib/cql/protocol/response_frame.rb
 - lib/cql/protocol/responses/authenticate_response.rb
 - lib/cql/protocol/responses/detailed_error_response.rb
@@ -60,12 +66,22 @@ files:
 - bin/cqlexec
 - README.md
 - spec/cql/byte_buffer_spec.rb
-- spec/cql/client_spec.rb
+- spec/cql/client/asynchronous_client_spec.rb
+- spec/cql/client/client_shared.rb
+- spec/cql/client/synchronous_client_spec.rb
+- spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/future_spec.rb
 - spec/cql/io/io_reactor_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
-- spec/cql/protocol/request_frame_spec.rb
+- spec/cql/protocol/request_spec.rb
+- spec/cql/protocol/requests/credentials_request_spec.rb
+- spec/cql/protocol/requests/execute_request_spec.rb
+- spec/cql/protocol/requests/options_request_spec.rb
+- spec/cql/protocol/requests/prepare_request_spec.rb
+- spec/cql/protocol/requests/query_request_spec.rb
+- spec/cql/protocol/requests/register_request_spec.rb
+- spec/cql/protocol/requests/startup_request_spec.rb
 - spec/cql/protocol/response_frame_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
@@ -103,12 +119,22 @@ specification_version: 3
 summary: Cassandra CQL3 driver
 test_files:
 - spec/cql/byte_buffer_spec.rb
-- spec/cql/client_spec.rb
+- spec/cql/client/asynchronous_client_spec.rb
+- spec/cql/client/client_shared.rb
+- spec/cql/client/synchronous_client_spec.rb
+- spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/future_spec.rb
 - spec/cql/io/io_reactor_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
-- spec/cql/protocol/request_frame_spec.rb
+- spec/cql/protocol/request_spec.rb
+- spec/cql/protocol/requests/credentials_request_spec.rb
+- spec/cql/protocol/requests/execute_request_spec.rb
+- spec/cql/protocol/requests/options_request_spec.rb
+- spec/cql/protocol/requests/prepare_request_spec.rb
+- spec/cql/protocol/requests/query_request_spec.rb
+- spec/cql/protocol/requests/register_request_spec.rb
+- spec/cql/protocol/requests/startup_request_spec.rb
 - spec/cql/protocol/response_frame_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb