cql-rb 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzFiOTFkMzdmNTNhMzkzYzg0ZmM5ZGViZDI4NTk1OTk0NzM0NmY0Mg==
+    ZTJjMzQ5MTY0M2I5N2JjYzZmODFkODQwNzY3ZmE2MmU1MGZjZGUzMw==
   data.tar.gz: !binary |-
-    MzRkNDQ2YjE0YmUyMjg0YTYyOWFhOTY4MDE2NGYwZDUwOTIxODEyOA==
+    N2I0MjdmODYxOTM0YjgwODFjNThhZDJmOWFlMzdiNDdjYjJmODBmNQ==
 SHA512:
   metadata.gz: !binary |-
-    NGQwOWEyNzdiYTc0YThjNWNiNGMzODAwMGY3NDgwMWEwYzEzZGRhYmQ1N2Iz
-    MDljZTkyY2EwNzE3ZTY4ZWMyMGIyZWYyZTM2MWUyMDQyMDNiY2RmYTlhODli
-    ZTBjOTM1MmY3NGM5NDQxMDY1OTJkNWM0NDBlMDdjMjE0ZDMzY2Q=
+    MzE0MWU4ZTUxYmNjOGFkMDc0MzE1YTgxMGEyN2YzMzY2NDYzYTJjZTYxNDM5
+    ZTU3NGJiY2MxYjAyZjBjOWU3NmM1NmNiMDU2ZmI0YWYxMDUyOGI5OTQ1M2Zi
+    YzBkZmRmODIyMTUyZTUxMGM3MTk5YTg4MDE3YTZhODAxY2U4MjE=
   data.tar.gz: !binary |-
-    ZjViNmJkNmQyYWIwZmQ4NGM4ZmJjMGFiYzc1NjFlZDRiYjBhZmU1ZGIxMzEw
-    MjQwOTAzODk1YmZjMTQyMDYyNDFhZTIyNDZiYmNjNDlhZDUwZDI4MWQ1MTIx
-    YTMwM2MwNjE0MDI4NDM5MTM5MjkyZjdkMDIyZDMxODk1NDhkYjc=
+    ZmMwYTY2NTU3MGZhMjMyOTk0NjhkZjRmMTA2YmU2MTVhNzYxMmRhZDkzNmU2
+    NWNiOTY1YmYzYjlkOGZlMTkyMDdkMzJiMjQyMzY1ZDFkNGI3ZDE4OTUyNzFj
+    ZTgyZWU0YzA3OTVmOWQwYjEzMDgwZTRmNmM2NDgxMjQwNDc2MTA=

data/lib/cql/protocol.rb

@@ -54,7 +54,7 @@ require 'cql/protocol/responses/set_keyspace_result_response'
 require 'cql/protocol/responses/prepared_result_response'
 require 'cql/protocol/responses/schema_change_result_response'
 require 'cql/protocol/responses/event_response'
-require 'cql/protocol/responses/schema_change_event_result_response'
+require 'cql/protocol/responses/schema_change_event_response'
 require 'cql/protocol/responses/status_change_event_result_response'
 require 'cql/protocol/responses/topology_change_event_result_response'
 require 'cql/protocol/request'

data/lib/cql/protocol/cql_protocol_handler.rb

@@ -245,22 +245,18 @@ module Cql
 
       def socket_closed(cause)
         request_failure_cause = cause || Io::ConnectionClosedError.new
+        promises_to_fail = nil
         @lock.synchronize do
-          @promises.each_with_index do |promise, i|
-            if promise
-              @promises[i].fail(request_failure_cause)
-              @promises[i] = nil
-            end
-          end
-          @request_queue_in.each do |promise|
-            promise.fail(request_failure_cause)
-          end
+          promises_to_fail = @promises.compact
+          promises_to_fail.concat(@request_queue_in)
+          promises_to_fail.concat(@request_queue_out)
+          @promises.fill(nil)
           @request_queue_in.clear
-          @request_queue_out.each do |promise|
-            promise.fail(request_failure_cause)
-          end
           @request_queue_out.clear
         end
+        promises_to_fail.each do |promise|
+          promise.fail(request_failure_cause)
+        end
         if cause
           @closed_promise.fail(cause)
         else

data/lib/cql/protocol/responses/event_response.rb

@@ -5,17 +5,16 @@ module Cql
     class EventResponse < ResultResponse
       def self.decode!(buffer)
         type = read_string!(buffer)
-        case type
-        when SchemaChangeEventResponse::TYPE
-          SchemaChangeEventResponse.decode!(buffer)
-        when StatusChangeEventResponse::TYPE
-          StatusChangeEventResponse.decode!(buffer)
-        when TopologyChangeEventResponse::TYPE
-          TopologyChangeEventResponse.decode!(buffer)
-        else
-          raise UnsupportedEventTypeError, %(Unsupported event type: "#{type}")
-        end
+        impl = EVENT_TYPES[type]
+        raise UnsupportedEventTypeError, %(Unsupported event type: "#{type}") unless impl
+        impl.decode!(buffer)
       end
+
+      private
+
+      EVENT_TYPES = {
+        # populated by subclasses
+      }
     end
   end
 end

