cequel 1.0.4 → 1.1.0

data/lib/cequel/metal/logger.rb

@@ -47,7 +47,7 @@ module Cequel
 
       private
 
-      def_delegator 'CassandraCQL::Statement', :sanitize
+      def_delegator 'Cequel::Metal::Keyspace', :sanitize
     end
 
     #

data/lib/cequel/metal/row.rb

@@ -9,9 +9,9 @@ module Cequel
     #
     class Row < DelegateClass(ActiveSupport::HashWithIndifferentAccess)
       #
-      # Encapsulate a row from CassandraCQL
+      # Encapsulate a result row from the driver
       #
-      # @param result_row [CassandraCQL::Row] row from underlying driver
+      # @param result_row [Hash] row from underlying driver
       # @return [Row] encapsulated row
       #
       # @api private
@@ -19,8 +19,7 @@ module Cequel
       def self.from_result_row(result_row)
         if result_row
           new.tap do |row|
-            names, values = result_row.column_names, result_row.column_values
-            names.zip(values) do |name, value|
+            result_row.each_pair do |name, value|
               if name =~ /^(ttl|writetime)\((.+)\)$/
                 if $1 == 'ttl' then row.set_ttl($2, value)
                 else row.set_writetime($2, value)

data/lib/cequel/metal/updater.rb

@@ -143,10 +143,10 @@ module Cequel
         super && column_updates.empty?
       end
 
-      def write_to_statement(statement)
+      def write_to_statement(statement, options)
         prepare_column_updates
         statement.append("UPDATE #{table_name}")
-          .append(generate_upsert_options)
+          .append(generate_upsert_options(options))
           .append(" SET ")
           .append(statements.join(', '), *bind_vars)
       end

data/lib/cequel/metal/writer.rb

@@ -15,13 +15,8 @@ module Cequel
 
       #
       # @param data_set [DataSet] data set to write to
-      # @param options [Options] options
-      # @option options [Integer] :ttl time-to-live in seconds for the written
-      #   data
-      # @option options [Time,Integer] :timestamp the timestamp associated with
-      #   the column values
       #
-      def initialize(data_set, options = {}, &block)
+      def initialize(data_set, &block)
         @data_set, @options, @block = data_set, options, block
         @statements, @bind_vars = [], []
         SimpleDelegator.new(self).instance_eval(&block) if block
@@ -30,14 +25,24 @@ module Cequel
       #
       # Execute the statement as a write operation
       #
+      # @param options [Options] options
+      # @opiton options [Symbol] :consistency what consistency level to use for
+      #   the operation
+      # @option options [Integer] :ttl time-to-live in seconds for the written
+      #   data
+      # @option options [Time,Integer] :timestamp the timestamp associated with
+      #   the column values
       # @return [void]
       #
-      def execute
+      def execute(options = {})
+        options.assert_valid_keys(:timestamp, :ttl, :consistency)
         return if empty?
         statement = Statement.new
-        write_to_statement(statement)
+        consistency = options.fetch(:consistency, data_set.query_consistency)
+        write_to_statement(statement, options)
         statement.append(*data_set.row_specifications_cql)
-        data_set.write(*statement.args)
+        data_set.write_with_consistency(
+          statement.cql, statement.bind_vars, consistency)
       end
 
       private
@@ -63,12 +68,13 @@ module Cequel
       #
       # Generate CQL option statement for inserts and updates
       #
-      def generate_upsert_options
-        if options.empty?
+      def generate_upsert_options(options)
+        upsert_options = options.slice(:timestamp, :ttl)
+        if upsert_options.empty?
           ''
         else
           ' USING ' <<
-          options.map do |key, value|
+          upsert_options.map do |key, value|
             serialized_value =
               case key
               when :timestamp then (value.to_f * 1_000_000).to_i

data/lib/cequel/record/associations.rb

@@ -82,6 +82,10 @@ module Cequel
         # has a primary key `(subdomain)`, this will declare a key column
         # `blog_subdomain` of the same type.
         #
