cassandra-driver 3.0.0.beta.1 → 3.0.0.rc.1

data/lib/cassandra/statements/simple.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -48,21 +48,27 @@ module Cassandra
       #
       # @raise [ArgumentError] if cql statement given is not a String
       def initialize(cql, params = nil, type_hints = nil, idempotent = false)
-        Util.assert_instance_of(::String, cql) { "cql must be a string, #{cql.inspect} given" }
+        Util.assert_instance_of(::String, cql) do
+          "cql must be a string, #{cql.inspect} given"
+        end
 
         params ||= EMPTY_LIST
 
         if params.is_a?(::Hash)
           params_names = []
-          params = params.each_with_object([]) do |(name, value), params|
+          params = params.each_with_object([]) do |(name, value), collector|
             params_names << name
-            params       << value
+            collector    << value
           end
           if type_hints && !type_hints.empty?
-            Util.assert_instance_of(::Hash, type_hints) { "type_hints must be a Hash when using named params" }
+            Util.assert_instance_of(::Hash, type_hints) do
+              'type_hints must be a Hash when using named params'
+            end
           end
         else
-          Util.assert_instance_of(::Array, params) { "params must be an Array or a Hash, #{params.inspect} given" }
+          Util.assert_instance_of(::Array, params) do
+            "params must be an Array or a Hash, #{params.inspect} given"
+          end
           params_names = EMPTY_LIST
         end
 
@@ -71,19 +77,26 @@ module Cassandra
         if type_hints.is_a?(::Hash)
           type_hints = params_names.map {|name| type_hints[name] }
         else
-          Util.assert_instance_of(::Array, type_hints) { "type_hints must be an Array or a Hash, #{type_hints.inspect} given" }
+          Util.assert_instance_of(::Array, type_hints) do
+            "type_hints must be an Array or a Hash, #{type_hints.inspect} given"
+          end
         end
 
         @cql          = cql
         @params       = params
-        @params_types = params.each_with_index.map {|value, index| (!type_hints.empty? && type_hints[index] && type_hints[index].is_a?(Type)) ? type_hints[index] : Util.guess_type(value)}
+        @params_types = params.each_with_index.map do |value, index|
+          (!type_hints.empty? && type_hints[index] && type_hints[index].is_a?(Type)) ?
+              type_hints[index] :
+              Util.guess_type(value)
+        end
         @params_names = params_names
         @idempotent   = idempotent
       end
 
       # @return [String] a CLI-friendly simple statement representation
       def inspect
-        "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @cql=#{@cql.inspect} @params=#{@params.inspect}>"
+        "#<#{self.class.name}:0x#{object_id.to_s(16)} @cql=#{@cql.inspect} " \
+            "@params=#{@params.inspect}>"
       end
 
       # @param other [Object, Cassandra::Statements::Simple] object to compare
@@ -94,7 +107,7 @@ module Cassandra
           @params == other.params
       end
 
-      alias :== :eql?
+      alias == eql?
     end
   end
 end

data/lib/cassandra/statements/void.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/cassandra/table.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,12 +30,23 @@ module Cassandra
                   :replicate_on_write, :compaction_strategy, :compact_storage,
                   :compression_parameters
 
-      def initialize(comment, read_repair_chance, local_read_repair_chance,
-                     gc_grace_seconds, caching, bloom_filter_fp_chance,
-                     populate_io_cache_on_flush, memtable_flush_period_in_ms,
-                     default_time_to_live, speculative_retry, index_interval,
-                     replicate_on_write, min_index_interval, max_index_interval,
-                     compaction_strategy, compression_parameters, compact_storage)
+      def initialize(comment,
+                     read_repair_chance,
+                     local_read_repair_chance,
+                     gc_grace_seconds,
+                     caching,
+                     bloom_filter_fp_chance,
+                     populate_io_cache_on_flush,
+                     memtable_flush_period_in_ms,
+                     default_time_to_live,
+                     speculative_retry,
+                     index_interval,
+                     replicate_on_write,
+                     min_index_interval,
+                     max_index_interval,
+                     compaction_strategy,
+                     compression_parameters,
+                     compact_storage)
         @comment                     = comment
         @read_repair_chance          = read_repair_chance
         @local_read_repair_chance    = local_read_repair_chance
