cassanity 0.3.0 → 0.4.0

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

@@ -18,12 +18,12 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyCreate do
     context "when missing required argument key" do
       let(:required_arguments) {
         {
-          name: 'tracks',
+          column_family_name: column_family_name,
           schema: schema,
         }
       }
 
-      [:name, :schema].each do |key|
+      [:column_family_name, :schema].each do |key|
         it "raises error if missing :#{key} key" do
           args = required_arguments.reject { |k, v| k == key }
           expect { subject.call(args) }.to raise_error(KeyError)
@@ -36,7 +36,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyCreate do
         cql = "CREATE COLUMNFAMILY #{column_family_name} (id text, name text, PRIMARY KEY (id))"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           schema: schema,
         }).should eq(expected)
       end
@@ -48,7 +48,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyCreate do
         expected = [cql]
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name,
+          column_family_name: column_family_name,
           schema: schema,
         }).should eq(expected)
       end
@@ -67,7 +67,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyCreate do
         cql = "CREATE COLUMNFAMILY #{column_family_name} (segment text, track_id timeuuid, page text, PRIMARY KEY (segment, track_id))"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           schema: schema,
         }).should eq(expected)
       end
@@ -98,7 +98,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyCreate do
         cql = "CREATE COLUMNFAMILY apps (id text, name text, PRIMARY KEY (id)) WITH comment = ?"
         expected = [cql, 'Testing']
         subject.call({
-          name: :apps,
+          column_family_name: :apps,
           schema: schema,
         }).should eq(expected)
       end

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

@@ -9,7 +9,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
       cql = "DELETE FROM #{column_family_name} WHERE id = ?"
       expected = [cql, '1']
       subject.call({
-        name: column_family_name,
+        column_family_name: column_family_name,
         where: {
           id: '1',
         }
@@ -22,7 +22,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
         expected = [cql, '1']
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name,
+          column_family_name: column_family_name,
           where: {
             id: '1',
           }
@@ -35,7 +35,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
         cql = "DELETE foo, bar FROM #{column_family_name} WHERE id = ?"
         expected = [cql, '1']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           columns: [:foo, :bar],
           where: {
             id: '1',
@@ -57,7 +57,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
         cql = "DELETE FROM #{column_family_name} WHERE id = ?"
         expected = [cql, '4']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           where: {
             id: '4',
           }
@@ -78,7 +78,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDelete do
         cql = "DELETE FROM #{column_family_name} USING TTL = 500 WHERE id = ?"
         expected = [cql, '4']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           using: {
             ttl: 500,
           },

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

@@ -8,7 +8,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDrop do
     it "returns array of arguments" do
       cql = "DROP COLUMNFAMILY #{column_family_name}"
       expected = [cql]
-      subject.call(name: column_family_name).should eq(expected)
+      subject.call(column_family_name: column_family_name).should eq(expected)
     end
 
     context "with :keyspace_name" do
@@ -17,7 +17,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyDrop do
         expected = [cql]
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name
+          column_family_name: column_family_name
         }).should eq(expected)
       end
     end

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

@@ -5,10 +5,10 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyInsert do
   let(:column_family_name) { 'apps' }
 
   describe "#call" do
-    [:name, :data].each do |key|
+    [:column_family_name, :data].each do |key|
       it "raises error if missing :#{key} key" do
         required_arguments = {
-          name: column_family_name,
+          column_family_name: column_family_name,
           data: {
             id: '1',
             name: 'GitHub',
@@ -24,7 +24,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyInsert do
       cql = "INSERT INTO #{column_family_name} (id, name) VALUES (?, ?)"
       expected = [cql, '1', 'GitHub']
       subject.call({
-        name: column_family_name,
+        column_family_name: column_family_name,
         data: {
           id: '1',
           name: 'GitHub',
@@ -38,7 +38,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyInsert do
         expected = [cql, '1', 'GitHub']
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name,
+          column_family_name: column_family_name,
           data: {
             id: '1',
             name: 'GitHub',
@@ -53,7 +53,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyInsert do
         cql = "INSERT INTO #{column_family_name} (id, name) VALUES (?, ?) USING TTL 86400 AND TIMESTAMP #{millis} AND CONSISTENCY quorum"
         expected = [cql, '1', 'GitHub']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           data: {
             id: '1',
             name: 'GitHub',

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

@@ -8,7 +8,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
     it "returns array of arguments" do
       cql = "SELECT * FROM #{column_family_name}"
       expected = [cql]
-      subject.call(name: column_family_name).should eq(expected)
+      subject.call(column_family_name: column_family_name).should eq(expected)
     end
 
     context "with :keyspace_name" do
@@ -17,7 +17,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         expected = [cql]
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name
+          column_family_name: column_family_name
         }).should eq(expected)
       end
     end
@@ -27,7 +27,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT name FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: :name,
         }).should eq(expected)
       end
@@ -38,7 +38,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT id, name, created_at FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: [:id, :name, :created_at],
         }).should eq(expected)
       end
@@ -49,7 +49,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT COUNT(*) FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: 'COUNT(*)',
         }).should eq(expected)
       end