+        # If the parent class has multiple keys, e.g. it belongs to a parent
+        # class, defining a `partition: true` option will declare all of the
+        # parent's keys as partition key columns for this class.
+        #
         # Parent associations are read/write, so declaring `belongs_to :blog`
         # will define a `blog` getter and `blog=` setter, which will update the
         # underlying key column. Note that a record's parent cannot be changed
@@ -104,12 +108,14 @@ module Cequel
                  "belongs_to association must be declared before declaring " \
                  "key(s)"
           end
+          
+          key_options = options.extract!(:partition)
 
           self.parent_association =
             BelongsToAssociation.new(self, name.to_sym, options)
 
           parent_association.association_key_columns.each do |column|
-            key :"#{name}_#{column.name}", column.type
+            key :"#{name}_#{column.name}", column.type, key_options
           end
           def_parent_association_accessors
         end

data/lib/cequel/record/bound.rb

@@ -28,7 +28,7 @@ module Cequel
         implementation =
           if column.partition_key?
             PartitionKeyBound
-          elsif column.type?(:timeuuid) && !value.is_a?(CassandraCQL::UUID)
+          elsif column.type?(:timeuuid) && !Cequel.uuid?(value)
             TimeuuidBound
           else
             ClusteringColumnBound

data/lib/cequel/record/callbacks.rb

@@ -31,21 +31,25 @@ module Cequel
 
       # (see Persistence#save)
       def save(options = {})
-        connection.batch { run_callbacks(:save) { super } }
+        connection.batch(options.slice(:consistency)) do
+          run_callbacks(:save) { super }
+        end
       end
 
-      # (see Persistence#save)
-      def destroy
-        connection.batch { run_callbacks(:destroy) { super } }
+      # (see Persistence#destroy)
+      def destroy(options = {})
+        connection.batch(options.slice(:consistency)) do
+          run_callbacks(:destroy) { super }
+        end
       end
 
       protected
 
-      def create
+      def create(*)
         run_callbacks(:create) { super }
       end
 
-      def update
+      def update(*)
         run_callbacks(:update) { super }
       end
     end

data/lib/cequel/record/data_set_builder.rb

@@ -14,7 +14,7 @@ module Cequel
       # Build a data set for the given record set
       #
       # @param (see #initialize)
-      # @return [Metal::DataSet] a DataSet exposing the rows for the record set
+      # @return (see #build)
       #
       def self.build_for(record_set)
         new(record_set).build
@@ -30,12 +30,16 @@ module Cequel
       end
       private_class_method :new
 
+      #
+      # @return [Metal::DataSet] a DataSet exposing the rows for the record set
+      #
       def build
         add_limit
         add_select_columns
         add_where_statement
         add_bounds
         add_order
+        set_consistency
         data_set
       end
 
@@ -46,7 +50,8 @@ module Cequel
       def_delegators :record_set, :row_limit, :select_columns,
                      :scoped_key_names, :scoped_key_values,
                      :scoped_indexed_column, :lower_bound,
-                     :upper_bound, :reversed?, :order_by_column
+                     :upper_bound, :reversed?, :order_by_column,
+                     :query_consistency
 
       private
 
@@ -82,6 +87,12 @@ module Cequel
       def add_order
         self.data_set = data_set.order(order_by_column => :desc) if reversed?
       end
+
+      def set_consistency
+        if query_consistency
+          self.data_set = data_set.consistency(query_consistency)
+        end
+      end
     end
   end
 end

data/lib/cequel/record/persistence.rb

@@ -171,9 +171,9 @@ module Cequel
       # @see Validations#save!
       #
       def save(options = {})
-        options.assert_valid_keys
-        if new_record? then create
-        else update
+        options.assert_valid_keys(:consistency)
+        if new_record? then create(options)
+        else update(options)
         end
         @new_record = false
         true
@@ -199,9 +199,10 @@ module Cequel
       #
       # @return [Record] self
       #
-      def destroy
+      def destroy(options = {})
+        options.assert_valid_keys(:consistency)
         assert_keys_present!
-        metal_scope.delete
+        metal_scope.delete(options)
         transient!
         self
       end
@@ -252,28 +253,29 @@ module Cequel
         self
       end
 
-      def create
+      def create(options = {})
         assert_keys_present!