@@ -71,22 +82,53 @@ module Cassandra
         options = []
 
         options << 'COMPACT STORAGE' if @compact_storage
-        options << "bloom_filter_fp_chance = #{Util.encode_object(@bloom_filter_fp_chance)}" unless @bloom_filter_fp_chance.nil?
+        unless @bloom_filter_fp_chance.nil?
+          options <<
+            "bloom_filter_fp_chance = #{Util.encode_object(@bloom_filter_fp_chance)}"
+        end
         options << "caching = #{Util.encode_object(@caching)}" unless @caching.nil?
         options << "comment = #{Util.encode_object(@comment)}" unless @comment.nil?
-        options << "compaction = #{@compaction_strategy.to_cql}" unless @compaction_strategy.nil?
-        options << "compression = #{Util.encode_object(@compression_parameters)}" unless @compression_parameters.nil?
-        options << "dclocal_read_repair_chance = #{Util.encode_object(@local_read_repair_chance)}" unless @local_read_repair_chance.nil?
-        options << "default_time_to_live = #{Util.encode_object(@default_time_to_live)}" unless @default_time_to_live.nil?
-        options << "gc_grace_seconds = #{Util.encode_object(@gc_grace_seconds)}" unless @gc_grace_seconds.nil?
-        options << "index_interval = #{Util.encode_object(@index_interval)}" unless @index_interval.nil?
-        options << "max_index_interval = #{Util.encode_object(@max_index_interval)}" unless @max_index_interval.nil?
-        options << "memtable_flush_period_in_ms = #{Util.encode_object(@memtable_flush_period_in_ms)}" unless @memtable_flush_period_in_ms.nil?
-        options << "min_index_interval = #{Util.encode_object(@min_index_interval)}" unless @min_index_interval.nil?
-        options << "populate_io_cache_on_flush = '#{@populate_io_cache_on_flush}'" unless @populate_io_cache_on_flush.nil?
-        options << "read_repair_chance = #{Util.encode_object(@read_repair_chance)}" unless @read_repair_chance.nil?
-        options << "replicate_on_write = '#{@replicate_on_write}'" unless @replicate_on_write.nil?
-        options << "speculative_retry = #{Util.encode_object(@speculative_retry)}" unless @speculative_retry.nil?
+        unless @compaction_strategy.nil?
+          options << "compaction = #{@compaction_strategy.to_cql}"
+        end
+        unless @compression_parameters.nil?
+          options << "compression = #{Util.encode_object(@compression_parameters)}"
+        end
+        unless @local_read_repair_chance.nil?
+          options << 'dclocal_read_repair_chance = ' \
+              "#{Util.encode_object(@local_read_repair_chance)}"
+        end
+        unless @default_time_to_live.nil?
+          options << "default_time_to_live = #{Util.encode_object(@default_time_to_live)}"
+        end
+        unless @gc_grace_seconds.nil?
+          options << "gc_grace_seconds = #{Util.encode_object(@gc_grace_seconds)}"
+        end
+        unless @index_interval.nil?
+          options << "index_interval = #{Util.encode_object(@index_interval)}"
+        end
+        unless @max_index_interval.nil?
+          options << "max_index_interval = #{Util.encode_object(@max_index_interval)}"
+        end
+        unless @memtable_flush_period_in_ms.nil?
+          options << 'memtable_flush_period_in_ms = ' \
+              "#{Util.encode_object(@memtable_flush_period_in_ms)}"
+        end
+        unless @min_index_interval.nil?
+          options << "min_index_interval = #{Util.encode_object(@min_index_interval)}"
+        end
+        unless @populate_io_cache_on_flush.nil?
+          options << "populate_io_cache_on_flush = '#{@populate_io_cache_on_flush}'"
+        end
+        unless @read_repair_chance.nil?
+          options << "read_repair_chance = #{Util.encode_object(@read_repair_chance)}"
+        end
+        unless @replicate_on_write.nil?
+          options << "replicate_on_write = '#{@replicate_on_write}'"
+        end
+        unless @speculative_retry.nil?
+          options << "speculative_retry = #{Util.encode_object(@speculative_retry)}"
+        end
 
         options.join("\nAND ")
       end
