cequel 0.5.5 → 0.5.6

data/lib/cequel/data_set.rb

@@ -294,6 +294,9 @@ module Cequel
     # @option options [Time,Integer] :timestamp the timestamp associated with the column values
     #
     def generate_upsert_options(options)
+      if keyspace.default_consistency
+        options[:consistency] ||= keyspace.default_consistency
+      end
       if options.empty?
         ''
       else
@@ -331,8 +334,9 @@ module Cequel
     end
 
     def consistency_cql
-      if @consistency
-        " USING CONSISTENCY #{@consistency.upcase}"
+      consistency = @consistency || keyspace.default_consistency
+      if consistency
+        " USING CONSISTENCY #{consistency.upcase}"
       else ''
       end
     end

data/lib/cequel/keyspace.rb

@@ -50,6 +50,22 @@ module Cequel
       @slowlog_threshold
     end
 
+    def with_consistency(consistency)
+      previous_consistency = default_consistency
+      Thread.current[consistency_key] = consistency
+      yield
+    ensure
+      Thread.current[consistency_key] = previous_consistency
+    end
+
+    def default_consistency
+      Thread.current[consistency_key]
+    end
+
+    def consistency_key
+      "Cequel::Keyspace[#{object_id}]#default_consistency"
+    end
+
     def connection_pool
       return @connection_pool if defined? @connection_pool
       if @configuration[:pool]

data/lib/cequel/model/persistence.rb

@@ -49,6 +49,10 @@ module Cequel
           Cequel::Model.keyspace
         end
 
+        def with_consistency(consistency, &block)
+          keyspace.with_consistency(consistency, &block)
+        end
+
         def _hydrate(row)
           type_column_name = @_cequel.type_column.try(:name)
           if type_column_name && row[type_column_name]

data/lib/cequel/version.rb

@@ -1,3 +1,3 @@
 module Cequel
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

data/spec/examples/data_set_spec.rb

@@ -19,6 +19,15 @@ describe Cequel::DataSet do
       )
     end
 
+    it 'should respect with_consistency block' do
+      connection.should_receive(:execute).
+        with "INSERT INTO posts (?) VALUES (?) USING CONSISTENCY QUORUM", [:id, :title], [1, 'Fun times']
+
+      cequel.with_consistency(:quorum) do
+        cequel[:posts].insert(:id => 1, :title => 'Fun times')
+      end
+    end
+
     it 'should include ttl argument' do
       connection.should_receive(:execute).
         with "INSERT INTO posts (?) VALUES (?) USING TTL 600", [:id, :title], [1, 'Fun times']
@@ -75,6 +84,15 @@ describe Cequel::DataSet do
       )
     end
 
+    it 'should respect default consistency' do
+      connection.should_receive(:execute).
+        with "UPDATE posts USING CONSISTENCY QUORUM SET ? = ?, ? = ?", :title, 'Fun times', :body, 'Fun'
+
+      cequel.with_consistency(:quorum) do
+        cequel[:posts].update(:title => 'Fun times', :body => 'Fun')
+      end
+    end
+
     it 'should send update statement scoped to current row specifications' do
       connection.should_receive(:execute).
         with "UPDATE posts SET ? = ? WHERE ? = ?", :title, 'Fun', :id, 4
@@ -146,6 +164,15 @@ describe Cequel::DataSet do
       )
     end
 
+    it 'should respect default consistency' do
+      connection.should_receive(:execute).
+        with "DELETE ? FROM posts USING CONSISTENCY QUORUM", [:title, :body]
+
+      cequel.with_consistency(:quorum) do
+        cequel[:posts].delete(:title, :body)
+      end
+    end
+
     it 'should send delete statement with scoped row specifications' do
       connection.should_receive(:execute).
         with "DELETE FROM posts WHERE ? = ?", :id, 4
@@ -310,6 +337,15 @@ describe Cequel::DataSet do
     end
   end
 