-        metal_scope.insert(attributes.reject { |attr, value| value.nil? })
+        metal_scope
+          .insert(attributes.reject { |attr, value| value.nil? }, options)
         loaded!
         persisted!
       end
 
-      def update
+      def update(options = {})
         assert_keys_present!
         connection.batch do
-          updater.execute
-          deleter.execute
+          updater.execute(options)
+          deleter.execute(options)
           @updater, @deleter = nil
         end
       end
 
       def updater
-        @updater ||= metal_scope.updater
+        @updater ||= Metal::Updater.new(metal_scope)
       end
 
       def deleter
-        @deleter ||= metal_scope.deleter
+        @deleter ||= Metal::Deleter.new(metal_scope)
       end
 
       private

data/lib/cequel/record/properties.rb

@@ -101,7 +101,7 @@ module Cequel
             unless Type[type].is_a?(Cequel::Type::Uuid)
               fail ArgumentError, ":auto option only valid for UUID columns"
             end
-            default = -> { CassandraCQL::UUID.new } if options[:auto]
+            default = -> { Cequel.uuid } if options[:auto]
           end
           set_attribute_default(name, default)
         end
@@ -300,8 +300,8 @@ module Cequel
       #
       def inspect
         inspected_attributes = attributes.each_pair.map do |attr, value|
-          inspected_value = value.is_a?(CassandraCQL::UUID) ?
-            value.to_guid :
+          inspected_value = Cequel.uuid?(value) ?
+            value.to_s :
             value.inspect
           "#{attr}: #{inspected_value}"
         end

data/lib/cequel/record/railtie.rb

@@ -20,7 +20,7 @@ module Cequel
           config = YAML.load(ERB.new(IO.read(config_path)).result)[Rails.env]
             .deep_symbolize_keys
         else
-          config = {host: '127.0.0.1:9160'}
+          config = {host: '127.0.0.1:9042'}
         end
         config.reverse_merge!(keyspace: "#{Railtie.app_name}_#{Rails.env}")
         connection = Cequel.connect(config)

data/lib/cequel/record/record_set.rb

@@ -454,6 +454,16 @@ module Cequel
         scoped(reversed: !reversed?)
       end
 
+      #
+      # Set the consistency at which to read records into the record set.
+      #
+      # @param consistency [Symbol] consistency for reads
+      # @return [RecordSet] record set tuned to given consistency
+      #
+      def consistency(consistency)
+        scoped(query_consistency: consistency)
+      end
+
       #
       # @overload first
       #   @return [Record] the first record in this record set
@@ -634,9 +644,9 @@ module Cequel
       attr_reader :attributes
       hattr_reader :attributes, :select_columns, :scoped_key_values,
                    :row_limit, :lower_bound, :upper_bound,
-                   :scoped_indexed_column
+                   :scoped_indexed_column, :query_consistency
       protected :select_columns, :scoped_key_values, :row_limit, :lower_bound,
-                :upper_bound, :scoped_indexed_column
+                :upper_bound, :scoped_indexed_column, :query_consistency
       hattr_inquirer :attributes, :reversed
       protected :reversed?
 
@@ -790,16 +800,6 @@ module Cequel
         Bound.create(range_key_column, gt, inclusive, value)
       end
 
-      def cast_range_key_for_bound(value)
-        if range_key_column.type?(Type::Timeuuid) &&
-           !value.is_a?(CassandraCQL::UUID)
-
-          Type::Timestamp.instance.cast(value)
-        else
-          cast_range_key(value)
-        end
-      end
-
       def load!
         fail ArgumentError, "Not all primary key columns have specified values"
       end

data/lib/cequel/record/schema.rb

@@ -48,6 +48,9 @@ module Cequel
         # @!attribute [r] partition_key_columns
         #   (see Cequel::Schema::Table#partition_key_columns)
         #
+        # @!attribute [r] partition_key_column_names
+        #   (see Cequel::Schema::Table#partition_key_column_names)
+        #
         # @!attribute [r] clustering_columns
         #   (see Cequel::Schema::Table#clustering_columns)
         #
@@ -56,7 +59,8 @@ module Cequel
         #
         def_delegators :table_schema, :columns, :key_columns,
                        :key_column_names, :partition_key_columns,
-                       :clustering_columns, :compact_storage?
+                       :partition_key_column_names, :clustering_columns,
+                       :compact_storage?
         #
         # @!method reflect_on_column(name)
         #   (see Cequel::Schema::Table#column)

data/lib/cequel/schema/keyspace.rb

@@ -43,7 +43,7 @@ module Cequel
           options[:replication_factor] ||= 1
         end
         options_strs = options.map do |name, value|
-          "'#{name}': #{CassandraCQL::Statement.quote(value)}"
+          "'#{name}': #{Cequel::Type.quote(value)}"
         end
 
         bare_connection.execute(<<-CQL)

data/lib/cequel/schema/table_property.rb

@@ -57,7 +57,7 @@ module Cequel
       end
 
       def quote(value)
-        CassandraCQL::Statement.quote(value)
+        Cequel::Type.quote(value)
       end
     end
 

data/lib/cequel/type.rb

@@ -73,12 +73,39 @@ module Cequel
       raise UnknownType, "Unrecognized internal type #{internal_name.inspect}"
     end
 
+    #
+    # Quote an arbitrary value for use in a CQL statement by inferring the
+    # equivalent CQL type to the value's Ruby type
+    #
+    # @return [String] quoted value
+    #
+    def self.quote(value)
+      if value.is_a?(Array)
+        return value.map { |element| quote(element) }.join(',')
+      end
+      case value
+      when ::String
+        if value.encoding == Encoding::ASCII_8BIT
+          "0x#{value}"
+        else
+          "'#{value.gsub("'", "''")}'"
+        end
+      when Date, Time, ActiveSupport::TimeWithZone
+        quote(value.to_i * 1000 + value.usec / 1000)
+      when Numeric, true, false, Cql::Uuid
+        value.to_s
+      else
+        quote(value.to_s)
+      end
+    end
+
     #
     # The base class for all type objects. Types are singletons.
     #
     # @abstract Subclasses should implement {#cast}, and may implement
-    #   {#internal_names} if it cannot be inferred from the class name. The
-    #   name of the type class should be the camel-cased CQL name of the type
+    #   {#internal_names} if it cannot be inferred from the class name.
+    #   The name of the type class should be the camel-cased CQL name of the
+    #   type
     #
     class Base
       include Singleton
@@ -367,10 +394,9 @@ module Cequel
     register Timestamp.instance
 
     #
-    # `uuid` columns store type 1 and type 4 UUIDs. Cequel uses the
-    # `CassandraCQL::UUID` type to represent UUIDs in Ruby, since this is what
-    # the underlying `cassandra-cql` library expects. Other UUID formats are
-    # supported as inputs.
+    # `uuid` columns store type 1 and type 4 UUIDs. New UUID instances can be
+    # created using the {Cequel.uuid} method, and a value can be checked to see
+    # if it is a UUID recognized by Cequel using the {Cequel.uuid?} method.
     #
     # @see http://cassandra.apache.org/doc/cql3/CQL.html#types
     #   CQL3 data type documentation
@@ -381,10 +407,14 @@ module Cequel
       end
 
       def cast(value)
-        case value
-        when CassandraCQL::UUID then value
-        when SimpleUUID::UUID then CassandraCQL::UUID.new(value.to_s)
-        else CassandraCQL::UUID.new(value)
+        if value.is_a? Cql::Uuid then value
+        elsif defined?(SimpleUUID::UUID) && value.is_a?(SimpleUUID::UUID)
+          Cql::Uuid.new(value.to_i)
+        elsif value.is_a?(::Integer) || value.is_a?(::String)
+          Cql::Uuid.new(value)
+        else
+          fail ArgumentError,
+               "Don't know how to cast #{value.inspect} to a UUID"
         end
       end
     end
@@ -401,6 +431,10 @@ module Cequel
     #   CQL3 data type documentation
     #
     class Timeuuid < Uuid
+      def cast(value)
+        Cql::TimeUuid.new(super.value)
+      end
+
       def internal_names
         ['org.apache.cassandra.db.marshal.TimeUUIDType']
       end