@@ -109,7 +151,7 @@ module Cassandra
           @compression_parameters == other.compression_parameters &&
           @compact_storage == other.compact_storage
       end
-      alias :== :eql?
+      alias == eql?
     end
 
     # @private
@@ -133,7 +175,7 @@ module Cassandra
           @klass == other.klass &&
           @options == other.options
       end
-      alias :== :eql?
+      alias == eql?
     end
 
     # @private
@@ -146,7 +188,13 @@ module Cassandra
     attr_reader :partition_key
 
     # @private
-    def initialize(keyspace, name, partition_key, clustering_columns, columns, options, clustering_order)
+    def initialize(keyspace,
+                   name,
+                   partition_key,
+                   clustering_columns,
+                   columns,
+                   options,
+                   clustering_order)
       @keyspace           = keyspace
       @name               = name
       @partition_key      = partition_key
@@ -159,7 +207,7 @@ module Cassandra
     # @param name [String] column name
     # @return [Boolean] whether this table has a given column
     def has_column?(name)
-      @columns.has_key?(name)
+      @columns.key?(name)
     end
 
     # @param name [String] column name
@@ -182,7 +230,7 @@ module Cassandra
         @columns.values
       end
     end
-    alias :columns :each_column
+    alias columns each_column
 
     # @return [String] a cql representation of this table
     def to_cql
@@ -229,7 +277,7 @@ module Cassandra
       cql << "\n)\nWITH "
 
       if @clustering_order.any? {|o| o != :asc}
-        cql << "CLUSTERING ORDER BY ("
+        cql << 'CLUSTERING ORDER BY ('
         first = true
         @clustering_columns.zip(@clustering_order) do |column, order|
           if first
@@ -249,7 +297,8 @@ module Cassandra
 
     # @private
     def inspect
-      "#<#{self.class.name}:0x#{self.object_id.to_s(16)} @keyspace=#{@keyspace} @name=#{@name}>"
+      "#<#{self.class.name}:0x#{object_id.to_s(16)} " \
+          "@keyspace=#{@keyspace} @name=#{@name}>"
     end
 
     # @private
@@ -263,7 +312,7 @@ module Cassandra
         @options == other.options &&
         @clustering_order == other.clustering_order
     end
-    alias :== :eql?
+    alias == eql?
 
     private
 
@@ -282,7 +331,7 @@ module Cassandra
         if is_frozen
           "frozen <#{type}>"
         else
-          "#{type}"
+          type.to_s
         end
       end
     end

data/lib/cassandra/time.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ module Cassandra
     # @private
     def initialize(nanoseconds = 0)
       if nanoseconds < 0 && nanoseconds > NANOSECONDS_IN_DAY - 1
-        raise ::ArgumentError, "value must be between 0 and " \
+        raise ::ArgumentError, 'value must be between 0 and ' \
                                "#{NANOSECONDS_IN_DAY}, #{value.inspect} given"
       end
 
@@ -57,18 +57,23 @@ module Cassandra
     # @return [Integer] an integer between 0 and 60, the number of full seconds
     #   since the last full minutes that this time represents
     def seconds
-      (@nanoseconds - (hours * NANOSECONDS_IN_HOUR) - (minutes * NANOSECONDS_IN_MINUTE)) / NANOSECONDS_IN_SECOND
+      (@nanoseconds -
+          (hours * NANOSECONDS_IN_HOUR) -
+          (minutes * NANOSECONDS_IN_MINUTE)) / NANOSECONDS_IN_SECOND
     end
 
     # @return [Integer] an integer between 0 and 60, the number of full
     #   miliseconds since the last full second that this time represents
     def miliseconds
