cequel 1.0.4 → 1.1.0

data/lib/cequel/uuids.rb

@@ -0,0 +1,46 @@
+# -*- encoding : utf-8 -*-
+module Cequel
+  #
+  # This module adds some utility methods for generating and type-checking UUID
+  # objects for use with Cequel. These methods are provided because the actual
+  # UUID implementation is an artifact of the underlying driver;
+  # initializing/typechecking those driver classes directly is potentially
+  # breaking.
+  #
+  module Uuids
+    #
+    # Create a UUID
+    #
+    # @param value [Time,String,Integer] timestamp to assign to the UUID, or
+    #   numeric or string representation of the UUID
+    # @return a UUID appropriate for use with Cequel
+    #
+    def uuid(value = nil)
+      if value.nil?
+        timeuuid_generator.next
+      elsif value.is_a?(Time)
+        timeuuid_generator.from_time(value)
+      elsif value.is_a?(DateTime)
+        timeuuid_generator.from_time(Time.at(value.to_f))
+      else
+        Type::Timeuuid.instance.cast(value)
+      end
+    end
+
+    #
+    # Determine if an object is a UUID
+    #
+    # @param object an object to check
+    # @return [Boolean] true if the object is recognized by Cequel as a UUID
+    #
+    def uuid?(object)
+      object.is_a?(Cql::Uuid)
+    end
+
+    private
+
+    def timeuuid_generator
+      @timeuuid_generator ||= Cql::TimeUuid::Generator.new
+    end
+  end
+end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 end

data/spec/examples/metal/data_set_spec.rb

@@ -84,6 +84,12 @@ describe Cequel::Metal::DataSet do
         first.writetime(:title).should == (time.to_f * 1_000_000).to_i
     end
 
+    it 'should insert row with given consistency' do
+      expect_query_with_consistency(/INSERT/, :one) do
+        cequel[:posts].insert(row, consistency: :one)
+      end
+    end
+
     it 'should include multiple arguments joined by AND' do
       cequel.schema.truncate_table(:posts)
       time = 1.day.ago
@@ -118,6 +124,13 @@ describe Cequel::Metal::DataSet do
       row.writetime(:title).should == (time.to_f * 1_000_000).to_i
     end
 
+    it 'should send update statement with given consistency' do
+      expect_query_with_consistency(/UPDATE/, :one) do
+        cequel[:posts].where(row_keys).update(
+          {title: 'Marshmallows'}, consistency: :one)
+      end
+    end
+
     it 'should overwrite list column' do
       cequel[:posts].where(row_keys).
         update(categories: ['Big Data', 'Cassandra'])
@@ -357,6 +370,12 @@ describe Cequel::Metal::DataSet do
       # This means timestamp is working, since the earlier timestamp would cause
       # Cassandra to ignore the deletion
     end
+
+    it 'should send delete with specified consistency' do
+      expect_query_with_consistency(/DELETE/, :one) do
+        cequel[:posts].where(row_keys).delete(:body, :consistency => :one)
+      end
+    end
   end
 
   describe '#list_remove_at' do
@@ -554,6 +573,80 @@ describe Cequel::Metal::DataSet do
     end
   end
 
