adapter-cassanity 0.5.0 → 0.6.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1761583821e237acab173505a0b8a8571ace2eba
+  data.tar.gz: d1ef6ff6e5de5259dd88681ff1ab242910d2252e
+SHA512:
+  metadata.gz: a8546307ae7a8190cc91609d87159e22ee78d7120a367c758526dbc033b2b32ab41c709c8983c4e94c21792b6d707cb8234784a5c31e799d1e27e0348440d2f0
+  data.tar.gz: ac61ef85fd2d3b1e20315922142559847b64ee77b5b5a97d3b99f4f2fe10fa4bf97ff0e2a1854665b3bb7abc29113d9798f7cf47d11a3975b558709c5b3f3abd

data/README.md

@@ -1,4 +1,4 @@
-# Adapter::Cassanity
+# Adapter::Cassanity [![Build Status](https://secure.travis-ci.org/jnunemaker/adapter-cassanity.png?branch=master)](http://travis-ci.org/jnunemaker/adapter-cassanity)
 
 Adapter for Cassanity. Defaults consistency to :quorum.
 
@@ -7,7 +7,7 @@ Adapter for Cassanity. Defaults consistency to :quorum.
 ```ruby
 require 'adapter/cassanity'
 
-client     = Cassanity::Client.new('127.0.0.1:9160')
+client     = Cassanity::Client.new(['127.0.0.1'], 9160)
 keyspace   = client.keyspace('adapter_cassanity')
 keyspace.recreate
 
@@ -27,15 +27,7 @@ client = apps
 adapter = Adapter[:cassanity].new(client)
 adapter.clear
 
-# you can also set options for the adapter
-using = {using: {consistency: :all}}
-adapter = Adapter[:cassanity].new(client, {
-  read: using,   # read using all consistency
-  write: using,  # write using all consistency
-  delete: using, # delete using all consistency
-})
-
-id = CassandraCQL::UUID.new
+id = Cql::TimeUuid::Generator.new.next
 
 adapter.read(id) # => nil
 
@@ -50,10 +42,6 @@ adapter.read(id) # => {'id' => ..., 'name' => 'GitHub'}
 
 adapter.clear
 adapter.read(id) # => nil
-
-# You can also override adapter options per method:
-# This will perform read with consistency set to ONE.
-adapter.read(id, using: {consistency: :one})
 ```
 
 ## Installation

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.4'
+  gem.add_dependency 'cassanity', '< 0.7', '>=0.6.0.beta1' # change to ~>0.6 when 0.6.0 final drops
 end

data/lib/adapter/cassanity.rb

@@ -9,7 +9,7 @@ module Adapter
     # Public
     def read(key, options = nil)
       operation_options = {where: where(key)}
-      adapter_options = with_default_consistency(@options[:read])
+      adapter_options = @options[:read]
       arguments = update_arguments(operation_options, adapter_options, options)
 
       rows = @client.select(arguments)
@@ -18,17 +18,17 @@ module Adapter
 
     # Public
     def write(key, attributes, options = nil)
-      operation_options = {set: attributes, where: where(key)}
-      adapter_options = with_default_consistency(@options[:write])
+      operation, operation_options = prepare_operation(options, :update, set: attributes, where: where(key))
+      adapter_options = @options[:write]
       arguments = update_arguments(operation_options, adapter_options, options)
 
-      @client.update(arguments)
+      @client.send(operation, arguments)
     end
 
     # Public
     def delete(key, options = nil)
       operation_options = {where: where(key)}
-      adapter_options = with_default_consistency(@options[:delete])
+      adapter_options = @options[:delete]
       arguments = update_arguments(operation_options, adapter_options, options)
 
       @client.delete(arguments)
@@ -45,6 +45,15 @@ module Adapter
       {primary_key => key}
     end
 
+    # Private.
+    def prepare_operation(options, operation, operation_options)
+      if options && (modifications = options[:modifications]) && modifications.any?
+        operation_options = {modifications: [ [operation, operation_options], *modifications ]}
+        operation = :batch
+      end
+      [ operation, operation_options ]
+    end
+
     # Private
     def update_arguments(operation_options, adapter_options, method_options)
       keys = operation_options.keys
@@ -61,14 +70,6 @@ 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.5.0"
+    VERSION = "0.6.0.beta1"
   end
 end

data/spec/cassanity_spec.rb

@@ -16,63 +16,20 @@ 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, primary_key: :some_key,)
-
-      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, primary_key: :some_key,)
-
-      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, primary_key: :some_key)
-
-      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 = {
         primary_key: :some_key,
         read: {
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       }).and_return([])
 
       adapter.read('foo')
@@ -84,14 +41,14 @@ describe "Cassanity adapter" do
         primary_key: :some_key,
         read: {
           where: {:some_key => 'bar'},
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       }).and_return([])
 
       adapter.read('foo')
@@ -102,17 +59,17 @@ describe "Cassanity adapter" do
       options = {
         primary_key: :some_key,
         read: {
-          using: {consistency: :one},
+          using: {ttl: 20},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       }).and_return([])
 
-      adapter.read('foo', using: {consistency: :one})
+      adapter.read('foo', using: {ttl: 10})
     end
   end
 