-      (@nanoseconds - (hours * NANOSECONDS_IN_HOUR) - (minutes * NANOSECONDS_IN_MINUTE) - (seconds * NANOSECONDS_IN_SECOND)) / NANOSECONDS_IN_MILISECOND
+      (@nanoseconds -
+          (hours * NANOSECONDS_IN_HOUR) -
+          (minutes * NANOSECONDS_IN_MINUTE) -
+          (seconds * NANOSECONDS_IN_SECOND)) / NANOSECONDS_IN_MILISECOND
     end
 
     # @return [String] a "%H:%M%S.%3N" formatted time string
     def to_s
-      '%.2d:%.2d:%.2d.%.3d' % [hours, minutes, seconds, miliseconds]
+      format('%.2d:%.2d:%.2d.%.3d', hours, minutes, seconds, miliseconds)
     end
 
     # @return [Integer] an integer between 0 and 86400000000000, the number of
@@ -81,7 +86,7 @@ module Cassandra
     def eql?(other)
       other.is_a?(Time) && other.to_nanoseconds == @nanoseconds
     end
-    alias :== :eql?
+    alias == eql?
 
     # @private
     def <=>(other)

data/lib/cassandra/time_uuid.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@ module Cassandra
     # @return [Time]
     def to_time
       t = time_bits - GREGORIAN_OFFSET
-      seconds = t/10_000_000
-      microseconds = (t - seconds * 10_000_000)/10.0
+      seconds = t / 10_000_000
+      microseconds = (t - seconds * 10_000_000) / 10.0
 
       ::Time.at(seconds, microseconds).utc
     end
@@ -52,10 +52,10 @@ module Cassandra
     # @return [Integer] `-1` when less than `other`, `0` when equal to `other`
     #   and `1` when greater than `other`
     def <=>(other)
-      return nil unless other.kind_of?(Cassandra::Uuid)
-      c = self.value <=> other.value
+      return nil unless other.is_a?(Cassandra::Uuid)
+      c = value <=> other.value
       return c if c == 0 || !other.is_a?(Cassandra::TimeUuid)
-      self.time_bits <=> other.time_bits
+      time_bits <=> other.time_bits
     end
 
     protected
@@ -77,4 +77,4 @@ module Cassandra
     # @private
     GREGORIAN_OFFSET = 122192928000000000
   end
-end
+end

data/lib/cassandra/tuple.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,12 +40,16 @@ module Cassandra
 
       def fetch(i)
         i = Integer(i)
-        raise ::IndexError, "index #{i} is outside of tuple, size: #{@types.size}" if i < 0 || i >= @types.size
+        if i < 0 || i >= @types.size
+          raise ::IndexError, "index #{i} is outside of tuple, size: #{@types.size}"
+        end
         @values[i]
       end
 
       def []=(i, value)
-        raise ::IndexError, "index #{i} is outside of tuple, size: #{@types.size}" if i < 0 || i >= @types.size
+        if i < 0 || i >= @types.size
+          raise ::IndexError, "index #{i} is outside of tuple, size: #{@types.size}"
+        end
         Util.assert_type(@types[i], value)
         @values[i] = value
       end
@@ -55,7 +59,7 @@ module Cassandra
       end
 
       def inspect
-        "#<Cassandra::Tuple:0x#{self.object_id.to_s(16)} #{to_s}>"
+        "#<Cassandra::Tuple:0x#{object_id.to_s(16)} #{self}>"
       end
     end
 
@@ -86,7 +90,9 @@ module Cassandra
     # @return [Object] value of the tuple at position `i`
     def fetch(i)
       i = Integer(i)
-      raise ::IndexError, "index #{i} is outside of tuple, size: #{@values.size}" if i < 0 || i >= @values.size
+      if i < 0 || i >= @values.size
+        raise ::IndexError, "index #{i} is outside of tuple, size: #{@values.size}"
+      end
       @values[i]
     end
 
@@ -97,7 +103,9 @@ module Cassandra
     # @return [Object] value of the tuple at position `i`
     def []=(i, value)
       i = Integer(i)