+  describe '#consistency' do
+    let(:data_set) { cequel[:posts].consistency(:one) }
+
+    it 'should issue SELECT with scoped consistency' do
+      expect_query_with_consistency(/SELECT/, :one) { data_set.to_a }
+    end
+
+    it 'should issue COUNT with scoped consistency' do
+      expect_query_with_consistency(/SELECT.*COUNT/, :one) { data_set.count }
+    end
+
+    it 'should issue INSERT with scoped consistency' do
+      expect_query_with_consistency(/INSERT/, :one) do
+        data_set.insert(row_keys)
+      end
+    end
+
+    it 'should issue UPDATE with scoped consistency' do
+      expect_query_with_consistency(/UPDATE/, :one) do
+        data_set.where(row_keys).update(title: 'Marshmallows')
+      end
+    end
+
+    it 'should issue DELETE with scoped consistency' do
+      expect_query_with_consistency(/DELETE/, :one) do
+        data_set.where(row_keys).delete
+      end
+    end
+
+    it 'should issue DELETE column with scoped consistency' do
+      expect_query_with_consistency(/DELETE/, :one) do
+        data_set.where(row_keys).delete(:title)
+      end
+    end
+  end
+
+  describe 'default consistency' do
+    before(:all) { cequel.default_consistency = :all }
+    after(:all) { cequel.default_consistency = nil }
+    let(:data_set) { cequel[:posts] }
+
+    it 'should issue SELECT with default consistency' do
+      expect_query_with_consistency(/SELECT/, :all) { data_set.to_a }
+    end
+
+    it 'should issue COUNT with default consistency' do
+      expect_query_with_consistency(/SELECT.*COUNT/, :all) { data_set.count }
+    end
+
+    it 'should issue INSERT with default consistency' do
+      expect_query_with_consistency(/INSERT/, :all) do
+        data_set.insert(row_keys)
+      end
+    end
+
+    it 'should issue UPDATE with default consistency' do
+      expect_query_with_consistency(/UPDATE/, :all) do
+        data_set.where(row_keys).update(title: 'Marshmallows')
+      end
+    end
+
+    it 'should issue DELETE with default consistency' do
+      expect_query_with_consistency(/DELETE/, :all) do
+        data_set.where(row_keys).delete
+      end
+    end
+
+    it 'should issue DELETE column with default consistency' do
+      expect_query_with_consistency(/DELETE/, :all) do
+        data_set.where(row_keys).delete(:title)
+      end
+    end
+  end
+
   describe 'result enumeration' do
     let(:row) { row_keys.merge(:title => 'Big Data') }
 

data/spec/examples/metal/keyspace_spec.rb

@@ -0,0 +1,74 @@
+# -*- encoding : utf-8 -*-
+require_relative '../spec_helper'
+
+describe Cequel::Metal::Keyspace do
+  before :all do
+    cequel.schema.create_table(:posts) do
+      key :id, :int
+      column :title, :text
+      column :body, :text
+    end
+  end
+
+  after :each do
+    ids = cequel[:posts].select(:id).map { |row| row[:id] }
+    cequel[:posts].where(id: ids).delete if ids.any?
+  end
+
+  after :all do
+    cequel.schema.drop_table(:posts)
+  end
+
+  describe '::batch' do
+    it 'should send enclosed write statements in bulk' do
+      expect(cequel).to receive(:execute).once.and_call_original
+      cequel.batch do
+        cequel[:posts].insert(id: 1, title: 'Hey')
+        cequel[:posts].where(id: 1).update(body: 'Body')
+        cequel[:posts].where(id: 1).delete(:title)
+      end
+      RSpec::Mocks.proxy_for(cequel).reset
+      expect(cequel[:posts].first).to eq({id: 1, title: nil, body: 'Body'}
+        .with_indifferent_access)
+    end
+
+    it 'should auto-apply if option given' do
+      cequel.batch(auto_apply: 2) do
+        cequel[:posts].insert(id: 1, title: 'One')
+        expect(cequel[:posts].count).to be_zero
+        cequel[:posts].insert(id: 2, title: 'Two')
+        expect(cequel[:posts].count).to be(2)
+      end
+    end
+
+    it 'should do nothing if no statements executed in batch' do
+      expect { cequel.batch {} }.to_not raise_error
+    end
+
+    it 'should execute unlogged batch if specified' do
+      expect_query_with_consistency(/BEGIN UNLOGGED BATCH/, anything) do
+        cequel.batch(unlogged: true) do
+          cequel[:posts].insert(id: 1, title: 'One')
+          cequel[:posts].insert(id: 2, title: 'Two')
+        end
+      end
+    end
+
+    it 'should execute batch with given consistency' do
+      expect_query_with_consistency(/BEGIN BATCH/, :one) do
+        cequel.batch(consistency: :one) do
+          cequel[:posts].insert(id: 1, title: 'One')
+          cequel[:posts].insert(id: 2, title: 'Two')
+        end
+      end
+    end
+
+    it 'should raise error if consistency specified in individual query in batch' do
+      expect {
+        cequel.batch(consistency: :one) do
+          cequel[:posts].consistency(:quorum).insert(id: 1, title: 'One')
+        end
+      }.to raise_error(ArgumentError)
+    end
+  end
+end

