cql-rb 2.0.0.pre0 → 2.0.0.pre1

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre0
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
-dependencies: []
+date: 2014-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ione
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A pure Ruby CQL3 driver for Cassandra
 email:
 - theo@iconara.net
@@ -20,12 +34,10 @@ files:
 - .yardopts
 - README.md
 - lib/cql.rb
-- lib/cql/byte_buffer.rb
 - lib/cql/client.rb
-- lib/cql/client/asynchronous_client.rb
-- lib/cql/client/asynchronous_prepared_statement.rb
 - lib/cql/client/authenticators.rb
 - lib/cql/client/batch.rb
+- lib/cql/client/client.rb
 - lib/cql/client/column_metadata.rb
 - lib/cql/client/connection_manager.rb
 - lib/cql/client/connector.rb
@@ -33,23 +45,17 @@ files:
 - lib/cql/client/keyspace_changer.rb
 - lib/cql/client/null_logger.rb
 - lib/cql/client/peer_discovery.rb
+- lib/cql/client/prepared_statement.rb
 - lib/cql/client/query_result.rb
 - lib/cql/client/query_trace.rb
 - lib/cql/client/request_runner.rb
 - lib/cql/client/result_metadata.rb
-- lib/cql/client/synchronous_client.rb
-- lib/cql/client/synchronous_prepared_statement.rb
 - lib/cql/client/void_result.rb
 - lib/cql/compression.rb
 - lib/cql/compression/snappy_compressor.rb
-- lib/cql/future.rb
-- lib/cql/io.rb
-- lib/cql/io/connection.rb
-- lib/cql/io/io_reactor.rb
 - lib/cql/protocol.rb
+- lib/cql/protocol/cql_byte_buffer.rb
 - lib/cql/protocol/cql_protocol_handler.rb
-- lib/cql/protocol/decoding.rb
-- lib/cql/protocol/encoding.rb
 - lib/cql/protocol/frame_decoder.rb
 - lib/cql/protocol/frame_encoder.rb
 - lib/cql/protocol/request.rb
@@ -85,31 +91,24 @@ files:
 - lib/cql/time_uuid.rb
 - lib/cql/uuid.rb
 - lib/cql/version.rb
-- spec/cql/byte_buffer_spec.rb
-- spec/cql/client/asynchronous_client_spec.rb
-- spec/cql/client/asynchronous_prepared_statement_spec.rb
 - spec/cql/client/authenticators_spec.rb
 - spec/cql/client/batch_spec.rb
+- spec/cql/client/client_spec.rb
 - spec/cql/client/column_metadata_spec.rb
 - spec/cql/client/connection_manager_spec.rb
 - spec/cql/client/connector_spec.rb
 - spec/cql/client/execute_options_decoder_spec.rb
 - spec/cql/client/keyspace_changer_spec.rb
 - spec/cql/client/peer_discovery_spec.rb
+- spec/cql/client/prepared_statement_spec.rb
 - spec/cql/client/query_result_spec.rb
 - spec/cql/client/query_trace_spec.rb
 - spec/cql/client/request_runner_spec.rb
-- spec/cql/client/synchronous_client_spec.rb
-- spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/client/void_result_spec.rb
 - spec/cql/compression/compression_common.rb
 - spec/cql/compression/snappy_compressor_spec.rb
-- spec/cql/future_spec.rb
-- spec/cql/io/connection_spec.rb
-- spec/cql/io/io_reactor_spec.rb
+- spec/cql/protocol/cql_byte_buffer_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
-- spec/cql/protocol/decoding_spec.rb
-- spec/cql/protocol/encoding_spec.rb
 - spec/cql/protocol/frame_decoder_spec.rb
 - spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/auth_response_request_spec.rb
@@ -143,7 +142,6 @@ files:
 - spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
-- spec/integration/io_spec.rb
 - spec/integration/protocol_spec.rb
 - spec/integration/regression_spec.rb
 - spec/integration/uuid_spec.rb
