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

data/lib/cassandra/protocol/responses/event_response.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/protocol/responses/function_failure_error_response.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,7 +30,18 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::FunctionCallError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @keyspace, @name, @signature)
+        Errors::FunctionCallError.new(@message,
+                                      @custom_payload,
+                                      @warnings,
+                                      keyspace,
+                                      statement,
+                                      options,
+                                      hosts,
+                                      consistency,
+                                      retries,
+                                      @keyspace,
+                                      @name,
+                                      @signature)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/prepared_result_response.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.
@@ -21,7 +21,13 @@ module Cassandra
     class PreparedResultResponse < ResultResponse
       attr_reader :id, :metadata, :result_metadata, :pk_idx
 
-      def initialize(custom_payload, warnings, id, metadata, result_metadata, pk_idx, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     id,
+                     metadata,
+                     result_metadata,
+                     pk_idx,
+                     trace_id)
         super(custom_payload, warnings, trace_id)
         @id              = id
         @metadata        = metadata
@@ -30,9 +36,9 @@ module Cassandra
       end
 
       def eql?(other)
-        self.id == other.id && self.metadata == other.metadata && self.trace_id == other.trace_id
+        id == other.id && metadata == other.metadata && trace_id == other.trace_id
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -46,7 +52,7 @@ module Cassandra
 
       def to_s
         hex_id = @id.each_byte.map { |x| x.to_s(16).rjust(2, '0') }.join('')
-        %(RESULT PREPARED #{hex_id} #@metadata)
+        %(RESULT PREPARED #{hex_id} #{@metadata})
       end
 
       private

data/lib/cassandra/protocol/responses/raw_rows_result_response.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.
@@ -19,7 +19,12 @@
 module Cassandra
   module Protocol
     class RawRowsResultResponse < RowsResultResponse
-      def initialize(custom_payload, warnings, protocol_version, raw_rows, paging_state, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     protocol_version,
+                     raw_rows,
+                     paging_state,
+                     trace_id)
         super(custom_payload, warnings, nil, nil, paging_state, trace_id)
         @protocol_version = protocol_version
         @raw_rows = raw_rows
@@ -28,13 +33,13 @@ module Cassandra
       def materialize(metadata)
         @metadata = metadata
 
-        if @protocol_version == 4
-          @rows = Coder.read_values_v4(@raw_rows, @metadata)
-        elsif @protocol_version == 3
-          @rows = Coder.read_values_v3(@raw_rows, @metadata)
-        else
-          @rows = Coder.read_values_v1(@raw_rows, @metadata)
-        end
+        @rows = if @protocol_version == 4
+                  Coder.read_values_v4(@raw_rows, @metadata)
+                elsif @protocol_version == 3
+                  Coder.read_values_v3(@raw_rows, @metadata)
+                else
+                  Coder.read_values_v1(@raw_rows, @metadata)
+                end
 
         @rows
       end

data/lib/cassandra/protocol/responses/read_failure_error_response.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.
@@ -21,7 +21,15 @@ module Cassandra
     class ReadFailureErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :numfailures, :data_present
 
-      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, numfailures, data_present)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     received,
+                     blockfor,
+                     numfailures,
+                     data_present)
         super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
@@ -32,11 +40,25 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::ReadError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @numfailures, @received)
+        Errors::ReadError.new(@message,
+                              @custom_payload,
+                              @warnings,
+                              keyspace,
+                              statement,
+                              options,
+                              hosts,
+                              consistency,
+                              retries,
+                              @data_present,
+                              @consistency,
+                              @blockfor,
+                              @numfailures,
+                              @received)
       end
 
       def to_s
-        "#{super} #{@consistency} #{@received} #{@blockfor} #{@numfailures} #{@data_present}"
+        "#{super} #{@consistency} #{@received} #{@blockfor} #{@numfailures} " \
+            "#{@data_present}"
       end
     end
   end

data/lib/cassandra/protocol/responses/read_timeout_error_response.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.
@@ -21,7 +21,14 @@ module Cassandra
     class ReadTimeoutErrorResponse < ErrorResponse
       attr_reader :consistency, :received, :blockfor, :data_present
 
-      def initialize(custom_payload, warnings, code, message, consistency, received, blockfor, data_present)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     received,
+                     blockfor,
+                     data_present)
         super(custom_payload, warnings, code, message)
 
         @consistency  = consistency
@@ -31,7 +38,19 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, consistency, retries)
-        Errors::ReadTimeoutError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, consistency, retries, @data_present, @consistency, @blockfor, @received)
+        Errors::ReadTimeoutError.new(@message,
+                                     @custom_payload,
+                                     @warnings,
+                                     keyspace,
+                                     statement,
+                                     options,
+                                     hosts,
+                                     consistency,
+                                     retries,
+                                     @data_present,
+                                     @consistency,
+                                     @blockfor,
+                                     @received)
       end
 
       def to_s

data/lib/cassandra/protocol/responses/ready_response.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.
@@ -20,9 +20,9 @@ module Cassandra
   module Protocol
     class ReadyResponse < Response
       def eql?(rs)
