adapter-cassanity 0.4.0 → 0.5.0

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.5.0
+
+* Drop support for composite primary keys.
+* Force supplying primary_key for adapter rather than reflecting from schema. Since cassanity has migrations, it is no longer needed to always supply schema. Easier to pass primary key and more performant than reflecting from the database like AR does.
+
 ## 0.3.0
 
 * Updates for adapter 0.7.0.

data/lib/adapter/cassanity.rb

@@ -6,8 +6,6 @@ module Adapter
   module Cassanity
     extend Forwardable
 
-    def_delegator :@client, :schema
-
     # Public
     def read(key, options = nil)
       operation_options = {where: where(key)}
@@ -42,13 +40,9 @@ module Adapter
     end
 
     # Private
-    def where(criteria)
-      if schema.composite_primary_key?
-        criteria
-      else
-        primary_key = schema.primary_keys.first
-        {primary_key => criteria}
-      end
+    def where(key)
+      primary_key = @options.fetch(:primary_key)
+      {primary_key => key}
     end
 
     # Private

data/lib/adapter/cassanity/version.rb

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

data/spec/cassanity_spec.rb

@@ -6,7 +6,7 @@ describe "Cassanity adapter" do
   context "single primary key" do
     before do
       @client = COLUMN_FAMILIES[:single]
-      @adapter = Adapter[adapter_name].new(@client)
+      @adapter = Adapter[adapter_name].new(@client, primary_key: :some_key)
       @adapter.clear
     end
 
@@ -19,7 +19,7 @@ describe "Cassanity adapter" do
   context "default read consistency" do
     it "is :quorum" do
       client = COLUMN_FAMILIES[:single]
-      adapter = Adapter[adapter_name].new(client)
+      adapter = Adapter[adapter_name].new(client, primary_key: :some_key,)
 
       client.should_receive(:select).with({
         where: {:some_key => 'foo'},
@@ -33,7 +33,7 @@ describe "Cassanity adapter" do
   context "default write consistency" do
     it "is :quorum" do
       client = COLUMN_FAMILIES[:single]
-      adapter = Adapter[adapter_name].new(client)
+      adapter = Adapter[adapter_name].new(client, primary_key: :some_key,)
 
       client.should_receive(:update).with({
         set: {'name' => 'New Name'},
@@ -48,7 +48,7 @@ describe "Cassanity adapter" do
   context "default delete consistency" do
     it "is :quorum" do
       client = COLUMN_FAMILIES[:single]
-      adapter = Adapter[adapter_name].new(client)
+      adapter = Adapter[adapter_name].new(client, primary_key: :some_key)
 
       client.should_receive(:delete).with({
         where: {:some_key => 'foo'},
@@ -62,9 +62,12 @@ describe "Cassanity adapter" do
   context "with adapter read options" do
     it "uses read options for read method" do
       client = COLUMN_FAMILIES[:single]
-      options = {read: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        read: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
@@ -77,10 +80,13 @@ describe "Cassanity adapter" do
 
     it "does not override where" do
       client = COLUMN_FAMILIES[:single]
-      options = {read: {
-        where: {:some_key => 'bar'},
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        read: {
+          where: {:some_key => 'bar'},
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
@@ -93,9 +99,12 @@ describe "Cassanity adapter" do
 
     it "can be overriden by read method options" do
       client = COLUMN_FAMILIES[:single]
-      options = {read: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        read: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:select).with({
@@ -110,9 +119,12 @@ describe "Cassanity adapter" do
   context "with adapter write options" do
     it "uses write options for write method" do
       client = COLUMN_FAMILIES[:single]
-      options = {write: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        write: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:update).with({
@@ -126,11 +138,14 @@ describe "Cassanity adapter" do
 
     it "does not override where or set" do
       client = COLUMN_FAMILIES[:single]
-      options = {write: {
-        where: {:some_key => 'should not use this'},
-        set: {'name' => 'should not use this'},
-        using: {consistency: :one,
-      }}}
+      options = {
+        primary_key: :some_key,
+        write: {
+          where: {:some_key => 'should not use this'},
+          set: {'name' => 'should not use this'},
+          using: {consistency: :one}
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:update).with({
@@ -144,9 +159,12 @@ describe "Cassanity adapter" do
 
     it "can be overriden by write method options" do
       client = COLUMN_FAMILIES[:single]
-      options = {write: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        write: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:update).with({
@@ -162,9 +180,12 @@ describe "Cassanity adapter" do
   context "with adapter delete options" do
     it "uses delete options for delete method" do
       client = COLUMN_FAMILIES[:single]
-      options = {delete: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        delete: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
@@ -177,10 +198,13 @@ describe "Cassanity adapter" do
 
     it "does not override where" do
       client = COLUMN_FAMILIES[:single]
-      options = {delete: {
-        where: {:some_key => 'bar'},
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        delete: {
+          where: {:some_key => 'bar'},
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
@@ -193,9 +217,12 @@ describe "Cassanity adapter" do
 
     it "can be overriden by delete method options" do
       client = COLUMN_FAMILIES[:single]
-      options = {delete: {
-        using: {consistency: :one},
-      }}
+      options = {
+        primary_key: :some_key,
+        delete: {
+          using: {consistency: :one},
+        },
+      }
       adapter = Adapter[adapter_name].new(client, options)
 
       client.should_receive(:delete).with({
@@ -206,23 +233,4 @@ describe "Cassanity adapter" do
       adapter.delete('foo', using: {consistency: :one})
     end
   end
-
-  context "composite primary key" do
-    before do
-      @client = COLUMN_FAMILIES[:composite]
-      @adapter = Adapter[adapter_name].new(@client)
-      @adapter.clear
-    end
-
-    it_behaves_like 'an adapter' do
-      let(:adapter) { @adapter }
-      let(:client)  { @client }
-
-      let(:key)  { {:bucket => '1', :id => CassandraCQL::UUID.new} }
-      let(:key2) { {:bucket => '2', :id => CassandraCQL::UUID.new} }
-
-      let(:unavailable_key)  { {:bucket => '3', :id => CassandraCQL::UUID.new} }
-      let(:unavailable_key2) { {:bucket => '4', :id => CassandraCQL::UUID.new} }
-    end
-  end
 end

data/spec/helper.rb

@@ -43,22 +43,7 @@ cassandra_setup = lambda { |args|
     }),
   })
 
-  COLUMN_FAMILIES[:composite] = keyspace.column_family(:composite, {
-    schema: Cassanity::Schema.new({
-      primary_key: [:bucket, :id],
-      columns: {
-        bucket: :text,
-        id: :timeuuid,
-        one: :text,
-        two: :text,
-        three: :text,
-        four: :text,
-      }
-    }),
-  })
-
   COLUMN_FAMILIES[:single].create
-  COLUMN_FAMILIES[:composite].create
 }
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adapter-cassanity
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-31 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
@@ -83,7 +83,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1292988058434292696
+      hash: 242222650800770136
 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: -1292988058434292696
+      hash: 242222650800770136
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23