data/spec/examples/record/associations_spec.rb

@@ -44,6 +44,12 @@ describe Cequel::Record::Associations do
     before_destroy { self.class.callback_count += 1 }
   end
 
+  model :Photo do
+    belongs_to :post, partition: true
+    key :id, :uuid, auto: true
+    column :caption, :text
+  end
+
   describe '::belongs_to' do
     let(:blog) { Blog.new { |blog| blog.subdomain = 'big-data' }}
     let(:post) { Post.new }
@@ -52,6 +58,18 @@ describe Cequel::Record::Associations do
       Post.key_column_names.first.should == :blog_subdomain
     end
 
+    it 'should add parent key as the partition key' do
+      Post.partition_key_column_names.should == [:blog_subdomain]
+    end
+
+    it "should add parent's keys as first keys" do
+      Comment.key_column_names.first(2).should == [:post_blog_subdomain, :post_id]
+    end
+
+    it "should add parent's first key as partition key" do
+      Comment.partition_key_column_names.should == [:post_blog_subdomain]
+    end
+
     it 'should provide accessors for association object' do
       post.blog = blog
       post.blog.should == blog
@@ -102,6 +120,72 @@ describe Cequel::Record::Associations do
       end.to raise_error(Cequel::Record::InvalidRecordConfiguration)
     end
 
+    context "with partition => true" do
+      let(:post) { Post.new { |post| post.blog_subdomain = 'big-data' }}
+      let(:photo) { Photo.new }
+
+      it "should add parent's keys as first keys" do
+        Photo.key_column_names.first(2).should == [:post_blog_subdomain, :post_id]
+      end
+
+      it "should add parent's keys as partition keys" do
+        Photo.partition_key_column_names.should == [:post_blog_subdomain, :post_id]
+      end
+
+      it 'should provide accessors for association object' do
+        photo.post = post
+        photo.post.should == post
+      end
+
+      it 'should set parent key(s) when setting association object' do
+        photo.post = post
+        photo.post_blog_subdomain.should == 'big-data'
+        photo.post_id.should == post.id
+      end
+
+      it 'should raise ArgumentError when parent is set without a key' do
+        post.blog_subdomain = nil
+        expect { photo.post = post }.to raise_error(ArgumentError)
+      end
+
+      it 'should raise ArgumentError when parent is set to wrong class' do
+        expect { photo.post = photo }.to raise_error(ArgumentError)
+      end
+
+      it 'should return Photo instance when parent keys are set directly' do
+        photo.post_blog_subdomain = 'big-data'
+        photo.post_id = post.id
+        photo.post.should == post
+      end
+
+      it 'should not hydrate parent instance when creating from keys' do
+        photo.post_blog_subdomain = 'big-data'
+        photo.post_id = post.id
+        disallow_queries!
+        photo.post.should_not be_loaded
+      end
+
+      it 'should not allow declaring belongs_to after key' do
+        expect do
+          Class.new do
+            include Cequel::Record
+            key :permalink, :text
+            belongs_to :post, partition: true
+          end
+        end.to raise_error(Cequel::Record::InvalidRecordConfiguration)
+      end
+
+      it 'should not allow declaring belongs_to more than once' do
+        expect do
+          Class.new do
+            include Cequel::Record
+            belongs_to :post, partition: true
+            belongs_to :user
+          end
+        end.to raise_error(Cequel::Record::InvalidRecordConfiguration)
+      end
+    end
+
   end
 
   describe '::has_many' do

