cequel 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df5fb851e4ce9dda4900d848faf903c32d63d069
-  data.tar.gz: 38d3ea0bda230427ddb452269976612fc2519026
+  metadata.gz: cbbbc8b19ddcc607473f72539c53fb5aaf00aa7e
+  data.tar.gz: b417bdbf6d4308074b1c83cc348cd8370913252e
 SHA512:
-  metadata.gz: b43b31556885f28cefc1c0285214448de5dcca189d3fbe414702bd887c4e7e20924affa0a5cc94cdfaa06acbd77c6418626b8ab136c974234d6bf8227f8ef8f4
-  data.tar.gz: e8790f4c65c31b17ec3dc2bd2b838403cbd456e6a95e425a9adc11a8a2a9ec504727d6e842b377c6a8c9002c05a28b875be65736c6407c5e3c32d8303e1aa35c
+  metadata.gz: b7259fcb8ca0ce0ef51d8417b1060726c6de8579041a066dfaf676a43902bfe3d652e086eaf62552627f47579bef4314df04770a165cfd8af6ba4a43be64c277
+  data.tar.gz: f397e3c887fe4bfcecd4de9666b3b53885576a3cc192cdd3a6fb14ae3f432b55026bfd665ebb7f99f37034f6a255dfee39dcd8e764309e20d543b7cb57fd0034

data/lib/cequel/metal/updater.rb

@@ -12,6 +12,14 @@ module Cequel
     # @since 1.0.0
     #
     class Updater < Writer
+      #
+      # @see Writer#initialize
+      #
+      def initialize(*)
+        @column_updates = {}
+        super
+      end
+
       #
       # Directly set column values
       #
@@ -22,10 +30,7 @@ module Cequel
       #
       def set(data)
         data.each_pair do |column, value|
-          prepare_upsert_value(value) do |binding, *values|
-            statements << "#{column} = #{binding}"
-            bind_vars.concat(values)
-          end
+          column_updates[column.to_sym] = value
         end
       end
 
@@ -131,12 +136,28 @@ module Cequel
 
       private
 
+      attr_reader :column_updates
+
+      def empty?
+        super && column_updates.empty?
+      end
+
       def write_to_statement(statement)
+        prepare_column_updates
         statement.append("UPDATE #{table_name}")
           .append(generate_upsert_options)
           .append(" SET ")
           .append(statements.join(', '), *bind_vars)
       end
+
+      def prepare_column_updates
+        column_updates.each_pair do |column, value|
+          prepare_upsert_value(value) do |binding, *values|
+            statements << "#{column} = #{binding}"
+            bind_vars.concat(values)
+          end
+        end
+      end
     end
   end
 end

data/lib/cequel/record/properties.rb

@@ -82,6 +82,9 @@ module Cequel
         # @option options [Boolean] :auto (false) automatically initialize this
         #   key with a UUID value for new records. Only valid for `uuid` and
         #   `timeuuid` columns.
+        # @option options [:asc,:desc] :order whether rows should be ordered
+        #   ascending or descending by this column. Only valid for clustering
+        #   columns
         # @return [void]
         #
         # @note {Associations::ClassMethods#belongs_to belongs_to} implicitly

data/lib/cequel/record/schema.rb

@@ -102,7 +102,7 @@ module Cequel
           if options[:partition]
             table_schema.add_partition_key(name, type)
           else
-            table_schema.add_key(name, type)
+            table_schema.add_key(name, type, options[:order])
           end
         end
 

data/lib/cequel/version.rb

@@ -1,4 +1,4 @@
 module Cequel
   # The current version of the library
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/examples/metal/data_set_spec.rb

@@ -152,6 +152,18 @@ describe Cequel::Metal::DataSet do
       cequel[:posts].where(row_keys).first[:categories].
         should == %w(Scalability Fault-Tolerance)
     end
+
+    it 'should use the last value set for a given column' do
+      cequel[:posts].insert(
+        row_keys.merge(title: 'Big Data',
+                       body: 'Cassandra',
+                       categories: ['Scalability']))
+      cequel[:posts].where(row_keys).update do
+        set(title: 'Bigger Data')
+        set(title: 'Even Bigger Data')
+      end
+      cequel[:posts].where(row_keys).first[:title].should == 'Even Bigger Data'
+    end
   end
 
   describe '#list_prepend' do

data/spec/examples/record/schema_spec.rb

@@ -45,6 +45,28 @@ describe Cequel::Record::Schema do
     end
   end
 
+  context 'CQL3 table with reversed clustering column' do
+
+    let(:model) do
+      Class.new do
+        include Cequel::Record
+        self.table_name = 'posts'
+
+        key :blog_id, :uuid
+        key :id, :timeuuid, order: :desc
+        column :title, :text
+      end
+    end
+
+    before { model.synchronize_schema }
+    after { cequel.schema.drop_table(:posts) }
+    subject { cequel.schema.read_table(:posts) }
+
+    it 'should order clustering column descending' do
+      subject.clustering_columns.first.clustering_order.should == :desc
+    end
+  end
+
   context 'wide-row legacy table' do
     let(:legacy_model) do
       Class.new do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Mat Brown
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-08 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport