cql-rb 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee42c11d2d4d39946b1df62d6d0cd9ef240edf57
-  data.tar.gz: c2d82f55a791696d8ea9e1d0529f0c1fbec31c02
+  metadata.gz: dcb7e0235108a8f81d404fd31054f2d1ac4701d4
+  data.tar.gz: 928b20dfd3e07da9062c3443b57de7b68e82f1df
 SHA512:
-  metadata.gz: ced007c5c12672918218c0c3e24d792f77a84d81779c972aeb10b976355f9f5d860615835c1b7878f267380a19e8960a1f2cab347c15e978a65d3a287049a4be
-  data.tar.gz: 896789b373ba5310738f046c823dac12f261f544116000a39594d9f4dd6a30cef37a213e7fbef3a3267565f8469c3124762c4b86475dae79677fb066d9b7d537
+  metadata.gz: 31788daec8a14dd8c2a3a0588e510ff54cef4b8ad289dfb806a978b49035345b760e5602cd5142930acfd2a56e6f289304efb714b5984f117b07e9196833d580
+  data.tar.gz: 4518fdb25311bd20433aae27094015d4502c53e9f793670a85fca6ed20da351e8065f08197a5621ecec3d82fe3050e6b368c02db5ffa614ddae82baf623b8c19

data/README.md

@@ -358,9 +358,9 @@ There's a known issue with collections that get too big. The protocol uses a sho
 
 ## Authentication doesn't work
 
-Please open an issue. It should be working, but it's hard to set up and write automated tests for, so there may be edge cases that aren't covered. If you're using Cassandra 2.0 or DataStax Enterprise 4.0 or higher and are using something other than the built in `PasswordAuthenticator` your setup is theoretically supported, but it's not field tested.
+Please open an issue. It should be working, but it's hard to set up and write automated tests for, so there may be edge cases that aren't covered. If you're using Cassandra 2.0 or DataStax Enterprise 3.1 or higher and/or are using something other than the built in `PasswordAuthenticator` your setup is theoretically supported, but it's not field tested.
 
-If you are using DataStax Enterprise earlier than 4.0 authentication is unfortunately supported. Please open an issue and we might be able to get it working, I just need someone who's willing to test it out. DataStax backported the authentication from Cassandra 2.0 into DSE, even though it only uses Cassandra 1.2. The authentication logic might not be able to handle this and will try to authenticate with DSE using an earlier version of the protocol. In short, DSE before 4.0 uses a non-standard protocol, but it should be possible to get it working.
+If you are using DataStax Enterprise earlier than 3.1 authentication is unfortunately not supported. Please open an issue and we might be able to get it working, I just need someone who's willing to test it out. DataStax backported the authentication from Cassandra 2.0 into DSE 3.0, even though it only uses Cassandra 1.2. The authentication logic might not be able to handle this and will try to authenticate with DSE using an earlier version of the protocol. In short, DSE before 3.1 uses a non-standard protocol, but it should be possible to get it working. DSE 3.1 and 4.0 have been confirmed to work.
 
 ## I'm connecting to port 9160 and it doesn't work
 

data/lib/cql/client/batch.rb

@@ -100,6 +100,7 @@ module Cql
             raise
           end
         end
+        @parts = []
         @request_runner.execute(connection, request, options[:timeout])
       end
 

data/lib/cql/protocol/cql_protocol_handler.rb

@@ -84,7 +84,8 @@ module Cql
       # @yieldparam error [nil, Error] the error that caused the connection to
       #   close, if any
       def on_closed(&listener)
-        @closed_promise.future.on_complete(&listener)
+        @closed_promise.future.on_value(&listener)
+        @closed_promise.future.on_failure(&listener)
       end
 
       # Register to receive server sent events, like schema changes, nodes going

data/lib/cql/uuid.rb

@@ -28,18 +28,17 @@ module Cql
     #
     def to_s
       @s ||= begin
-        parts = []
-        parts << (@n >> (24 * 4)).to_s(16).rjust(8, '0')
-        parts << ((@n >> (20 * 4)) & 0xffff).to_s(16).rjust(4, '0')
-        parts << ((@n >> (16 * 4)) & 0xffff).to_s(16).rjust(4, '0')
-        parts << ((@n >> (12 * 4)) & 0xffff).to_s(16).rjust(4, '0')
-        parts << (@n & 0xffffffffffff).to_s(16).rjust(12, '0')
-        parts.join('-').force_encoding(::Encoding::ASCII)
+        s = RAW_FORMAT % @n
+        s.insert(20, HYPHEN)
+        s.insert(16, HYPHEN)
+        s.insert(12, HYPHEN)
+        s.insert( 8, HYPHEN)
+        s
       end
     end
 
     def hash
-      @h ||= 0x7fffffffffffffff - ((@n & 0xffffffffffffffff) ^ ((@n >> 64) & 0xffffffffffffffff))
+      @n.hash
     end
 
     # Returns the numerical representation of this UUID
@@ -59,17 +58,25 @@ module Cql
 
     private
 
-    HEX_STRING_PATTERN = /^[0-9a-fA-F]+$/
+    RAW_FORMAT = '%032x'.force_encoding(Encoding::ASCII).freeze
+    HYPHEN = '-'.force_encoding(Encoding::ASCII).freeze
+    EMPTY_STRING = ''.freeze
 
-    def from_s(str)
-      str = str.gsub('-', '')
-      raise ArgumentError, "Expected 32 chars but got #{str.length}" unless str.length == 32
-      raise ArgumentError, "Expected only characters 0-9, a-f, A-F" unless str =~ HEX_STRING_PATTERN
-      n = 0
-      (str.length/2).times do |i|
-        n = (n << 8) | str[i * 2, 2].to_i(16)
+    if RUBY_ENGINE == 'jruby'
+      HEX_RE = /^[A-Fa-f0-9]+$/
+      # See https://github.com/jruby/jruby/issues/1608
+      def from_s(str)
+        str = str.gsub(HYPHEN, EMPTY_STRING)
+        raise ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
+        raise ArgumentError, "invalid value for Integer(): \"#{str}\"" unless str =~ HEX_RE
+        Integer(str, 16)
+      end
+    else
+      def from_s(str)
+        str = str.gsub(HYPHEN, EMPTY_STRING)
+        raise ArgumentError, "Expected 32 hexadecimal digits but got #{str.length}" unless str.length == 32
+        Integer(str, 16)
       end
-      n
     end
   end
 end

data/lib/cql/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cql
-  VERSION = '2.0.0.pre1'.freeze
+  VERSION = '2.0.0.pre2'.freeze
 end

data/spec/cql/client/batch_spec.rb

@@ -86,6 +86,17 @@ module Cql
           encoded_frame.to_s.should include(Protocol::ExecuteRequest.encode_values(Protocol::CqlByteBuffer.new, metadata, [3, 'foo']))
         end
 
+        it 'resets the batch so that it can be used again' do
+          batch.add('UPDATE x SET y = 1 WHERE z = 2')
+          batch.execute.value
+          batch.add('UPDATE x SET y = 2 WHERE z = 3')
+          batch.execute.value
+          first_request, second_request = requests.map { |r| r[0].write(1, Protocol::CqlByteBuffer.new).to_s }
+          first_request.should include('UPDATE x SET y = 1 WHERE z = 2')
+          second_request.should include('UPDATE x SET y = 2 WHERE z = 3')
+          second_request.should_not include('UPDATE x SET y = 1 WHERE z = 2')
+        end
+
         it 'uses the provided type hints' do
           batch.add('UPDATE x SET y = 2 WHERE z = ?', 3, type_hints: [:int])
           batch.execute.value

data/spec/cql/client/query_result_spec.rb

@@ -159,7 +159,10 @@ module Cql
 
       describe '#each' do
         it 'delegates to the wrapped result' do
-          query_result.stub(:each).and_yield(:row1).and_yield(:row2)
+          query_result.stub(:each) do |&block|
+            block.call(:row1)
+            block.call(:row2)
+          end
           rows = paged_query_result.each_with_object([]) { |row, rows| rows << row }
           rows.should == [:row1, :row2]
         end

data/spec/cql/protocol/cql_protocol_handler_spec.rb

@@ -322,6 +322,13 @@ module Cql
           called.should be_true, 'expected the close listener to have been called'
         end
 
+        it 'passes the error that made the connection close to the listener' do
+          error = nil
+          protocol_handler.on_closed { |e| error = e }
+          connection.closed_listener.call(StandardError.new('Blurgh'))
+          error.message.should == 'Blurgh'
+        end
+
         it 'ignores errors raised by the listener' do
           called = false
           protocol_handler.on_closed { |e| raise 'Blurgh' }

data/spec/cql/uuid_spec.rb

@@ -56,6 +56,11 @@ module Cql
       it 'returns a UUID standard format' do
         Uuid.new('a4a70900-24e1-11df-8924-001ff3591711').to_s.should == 'a4a70900-24e1-11df-8924-001ff3591711'
       end
+
+      it 'returns an ASCII string' do
+        s = Uuid.new('a4a70900-24e1-11df-8924-001ff3591711').to_s
+        s.encoding.should == Encoding::ASCII
+      end
     end
 
     describe '#hash' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ione