data/spec/examples/record/persistence_spec.rb

@@ -48,6 +48,15 @@ describe Cequel::Record::Persistence do
             Blog.new.save
           }.to raise_error(Cequel::Record::MissingKeyError)
         end
+
+        it 'should save with specified consistency' do
+          expect_query_with_consistency(/INSERT/, :one) do
+            Blog.new do |blog|
+              blog.subdomain = 'cequel'
+              blog.name = 'Cequel'
+            end.save(consistency: :one)
+          end
+        end
       end
 
       context 'on update' do
@@ -78,6 +87,13 @@ describe Cequel::Record::Persistence do
             blog.save
           }.to raise_error(ArgumentError)
         end
+
+        it 'should save with specified consistency' do
+          expect_query_with_consistency(/UPDATE/, :one) do
+            blog.name = 'Cequel'
+            blog.save(consistency: :one)
+          end
+        end
       end
     end
 
@@ -161,6 +177,13 @@ describe Cequel::Record::Persistence do
       it 'should mark record transient' do
         blog.should be_transient
       end
+
+      it 'should destroy with specified consistency' do
+        blog = Blog.create(:subdomain => 'big-data', :name => 'Big Data')
+        expect_query_with_consistency(/DELETE/, :one) do
+          blog.destroy(consistency: :one)
+        end
+      end
     end
   end
 

data/spec/examples/record/properties_spec.rb

@@ -147,7 +147,7 @@ describe Cequel::Record::Properties do
     end
 
     it 'should auto-generate UUID key' do
-      Post.new.id.should be_a(CassandraCQL::UUID)
+      Cequel.uuid?(Post.new.id).should be_true
     end
 
     it 'should raise ArgumentError if auto specified for non-UUID' do

data/spec/examples/record/record_set_spec.rb

@@ -38,7 +38,7 @@ describe Cequel::Record::RecordSet do
   end
 
   let(:subdomains) { blogs.map(&:subdomain) }
-  let(:uuids) { Array.new(2) { CassandraCQL::UUID.new }}
+  let(:uuids) { Array.new(2) { Cequel.uuid }}
   let(:now) { Time.at(Time.now.to_i) }
 
   let(:blogs) do
@@ -110,7 +110,7 @@ describe Cequel::Record::RecordSet do
       Comment.new(
         :blog_subdomain => 'cassandra',
         :permalink => 'cequel0',
-        :id => CassandraCQL::UUID.new(Time.now - 5 + i),
+        :id => Cequel.uuid(Time.now - 5 + i),
         :body => "Comment #{i}"
       )
     end
@@ -353,10 +353,11 @@ describe Cequel::Record::RecordSet do
     let(:records) { [posts, blogs, mongo_posts] }
 
     it 'should respect :batch_size argument' do
-      cequel.should_receive(:execute).twice.and_call_original
+      cequel.should_receive(:execute_with_consistency).twice.and_call_original
       Blog.find_each(:batch_size => 2).map(&:subdomain).
         should =~ subdomains
     end
+
     it 'should iterate over all keys' do
       Post.find_each(:batch_size => 2).map(&:title).should =~
         (0...5).flat_map { |i| ["Cequel #{i}", "Sequel #{i}", "Mongoid #{i}"] }
@@ -616,6 +617,14 @@ describe Cequel::Record::RecordSet do
     end
   end
 
+  describe '#consistency' do
+    it 'should perform query with specified consistency' do
+      expect_query_with_consistency(/SELECT/, :one) do
+        Post.consistency(:one).to_a
+      end
+    end
+  end
+
   describe '#count' do
     let(:records) { blogs }