+  describe 'in with_consistency block' do
+    it 'should use default consistency' do
+      cequel.with_consistency(:quorum) do
+        cequel[:posts].cql.
+          should == ["SELECT * FROM posts USING CONSISTENCY QUORUM"]
+      end
+    end
+  end
+
   describe '#limit' do
     it 'should add LIMIT' do
       cequel[:posts].limit(2).cql.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,80 +171,80 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/cequel.rb
+- lib/cequel/keyspace.rb
 - lib/cequel/cql_row_specification.rb
-- lib/cequel/statement.rb
 - lib/cequel/model/inheritable.rb
-- lib/cequel/model/remote_association.rb
 - lib/cequel/model/counter.rb
-- lib/cequel/model/naming.rb
-- lib/cequel/model/readable_dictionary.rb
-- lib/cequel/model/associations.rb
-- lib/cequel/model/mass_assignment_security.rb
-- lib/cequel/model/dictionary.rb
-- lib/cequel/model/translation.rb
-- lib/cequel/model/subclass_internals.rb
-- lib/cequel/model/magic.rb
 - lib/cequel/model/callbacks.rb
+- lib/cequel/model/naming.rb
+- lib/cequel/model/instance_internals.rb
 - lib/cequel/model/dynamic.rb
-- lib/cequel/model/observer.rb
+- lib/cequel/model/properties.rb
 - lib/cequel/model/column.rb
-- lib/cequel/model/instance_internals.rb
-- lib/cequel/model/validations.rb
+- lib/cequel/model/observer.rb
+- lib/cequel/model/mass_assignment_security.rb
+- lib/cequel/model/associations.rb
 - lib/cequel/model/persistence.rb
-- lib/cequel/model/railtie.rb
-- lib/cequel/model/properties.rb
 - lib/cequel/model/scope.rb
+- lib/cequel/model/magic.rb
+- lib/cequel/model/readable_dictionary.rb
+- lib/cequel/model/remote_association.rb
+- lib/cequel/model/class_internals.rb
+- lib/cequel/model/validations.rb
+- lib/cequel/model/railtie.rb
+- lib/cequel/model/translation.rb
 - lib/cequel/model/scoped.rb
-- lib/cequel/model/timestamps.rb
-- lib/cequel/model/local_association.rb
 - lib/cequel/model/dirty.rb
 - lib/cequel/model/errors.rb
-- lib/cequel/model/class_internals.rb
-- lib/cequel/keyspace.rb
+- lib/cequel/model/local_association.rb
+- lib/cequel/model/dictionary.rb
+- lib/cequel/model/subclass_internals.rb
+- lib/cequel/model/timestamps.rb
+- lib/cequel/model.rb
 - lib/cequel/version.rb
 - lib/cequel/data_set.rb
-- lib/cequel/row_specification.rb
-- lib/cequel/new_relic_instrumentation.rb
-- lib/cequel/model.rb
 - lib/cequel/batch.rb
+- lib/cequel/new_relic_instrumentation.rb
+- lib/cequel/statement.rb
 - lib/cequel/errors.rb
-- spec/environment.rb
-- spec/examples/spec_helper.rb
-- spec/examples/data_set_spec.rb
-- spec/examples/keyspace_spec.rb
-- spec/examples/model/naming_spec.rb
-- spec/examples/model/properties_spec.rb
-- spec/examples/model/observer_spec.rb
-- spec/examples/model/mass_assignment_security_spec.rb
-- spec/examples/model/dynamic_spec.rb
-- spec/examples/model/dirty_spec.rb
-- spec/examples/model/spec_helper.rb
-- spec/examples/model/timestamps_spec.rb
-- spec/examples/model/persistence_spec.rb
-- spec/examples/model/magic_spec.rb
-- spec/examples/model/counter_spec.rb
-- spec/examples/model/callbacks_spec.rb
-- spec/examples/model/inheritable_spec.rb
-- spec/examples/model/scope_spec.rb
-- spec/examples/model/dictionary_spec.rb
-- spec/examples/model/serialization_spec.rb
-- spec/examples/model/validations_spec.rb
-- spec/examples/model/associations_spec.rb
-- spec/examples/model/translation_spec.rb
+- lib/cequel/row_specification.rb
 - spec/models/post_observer.rb
