cql-rb 1.1.0.rc0 → 1.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTBkMThlZTE2MTk5MzFiNTgzNmYyMDM4ZTViNjNhNjFhNWM3OGVhNw==
+    MjQ0ZjFmMTgzZGI3ZDY1M2RjYTUzZGNmMWE5OTE1NWU5N2U5YWVmNg==
   data.tar.gz: !binary |-
-    ZWQ1M2EzZWExOGUyNzUwNzE2ODQxMzgyYmI2MDdkM2ZhY2Q0NTA3OQ==
+    Mzk3OWFlMjg3ZTIzODk3OTNjZDcwNDM4OGEyNDI0MGM3MjE2ZTBiNQ==
 SHA512:
   metadata.gz: !binary |-
-    Y2QzMzNmMTg1ODZhYzVmYTU4Njk5MjYzNDgxZmFlMjExZTYwYzRiNjk2MjVj
-    YmYxOWQ3YzVkNDZlNmM5NWQ2YzYwN2Y5OGMwMDc1NWYzZTBhMzBhZmRlZGU2
-    ODUwMGY4NGIxNTdlNWVlZThlZTc4M2NhZjU4ODVlMGYyYWM5MWM=
+    YjNiMTJlZDg3M2NmNGFlNTllNTZlNTRjZmJjOWEyODYxODFmMWFkOGY5NzBl
+    ZTUxOGY1NjNjMzcxMjUwNDA2NjY0N2I0YTk0NWY0OWM5NzBkNzcyNzJkMDI5
+    MzljMzNmZWZiYTRhMzMxYWQxMTk0MzVjMzliZjQ3NzVjMzlmY2M=
   data.tar.gz: !binary |-
-    YzQ1ZTRjMjUxM2I4OGJlMGRkZDE4NTkwZmZkNWFmZjc5NTNhNWI2ZmNjZTZi
-    YjE2ZGM0ODIzMDBmNmViNzBjMDU5YzUzZDVkNGNjMTQyMzYzY2FjNDdkYTAx
-    OGQ4ODIwZDk5YzQ4YjRmOGUxMmYzZTcyNmVlMTcwM2VlNWE5ZjQ=
+    MWIxYTk4ZDAwMDA3MDU4MDZmYmU1YmM0YWU5MTUwNmE1ODE5MzI5ZjBlMjA4
+    YjI5OWIyN2IxMzRmZjYxMGY4ZmMwZTE5NTk2NDhjM2I2OTg3MWRlYThmOWEy
+    ODQzN2VmODFhYjk0OTE1YWUxZWIwYjZjYzUxNTI5YTMxOTRjNTk=

data/README.md

@@ -5,7 +5,7 @@
 
 # Requirements
 
-Cassandra 1.2 or later with the native transport protocol turned on and a modern Ruby. It's tested continuously in Travis with Ruby 1.9.3, 2.0.0, and JRuby 1.7.x stable and head.
+Cassandra 1.2 or later with the native transport protocol turned on and a modern Ruby. It's tested continuously in Travis with Ruby 1.9.3, 2.0, JRuby 1.7 and Rubinius 2.0.
 
 # Installation
 
@@ -156,6 +156,7 @@ The possible values for consistency are:
 * `:all`
 * `:local_quorum`
 * `:each_quorum`
+* `:local_one`
 
 The default consistency level unless you've set it yourself is `:quorum`.
 

data/lib/cql/protocol.rb

@@ -15,7 +15,7 @@ module Cql
     UnsupportedColumnTypeError = Class.new(ProtocolError)
     UnsupportedEventTypeError = Class.new(ProtocolError)
 
-    CONSISTENCIES = [:any, :one, :two, :three, :quorum, :all, :local_quorum, :each_quorum].freeze
+    CONSISTENCIES = [:any, :one, :two, :three, :quorum, :all, :local_quorum, :each_quorum, nil, nil, nil, nil, nil, nil, nil, nil, :local_one].freeze
 
     module Formats
       CHAR_FORMAT = 'c'.freeze

data/lib/cql/protocol/decoding.rb

@@ -158,7 +158,7 @@ module Cql
 
       def read_consistency!(buffer)
         index = read_short!(buffer)
-        raise DecodingError, "Unknown consistency index #{index}" unless index < CONSISTENCIES.size
+        raise DecodingError, "Unknown consistency index #{index}" if index >= CONSISTENCIES.size || CONSISTENCIES[index].nil?
         CONSISTENCIES[index]
       end
 

data/lib/cql/protocol/encoding.rb

@@ -64,7 +64,7 @@ module Cql
 
       def write_consistency(buffer, consistency)
         index = CONSISTENCIES.index(consistency)
-        raise EncodingError, %(Unknown consistency "#{consistency}") unless index
+        raise EncodingError, %(Unknown consistency "#{consistency}") if index.nil? || CONSISTENCIES[index].nil?
         write_short(buffer, index)
       end
 

data/lib/cql/protocol/requests/query_request.rb

@@ -7,7 +7,7 @@ module Cql
 
       def initialize(cql, consistency)
         raise ArgumentError, %(No CQL given!) unless cql