@@ -60,7 +60,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT COUNT(1) FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: 'COUNT(1)',
         }).should eq(expected)
       end
@@ -71,7 +71,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT WRITETIME(name) FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: 'WRITETIME(name)',
         }).should eq(expected)
       end
@@ -82,7 +82,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT TTL(name) FROM #{column_family_name}"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           select: 'TTL(name)',
         }).should eq(expected)
       end
@@ -100,7 +100,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT * FROM #{column_family_name} USING CONSISTENCY BATMAN"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           using: using,
         }).should eq(expected)
       end
@@ -118,7 +118,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT * FROM #{column_family_name} WHERE foo = ?"
         expected = [cql, 'bar']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           where: where,
         }).should eq(expected)
       end
@@ -135,7 +135,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT * FROM #{column_family_name} ORDER BY name"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           order: :name,
         }).should eq(expected)
       end
@@ -152,7 +152,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilySelect do
         cql = "SELECT * FROM #{column_family_name} LIMIT 50"
         expected = [cql]
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           limit: 50,
         }).should eq(expected)
       end

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

@@ -8,7 +8,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyTruncate do
     it "returns array of arguments" do
       cql = "TRUNCATE #{column_family_name}"
       expected = [cql]
-      subject.call(name: column_family_name).should eq(expected)
+      subject.call(column_family_name: column_family_name).should eq(expected)
     end
 
     context "with :keyspace_name" do
@@ -17,7 +17,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyTruncate do
         expected = [cql]
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name
+          column_family_name: column_family_name
         }).should eq(expected)
       end
     end

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