@@ -151,7 +149,6 @@ files:
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb
 - spec/support/fake_io_reactor.rb
-- spec/support/fake_server.rb
 homepage: http://github.com/iconara/cql-rb
 licenses:
 - Apache License 2.0
@@ -164,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>'
@@ -177,31 +174,24 @@ signing_key:
 specification_version: 4
 summary: Cassandra CQL3 driver
 test_files:
-- spec/cql/byte_buffer_spec.rb
-- spec/cql/client/asynchronous_client_spec.rb
-- spec/cql/client/asynchronous_prepared_statement_spec.rb
 - spec/cql/client/authenticators_spec.rb
 - spec/cql/client/batch_spec.rb
+- spec/cql/client/client_spec.rb
 - spec/cql/client/column_metadata_spec.rb
 - spec/cql/client/connection_manager_spec.rb
 - spec/cql/client/connector_spec.rb
 - spec/cql/client/execute_options_decoder_spec.rb
 - spec/cql/client/keyspace_changer_spec.rb
 - spec/cql/client/peer_discovery_spec.rb
+- spec/cql/client/prepared_statement_spec.rb
 - spec/cql/client/query_result_spec.rb
 - spec/cql/client/query_trace_spec.rb
 - spec/cql/client/request_runner_spec.rb
-- spec/cql/client/synchronous_client_spec.rb
-- spec/cql/client/synchronous_prepared_statement_spec.rb
 - spec/cql/client/void_result_spec.rb
 - spec/cql/compression/compression_common.rb
 - spec/cql/compression/snappy_compressor_spec.rb
-- spec/cql/future_spec.rb
-- spec/cql/io/connection_spec.rb
-- spec/cql/io/io_reactor_spec.rb
+- spec/cql/protocol/cql_byte_buffer_spec.rb
 - spec/cql/protocol/cql_protocol_handler_spec.rb
-- spec/cql/protocol/decoding_spec.rb
-- spec/cql/protocol/encoding_spec.rb
 - spec/cql/protocol/frame_decoder_spec.rb
 - spec/cql/protocol/frame_encoder_spec.rb
 - spec/cql/protocol/requests/auth_response_request_spec.rb
@@ -235,7 +225,6 @@ test_files:
 - spec/cql/time_uuid_spec.rb
 - spec/cql/uuid_spec.rb
 - spec/integration/client_spec.rb
-- spec/integration/io_spec.rb
 - spec/integration/protocol_spec.rb
 - spec/integration/regression_spec.rb
 - spec/integration/uuid_spec.rb
@@ -243,5 +232,4 @@ test_files:
 - spec/support/await_helper.rb
 - spec/support/bytes_helper.rb
 - spec/support/fake_io_reactor.rb
-- spec/support/fake_server.rb
 has_rdoc: 

data/lib/cql/byte_buffer.rb

