adapter-cassanity 0.3.0 → 0.4.0

data/README.md

@@ -1,16 +1,14 @@
 # Adapter::Cassanity
 
-Adapter for Cassanity.
+Adapter for Cassanity. Defaults consistency to :quorum.
 
 ## Usage
 
 ```ruby
 require 'adapter/cassanity'
 
-client     = CassandraCQL::Database.new('127.0.0.1:9160')
-executor   = Cassanity::Executors::CassandraCql.new(client: client)
-connection = Cassanity::Connection.new(executor: executor)
-keyspace   = connection.keyspace('adapter_cassanity')
+client     = Cassanity::Client.new('127.0.0.1:9160')
+keyspace   = client.keyspace('adapter_cassanity')
 keyspace.recreate
 
 apps = keyspace.column_family(:apps, {
@@ -30,11 +28,11 @@ adapter = Adapter[:cassanity].new(client)
 adapter.clear
 
 # you can also set options for the adapter
-using = {using: {consistency: :quorum}}
+using = {using: {consistency: :all}}
 adapter = Adapter[:cassanity].new(client, {
-  read: using,   # read using quorum consistency
-  write: using,  # write using quorum consistency
-  delete: using, # delete using quorum consistency
+  read: using,   # read using all consistency
+  write: using,  # write using all consistency
+  delete: using, # delete using all consistency
 })
 
 id = CassandraCQL::UUID.new

data/adapter-cassanity.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'adapter', '~> 0.7.0'
-  gem.add_dependency 'cassanity', '~> 0.2.1'
+  gem.add_dependency 'cassanity', '~> 0.4'
 end

data/examples/adapter_options.rb

@@ -1,7 +1,7 @@
 require_relative 'shared_setup'
 
 client = AppsCF
-using = {using: {consistency: :quorum}}
+using = {using: {consistency: :one}}
 adapter = Adapter[:cassanity].new(client, {
   read: using,
   write: using,

data/examples/method_options.rb

@@ -6,6 +6,6 @@ adapter.clear
 
 id = CassandraCQL::UUID.new
 
-adapter.write(id, {name: 'GitHub'}, using: {consistency: :quorum})
-pp adapter.read(id, using: {consistency: :quorum})
+adapter.write(id, {name: 'GitHub'}, using: {consistency: :one})
+pp adapter.read(id, using: {consistency: :one})
 adapter.delete(id)

data/examples/shared_setup.rb

@@ -8,10 +8,8 @@ $:.unshift(lib_path)
 
 require 'adapter/cassanity'
 
-client     = CassandraCQL::Database.new('127.0.0.1:9160')
-executor   = Cassanity::Executors::CassandraCql.new(client: client)
-connection = Cassanity::Connection.new(executor: executor)
-keyspace   = connection.keyspace('adapter_cassanity')
+client     = Cassanity::Client.new('127.0.0.1:9160')
+keyspace   = client.keyspace(:adapter_cassanity)
 keyspace.recreate
 
 AppsCF = keyspace.column_family(:apps, {

data/lib/adapter/cassanity.rb

@@ -11,7 +11,7 @@ module Adapter
     # Public
     def read(key, options = nil)
       operation_options = {where: where(key)}
-      adapter_options = @options[:read]
+      adapter_options = with_default_consistency(@options[:read])
       arguments = update_arguments(operation_options, adapter_options, options)
 
       rows = @client.select(arguments)
@@ -21,7 +21,7 @@ module Adapter
     # Public
     def write(key, attributes, options = nil)
       operation_options = {set: attributes, where: where(key)}
-      adapter_options = @options[:write]
+      adapter_options = with_default_consistency(@options[:write])
       arguments = update_arguments(operation_options, adapter_options, options)
 
       @client.update(arguments)
@@ -30,7 +30,7 @@ module Adapter
     # Public
     def delete(key, options = nil)
       operation_options = {where: where(key)}
-      adapter_options = @options[:delete]
+      adapter_options = with_default_consistency(@options[:delete])
       arguments = update_arguments(operation_options, adapter_options, options)
 
       @client.delete(arguments)
@@ -67,6 +67,14 @@ module Adapter
 
       operation_options
     end
+
+    # Private
+    def with_default_consistency(options)
+      options ||= {}
+      options[:using] ||= {}
+      options[:using][:consistency] ||= :quorum
+      options
+    end
   end
 end
 

data/lib/adapter/cassanity/version.rb

@@ -1,5 +1,5 @@
 module Adapter
   module Cassanity
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/spec/cassanity_spec.rb

@@ -16,17 +16,60 @@ describe "Cassanity adapter" do
     it_behaves_like 'an adapter'
   end
 
+  context "default read consistency" do
+    it "is :quorum" do
+      client = COLUMN_FAMILIES[:single]
+      adapter = Adapter[adapter_name].new(client)
+
+      client.should_receive(:select).with({
+        where: {:some_key => 'foo'},
+        using: {consistency: :quorum},
+      }).and_return([])
+
+      adapter.read('foo')
+    end
+  end
+
+  context "default write consistency" do
+    it "is :quorum" do
+      client = COLUMN_FAMILIES[:single]
+      adapter = Adapter[adapter_name].new(client)
+
+      client.should_receive(:update).with({
+        set: {'name' => 'New Name'},
+        where: {:some_key => 'foo'},
+        using: {consistency: :quorum},
+      })
+
+      adapter.write('foo', {'name' => 'New Name'})
+    end
+  end
+
+  context "default delete consistency" do
+    it "is :quorum" do
+      client = COLUMN_FAMILIES[:single]
+      adapter = Adapter[adapter_name].new(client)
+
+      client.should_receive(:delete).with({
+        where: {:some_key => 'foo'},
+        using: {consistency: :quorum},
+      })
+
+      adapter.delete('foo')
+    end
+  end
+
   context "with adapter read options" do
     it "uses read options for read method" do
       client = COLUMN_FAMILIES[:single]
       options = {read: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }).and_return([])
 
       adapter.read('foo')
@@ -36,13 +79,13 @@ describe "Cassanity adapter" do
       client = COLUMN_FAMILIES[:single]
       options = {read: {
         where: {:some_key => 'bar'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }).and_return([])
 
       adapter.read('foo')
@@ -51,7 +94,7 @@ describe "Cassanity adapter" do
     it "can be overriden by read method options" do
       client = COLUMN_FAMILIES[:single]
       options = {read: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
@@ -68,14 +111,14 @@ describe "Cassanity adapter" do
     it "uses write options for write method" do
       client = COLUMN_FAMILIES[:single]
       options = {write: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       })
 
       adapter.write('foo', {'name' => 'New Name'})
@@ -86,14 +129,14 @@ describe "Cassanity adapter" do
       options = {write: {
         where: {:some_key => 'should not use this'},
         set: {'name' => 'should not use this'},
-        using: {consistency: :quorum,
+        using: {consistency: :one,
       }}}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       })
 
       adapter.write('foo', {'name' => 'New Name'})
@@ -102,7 +145,7 @@ describe "Cassanity adapter" do
     it "can be overriden by write method options" do
       client = COLUMN_FAMILIES[:single]
       options = {write: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
@@ -120,13 +163,13 @@ describe "Cassanity adapter" do
     it "uses delete options for delete method" do
       client = COLUMN_FAMILIES[:single]
       options = {delete: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       })
 
       adapter.delete('foo')
@@ -136,13 +179,13 @@ describe "Cassanity adapter" do
       client = COLUMN_FAMILIES[:single]
       options = {delete: {
         where: {:some_key => 'bar'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       })
 
       adapter.delete('foo')
@@ -151,7 +194,7 @@ describe "Cassanity adapter" do
     it "can be overriden by delete method options" do
       client = COLUMN_FAMILIES[:single]
       options = {delete: {
-        using: {consistency: :quorum},
+        using: {consistency: :one},
       }}
       adapter = Adapter[adapter_name].new(client, options)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapter-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-11-16 00:00:00.000000000 Z
+date: 2013-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.4'
 description: Adapter for Cassanity
 email:
 - nunemaker@gmail.com
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -116999635616245635
+      hash: -1292988058434292696
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -116999635616245635
+      hash: -1292988058434292696
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23