@@ -122,7 +79,7 @@ describe "Cassanity adapter" do
       options = {
         primary_key: :some_key,
         write: {
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
@@ -130,7 +87,7 @@ describe "Cassanity adapter" do
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       })
 
       adapter.write('foo', {'name' => 'New Name'})
@@ -143,7 +100,7 @@ describe "Cassanity adapter" do
         write: {
           where: {:some_key => 'should not use this'},
           set: {'name' => 'should not use this'},
-          using: {consistency: :one}
+          using: {ttl: 10}
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
@@ -151,7 +108,7 @@ describe "Cassanity adapter" do
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       })
 
       adapter.write('foo', {'name' => 'New Name'})
@@ -162,7 +119,7 @@ describe "Cassanity adapter" do
       options = {
         primary_key: :some_key,
         write: {
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
@@ -170,10 +127,32 @@ describe "Cassanity adapter" do
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 20},
+      })
+
+      adapter.write('foo', {'name' => 'New Name'}, using: {ttl: 20})
+    end
+
+    it "accepts other batch operations" do
+      client = COLUMN_FAMILIES[:single]
+      options = {
+        primary_key: :some_key,
+        write: {
+          using: {ttl: 10},
+        },
+      }
+      adapter = Adapter[adapter_name].new(client, options)
+
+      client.should_receive(:batch).with({
+        modifications: [
+          [:update, set: {'name' => 'New Name'}, where: {:some_key => 'foo'}],
+          [:other],
+        ],
+        using: {ttl: 10},
       })
+      client.should_not_receive(:update)
 
-      adapter.write('foo', {'name' => 'New Name'}, using: {consistency: :one})
+      adapter.write('foo', {'name' => 'New Name'}, using: {ttl: 10}, modifications: [ [:other] ])
     end
   end
 
@@ -183,14 +162,14 @@ describe "Cassanity adapter" do
       options = {
         primary_key: :some_key,
         delete: {
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       })
 
       adapter.delete('foo')
@@ -202,14 +181,14 @@ describe "Cassanity adapter" do
         primary_key: :some_key,
         delete: {
           where: {:some_key => 'bar'},
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 10},
       })
 
       adapter.delete('foo')
@@ -220,17 +199,17 @@ describe "Cassanity adapter" do
       options = {
         primary_key: :some_key,
         delete: {
-          using: {consistency: :one},
+          using: {ttl: 10},
         },
       }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
-        using: {consistency: :one},
+        using: {ttl: 20},
       })
 
-      adapter.delete('foo', using: {consistency: :one})
+      adapter.delete('foo', using: {ttl: 20})
     end
   end
 end

data/spec/helper.rb

@@ -19,15 +19,11 @@ logger = Logger.new(log_path.join('test.log'))
 COLUMN_FAMILIES = {}
 
 cassandra_setup = lambda { |args|
-  host          = ENV.fetch('CASSANDRA_HOST', '127.0.0.1:9160')
+  host          = ENV.fetch('CASSANDRA_HOST', '127.0.0.1')
+  port          = ENV.fetch('CASSANDRA_PORT', '9042').to_i
   keyspace_name = ENV.fetch('CASSANDRA_KEYSPACE_NAME', 'adapter_cassanity')
-  client        = CassandraCQL::Database.new(host, cql_version: '3.0.0')
-  executor      = Cassanity::Executors::CassandraCql.new({
-    client: client,
-    logger: logger,
-  })
-  connection    = Cassanity::Connection.new(executor: executor)
-  keyspace      = connection.keyspace(keyspace_name)
+  client        = Cassanity::Client.new([host], port)
+  keyspace      = client.keyspace(keyspace_name)
   keyspace.recreate
 
   COLUMN_FAMILIES[:single] = keyspace.column_family(:single, {

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: adapter-cassanity
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0.beta1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,19 +27,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cassanity
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.6.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - <
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.7'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0.beta1
 description: Adapter for Cassanity
 email:
 - nunemaker@gmail.com
@@ -60,9 +61,7 @@ files:
 - README.md
 - Rakefile
 - adapter-cassanity.gemspec
-- examples/adapter_options.rb
 - examples/cassanity.rb
-- examples/method_options.rb
 - examples/shared_setup.rb
 - lib/adapter-cassanity.rb
 - lib/adapter/cassanity.rb
@@ -71,33 +70,26 @@ files:
 - spec/helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 242222650800770136
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 242222650800770136
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Adapter for Cassanity
 test_files:
 - spec/cassanity_spec.rb

data/examples/adapter_options.rb

@@ -1,16 +0,0 @@
-require_relative 'shared_setup'
-
-client = AppsCF
-using = {using: {consistency: :one}}
-adapter = Adapter[:cassanity].new(client, {
-  read: using,
-  write: using,
-  delete: using,
-})
-adapter.clear
-
-id = CassandraCQL::UUID.new
-
-adapter.write(id, {name: 'GitHub'})
-pp adapter.read(id)
-adapter.delete(id)

data/examples/method_options.rb

@@ -1,11 +0,0 @@
-require_relative 'shared_setup'
-
-client = AppsCF
-adapter = Adapter[:cassanity].new(client)
-adapter.clear
-
-id = CassandraCQL::UUID.new
-
-adapter.write(id, {name: 'GitHub'}, using: {consistency: :one})
-pp adapter.read(id, using: {consistency: :one})
-adapter.delete(id)