cassanity 0.4.0 → 0.5.0

data/spec/unit/cassanity/connection_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/connection'
 
 describe Cassanity::Connection do
-  let(:keyspace_name) { 'analytics' }
+  let(:keyspace_name) { :analytics }
   let(:executor) {
     double('Executor', {
       call: nil,

data/spec/unit/cassanity/error_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/error'
 
 describe Cassanity::Error do
-  HorribleBadThing = Class.new(Exception)
+  HorribleBadThing = Class.new(StandardError)
 
   it "can wrap original error" do
     original = HorribleBadThing.new
@@ -14,7 +14,7 @@ describe Cassanity::Error do
     begin
       begin
         raise HorribleBadThing, 'Yep, really bad'
-      rescue Exception => e
+      rescue StandardError => e
         raise described_class
       end
     rescue described_class => e
@@ -28,6 +28,11 @@ describe Cassanity::Error do
     error.message.should eq('Is this thing on?')
   end
 
+  it "works with only a string" do
+    error = described_class.new("Is this thing on?")
+    error.message.should eq('Is this thing on?')
+  end
+
   it "does not require any arguments" do
     error = described_class.new
     error.message.should eq("Something truly horrible went wrong")

data/spec/unit/cassanity/executors/cassandra_cql_spec.rb

@@ -3,46 +3,50 @@ require 'cassanity/executors/cassandra_cql'
 require 'cassanity/instrumenters/memory'
 
 describe Cassanity::Executors::CassandraCql do
-  let(:client) { double('Client', :execute => nil) }
+  let(:driver) { double('Client', :execute => nil) }
 
   let(:required_arguments) {
     {
-      client: client,
+      driver: driver,
     }
   }
 
   let(:argument_generators) {
     {
-      :foo => lambda { |args| ['mapped', args] },
+      :foo => lambda { |*args| ['mapped', *args] },
     }
   }
 
   let(:result_transformers) {
     {
-      :foo => lambda { |args| ['transformed', args] }
+      :foo => lambda { |*args| ['transformed', *args] }
     }
   }
 
   subject { described_class.new(required_arguments) }
 
   describe "#initialize" do
-    [:client].each do |key|
+    [:driver].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
 
-    it "sets client" do
-      subject.client.should eq(client)
+    it "sets driver" do
+      subject.driver.should eq(driver)
+    end
+
+    it "sets a default retry strategy when none is passed" do
+      subject.retry_strategy.should be_an_instance_of(Cassanity::RetryStrategies::RetryNTimes)
     end
 
     it "defaults :argument_generators" do
-      subject.argument_generators.should eq(described_class::ArgumentGenerators)
+      subject.argument_generators.should eq(described_class::DefaultArgumentGenerators)
     end
 
     it "defaults :result_transformers" do
-      subject.result_transformers.should eq(described_class::ResultTransformers)
+      subject.result_transformers.should eq(described_class::DefaultResultTransformers)
     end
 
     it "defaults :instrumenter" do
@@ -90,6 +94,7 @@ describe Cassanity::Executors::CassandraCql do
     :index_create,
     :index_drop,
     :batch,
+    :columns,
   ]
 
   KnownCommands.each do |key|
@@ -106,7 +111,7 @@ describe Cassanity::Executors::CassandraCql do
     }
 
     context "for known command" do
-      it "generates arguments based on command to argument map and passes generated arguments client execute method" do
+      it "generates arguments based on command to argument map and passes generated arguments driver execute method" do
         args = {
           command: :foo,
           arguments: {
@@ -114,7 +119,7 @@ describe Cassanity::Executors::CassandraCql do
           },
         }
 
-        client.should_receive(:execute).with('mapped', args[:arguments])
+        driver.should_receive(:execute).with('mapped', args[:arguments])
         subject.call(args)
       end
 
@@ -143,13 +148,60 @@ describe Cassanity::Executors::CassandraCql do
           event.name.should eq('cql.cassanity')
           event.payload.should eq({
             command: :foo,
-            generator: argument_generators[:foo],
-            arguments: {something: 'else'},
-            execute_arguments: ['mapped', {something: 'else'}],
-            transformer: Cassanity::Executors::CassandraCql::Mirror,
             result: nil,
+            cql: 'mapped',
+            cql_variables: [{something: 'else'}],
+            attempts: 1,
           })
         end
+
+        context "with retries" do
+          let(:retry_strategy) { Cassanity::RetryStrategies::RetryStrategy.new }
+          let(:driver) { double('Driver') }
+
+          subject {
+            described_class.new(required_arguments.merge({
+              driver: driver,
+              argument_generators: argument_generators,
+              instrumenter: instrumenter,
+              retry_strategy: retry_strategy,
+            }))
+          }
+
+          it "adds retry count to the cql.cassanity payload" do
+            retry_strategy.should_receive(:fail).once
+
+            args = {
+              command: :foo,
+              arguments: {
+                something: 'else',
+              },
+            }
+
+            i = 0
+            driver.stub(:execute) {
+              i += 1
+              if i > 1
+                'ok!'
+              else
+                raise cassandra_error('not ok!')
+              end
+            }
+
+            subject.call(args)
+
+            event = instrumenter.events.last
+            event.should_not be_nil
+            event.name.should eq('cql.cassanity')
+            event.payload.should eq({
+              command: :foo,
+              result: 'ok!',
+              cql: 'mapped',
+              cql_variables: [{something: 'else'}],
+              attempts: 2,
+            })
+          end
+        end
       end
 
       context "with result transformer" do
@@ -162,7 +214,7 @@ describe Cassanity::Executors::CassandraCql do
 
         it "returns result transformed" do
           result = double('Result')
-          client.stub(:execute => result)
+          driver.stub(:execute => result)
           tranformer = result_transformers[:foo]
 
           args = {
@@ -172,7 +224,7 @@ describe Cassanity::Executors::CassandraCql do
             },
           }
 
