cassanity 0.3.0 → 0.4.0

data/spec/unit/cassanity/column_family_spec.rb

@@ -50,6 +50,21 @@ describe Cassanity::ColumnFamily do
       instance.schema.should eq(schema)
     end
 
+    it "wraps schema if schema is hash" do
+      schema = {
+        primary_key: :id,
+        columns: {
+          id: :text,
+          name: :text,
+        }
+      }
+
+      instance = described_class.new(required_arguments.merge({
+        schema: schema,
+      }))
+      instance.schema.should eq(Cassanity::Schema.new(schema))
+    end
+
     it "allows overriding executor" do
       other_executor = lambda { |args| }
       column_family = described_class.new(required_arguments.merge({
@@ -125,7 +140,7 @@ describe Cassanity::ColumnFamily do
         executor.should_receive(:call).with({
           command: :column_family_create,
           arguments: args.merge({
-            name: column_family_name,
+            column_family_name: column_family_name,
             keyspace_name: keyspace_name,
             schema: schema,
           }),
@@ -139,7 +154,7 @@ describe Cassanity::ColumnFamily do
         executor.should_receive(:call).with({
           command: :column_family_create,
           arguments: args.merge({
-            name: column_family_name,
+            column_family_name: column_family_name,
             keyspace_name: keyspace_name,
             schema: schema_argument,
           }),
@@ -158,26 +173,28 @@ describe Cassanity::ColumnFamily do
       it "sends passed in schema if present" do
         args = {schema: schema}
         command_arguments = args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
           schema: schema,
         })
+
         executor.should_receive(:call).with({
           command: :column_family_create,
           arguments: command_arguments,
         })
+
         subject.create(args)
       end
     end
   end
 
   describe "#truncate" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :column_family_truncate,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
@@ -186,12 +203,12 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#drop" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :column_family_drop,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
@@ -200,12 +217,12 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#alter" do
-    it "sends command and arguments, including :name and :keyspace_name, to executor" do
+    it "sends command and arguments, including :column_family_name and :keyspace_name, to executor" do
       args = {drop: :name, something: 'else'}
       executor.should_receive(:call).with({
         command: :column_family_alter,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
@@ -214,7 +231,7 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#create_index" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :index_create,
@@ -228,7 +245,7 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#drop_index" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {something: 'else', name: 'users_state_idx'}
       executor.should_receive(:call).with({
         command: :index_drop,
@@ -239,12 +256,12 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#insert" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {data: {id: '1', name: 'GitHub'}}
       executor.should_receive(:call).with({
         command: :column_family_insert,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
@@ -253,12 +270,12 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#update" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {set: {name: 'GitHub'}, where: {id: '1'}}
       executor.should_receive(:call).with({
         command: :column_family_update,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
@@ -267,16 +284,46 @@ describe Cassanity::ColumnFamily do
   end
 
   describe "#delete" do
-    it "sends command and arguments, including :name, to executor" do
+    it "sends command and arguments, including :column_family_name, to executor" do
       args = {where: {id: '1'}}
       executor.should_receive(:call).with({
         command: :column_family_delete,
         arguments: args.merge({
-          name: column_family_name,
+          column_family_name: column_family_name,
           keyspace_name: keyspace_name,
         }),
       })
       subject.delete(args)
     end
   end
+
+  describe "#batch" do
+    it "sends command and arguments, including :column_fmaily_name, to executor" do
+      args = {
+        keyspace_name: keyspace_name,
+        column_family_name: subject.name,
+        modifications: [
+          [:insert, data: {id: '1', name: 'GitHub'}],
+        ],
+      }
+
+      executor.should_receive(:call).with({
+        command: :batch,
+        arguments: args,
+      })
+
+      subject.batch(args)
+    end
+  end
+
+  describe "#inspect" do
+    it "return representation" do
+      result = subject.inspect
+      result.should match(/#{described_class}/)
+      result.should match(/name=/)
+      result.should match(/keyspace=/)
+      result.should match(/executor=/)
+      result.should match(/schema=/)
+    end
+  end
 end

data/spec/unit/cassanity/connection_spec.rb

@@ -125,4 +125,12 @@ describe Cassanity::Connection do
       @return_value.should be_instance_of(Cassanity::Keyspace)
     end
   end
+
+  describe "#inspect" do
+    it "return representation" do
+      result = subject.inspect
+      result.should match(/#{described_class}/)
+      result.should match(/executor=/)
+    end
+  end
 end

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

@@ -1,5 +1,6 @@
 require 'helper'
 require 'cassanity/executors/cassandra_cql'
+require 'cassanity/instrumenters/memory'
 
 describe Cassanity::Executors::CassandraCql do
   let(:client) { double('Client', :execute => nil) }
@@ -44,6 +45,17 @@ describe Cassanity::Executors::CassandraCql do
       subject.result_transformers.should eq(described_class::ResultTransformers)
     end
 
+    it "defaults :instrumenter" do
+      subject.instrumenter.should eq(Cassanity::Instrumenters::Noop)
+    end
+
+    it "defaults instrumenter if nil is passed in" do
+      instance = described_class.new(required_arguments.merge({
+        instrumenter: nil,
+      }))
+      instance.instrumenter.should eq(Cassanity::Instrumenters::Noop)
+    end
+
     it "allows overriding :argument_generators" do
       instance = described_class.new(required_arguments.merge({
         argument_generators: argument_generators
@@ -106,29 +118,17 @@ describe Cassanity::Executors::CassandraCql do
         subject.call(args)
       end
 
-      context "with logger" do
-        let(:logger) {
-          Class.new do
-            attr_reader :logs
-
-            def initialize
-              @logs = []
-            end
-
-            def debug
-              @logs << {debug: yield}
-            end
-          end.new
-        }
+      context "with instrumenter" do
+        let(:instrumenter) { Cassanity::Instrumenters::Memory.new }
 
         subject {
           described_class.new(required_arguments.merge({
             argument_generators: argument_generators,
-            logger: logger,
+            instrumenter: instrumenter,
           }))
         }
 
-        it "logs executed arguments" do
+        it "instruments executed arguments" do
           args = {
             command: :foo,
             arguments: {
@@ -138,9 +138,17 @@ describe Cassanity::Executors::CassandraCql do
 
           subject.call(args)
 
-          logger.logs.should eq([
-            {debug: 'Cassanity::Executors::CassandraCql executing ["mapped", {:something=>"else"}]'},
-          ])
+          event = instrumenter.events.last
+          event.should_not be_nil
+          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,
+          })
         end
       end
 
@@ -214,4 +222,12 @@ describe Cassanity::Executors::CassandraCql do
       end
     end
   end
+
+  describe "#inspect" do
+    it "return representation" do
+      result = subject.inspect
+      result.should match(/#{described_class}/)
+      result.should match(/client=/)
+    end
+  end
 end

data/spec/unit/cassanity/instrumentors/memory_spec.rb

@@ -0,0 +1,26 @@
+require 'helper'
+require 'cassanity/instrumenters/memory'
+
+describe Cassanity::Instrumenters::Memory do
+  describe "#initialize" do
+    it "sets events to empty array" do
+      instrumentor = described_class.new
+      instrumentor.events.should eq([])
+    end
+  end
+
+  describe "#instrument" do
+    it "adds to events" do
+      instrumentor = described_class.new
+      name         = 'user.signup'
+      payload      = {:email => 'john@doe.com'}
+      block_result = :yielded
+
+      result = instrumentor.instrument(name, payload) { block_result }
+      result.should eq(block_result)
+
+      event = described_class::Event.new(name, payload, block_result)
+      instrumentor.events.should eq([event])
+    end
+  end
+end

data/spec/unit/cassanity/instrumentors/noop_spec.rb

@@ -0,0 +1,22 @@
+require 'helper'
+require 'cassanity/instrumenters/noop'
+
+describe Cassanity::Instrumenters::Noop do
+  describe ".instrument" do
+    context "with name" do
+      it "yields block" do
+        yielded = false
+        described_class.instrument(:foo) { yielded = true }
+        yielded.should be_true
+      end
+    end
+
+    context "with name and payload" do
+      it "yields block" do
+        yielded = false
+        described_class.instrument(:foo, {:pay => :load}) { yielded = true }
+        yielded.should be_true
+      end
+    end
+  end
+end

data/spec/unit/cassanity/keyspace_spec.rb

@@ -212,7 +212,7 @@ describe Cassanity::Keyspace do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :keyspace_create,
-        arguments: args.merge(name: keyspace_name),
+        arguments: args.merge(keyspace_name: keyspace_name),
       })
       subject.create(args)
     end
@@ -256,7 +256,7 @@ describe Cassanity::Keyspace do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :keyspace_use,
-        arguments: args.merge(name: keyspace_name),
+        arguments: args.merge(keyspace_name: keyspace_name),
       })
       subject.use(args)
     end
@@ -267,9 +267,31 @@ describe Cassanity::Keyspace do
       args = {something: 'else'}
       executor.should_receive(:call).with({
         command: :keyspace_drop,
-        arguments: args.merge(name: keyspace_name),
+        arguments: args.merge(keyspace_name: keyspace_name),
       })
       subject.drop(args)
     end
   end
+
+  describe "#batch" do
+    it "sends command and arguments, including :keyspace_name, to executor" do
+      args = {
+        keyspace_name: subject.name,
+        modifications: [
+          [:insert, data: {id: '1', name: 'GitHub'}],
+        ]
+      }
+      executor.should_receive(:call).with({
+        command: :batch,
+        arguments: args,
+      })
+      subject.batch(args)
+    end
+  end
+
+  describe "#inspect" do
+    it "return representation" do
+      subject.inspect.should eq("#<Cassanity::Keyspace:#{subject.object_id} name=\"analytics\">")
+    end
+  end
 end

data/spec/unit/cassanity/operator_spec.rb

@@ -2,6 +2,10 @@ require 'helper'
 require 'cassanity/operator'
 
 describe Cassanity::Operator do
+  subject {
+    described_class.new(:<, 5)
+  }
+
   describe "self named helper method" do
     it "returns instance" do
       Cassanity::Operator(:<, 5).should eq(described_class.new(:<, 5))
@@ -55,4 +59,10 @@ describe Cassanity::Operator do
   describe "#==" do
     include_examples "operator equality", :==
   end
+
+  describe "#inspect" do
+    it "return representation" do
+      subject.inspect.should eq("#<Cassanity::Operator:#{subject.object_id} symbol=:<, value=5>")
+    end
+  end
 end

data/spec/unit/cassanity/schema_spec.rb

@@ -115,4 +115,10 @@ describe Cassanity::Schema do
       end
     end
   end
+
+  describe "#inspect" do
+    it "return representation" do
+      subject.inspect.should eq("#<Cassanity::Schema:#{subject.object_id} primary_keys=[:id], columns={:id=>:text, :name=>:text}, with={}>")
+    end
+  end
 end

data/spec/unit/cassanity_spec.rb

@@ -120,4 +120,10 @@ describe Cassanity do
       Cassanity.decrement.should eq(Cassanity::Decrement.new(1))
     end
   end
+
+  describe ".range" do
+    it "returns increment instance" do
+      Cassanity.range(1, 5).should eq(Cassanity::Range.new(1, 5))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassanity
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
@@ -74,12 +74,16 @@ files:
 - lib/cassanity/argument_generators/using_clause.rb
 - lib/cassanity/argument_generators/where_clause.rb
 - lib/cassanity/argument_generators/with_clause.rb
+- lib/cassanity/client.rb
 - lib/cassanity/column_family.rb
 - lib/cassanity/connection.rb
 - lib/cassanity/decrement.rb
 - lib/cassanity/error.rb
 - lib/cassanity/executors/cassandra_cql.rb
 - lib/cassanity/increment.rb
+- lib/cassanity/instrumentation/log_subscriber.rb
+- lib/cassanity/instrumenters/memory.rb
+- lib/cassanity/instrumenters/noop.rb
 - lib/cassanity/keyspace.rb
 - lib/cassanity/operator.rb
 - lib/cassanity/operators/eq.rb
@@ -87,6 +91,7 @@ files:
 - lib/cassanity/operators/gte.rb
 - lib/cassanity/operators/lt.rb
 - lib/cassanity/operators/lte.rb
+- lib/cassanity/range.rb
 - lib/cassanity/result_transformers/mirror.rb
 - lib/cassanity/result_transformers/result_to_array.rb
 - lib/cassanity/schema.rb
@@ -118,12 +123,15 @@ files:
 - spec/unit/cassanity/argument_generators/using_clause_spec.rb
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb
 - spec/unit/cassanity/argument_generators/with_clause_spec.rb
+- spec/unit/cassanity/client_spec.rb
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/connection_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
 - spec/unit/cassanity/executors/cassandra_cql_spec.rb
 - spec/unit/cassanity/increment_spec.rb
+- spec/unit/cassanity/instrumentors/memory_spec.rb
+- spec/unit/cassanity/instrumentors/noop_spec.rb
 - spec/unit/cassanity/keyspace_spec.rb
 - spec/unit/cassanity/operator_spec.rb
 - spec/unit/cassanity/operators/eq_spec.rb
@@ -149,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3997428165624829659
+      hash: 3992273312347222416
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3997428165624829659
+      hash: 3992273312347222416
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -194,12 +202,15 @@ test_files:
 - spec/unit/cassanity/argument_generators/using_clause_spec.rb
 - spec/unit/cassanity/argument_generators/where_clause_spec.rb
 - spec/unit/cassanity/argument_generators/with_clause_spec.rb
+- spec/unit/cassanity/client_spec.rb
 - spec/unit/cassanity/column_family_spec.rb
 - spec/unit/cassanity/connection_spec.rb
 - spec/unit/cassanity/decrement_spec.rb
 - spec/unit/cassanity/error_spec.rb
 - spec/unit/cassanity/executors/cassandra_cql_spec.rb
 - spec/unit/cassanity/increment_spec.rb
+- spec/unit/cassanity/instrumentors/memory_spec.rb
+- spec/unit/cassanity/instrumentors/noop_spec.rb
 - spec/unit/cassanity/keyspace_spec.rb
 - spec/unit/cassanity/operator_spec.rb
 - spec/unit/cassanity/operators/eq_spec.rb