-- spec/models/blog_posts.rb
-- spec/models/blog.rb
 - spec/models/comment_counts.rb
-- spec/models/post.rb
+- spec/models/asset_observer.rb
 - spec/models/photo.rb
-- spec/models/asset.rb
 - spec/models/post_comments.rb
 - spec/models/comment.rb
-- spec/models/asset_observer.rb
+- spec/models/blog_posts.rb
+- spec/models/blog.rb
+- spec/models/asset.rb
+- spec/models/post.rb
 - spec/models/category.rb
 - spec/support/helpers.rb
 - spec/support/result_stub.rb
 - spec/shared/readable_dictionary.rb
+- spec/environment.rb
+- spec/examples/model/dictionary_spec.rb
+- spec/examples/model/observer_spec.rb
+- spec/examples/model/dirty_spec.rb
+- spec/examples/model/callbacks_spec.rb
+- spec/examples/model/persistence_spec.rb
+- spec/examples/model/serialization_spec.rb
+- spec/examples/model/dynamic_spec.rb
+- spec/examples/model/validations_spec.rb
+- spec/examples/model/scope_spec.rb
+- spec/examples/model/mass_assignment_security_spec.rb
+- spec/examples/model/timestamps_spec.rb
+- spec/examples/model/properties_spec.rb
+- spec/examples/model/counter_spec.rb
+- spec/examples/model/inheritable_spec.rb
+- spec/examples/model/translation_spec.rb
+- spec/examples/model/associations_spec.rb
+- spec/examples/model/naming_spec.rb
+- spec/examples/model/spec_helper.rb
+- spec/examples/model/magic_spec.rb
+- spec/examples/data_set_spec.rb
+- spec/examples/keyspace_spec.rb
+- spec/examples/spec_helper.rb
 homepage: https://github.com/brewster/cequel
 licenses:
 - MIT
@@ -272,26 +272,26 @@ signing_key:
 specification_version: 3
 summary: Query abstraction layer and object-row mapper for Cassandra and CQL
 test_files:
-- spec/examples/spec_helper.rb
-- spec/examples/data_set_spec.rb
-- spec/examples/keyspace_spec.rb
-- spec/examples/model/naming_spec.rb
-- spec/examples/model/properties_spec.rb
+- spec/examples/model/dictionary_spec.rb
 - spec/examples/model/observer_spec.rb
-- spec/examples/model/mass_assignment_security_spec.rb
-- spec/examples/model/dynamic_spec.rb
 - spec/examples/model/dirty_spec.rb
-- spec/examples/model/spec_helper.rb
-- spec/examples/model/timestamps_spec.rb
-- spec/examples/model/persistence_spec.rb
-- spec/examples/model/magic_spec.rb
-- spec/examples/model/counter_spec.rb
 - spec/examples/model/callbacks_spec.rb
-- spec/examples/model/inheritable_spec.rb
-- spec/examples/model/scope_spec.rb
-- spec/examples/model/dictionary_spec.rb
+- spec/examples/model/persistence_spec.rb
 - spec/examples/model/serialization_spec.rb
+- spec/examples/model/dynamic_spec.rb
 - spec/examples/model/validations_spec.rb
-- spec/examples/model/associations_spec.rb
+- spec/examples/model/scope_spec.rb
+- spec/examples/model/mass_assignment_security_spec.rb
+- spec/examples/model/timestamps_spec.rb
+- spec/examples/model/properties_spec.rb
+- spec/examples/model/counter_spec.rb
+- spec/examples/model/inheritable_spec.rb
 - spec/examples/model/translation_spec.rb
+- spec/examples/model/associations_spec.rb
+- spec/examples/model/naming_spec.rb
+- spec/examples/model/spec_helper.rb
+- spec/examples/model/magic_spec.rb
+- spec/examples/data_set_spec.rb
+- spec/examples/keyspace_spec.rb
+- spec/examples/spec_helper.rb
 has_rdoc: false