-        self.class === rs
+        rs.is_a?(self.class)
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin

data/lib/cassandra/protocol/responses/result_response.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.
@@ -22,7 +22,9 @@ module Cassandra
       attr_reader :custom_payload, :warnings, :trace_id
 
       def initialize(custom_payload, warnings, trace_id)
-        @custom_payload, @warnings, @trace_id = custom_payload, warnings, trace_id
+        @custom_payload = custom_payload
+        @warnings = warnings
+        @trace_id = trace_id
       end
 
       def void?

data/lib/cassandra/protocol/responses/rows_result_response.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.
@@ -23,11 +23,13 @@ module Cassandra
 
       def initialize(custom_payload, warnings, rows, metadata, paging_state, trace_id)
         super(custom_payload, warnings, trace_id)
-        @rows, @metadata, @paging_state = rows, metadata, paging_state
+        @rows = rows
+        @metadata = metadata
+        @paging_state = paging_state
       end
 
       def to_s
-        %(RESULT ROWS #@metadata #@rows)
+        %(RESULT ROWS #{@metadata} #{@rows})
       end
 
       private

data/lib/cassandra/protocol/responses/schema_change_event_response.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.
@@ -43,7 +43,7 @@ module Cassandra
           @target == other.target &&
           @arguments == other.arguments
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -59,9 +59,10 @@ module Cassandra
 
       def to_s
         if @arguments
-          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name" #@arguments)
+          %(EVENT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}" ) \
+              "#{@arguments}"
         else
-          %(EVENT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
+          %(EVENT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
         end
       end
 

data/lib/cassandra/protocol/responses/schema_change_result_response.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.
@@ -19,9 +19,16 @@
 module Cassandra
   module Protocol
     class SchemaChangeResultResponse < ResultResponse
-      attr_reader :change, :keyspace, :name, :type, :target, :arguments
+      attr_reader :arguments, :change, :keyspace, :name, :target, :type
 
-      def initialize(custom_payload, warnings, change, keyspace, name, target, arguments, trace_id)
+      def initialize(custom_payload,
+                     warnings,
+                     change,
+                     keyspace,
+                     name,
+                     target,
+                     arguments,
+                     trace_id)
         super(custom_payload, warnings, trace_id)
 
         @change    = change
@@ -33,12 +40,12 @@ module Cassandra
 
       def eql?(other)
         @change == other.change &&
-        @keyspace == other.keyspace &&
-        @name == other.name &&
-        @target == other.target &&
-        @arguments == other.arguments
+          @keyspace == other.keyspace &&
+          @name == other.name &&
+          @target == other.target &&
+          @arguments == other.arguments
       end
-      alias_method :==, :eql?
+      alias == eql?
 
       def hash
         @h ||= begin
@@ -53,7 +60,7 @@ module Cassandra
       end
 
       def to_s
-        %(RESULT SCHEMA_CHANGE #@change #@target "#@keyspace" "#@name")
+        %(RESULT SCHEMA_CHANGE #{@change} #{@target} "#{@keyspace}" "#{@name}")
       end
 
       private

data/lib/cassandra/protocol/responses/set_keyspace_result_response.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.
@@ -27,7 +27,7 @@ module Cassandra
       end
 
       def to_s
-        %(RESULT SET_KEYSPACE "#@keyspace")
+        %(RESULT SET_KEYSPACE "#{@keyspace}")
       end
 
       private

data/lib/cassandra/protocol/responses/status_change_event_response.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.
@@ -29,7 +29,7 @@ module Cassandra
       end
 
       def to_s
-        %(EVENT #@type #@change #@address:#@port)
+        %(EVENT #{@type} #{@change} #{@address}:#{@port})
       end
 
       private

data/lib/cassandra/protocol/responses/supported_response.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/protocol/responses/topology_change_event_response.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/protocol/responses/unavailable_error_response.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.
@@ -21,7 +21,13 @@ module Cassandra
     class UnavailableErrorResponse < ErrorResponse
       attr_reader :consistency, :required, :alive
 
-      def initialize(custom_payload, warnings, code, message, consistency, required, alive)
+      def initialize(custom_payload,
+                     warnings,
+                     code,
+                     message,
+                     consistency,
+                     required,
+                     alive)
         super(custom_payload, warnings, code, message)
 
         @consistency = consistency
@@ -30,7 +36,18 @@ module Cassandra
       end
 
       def to_error(keyspace, statement, options, hosts, r_consistency, retries)
-        Errors::UnavailableError.new(@message, @custom_payload, @warnings, keyspace, statement, options, hosts, r_consistency, retries, @consistency, @required, @alive)
+        Errors::UnavailableError.new(@message,
+                                     @custom_payload,
+                                     @warnings,
+                                     keyspace,
+                                     statement,
+                                     options,
+                                     hosts,
+                                     r_consistency,
+                                     retries,
+                                     @consistency,
+                                     @required,
+                                     @alive)
       end
 
       def to_s