-          subject.call(args).should eq(['transformed', result])
+          subject.call(args).should eq(['transformed', result, nil])
         end
       end
 
@@ -186,7 +238,7 @@ describe Cassanity::Executors::CassandraCql do
 
         it "returns result transformed" do
           result = double('Result')
-          client.stub(:execute => result)
+          driver.stub(:execute => result)
           tranformer = result_transformers[:foo]
 
           args = {
@@ -202,7 +254,8 @@ describe Cassanity::Executors::CassandraCql do
     end
 
     context "for unknown command" do
-      it "generates arguments based on command to argument map and passes generated arguments client execute method" do
+      it "generates arguments based on command to argument map and passes
+            generated arguments driver execute method" do
         expect {
           subject.call({
             command: :surprise,
@@ -211,14 +264,14 @@ describe Cassanity::Executors::CassandraCql do
       end
     end
 
-    context "when client raises exception" do
+    context "when driver raises exception" do
       it "raises Cassanity::Error" do
-        client.should_receive(:execute).and_raise(Exception.new)
+        driver.should_receive(:execute).and_raise(StandardError.new)
         expect {
           subject.call({
             command: :foo,
           })
-        }.to raise_error(Cassanity::Error, /Exception: Exception/)
+        }.to raise_error(Cassanity::Error, /StandardError: StandardError/)
       end
     end
   end
@@ -227,7 +280,7 @@ describe Cassanity::Executors::CassandraCql do
     it "return representation" do
       result = subject.inspect
       result.should match(/#{described_class}/)
-      result.should match(/client=/)
+      result.should match(/driver=/)
     end
   end
 end

data/spec/unit/cassanity/keyspace_spec.rb

@@ -2,7 +2,7 @@ require 'helper'
 require 'cassanity/keyspace'
 
 describe Cassanity::Keyspace do
-  let(:keyspace_name) { 'analytics' }
+  let(:keyspace_name) { :analytics }
 
   let(:executor) {
     lambda { |args| ['GOTTA KEEP EM EXECUTED', args] }
@@ -59,8 +59,17 @@ describe Cassanity::Keyspace do
     end
   end
 
+  context "with string name" do
+    it "converts name to symbol" do
+      instance = described_class.new(required_arguments.merge({
+        name: 'foo',
+      }))
+      instance.name.should be(:foo)
+    end
+  end
+
   describe "#column_family" do
-    let(:column_family_name) { 'apps' }
+    let(:column_family_name) { :apps }
 
     context "with only name" do
       before do
@@ -147,7 +156,7 @@ describe Cassanity::Keyspace do
   end
 
   describe "#table" do
-    let(:column_family_name) { 'apps' }
+    let(:column_family_name) { :apps }
 
     before do
       @return_value = subject.table(column_family_name)
@@ -163,7 +172,7 @@ describe Cassanity::Keyspace do
   end
 
   describe "#[]" do
-    let(:column_family_name) { 'apps' }
+    let(:column_family_name) { :apps }
 
     before do
       @return_value = subject[column_family_name]
@@ -180,21 +189,36 @@ describe Cassanity::Keyspace do
 
   shared_examples_for "keyspace existence" do |method_name|
     it "returns true if name in existing keyspace names" do
-      executor.should_receive(:call).with(command: :keyspaces).and_return([
-        {'name' => keyspace_name.to_s},
+      executor.should_receive(:call).with({
+        command: :keyspaces,
+        transformer_arguments: {
+          executor: executor,
+        },
+      }).and_return([
+        Cassanity::Keyspace.new({name: keyspace_name, executor: executor}),
       ])
       subject.send(method_name).should be_true
     end
 
     it "returns false if name not in existing keyspace names" do
-      executor.should_receive(:call).with(command: :keyspaces).and_return([
-        {'name' => 'batman'},
+      executor.should_receive(:call).with({
+        command: :keyspaces,
+        transformer_arguments: {
+          executor: executor,
+        },
+      }).and_return([
+        Cassanity::Keyspace.new({name: :batman, executor: executor}),
       ])
       subject.send(method_name).should be_false
     end
 
     it "returns false if no keyspaces" do
-      executor.should_receive(:call).with(command: :keyspaces).and_return([])
+      executor.should_receive(:call).with({
+        command: :keyspaces,
+        transformer_arguments: {
+          executor: executor,
+        },
+      }).and_return([])
       subject.send(method_name).should be_false
     end
   end
@@ -221,10 +245,11 @@ describe Cassanity::Keyspace do
   describe "#recreate" do
     context "for existing keyspace" do
       before do
-        subject.stub(:exist? => true)
+        subject.stub(:exists? => true)
       end
+
       it "performs drop" do
-        subject.should_not_receive(:drop)
+        subject.should_receive(:drop)
         subject.recreate
       end
 
@@ -236,7 +261,7 @@ describe Cassanity::Keyspace do
 
     context "for non-existing keyspace" do
       before do
-        subject.stub(:exist? => false)
+        subject.stub(:exists? => false)
       end
 
       it "does not perform drop" do
@@ -291,7 +316,7 @@ describe Cassanity::Keyspace do
 
   describe "#inspect" do
     it "return representation" do
-      subject.inspect.should eq("#<Cassanity::Keyspace:#{subject.object_id} name=\"analytics\">")
+      subject.inspect.should eq("#<Cassanity::Keyspace:#{subject.object_id} name=:analytics>")
     end
   end
 end

data/spec/unit/cassanity/migration_proxy_spec.rb

@@ -0,0 +1,81 @@
+require 'helper'
+require 'cassanity/migration_proxy'
+
+describe Cassanity::MigrationProxy do
+  describe "#initialize" do
+    context "with path that is pathname" do
+      it "sets path" do
+        instance = described_class.new(Pathname('/some/path/1_foo.rb'))
+        instance.path.should eq(Pathname('/some/path/1_foo.rb'))
+      end
+    end
+
+    context "with path that is string" do
+      it "sets path to pathname" do
+        instance = described_class.new('/some/path/1_foo.rb')
+        instance.path.should eq(Pathname('/some/path/1_foo.rb'))
+      end
+    end
+
+    context "with nil path" do
+      it "raises argument error" do
+        expect {
+          described_class.new(nil)
+        }.to raise_error(ArgumentError, 'path cannot be nil')
+      end
+    end
+
+    context "with nil name" do
+      it "raises argument error" do
+        expect {
+          described_class.new('/some/1')
+        }.to raise_error(ArgumentError, 'name cannot be nil')
+      end
+    end
+  end
+
+  describe "#eql?" do
+    it "returns true for same path" do
+      other = described_class.new('/some/path/1_foo.rb')
+      described_class.new('/some/path/1_foo.rb').eql?(other).should be_true
+    end
+
+    it "returns false for different path" do
+      other = described_class.new('/some/path/1_foo.rb')
+      described_class.new('/some/path/2_foo.rb').eql?(other).should be_false
+    end
+
+    it "returns false for different class" do
+      other = Object.new
+      described_class.new('/some/path/1_foo.rb').eql?(other).should be_false
+    end
+  end
+
+  describe "#hash" do
+    it "delegates to path" do
+      path = '/some/path/1_foo.rb'
+      instance = described_class.new(path)
+      instance.hash.should eq(path.hash)
+    end
+  end
+
+  describe "#<=>" do
+    it "returns -1 when version is less than other" do
+      older = described_class.new(Pathname('/some/path/1_a.rb'))
+      newer = described_class.new(Pathname('/some/path/2_a.rb'))
+      (older <=> newer).should be(-1)
+    end
+
+    it "compares against name when version is equal to other" do
+      older = described_class.new(Pathname('/some/path/1_a.rb'))
+      newer = described_class.new(Pathname('/some/path/2_b.rb'))
+      (older <=> newer).should eq(older.name <=> newer.name)
+    end
+
+    it "returns 1 when version is greater than other" do
+      older = described_class.new(Pathname('/some/path/1_a.rb'))
+      newer = described_class.new(Pathname('/some/path/2_a.rb'))
+      (newer <=> older).should be(1)
+    end
+  end
+end