cql-rb 1.0.6 → 1.1.0.pre0

data/spec/integration/regression_spec.rb

@@ -0,0 +1,124 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+
+describe 'Regressions' do
+  let :connection_options do
+    {:host => ENV['CASSANDRA_HOST'], :credentials => {:username => 'cassandra', :password => 'cassandra'}}
+  end
+
+  let :client do
+    Cql::Client.connect(connection_options)
+  end
+
+  before do
+    client.execute('DROP KEYSPACE cql_rb_client_spec') rescue nil
+    client.execute(%(CREATE KEYSPACE cql_rb_client_spec WITH REPLICATION = {'class': 'SimpleStrategy', 'replication_factor': 1}))
+    client.use('cql_rb_client_spec')
+  end
+
+  after do
+    client.execute('DROP KEYSPACE cql_rb_client_spec') rescue nil
+    client.close rescue nil
+  end
+
+  context 'with multibyte characters' do
+    it 'executes queries with multibyte characters' do
+      client.execute(%(CREATE TABLE users (user_id VARCHAR PRIMARY KEY, first VARCHAR, last VARCHAR, age INT)))
+      client.execute(%(INSERT INTO users (user_id, first, last, age) VALUES ('test', 'ümlaut', 'test', 1)))
+    end
+
+    it 'executes prepared statements with multibyte characters' do
+      client.execute(%(CREATE TABLE users (user_id VARCHAR PRIMARY KEY, first VARCHAR, last VARCHAR, age INT)))
+      client.execute("INSERT INTO users (user_id, first, last, age) VALUES ('test', 'ümlaut', 'test', 1)")
+      statement = client.prepare('INSERT INTO users (user_id, first, last, age) VALUES (?, ?, ?, ?)')
+      statement.execute('test2', 'test2', 'test2', 2)
+      statement.execute('test3', 'ümlaut', 'test3', 3)
+    end
+  end
+
+  context 'with collections' do
+    it 'prepares and executes a statement with an append to a set' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails SET<VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute(['eve@gmail.com'])
+    end
+
+    it 'prepares and executes a statement with an append to a list' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails LIST<VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute(['eve@gmail.com', 'eve@yahoo.com'])
+    end
+
+    it 'prepares and executes a statement with an append to a map' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails MAP<VARCHAR, VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails = emails + ? WHERE name = 'eve'))
+      statement.execute({'home' => 'eve@yahoo.com'})
+    end
+
+    it 'prepares and executes a statement with a map assignment' do
+      client.execute(%(CREATE TABLE users (name VARCHAR PRIMARY KEY, emails MAP<VARCHAR, VARCHAR>)))
+      statement = client.prepare(%(UPDATE users SET emails['home'] = ? WHERE name = 'eve'))
+      statement.execute('eve@gmail.com')
+    end
+  end
+
+  context 'with null values' do
+    it 'decodes null counters' do
+      client.execute(%<CREATE TABLE counters (id ASCII, counter1 COUNTER, counter2 COUNTER, PRIMARY KEY (id))>)
+      client.execute(%<UPDATE counters SET counter1 = counter1 + 1 WHERE id = 'foo'>)
+      result = client.execute(%<SELECT counter1, counter2 FROM counters WHERE id = 'foo'>)
+      result.first['counter1'].should == 1
+      result.first['counter2'].should be_nil
+    end
+
+    it 'decodes null values' do
+      client.execute(<<-CQL)
+        CREATE TABLE lots_of_types (
+          id               INT,
+          ascii_column     ASCII,
+          bigint_column    BIGINT,
+          blob_column      BLOB,
+          boolean_column   BOOLEAN,
+          decimal_column   DECIMAL,
+          double_column    DOUBLE,
+          float_column     FLOAT,
+          int_column       INT,
+          text_column      TEXT,
+          timestamp_column TIMESTAMP,
+          uuid_column      UUID,
+          varchar_column   VARCHAR,
+          varint_column    VARINT,
+          timeuuid_column  TIMEUUID,
+          inet_column      INET,
+          list_column      LIST<ASCII>,
+          map_column       MAP<TEXT, BOOLEAN>,
+          set_column       SET<BLOB>,
+          PRIMARY KEY (id)
+        )
+      CQL
+      client.execute(%<INSERT INTO lots_of_types (id) VALUES (3)>)
+      result = client.execute(%<SELECT * FROM lots_of_types WHERE id = 3>)
+      row = result.first
+      row['ascii_column'].should be_nil
+      row['bigint_column'].should be_nil
+      row['blob_column'].should be_nil
+      row['boolean_column'].should be_nil
+      row['decimal_column'].should be_nil
+      row['double_column'].should be_nil
+      row['float_column'].should be_nil
+      row['int_column'].should be_nil
+      row['text_column'].should be_nil
+      row['timestamp_column'].should be_nil
+      row['uuid_column'].should be_nil
+      row['varchar_column'].should be_nil
+      row['varint_column'].should be_nil
+      row['timeuuid_column'].should be_nil
+      row['inet_column'].should be_nil
+      row['list_column'].should be_nil
+      row['map_column'].should be_nil
+      row['set_column'].should be_nil
+    end
+  end
+end

