cassanity 0.4.0 → 0.5.0

data/spec/support/cassanity_helpers.rb

@@ -1,35 +1,39 @@
 module CassanityHelpers
-  def client_keyspace?(client, name)
-    client.keyspaces.map(&:name).include?(name.to_s)
+  def driver_keyspace?(driver, name)
+    driver.keyspaces.map(&:name).include?(name.to_s)
   end
 
-  def client_create_keyspace(client, name)
-    unless client_keyspace?(client, name)
-      client.execute("CREATE KEYSPACE #{name} WITH strategy_class = 'SimpleStrategy' AND strategy_options:replication_factor = 1")
+  def driver_create_keyspace(driver, name)
+    unless driver_keyspace?(driver, name)
+      driver.execute("CREATE KEYSPACE #{name} WITH strategy_class = 'SimpleStrategy' AND strategy_options:replication_factor = 1")
     end
-    client.execute("USE #{name}")
+    driver.execute("USE #{name}")
   end
 
-  def client_drop_keyspace(client, name)
-    if client_keyspace?(client, name)
-      client.execute("DROP KEYSPACE #{name}")
+  def driver_drop_keyspace(driver, name)
+    if driver_keyspace?(driver, name)
+      driver.execute("DROP KEYSPACE #{name}")
     end
   end
 
-  def client_column_family?(client, name)
-    client.schema.column_family_names.include?(name.to_s)
+  def driver_column_family?(driver, name)
+    driver.schema.column_family_names.include?(name.to_s)
   end
 
-  def client_create_column_family(client, name, columns = nil)
+  def driver_create_column_family(driver, name, columns = nil)
     columns ||= "id text PRIMARY KEY, name text"
-    unless client_column_family?(client, name)
-      client.execute("CREATE COLUMNFAMILY #{name} (#{columns})")
+    unless driver_column_family?(driver, name)
+      driver.execute("CREATE COLUMNFAMILY #{name} (#{columns})")
     end
   end
 
-  def client_drop_column_family(client, name)
-    if client_column_family?(client, name)
-      client.execute("DROP COLUMNFAMILY #{name}")
+  def driver_drop_column_family(driver, name)
+    if driver_column_family?(driver, name)
+      driver.execute("DROP COLUMNFAMILY #{name}")
     end
   end
+
+  def cassandra_error(err)
+    CassandraCQL::Error::InvalidRequestException.new(err)
+  end
 end

data/spec/support/fake_udp_socket.rb

@@ -0,0 +1,27 @@
+class FakeUDPSocket
+  attr_reader :buffer
+
+  def initialize
+    @buffer = []
+  end
+
+  def send(message, *rest)
+    @buffer.push [message]
+  end
+
+  def recv
+    @buffer.shift
+  end
+
+  def clear
+    @buffer = []
+  end
+
+  def to_s
+    inspect
+  end
+
+  def inspect
+    "<FakeUDPSocket: #{@buffer.inspect}>"
+  end
+end

data/spec/unit/cassanity/argument_generators/batch_spec.rb

@@ -4,7 +4,7 @@ require 'cassanity/argument_generators/batch'
 describe Cassanity::ArgumentGenerators::Batch do
   describe "#call" do
     it "returns array of arguments" do