@@ -1,177 +0,0 @@
-# encoding: utf-8
-
-module Cql
-  # @private
-  class ByteBuffer
-    def initialize(initial_bytes='')
-      @read_buffer = ''
-      @write_buffer = ''
-      @offset = 0
-      @length = 0
-      append(initial_bytes) unless initial_bytes.empty?
-    end
-
-    attr_reader :length
-    alias_method :size, :length
-    alias_method :bytesize, :length
-
-    def empty?
-      length == 0
-    end
-
-    def append(bytes)
-      if bytes.is_a?(self.class)
-        bytes.append_to(self)
-      else
-        bytes = bytes.to_s
-        unless bytes.ascii_only?
-          bytes = bytes.dup.force_encoding(::Encoding::BINARY)
-        end
-        retag = @write_buffer.empty?
-        @write_buffer << bytes
-        @write_buffer.force_encoding(::Encoding::BINARY) if retag
-        @length += bytes.bytesize
-      end
-      self
-    end
-    alias_method :<<, :append
-
-    def discard(n)
-      raise RangeError, "#{n} bytes to discard but only #{@length} available" if @length < n
-      @offset += n
-      @length -= n
-      self
-    end
-
-    def read(n)
-      raise RangeError, "#{n} bytes required but only #{@length} available" if @length < n
-      if @offset >= @read_buffer.bytesize
-        swap_buffers
-      end
-      if @offset + n > @read_buffer.bytesize
-        s = read(@read_buffer.bytesize - @offset)
-        s << read(n - s.bytesize)
-        s
-      else
-        s = @read_buffer[@offset, n]
-        @offset += n
-        @length -= n
-        s
-      end
-    end
-
-    def read_int
-      raise RangeError, "4 bytes required to read an int, but only #{@length} available" if @length < 4
-      if @offset >= @read_buffer.bytesize
-        swap_buffers
-      end
-      if @read_buffer.bytesize >= @offset + 4
-        i0 = @read_buffer.getbyte(@offset + 0)
-        i1 = @read_buffer.getbyte(@offset + 1)
-        i2 = @read_buffer.getbyte(@offset + 2)
-        i3 = @read_buffer.getbyte(@offset + 3)
-        @offset += 4
-        @length -= 4
-      else
-        i0 = read_byte
-        i1 = read_byte
-        i2 = read_byte
-        i3 = read_byte
-      end
-      (i0 << 24) | (i1 << 16) | (i2 << 8) | i3
-    end
-
-    def read_short
-      raise RangeError, "2 bytes required to read a short, but only #{@length} available" if @length < 2
-      if @offset >= @read_buffer.bytesize
-        swap_buffers
-      end
-      if @read_buffer.bytesize >= @offset + 2
-        i0 = @read_buffer.getbyte(@offset + 0)
-        i1 = @read_buffer.getbyte(@offset + 1)
-        @offset += 2
-        @length -= 2
-      else
-        i0 = read_byte
-        i1 = read_byte
-      end
-      (i0 << 8) | i1
-    end
-
-    def read_byte(signed=false)
-      raise RangeError, "No bytes available to read byte" if empty?
-      if @offset >= @read_buffer.bytesize
-        swap_buffers
-      end
-      b = @read_buffer.getbyte(@offset)
-      b = (b & 0x7f) - (b & 0x80) if signed
-      @offset += 1
-      @length -= 1
-      b
-    end
-
-    def update(location, bytes)
-      absolute_offset = @offset + location
-      bytes_length = bytes.bytesize
-      if absolute_offset >= @read_buffer.bytesize
-        @write_buffer[absolute_offset - @read_buffer.bytesize, bytes_length] = bytes
-      else
-        overflow = absolute_offset + bytes_length - @read_buffer.bytesize
-        read_buffer_portion = bytes_length - overflow
-        @read_buffer[absolute_offset, read_buffer_portion] = bytes[0, read_buffer_portion]
-        if overflow > 0
-          @write_buffer[0, overflow] = bytes[read_buffer_portion, bytes_length - 1]
-        end
-      end
-    end
-
-    def cheap_peek
-      if @offset >= @read_buffer.bytesize
-        swap_buffers
-      end
-      @read_buffer[@offset, @read_buffer.bytesize - @offset]
-    end
-
-    def eql?(other)
-      self.to_str.eql?(other.to_str)
-    end
-    alias_method :==, :eql?
-
-    def hash
-      to_str.hash
-    end
-
-    def dup
-      self.class.new(to_str)
-    end
-
-    def to_str
-      (@read_buffer + @write_buffer)[@offset, @length]
-    end
-    alias_method :to_s, :to_str
-
-    def inspect
-      %(#<#{self.class.name}: #{to_str.inspect}>)
-    end
-
-    protected
-
-    def append_to(other)
-      other.raw_append(cheap_peek)
-      other.raw_append(@write_buffer) unless @write_buffer.empty?
-    end
-
-    def raw_append(bytes)
-      @write_buffer << bytes
-      @length += bytes.bytesize
-    end
-
-    private
-
-    def swap_buffers
-      @offset -= @read_buffer.bytesize
-      @read_buffer = @write_buffer
-      @write_buffer = ''
-    end
-  end
-end

data/lib/cql/client/synchronous_client.rb

@@ -1,79 +0,0 @@
-# encoding: utf-8
-
-module Cql
-  module Client
-    # @private
-    module SynchronousBacktrace
-      def synchronous_backtrace
-        yield
-      rescue CqlError => e
-        new_backtrace = caller
-        if new_backtrace.first.include?(SYNCHRONOUS_BACKTRACE_METHOD_NAME)
-          new_backtrace = new_backtrace.drop(1)
-        end
-        e.set_backtrace(new_backtrace)
-        raise
-      end
-
-      private
-
-      SYNCHRONOUS_BACKTRACE_METHOD_NAME = 'synchronous_backtrace'
-    end
-
-    # @private
-    class SynchronousClient < Client
-      include SynchronousBacktrace
-
-      def initialize(async_client)
-        @async_client = async_client
-      end
-
-      def connect
-        synchronous_backtrace { @async_client.connect.value }
-        self
-      end
-
-      def close
-        synchronous_backtrace { @async_client.close.value }
-        self
-      end
-
-      def connected?
-        @async_client.connected?
-      end
-
-      def keyspace
-        @async_client.keyspace
-      end
-
-      def use(keyspace)
-        synchronous_backtrace { @async_client.use(keyspace).value }
-      end
-
-      def execute(cql, *args)
-        synchronous_backtrace do
-          result = @async_client.execute(cql, *args).value
-          result = SynchronousPagedQueryResult.new(result) if result.is_a?(PagedQueryResult)
-          result
-        end
-      end
-
-      def prepare(cql)
-        async_statement = synchronous_backtrace { @async_client.prepare(cql).value }
-        SynchronousPreparedStatement.new(async_statement)
-      end
-
-      def batch(type=:logged, options={}, &block)
-        if block_given?
-          synchronous_backtrace { @async_client.batch(type, options, &block).value }
-        else
-          SynchronousBatch.new(@async_client.batch(type, options))
-        end
-      end
-
-      def async
-        @async_client
-      end
-    end
-  end
-end

data/lib/cql/client/synchronous_prepared_statement.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-module Cql
-  module Client
-    # @private
-    class SynchronousPreparedStatement < PreparedStatement
-      include SynchronousBacktrace
-
-      def initialize(async_statement)
-        @async_statement = async_statement
-        @metadata = async_statement.metadata
-        @result_metadata = async_statement.result_metadata
-      end
-
-      def execute(*args)
-        synchronous_backtrace do
-          result = @async_statement.execute(*args).value
-          result = SynchronousPagedQueryResult.new(result) if result.is_a?(PagedQueryResult)
-          result
-        end
-      end
-
-      def batch(type=:logged, options=nil, &block)
-        if block_given?
-          synchronous_backtrace { @async_statement.batch(type, options, &block).value }
-        else
-          SynchronousPreparedStatementBatch.new(@async_statement.batch(type, options))
-        end
-      end
-
-      def pipeline
-        pl = Pipeline.new(@async_statement)
-        yield pl
-        synchronous_backtrace { pl.value }
-      end
-
-      def async
-        @async_statement
-      end
-
-      # @private
-      def add_to_batch(batch, connection, bound_arguments)
-        @async_statement.add_to_batch(batch, connection, bound_arguments)
-      end
-    end
-
-    # @private
-    class Pipeline
-      def initialize(async_statement)
-        @async_statement = async_statement
-        @futures = []
-      end
-
-      def execute(*args)
-        @futures << @async_statement.execute(*args)
-      end
-
-      def value
-        Future.all(*@futures).value
-      end
-    end
-  end
-end