data/lib/cql/protocol/responses/prepared_result_response.rb

@@ -18,6 +18,10 @@ module Cql
       def to_s
         %(RESULT PREPARED #{id.each_byte.map { |x| x.to_s(16) }.join('')} #@metadata)
       end
+
+      private
+
+      RESULT_TYPES[0x04] = self
     end
   end
 end

data/lib/cql/protocol/responses/result_response.rb

@@ -5,25 +5,20 @@ module Cql
     class ResultResponse < Response
       def self.decode!(buffer)
         kind = read_int!(buffer)
-        case kind
-        when 0x01
-          VoidResultResponse.decode!(buffer)
-        when 0x02
-          RowsResultResponse.decode!(buffer)
-        when 0x03
-          SetKeyspaceResultResponse.decode!(buffer)
-        when 0x04
-          PreparedResultResponse.decode!(buffer)
-        when 0x05
-          SchemaChangeResultResponse.decode!(buffer)
-        else
-          raise UnsupportedResultKindError, %(Unsupported result kind: #{kind})
-        end
+        impl = RESULT_TYPES[kind]
+        raise UnsupportedResultKindError, %(Unsupported result kind: #{kind}) unless impl
+        impl.decode!(buffer)
       end
 
       def void?
         false
       end
+
+      private
+
+      RESULT_TYPES = [
+        # populated by subclasses
+      ]
     end
   end
 end

data/lib/cql/protocol/responses/rows_result_response.rb

@@ -20,6 +20,8 @@ module Cql
 
       private
 
+      RESULT_TYPES[0x02] = self
+
       COLUMN_TYPES = [
         nil,
         :ascii,

data/lib/cql/protocol/responses/{schema_change_event_result_response.rb → schema_change_event_response.rb}

@@ -35,6 +35,10 @@ module Cql
       def to_s
         %(EVENT #@type #@change "#@keyspace" "#@table")
       end
+
+      private
+
+      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cql/protocol/responses/schema_change_result_response.rb

@@ -31,6 +31,10 @@ module Cql
       def to_s
         %(RESULT SCHEMA_CHANGE #@change "#@keyspace" "#@table")
       end
+
+      private
+
+      RESULT_TYPES[0x05] = self
     end
   end
 end

data/lib/cql/protocol/responses/set_keyspace_result_response.rb

@@ -16,6 +16,10 @@ module Cql
       def to_s
         %(RESULT SET_KEYSPACE "#@keyspace")
       end
+
+      private
+
+      RESULT_TYPES[0x03] = self
     end
   end
 end

data/lib/cql/protocol/responses/status_change_event_result_response.rb

@@ -19,6 +19,10 @@ module Cql
       def to_s
         %(EVENT #@type #@change #@address:#@port)
       end
+
+      private
+
+      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cql/protocol/responses/topology_change_event_result_response.rb

@@ -9,6 +9,10 @@ module Cql
         super
         @type = TYPE
       end
+
+      private
+
+      EVENT_TYPES[TYPE] = self
     end
   end
 end

data/lib/cql/protocol/responses/void_result_response.rb

@@ -14,6 +14,10 @@ module Cql
       def void?
         true
       end
+
+      private
+
+      RESULT_TYPES[0x01] = self
     end
   end
 end

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/spec/integration/client_spec.rb

@@ -25,8 +25,8 @@ describe 'A CQL client' do
     it 'knows which keyspace it\'s in' do
       client.use('system')
       client.keyspace.should == 'system'
-      client.use('system_auth')
-      client.keyspace.should == 'system_auth'
+      client.use('system_traces')
+      client.keyspace.should == 'system_traces'
     end
 
     it 'is not in a keyspace initially' do

data/spec/integration/protocol_spec.rb

@@ -142,7 +142,6 @@ describe 'Protocol parsing and communication' do
           raw_execute_request(Cql::Protocol::StartupRequest.new)
           response = raw_execute_request(Cql::Protocol::RegisterRequest.new('TOPOLOGY_CHANGE'))
           response.code.should == 10
-          response.message.should include('needs authentication')
         end
       end
 

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'support/await_helper'
 require 'support/fake_server'
 require 'support/fake_io_reactor'
 
-unless ENV['COVERAGE'] == 'no'
+unless ENV['COVERAGE'] == 'no' || RUBY_ENGINE == 'rbx'
   require 'coveralls'
   require 'simplecov'
 
@@ -26,4 +26,3 @@ unless ENV['COVERAGE'] == 'no'
 end
 
 require 'cql'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-07 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -57,7 +57,7 @@ files:
 - lib/cql/protocol/responses/ready_response.rb
 - lib/cql/protocol/responses/result_response.rb
 - lib/cql/protocol/responses/rows_result_response.rb
-- lib/cql/protocol/responses/schema_change_event_result_response.rb
+- lib/cql/protocol/responses/schema_change_event_response.rb
 - lib/cql/protocol/responses/schema_change_result_response.rb
 - lib/cql/protocol/responses/set_keyspace_result_response.rb
 - lib/cql/protocol/responses/status_change_event_result_response.rb
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Cassandra CQL3 driver