-      cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE users SET name = ? WHERE id = ? DELETE FROM users WHERE id = ? APPLY BATCH"
+      cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE users SET name = ? WHERE \"id\" = ? DELETE FROM users WHERE \"id\" = ? APPLY BATCH"
       subject.call({
         modifications: [
           [:insert, column_family_name: :users, data: {id: '1'}],
@@ -16,7 +16,7 @@ describe Cassanity::ArgumentGenerators::Batch do
 
     context "with :column_family_name" do
       it "merges column_family_name with each set of modifications" do
-        cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE users SET name = ? WHERE id = ? APPLY BATCH"
+        cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE users SET name = ? WHERE \"id\" = ? APPLY BATCH"
         subject.call({
           column_family_name: :users,
           modifications: [
@@ -27,7 +27,7 @@ describe Cassanity::ArgumentGenerators::Batch do
       end
 
       it "does not override command argument name" do
-        cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE other_column_family SET name = ? WHERE id = ? APPLY BATCH"
+        cql = "BEGIN BATCH INSERT INTO users (id) VALUES (?) UPDATE other_column_family SET name = ? WHERE \"id\" = ? APPLY BATCH"
         subject.call({
           column_family_name: :users,
           modifications: [
@@ -40,7 +40,7 @@ describe Cassanity::ArgumentGenerators::Batch do
 
     context "with :keyspace_name" do
       it "merges column_family_name with each set of modifications" do
-        cql = "BEGIN BATCH INSERT INTO analytics.users (id) VALUES (?) UPDATE analytics.users SET name = ? WHERE id = ? APPLY BATCH"
+        cql = "BEGIN BATCH INSERT INTO analytics.users (id) VALUES (?) UPDATE analytics.users SET name = ? WHERE \"id\" = ? APPLY BATCH"
         subject.call({
           keyspace_name: :analytics,
           modifications: [
@@ -51,7 +51,7 @@ describe Cassanity::ArgumentGenerators::Batch do
       end
 
       it "does not override command argument keyspace_name" do
-        cql = "BEGIN BATCH INSERT INTO other_keyspace_name.users (id) VALUES (?) UPDATE analytics.users SET name = ? WHERE id = ? APPLY BATCH"
+        cql = "BEGIN BATCH INSERT INTO other_keyspace_name.users (id) VALUES (?) UPDATE analytics.users SET name = ? WHERE \"id\" = ? APPLY BATCH"
         subject.call({
           keyspace_name: :analytics,
           modifications: [

data/spec/unit/cassanity/argument_generators/column_family_delete_spec.rb

@@ -6,7 +6,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
 
   describe "#call" do
     it "returns array of arguments" do
-      cql = "DELETE FROM #{column_family_name} WHERE id = ?"
+      cql = "DELETE FROM #{column_family_name} WHERE \"id\" = ?"
       expected = [cql, '1']
       subject.call({
         column_family_name: column_family_name,
@@ -18,7 +18,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
 
     context "with :keyspace_name" do
       it "returns array of arguments" do
-        cql = "DELETE FROM foo.#{column_family_name} WHERE id = ?"
+        cql = "DELETE FROM foo.#{column_family_name} WHERE \"id\" = ?"
         expected = [cql, '1']
         subject.call({
           keyspace_name: :foo,
@@ -30,9 +30,23 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
       end
     end
 
+    context "with single column" do
+      it "returns array of arguments only deleting specific column" do
+        cql = "DELETE foo FROM #{column_family_name} WHERE \"id\" = ?"
+        expected = [cql, '1']
+        subject.call({
+          column_family_name: column_family_name,
+          columns: :foo,
+          where: {
+            id: '1',
+          }
+        }).should eq(expected)
+      end
+    end
+
     context "with specific columns" do
       it "returns array of arguments only deleting specific columns" do
-        cql = "DELETE foo, bar FROM #{column_family_name} WHERE id = ?"
+        cql = "DELETE foo, bar FROM #{column_family_name} WHERE \"id\" = ?"
         expected = [cql, '1']
         subject.call({
           column_family_name: column_family_name,
@@ -48,13 +62,13 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
       subject {
         described_class.new({
           where_clause: lambda { |args|
-            [" WHERE id = ?", args.fetch(:where).fetch(:id)]
+            [" WHERE \"id\" = ?", args.fetch(:where).fetch(:id)]
           }
         })
       }
 
       it "uses where clause to get additional cql and bound variables" do
-        cql = "DELETE FROM #{column_family_name} WHERE id = ?"
+        cql = "DELETE FROM #{column_family_name} WHERE \"id\" = ?"
         expected = [cql, '4']
         subject.call({
           column_family_name: column_family_name,
@@ -75,7 +89,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
       }
 
       it "uses using clause to get additional cql and bound variables" do
-        cql = "DELETE FROM #{column_family_name} USING TTL = 500 WHERE id = ?"
+        cql = "DELETE FROM #{column_family_name} USING TTL = 500 WHERE \"id\" = ?"
         expected = [cql, '4']
         subject.call({
           column_family_name: column_family_name,

data/spec/unit/cassanity/argument_generators/column_family_update_spec.rb

@@ -6,7 +6,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
 
   describe "#call" do
     it "returns array of arguments" do
-      cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
+      cql = "UPDATE #{column_family_name} SET name = ? WHERE \"id\" = ?"
       expected = [cql, 'New Name', '1']
       subject.call({
         column_family_name: column_family_name,
@@ -21,7 +21,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
 
     context "with :keyspace_name" do
       it "returns array of arguments" do
-        cql = "UPDATE foo.#{column_family_name} SET name = ? WHERE id = ?"
+        cql = "UPDATE foo.#{column_family_name} SET name = ? WHERE \"id\" = ?"
         expected = [cql, 'New Name', '1']
         subject.call({
           keyspace_name: :foo,
@@ -40,13 +40,13 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
       subject {
         described_class.new({
           where_clause: lambda { |args|
-            [" WHERE id = ?", args.fetch(:where).fetch(:id)]
+            [" WHERE \"id\" = ?", args.fetch(:where).fetch(:id)]
           }
         })
       }
 
       it "uses where clause to get additional cql and bound variables" do
-        cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
+        cql = "UPDATE #{column_family_name} SET name = ? WHERE \"id\" = ?"
         expected = [cql, 'New Name', '4']
         subject.call({
           column_family_name: column_family_name,
@@ -70,7 +70,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
       }
 
       it "uses set clause to get additional cql and bound variables" do
-        cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
+        cql = "UPDATE #{column_family_name} SET name = ? WHERE \"id\" = ?"
         expected = [cql, 'New Name', '4']
         subject.call({
           column_family_name: column_family_name,
@@ -87,7 +87,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
     context "with :using key" do
       it "returns array of arguments with cql including using" do
         millis = (Time.mktime(2012, 11, 1, 14, 9, 9).to_f * 1000).to_i
-        cql = "UPDATE #{column_family_name} USING TTL 86400 AND TIMESTAMP #{millis} AND CONSISTENCY quorum SET name = ? WHERE id = ?"
+        cql = "UPDATE #{column_family_name} USING TTL 86400 AND TIMESTAMP #{millis} AND CONSISTENCY quorum SET name = ? WHERE \"id\" = ?"
         expected = [cql, 'New Name', '1']
         subject.call({
           column_family_name: column_family_name,

data/spec/unit/cassanity/argument_generators/columns_spec.rb

@@ -0,0 +1,45 @@
+require 'helper'
+require 'cassanity/argument_generators/columns'
+
+describe Cassanity::ArgumentGenerators::Columns do
+  describe "#call" do
+    context "with no args" do
+      it "returns array of arguments for selecting all columns" do
+        cql = 'SELECT * FROM system.schema_columns'
+        expected = [cql]
+        subject.call.should eq(expected)
+      end
+    end
+
+    context "with keyspace" do
+      it "returns array of arguments for selecting all columns for keyspace" do
+        cql = 'SELECT * FROM system.schema_columns WHERE "keyspace" = ?'
+        expected = [cql, 'foo']
+        subject.call({
+          keyspace_name: 'foo',
+        }).should eq(expected)
+      end
+    end
+
+    context "with column family" do
+      it "returns array of arguments for selecting all columns for column family" do
+        cql = 'SELECT * FROM system.schema_columns WHERE "columnfamily" = ?'
+        expected = [cql, 'foo']
+        subject.call({
+          column_family_name: 'foo',
+        }).should eq(expected)
+      end
+    end
+
+    context "with keyspace and column family" do
+      it "returns array of arguments for selecting all columns for a column family in a keyspace" do
+        cql = 'SELECT * FROM system.schema_columns WHERE "keyspace" = ? AND "columnfamily" = ?'
+        expected = [cql, 'foo', 'bar']
+        subject.call({
+          keyspace_name: 'foo',
+          column_family_name: 'bar',
+        }).should eq(expected)
+      end
+    end
+  end
+end

data/spec/unit/cassanity/argument_generators/keyspace_create_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/argument_generators/keyspace_create'
 
 describe Cassanity::ArgumentGenerators::KeyspaceCreate do
-  let(:keyspace_name) { 'analytics' }
+  let(:keyspace_name) { :analytics }
 
   describe "#call" do
     context "only name" do

data/spec/unit/cassanity/argument_generators/keyspace_drop_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/argument_generators/keyspace_drop'
 
 describe Cassanity::ArgumentGenerators::KeyspaceDrop do
-  let(:keyspace_name) { 'analytics' }
+  let(:keyspace_name) { :analytics }
 
   describe "#call" do
     it "returns array of arguments" do

data/spec/unit/cassanity/argument_generators/keyspace_use_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/argument_generators/keyspace_use'
 
 describe Cassanity::ArgumentGenerators::KeyspaceUse do
-  let(:keyspace_name) { 'analytics' }
+  let(:keyspace_name) { :analytics }
 
   describe "#call" do
     it "returns array of arguments" do

data/spec/unit/cassanity/argument_generators/where_clause_spec.rb

@@ -9,7 +9,7 @@ describe Cassanity::ArgumentGenerators::WhereClause do
           id: '1',
         }
       }).should eq([
-        " WHERE id = ?",
+        ' WHERE "id" = ?',
         '1',
       ])
     end
@@ -34,7 +34,7 @@ describe Cassanity::ArgumentGenerators::WhereClause do
             id: '1',
           }
         }).should eq([
-          " WHERE bucket = ? AND id = ?",
+          ' WHERE "bucket" = ? AND "id" = ?',
           '2012',
           '1',
         ])

data/spec/unit/cassanity/client_spec.rb

@@ -2,6 +2,13 @@ require 'helper'
 require 'cassanity/client'
 
 describe Cassanity::Client do
+  let(:driver) { double('Driver') }
+
+  before do
+    # Ensure that we never hit cassandra for real here.
+    CassandraCQL::Database.stub(:new => driver)
+  end
+
   describe "#initialize" do
     it "passes arguments to cassandra cql database instance" do
       CassandraCQL::Database.should_receive(:new).
@@ -72,7 +79,7 @@ describe Cassanity::Client do
         and_return(driver)
 
       Cassanity::Executors::CassandraCql.should_receive(:new).
-        with(client: driver, instrumenter: instrumenter).
+        with(hash_including(driver: driver, instrumenter: instrumenter)).
         and_return(executor)
 
       described_class.new('localhost:1234', instrumenter: instrumenter)
@@ -80,7 +87,7 @@ describe Cassanity::Client do
 
     it "sets cassandra cql database instance as driver" do
       client = described_class.new
-      client.driver.should be_instance_of(CassandraCQL::Database)
+      client.driver.should be_instance_of(driver.class)
     end
 
     it "builds driver, executor and connection" do
@@ -91,7 +98,7 @@ describe Cassanity::Client do
       CassandraCQL::Database.should_receive(:new).and_return(driver)
 
       Cassanity::Executors::CassandraCql.should_receive(:new).
-        with(hash_including(client: driver)).
+        with(hash_including(driver: driver)).
         and_return(executor)
 
       Cassanity::Connection.should_receive(:new).

data/spec/unit/cassanity/column_family_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/column_family'
 
 describe Cassanity::ColumnFamily do
-  let(:column_family_name) { 'analytics' }
+  let(:column_family_name) { :analytics }
   let(:keyspace_name) { 'foo' }
 
   let(:keyspace) {
@@ -81,6 +81,15 @@ describe Cassanity::ColumnFamily do
     end
   end
 
+  context "with string name" do
+    it "converts name to symbol" do
+      column_family = described_class.new(required_arguments.merge({
+        name: 'foo',
+      }))
+      column_family.name.should be(:foo)
+    end
+  end
+
   describe "#schema" do
     it "returns schema if set" do
       described_class.new(required_arguments.merge({
@@ -100,8 +109,12 @@ describe Cassanity::ColumnFamily do
       executor.should_receive(:call).with({
         command: :column_families,
         arguments: {keyspace_name: keyspace.name},
+        transformer_arguments: {keyspace: keyspace},
       }).and_return([
-        {'columnfamily' => column_family_name},
+        Cassanity::ColumnFamily.new({
+          name: column_family_name,
+          keyspace: keyspace,
+        })
       ])
 
       subject.send(method_name).should be_true
@@ -111,8 +124,12 @@ describe Cassanity::ColumnFamily do
       executor.should_receive(:call).with({
         command: :column_families,
         arguments: {keyspace_name: keyspace.name},
+        transformer_arguments: {keyspace: keyspace},
       }).and_return([
-        {'columnfamily' => 'boo'},
+        Cassanity::ColumnFamily.new({
+          name: 'boo',
+          keyspace: keyspace,
+        })
       ])
 
       subject.send(method_name).should be_false

data/spec/unit/cassanity/column_spec.rb

@@ -0,0 +1,76 @@
+require 'helper'
+require 'cassanity/column_family'
+
+describe Cassanity::Column do
+  let(:name) { :age }
+  let(:type) { :int }
+  let(:column_family) { double('Column Family') }
+
+  let(:required_arguments) {
+    {
+      name: name,
+      type: type,
+      column_family: column_family,
+    }
+  }
+
+  subject { described_class.new(required_arguments) }
+
+  it { should respond_to(:name) }
+  it { should respond_to(:type) }
+  it { should respond_to(:column_family) }
+
+  describe "#initialize" do
+    it "sets name" do
+      subject.name.should eq(name)
+    end
+
+    it "sets type" do
+      subject.type.should eq(type)
+    end
+
+    it "sets column_family" do
+      subject.column_family.should eq(column_family)
+    end
+
+    [:name, :type, :column_family].each do |key|
+      it "raises error without :#{key} key" do
+        args = required_arguments.reject { |k, v| k == key }
+        expect { described_class.new(args) }.to raise_error(KeyError)
+      end
+    end
+  end
+
+  context "initializing with string name" do
+    it "sets name to symbol" do
+      instance = described_class.new(required_arguments.merge(name: 'foo'))
+      instance.name.should be(:foo)
+    end
+  end
+
+  context "initializing with long cassandra type" do
+    described_class::Types.each do |long, short|
+      it "converts #{long} to #{short}" do
+        instance = described_class.new(required_arguments.merge(type: long))
+        instance.type.should eq(short)
+      end
+    end
+  end
+
+  context "initializing with some unknown long type" do
+    it "sets does not change type" do
+      instance = described_class.new(required_arguments.merge(type: 'foo.bar.String'))
+      instance.type.should eq('foo.bar.String')
+    end
+  end
+
+  describe "#inspect" do
+    it "return representation" do
+      result = subject.inspect
+      result.should match(/#{described_class}/)
+      result.should match(/name=/)
+      result.should match(/type=/)
+      result.should match(/column_family=/)
+    end
+  end
+end