-      raise ::IndexError, "index #{i} is outside of tuple, size: #{@values.size}" if i < 0 || i >= @values.size
+      if i < 0 || i >= @values.size
+        raise ::IndexError, "index #{i} is outside of tuple, size: #{@values.size}"
+      end
       @values[i] = value
     end
 
@@ -114,14 +122,14 @@ module Cassandra
 
     # @private
     def inspect
-      "#<Cassandra::Tuple:0x#{self.object_id.to_s(16)} #{to_s}>"
+      "#<Cassandra::Tuple:0x#{object_id.to_s(16)} #{self}>"
     end
 
     # @private
     def eql?(other)
       other == @values
     end
-    alias :== :eql?
+    alias == eql?
 
     # @private
     def hash

data/lib/cassandra/types.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 #--
-# Copyright 2013-2015 DataStax, Inc.
+# Copyright 2013-2016 DataStax, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -144,7 +144,10 @@ module Cassandra
       end
 
       def assert_boolean(value, message, &block)
-        Util.assert_instance_of_one_of([::TrueClass, ::FalseClass], value, message, &block)
+        Util.assert_instance_of_one_of([::TrueClass, ::FalseClass],
+                                       value,
+                                       message,
+                                       &block)
       end
 
       def new_decimal(value)
@@ -193,7 +196,7 @@ module Cassandra
         Util.assert_instance_of(::Time, value, message, &block)
       end
 
-      def new_uuid(value, message, &block)
+      def new_uuid(value)
         Cassandra::Uuid.new(value)
       end
 
@@ -1042,7 +1045,9 @@ module Cassandra
       #
       #   tuple(varchar, varchar, int).new('Jane', 'Smith', 38) # => (Jane, Smith, 38)
       def new(*values)
-        Util.assert(values.size <= @members.size) { "too many values: #{values.size} out of max #{@members.size}" }
+        Util.assert(values.size <= @members.size) do
+          "too many values: #{values.size} out of max #{@members.size}"
+        end
         values.each_with_index do |v, i|
           Util.assert_type(@members[i], v)
         end
@@ -1240,7 +1245,9 @@ module Cassandra
         value = value.first if value.one?
         value = Array(value) unless value.is_a?(::Hash)
 
-        Util.assert(value.size <= @fields.size) { "too many values: #{value.size} out of #{@fields.size}" }
+        Util.assert(value.size <= @fields.size) do
+          "too many values: #{value.size} out of #{@fields.size}"
+        end
 
         case value
         when ::Array
@@ -1282,7 +1289,8 @@ module Cassandra
       # @return [String] `"keyspace.name"`
       # @see Cassandra::Type#to_s
       def to_s
-        "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)} {#{@fields.join(', ')}}"
+        "#{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)} " \
+            "{#{@fields.join(', ')}}"
       end
 
       def hash
@@ -1306,7 +1314,8 @@ module Cassandra
 
       # Output this type in CQL
       def to_cql
-        cql   = "CREATE TYPE #{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)} (\n"
+        cql   = "CREATE TYPE #{Util.escape_name(@keyspace)}.#{Util.escape_name(@name)} " \
+            "(\n"
         first = true
 
         @fields.each do |field|
@@ -1355,7 +1364,8 @@ module Cassandra
       # @param value [*Object] value to be coerced
       # @return [Object] a value of this type
       def new(*value)
-        raise ::NotImplementedError, "unable to create a value for custom type: #{@name.inspect}"
+        raise ::NotImplementedError,
+              "unable to create a value for custom type: #{@name.inspect}"
       end
 
       # Asserts that a given value is of this type
@@ -1365,7 +1375,8 @@ module Cassandra
       # @raise [ArgumentError] if the value is invalid
       # @return [void]
       def assert(value, message = nil, &block)
-        raise ::NotImplementedError, "unable to assert a value for custom type: #{@name.inspect}"
+        raise ::NotImplementedError,
+              "unable to assert a value for custom type: #{@name.inspect}"
       end
 
       # @return [String] a cassandra representation of this type