@@ -9,7 +9,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
       cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
       expected = [cql, 'New Name', '1']
       subject.call({
-        name: column_family_name,
+        column_family_name: column_family_name,
         set: {
           name: 'New Name',
         },
@@ -25,7 +25,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
         expected = [cql, 'New Name', '1']
         subject.call({
           keyspace_name: :foo,
-          name: column_family_name,
+          column_family_name: column_family_name,
           set: {
             name: 'New Name',
           },
@@ -49,7 +49,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
         cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
         expected = [cql, 'New Name', '4']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           set: {
             name: 'New Name',
           },
@@ -73,7 +73,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
         cql = "UPDATE #{column_family_name} SET name = ? WHERE id = ?"
         expected = [cql, 'New Name', '4']
         subject.call({
-          name: column_family_name,
+          column_family_name: column_family_name,
           set: {
             name: 'New Name',
           },
@@ -90,7 +90,7 @@ describe Cassanity::ArgumentGenerators::ColumnFamilyUpdate do
         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({
-          name: column_family_name,
+          column_family_name: column_family_name,
           using: {
             ttl: 86400,
             timestamp: millis,

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

@@ -9,7 +9,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceCreate do
       it "returns array of arguments" do
         cql = "CREATE KEYSPACE #{keyspace_name} WITH strategy_class = ? AND strategy_options:replication_factor = ?"
         expected = [cql, 'SimpleStrategy', 1]
-        subject.call(name: keyspace_name).should eq(expected)
+        subject.call(keyspace_name: keyspace_name).should eq(expected)
       end
     end
 
@@ -18,7 +18,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceCreate do
         cql = "CREATE KEYSPACE #{keyspace_name} WITH strategy_class = ? AND strategy_options:replication_factor = ?"
         expected = [cql, 'FooStrategy', 1]
         subject.call({
-          name: keyspace_name,
+          keyspace_name: keyspace_name,
           strategy_class: 'FooStrategy',
         }).should eq(expected)
       end
@@ -29,7 +29,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceCreate do
         cql = "CREATE KEYSPACE #{keyspace_name} WITH strategy_class = ? AND strategy_options:replication_factor = ?"
         expected = [cql, 'SimpleStrategy', 3]
         subject.call({
-          name: keyspace_name,
+          keyspace_name: keyspace_name,
           strategy_options: {
             replication_factor: 3,
           }
@@ -42,7 +42,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceCreate do
         cql = "CREATE KEYSPACE #{keyspace_name} WITH strategy_class = ? AND strategy_options:replication_factor = ? AND strategy_options:batman = ?"
         expected = [cql, 'SimpleStrategy', 1, 'robin']
         subject.call({
-          name: keyspace_name,
+          keyspace_name: keyspace_name,
           strategy_options: {
             batman: 'robin',
           }

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

@@ -8,7 +8,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceDrop do
     it "returns array of arguments" do
       cql = "DROP KEYSPACE #{keyspace_name}"
       expected = [cql]
-      subject.call(name: keyspace_name).should eq(expected)
+      subject.call(keyspace_name: keyspace_name).should eq(expected)
     end
   end
 end

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

@@ -8,7 +8,7 @@ describe Cassanity::ArgumentGenerators::KeyspaceUse do
     it "returns array of arguments" do
       cql = "USE #{keyspace_name}"
       expected = [cql]
-      subject.call(name: keyspace_name).should eq(expected)
+      subject.call(keyspace_name: keyspace_name).should eq(expected)
     end
   end
 end

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

@@ -80,6 +80,32 @@ describe Cassanity::ArgumentGenerators::WhereClause do
       end
     end
 
+    context "with inclusive cassanity range value for a where" do
+      it "returns range comparison including end of range" do
+        subject.call({
+          where: {
+            timestamp: Cassanity::Range.new(1, 3)
+          },
+        }).should eq([
+          " WHERE timestamp >= ? AND timestamp <= ?",
+          1, 3
+        ])
+      end
+    end
+
+    context "with exclusive cassanity range value for a where" do
+      it "returns range comparison including end of range" do
+        subject.call({
+          where: {
+            timestamp: Cassanity::Range.new(1, 3, true)
+          },
+        }).should eq([
+          " WHERE timestamp >= ? AND timestamp < ?",
+          1, 3
+        ])
+      end
+    end
+
     context "with a cassanity operator value" do
       it "returns correct cql" do
         subject.call({

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

@@ -31,6 +31,32 @@ describe Cassanity::ArgumentGenerators::WithClause do
       end
     end
 
+    context "with :compact_storage option" do
+      context "set to true" do
+        it "returns array of arguments converting compact storage" do
+          subject.call({
+            with: {
+              compact_storage: true,
+            }
+          }).should eq([
+            " WITH COMPACT STORAGE",
+          ])
+        end
+      end
+
+      context "set to false" do
+        it "returns array of arguments not including compact storage" do
+          subject.call({
+            with: {
+              compact_storage: false,
+            }
+          }).should eq([
+            " WITH ",
+          ])
+        end
+      end
+    end
+
     context "when using :with option that has sub options" do
       it "returns array of arguments" do
         subject.call({

data/spec/unit/cassanity/client_spec.rb

@@ -0,0 +1,159 @@
+require 'helper'
+require 'cassanity/client'
+
+describe Cassanity::Client do
+  describe "#initialize" do
+    it "passes arguments to cassandra cql database instance" do
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          'localhost:1234',
+          hash_including(some: 'option'),
+          instance_of(Hash)
+        )
+
+      described_class.new('localhost:1234', some: 'option')
+    end
+
+    it "defaults servers if not present" do
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          '127.0.0.1:9160',
+          instance_of(Hash),
+          instance_of(Hash)
+        )
+
+      described_class.new
+    end
+
+    it "defaults servers if nil" do
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          '127.0.0.1:9160',
+          instance_of(Hash),
+          instance_of(Hash)
+        )
+
+      described_class.new(nil)
+    end
+
+    it "defaults cql version in options to 3" do
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          anything,
+          hash_including(cql_version: '3.0.0'),
+          instance_of(Hash)
+        )
+
+      described_class.new
+    end
+
+    it "does not override cql version option if other options are provided" do
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          anything,
+          hash_including(cql_version: '3.0.0', some: 'thing'),
+          instance_of(Hash)
+        )
+
+      described_class.new('localhost:1234', some: 'thing')
+    end
+
+    it "allows passing instrumenter to executor, but does not pass it to driver instance" do
+      instrumenter = double('Instrumenter')
+      driver = double('Driver')
+      executor = double('Executor')
+
+      CassandraCQL::Database.should_receive(:new).
+        with(
+          anything,
+          hash_not_including(instrumenter: instrumenter),
+          instance_of(Hash)
+        ).
+        and_return(driver)
+
+      Cassanity::Executors::CassandraCql.should_receive(:new).
+        with(client: driver, instrumenter: instrumenter).
+        and_return(executor)
+
+      described_class.new('localhost:1234', instrumenter: instrumenter)
+    end
+
+    it "sets cassandra cql database instance as driver" do
+      client = described_class.new
+      client.driver.should be_instance_of(CassandraCQL::Database)
+    end
+
+    it "builds driver, executor and connection" do
+      driver = double('Driver')
+      executor = double('Executor')
+      connection = double('Connection')
+
+      CassandraCQL::Database.should_receive(:new).and_return(driver)
+
+      Cassanity::Executors::CassandraCql.should_receive(:new).
+        with(hash_including(client: driver)).
+        and_return(executor)
+
+      Cassanity::Connection.should_receive(:new).
+        with(executor: executor).
+        and_return(connection)
+
+      client = described_class.new
+
+      client.driver.should be(driver)
+      client.executor.should be(executor)
+      client.connection.should be(connection)
+    end
+  end
+
+  describe "#keyspaces" do
+    it "delegates to connection" do
+      keyspace = double('Keyspace')
+      keyspaces = [keyspace]
+      client = described_class.new
+      client.connection.stub(:keyspaces => keyspaces)
+      client.keyspaces.should be(keyspaces)
+    end
+  end
+
+  describe "#keyspace" do
+    it "delegates to connection" do
+      keyspace = double('Keyspace')
+      client = described_class.new
+      client.connection.stub(:keyspace => keyspace)
+      client.keyspace(:foo).should be(keyspace)
+    end
+  end
+
+  describe "#[]" do
+    it "delegates to connection" do
+      keyspace = double('Keyspace')
+      client = described_class.new
+      client.connection.stub(:[] => keyspace)
+      client[:foo].should be(keyspace)
+    end
+  end
+
+  describe "#batch" do
+    it "delegates to connection" do
+      modifications = [[:insert, :stuff]]
+
+      client = described_class.new
+      client.connection.should_receive(:batch).
+        with(modifications).
+        and_return(:booyeah)
+
+      client.batch(modifications)
+    end
+  end
+
+  describe "#inspect" do
+    it "return representation" do
+      result = subject.inspect
+      result.should match(/#{described_class}/)
+      result.should match(/driver=/)
+      result.should match(/executor=/)
+      result.should match(/connection=/)
+    end
+  end
+end