-        raise ArgumentError, %(No such consistency: #{consistency.inspect}) unless CONSISTENCIES.include?(consistency)
+        raise ArgumentError, %(No such consistency: #{consistency.inspect}) if consistency.nil? || !CONSISTENCIES.include?(consistency)
         super(7)
         @cql = cql
         @consistency = consistency

data/lib/cql/version.rb

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

data/spec/cql/protocol/decoding_spec.rb

@@ -470,9 +470,14 @@ module Cql
           Decoding.read_consistency!(buffer).should == :each_quorum
         end
 
+        it 'decodes LOCAL_ONE' do
+          buffer = ByteBuffer.new("\x00\x10")
+          Decoding.read_consistency!(buffer).should == :local_one
+        end
+
         it 'raises an exception for an unknown consistency' do
-          buffer = ByteBuffer.new("\xff\xff")
-          expect { Decoding.read_consistency!(buffer) }.to raise_error(DecodingError)
+          expect { Decoding.read_consistency!(ByteBuffer.new("\xff\xff")) }.to raise_error(DecodingError)
+          expect { Decoding.read_consistency!(ByteBuffer.new("\x00\x0a")) }.to raise_error(DecodingError)
         end
       end
 

data/spec/cql/protocol/encoding_spec.rb

@@ -237,7 +237,8 @@ module Cql
           :quorum => "\x00\x04",
           :all => "\x00\x05",
           :local_quorum => "\x00\x06",
-          :each_quorum => "\x00\x07"
+          :each_quorum => "\x00\x07",
+          :local_one => "\x00\x10",
         }.each do |consistency, expected_encoding|
           it "encodes #{consistency}" do
             Encoding.write_consistency(buffer, consistency)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cql-rb
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc0
+  version: 1.1.0
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies: []
 description: A pure Ruby CQL3 driver for Cassandra
 email:
@@ -70,7 +70,6 @@ files:
 - lib/cql/uuid.rb
 - lib/cql/version.rb
 - lib/cql.rb
-- bin/cqlexec
 - README.md
 - spec/cql/byte_buffer_spec.rb
 - spec/cql/client/asynchronous_client_spec.rb
@@ -126,9 +125,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.5

data/bin/cqlexec

@@ -1,135 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: utf-8
-
-$: << File.expand_path('../../lib', __FILE__)
-
-require 'optparse'
-require 'set'
-require 'cql'
-
-
-class CqlExecutor
-  def initialize(args)
-    @options = parse_options!(args)
-  end
-
-  def run(io)
-    @client = Cql::Client.connect(host: @options[:host], port: @options[:port])
-
-    # TODO register for events
-
-    begin
-      buffer = ''
-      while (line = io.gets)
-        buffer << line
-        if semi_index = buffer.index(';')
-          query = buffer.slice!(0, semi_index + 1)
-          prepare_and_execute_request(query)
-        end
-      end
-      prepare_and_execute_request(buffer)
-    rescue Cql::CqlError => e
-      abort("Error: #{e.message} (#{e.class})")
-    rescue Interrupt
-      exit
-    ensure
-      @client.close
-    end
-  end
-
-  private
-
-  def parse_options!(args)
-    options = {}
-
-    option_parser = OptionParser.new do |opts|
-      opts.banner = "Usage: #{File.basename(__FILE__)} [options]"
-      opts.separator('')
-      opts.on('--help', 'Show this message') do
-        $stderr.puts(opts)
-        exit!
-      end
-      opts.on('-h', '--host [HOST]', 'Connect to HOST, defaults to localhost') do |host|
-        options[:host] = host
-      end
-      opts.on('-p', '--port [PORT]', Integer, 'Connect to PORT, defaults to 9042') do |port|
-        options[:port] = port
-      end
-      opts.on('-v', '--verbose', 'Print requests to STDERR') do |port|
-        options[:verbose] = true
-      end
-      opts.separator('')
-      opts.separator('Pass CQL commands on STDIN, prints results on STDOUT')
-      opts.separator('')
-    end
-
-    option_parser.parse!
-    
-    options
-  end
-
-  def prepare_and_execute_request(query)
-    query.chomp!(';')
-    query.strip!
-    unless query.empty?
-      format_table_output(@client.execute(query, :one))
-    end
-  end
-
-  def format_table_output(rows)
-    table_names = []
-    header = ''
-    row_format = ''
-    divider = ''
-    column_widths = {}
-    if rows && rows.any?
-      rows.metadata.each do |ks, table, column, type|
-        table_names << [ks, table].join('.')
-        column_width = [format_value(rows.first[column]).length, column.length].max
-        column_widths[column] = column_width
-        format = "%-#{column_width}.#{column_width}s"
-        header << "#{format} | " % [column]
-        row_format << "#{format} | "
-        divider << ('-' * column_width) << '-+-'
-      end
-      row_format.sub!(/ \| $/, '')
-      divider = divider[0..-4]
-      table_name = table_names.uniq.join(', ')
-
-      $stdout.puts(table_name)
-      $stdout.puts('=' * table_name.length)
-      $stdout.puts(header[0, divider.length])
-      $stdout.puts(divider)
-
-      rows.each do |row|
-        values = rows.metadata.map do |_, _, column, _|
-          limit_width(format_value(row[column]), column_widths[column])
-        end
-        $stdout.puts(row_format % values)
-      end
-    else
-      $stdout.puts('(empty result set)')
-    end
-  end
-
-  def format_value(value)
-    case value
-    when Set
-      value.to_a.to_s
-    when nil
-      '(nil)'
-    else
-      value.to_s
-    end
-  end
-
-  def limit_width(value, width)
-    if value.length > width
-      value[0, width - 1] << '…'
-    else
-      value
-    end
-  end
-end
-
-CqlExecutor.new(ARGV).run(STDIN)