data/spec/integration/uuid_spec.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+
+describe 'Loading and storing UUIDs' do
+  let :connection_options do
+    {:host => ENV['CASSANDRA_HOST'], :credentials => {:username => 'cassandra', :password => 'cassandra'}}
+  end
+
+  let :client do
+    Cql::Client.connect(connection_options)
+  end
+
+  let :keyspace_name do
+    "cql_rb_#{rand(1000)}"
+  end
+
+  before do
+    client.connect
+    client.execute(%<CREATE KEYSPACE #{keyspace_name} WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1}>)
+    client.use(keyspace_name)
+  end
+
+  after do
+    client.execute(%<DROP KEYSPACE #{keyspace_name}>)
+    client.close
+  end
+
+  context Cql::Uuid do
+    let :store_statement do
+      client.prepare(%<INSERT INTO ids (id, data) VALUES (?, ?)>)
+    end
+
+    before do
+      client.execute(%<CREATE TABLE ids (id UUID PRIMARY KEY, data TEXT)>)
+    end
+
+    it 'can be used to store data in UUID cells' do
+      store_statement.execute(Cql::Uuid.new('39bc6ab8-d0f5-11e2-b041-adb2253022a3'), 'hello world')
+    end
+
+    it 'will be used when loading data from UUID cells' do
+      store_statement.execute(Cql::Uuid.new('39bc6ab8-d0f5-11e2-b041-adb2253022a3'), 'hello world')
+      client.execute(%<SELECT * FROM ids>).first['id'].should == Cql::Uuid.new('39bc6ab8-d0f5-11e2-b041-adb2253022a3')
+    end
+  end
+
+  context Cql::TimeUuid::Generator do
+    let :store_statement do
+      client.prepare(%<INSERT INTO timeline (id, time, value) VALUES (?, ?, ?)>)
+    end
+
+    let :generator do
+      Cql::TimeUuid::Generator.new
+    end
+
+    before do
+      client.execute(%<CREATE TABLE timeline (id ASCII, time TIMEUUID, value INT, PRIMARY KEY (id, time))>)
+    end
+
+    it 'can be used to generate values for TIMEUUID cells' do
+      store_statement.execute('foo', generator.next, 1)
+      store_statement.execute('foo', generator.next, 2)
+      store_statement.execute('foo', generator.next, 3)
+      result = client.execute(%<SELECT * FROM timeline WHERE id = 'foo'>)
+      result.map { |row| row['value'] }.should == [1, 2, 3]
+    end
+
+    it 'will be used when loading data from TIMEUUID cells' do
+      store_statement.execute('foo', generator.next, 1)
+      result = client.execute(%<SELECT * FROM timeline WHERE id = 'foo'>)
+      result.first['time'].should be_a(Cql::TimeUuid)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,26 +1,29 @@
 # encoding: utf-8
 
-require 'bundler/setup'
-require 'simplecov'; SimpleCov.start
-require 'cql'
-
 ENV['CASSANDRA_HOST'] ||= '127.0.0.1'
 
 require 'bundler/setup'
 
+require 'support/bytes_helper'
+require 'support/await_helper'
+require 'support/fake_server'
+require 'support/fake_io_reactor'
+
 unless ENV['COVERAGE'] == 'no'
+  require 'coveralls'
   require 'simplecov'
+
+  if ENV.include?('TRAVIS')
+    Coveralls.wear!
+    SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+  end
+
   SimpleCov.start do
     add_group 'Source', 'lib'
     add_group 'Unit tests', 'spec/cql'
     add_group 'Integration tests', 'spec/integration'
-    add_group 'Test support', 'spec/support'
   end
 end
 
 require 'cql'
 
-require 'support/bytes_helper'
-require 'support/await_helper'
-require 'support/fake_server'
-require 'support/fake_io_reactor'

data/spec/support/fake_io_reactor.rb

@@ -8,48 +8,79 @@ class FakeIoReactor
     @connections = []
     @queued_responses = Hash.new { |h, k| h[k] = [] }
     @default_host = nil
+    @connection_listeners = []
+    @started_future = Cql::Future.new
+    @startup_delay = 0
   end
 
-  def queue_response(response, host=nil)
-    @queued_responses[host] << response
+  def startup_delay=(n)
+    @startup_delay = n
+  end
+
+  def connect(host, port, timeout)
+    connection = FakeConnection.new(host, port, timeout)
+    @connections << connection
+    @connection_listeners.each do |listener|
+      listener.call(connection)
+    end
+    Cql::Future.completed(connection)
+  end
+
+  def on_connection(&listener)
+    @connection_listeners << listener
   end
 
   def start
     @running = true
-    @connections = []
-    @connections.each do |connection|
-      connection[:future].complete! unless connection[:future].complete?
+    Thread.start do
+      sleep(@startup_delay)
+      @started_future.complete!(self)
     end
-    Cql::Future.completed
+    @started_future
   end
 
   def stop
     @running = false
+    @connections.each(&:close)
     Cql::Future.completed
   end
 
   def running?
     @running
   end
+end
 
-  def add_connection(host, port)
-    @default_host ||= host
-    future = Cql::Future.new
-    connection = {:host => host, :port => port, :future => future, :requests => []}
-    @connections << connection
-    future.complete!(connection.object_id) if @running
-    future
+class FakeConnection
+  attr_reader :host, :port, :timeout, :requests, :keyspace
+
+  def initialize(host, port, timeout)
+    @host = host
+    @port = port
+    @timeout = timeout
+    @requests = []
+    @responses = []
+    @closed = false
+    @keyspace = nil
+  end
+
+  def close
+    @closed = true
+  end
+
+  def queue_response(response)
+    @responses << response
   end
 
-  def queue_request(request, connection_id=nil)
-    if connection_id
-      connection = @connections.find { |c| c.object_id == connection_id }
+  def send_request(request)
+    if @closed
+      Cql::Future.failed(Cql::NotConnectedError.new)
     else
-      connection = @connections.sample
+      @requests << request
+      response = @responses.shift
+      if response.is_a?(Cql::Protocol::SetKeyspaceResultResponse)
+        @keyspace = response.keyspace
+      end
+      Cql::Future.completed(response)
     end
-    connection[:requests] << request
-    response = @queued_responses[connection[:host]].shift || @queued_responses[nil].shift
-    @last_used_connection = connection
-    Cql::Future.completed([response, connection.object_id])
   end
 end

data/spec/support/fake_server.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
 class FakeServer
-  attr_reader :connects, :disconnects
+  attr_reader :port, :connects, :disconnects
 
-  def initialize(port)
+  def initialize(port=(2**15 + rand(2**15)))
     @port = port
     @state = {}
     @lock = Mutex.new

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0.pre0
+  prerelease: 6
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -22,14 +23,16 @@ files:
 - lib/cql/client/asynchronous_prepared_statement.rb
 - lib/cql/client/column_metadata.rb
 - lib/cql/client/query_result.rb
+- lib/cql/client/request_runner.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/connection.rb
 - lib/cql/io/io_reactor.rb
-- lib/cql/io/node_connection.rb
 - lib/cql/io.rb
+- lib/cql/protocol/cql_protocol_handler.rb
 - lib/cql/protocol/decoding.rb
 - lib/cql/protocol/encoding.rb
 - lib/cql/protocol/request.rb
@@ -59,6 +62,7 @@ files:
 - lib/cql/protocol/responses/void_result_response.rb
 - lib/cql/protocol/type_converter.rb
 - lib/cql/protocol.rb
+- lib/cql/time_uuid.rb
 - lib/cql/uuid.rb
 - lib/cql/version.rb
 - lib/cql.rb
@@ -66,11 +70,16 @@ files:
 - README.md
 - 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
 - spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/future_spec.rb
+- spec/cql/io/connection_spec.rb
 - spec/cql/io/io_reactor_spec.rb
+- spec/cql/protocol/cql_protocol_handler_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
 - spec/cql/protocol/request_spec.rb
@@ -82,10 +91,14 @@ files:
 - 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/protocol/type_converter_spec.rb
+- spec/cql/protocol/responses/schema_change_result_response_spec.rb
+- spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
+- spec/integration/io_spec.rb
 - spec/integration/protocol_spec.rb
+- spec/integration/regression_spec.rb
+- spec/integration/uuid_spec.rb
 - spec/spec_helper.rb
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb
@@ -94,35 +107,41 @@ files:
 homepage: http://github.com/iconara/cql-rb
 licenses:
 - Apache
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Cassandra CQL3 driver
 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
 - spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/future_spec.rb
+- spec/cql/io/connection_spec.rb
 - spec/cql/io/io_reactor_spec.rb
+- spec/cql/protocol/cql_protocol_handler_spec.rb
 - spec/cql/protocol/decoding_spec.rb
 - spec/cql/protocol/encoding_spec.rb
 - spec/cql/protocol/request_spec.rb
@@ -134,10 +153,14 @@ test_files:
 - 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/protocol/type_converter_spec.rb
+- spec/cql/protocol/responses/schema_change_result_response_spec.rb
+- spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
+- spec/integration/io_spec.rb
 - spec/integration/protocol_spec.rb
+- spec/integration/regression_spec.rb
+- spec/integration/uuid_spec.rb
 - spec/spec_helper.rb
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb