ciql 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b51cce24db2606ed0a9b683e21549063ced9d7b
-  data.tar.gz: 3a844e684f3e9262033249c4ee68ef236ea13cc0
+  metadata.gz: 90a74923332f73607ec9ec7a36de440dbe47001d
+  data.tar.gz: 1f569aa52dd3ccf3903c2e78cef45beb1c6a869c
 SHA512:
-  metadata.gz: 46aa844c42a01f8a98177fe4afa8450f154296fded7667341f0f370ff0bd778568dc9d105a893cd8da5108aee5b701d4a8bc5b38720c1cad209828426b0c9348
-  data.tar.gz: c5e4cc303e0df7d73001cadf5522cddbeff0254473a57f599e93d5cad07e1bce174895c63ed39a56d5aa6bcce93bded642d4ce6a8de6d4a0872ca59d543d8af1
+  metadata.gz: 267ddb3749c72c8fb9883701726d155653ab8b154f4a08c709b132c51b7c37d1eddfccd3f271253d96cd2bc60ef1d86e5109d7403388410db5dfe3fff349e8df
+  data.tar.gz: 9770ffcda81a5d21dcf43b51e888b6808d22e326b06f487fe6ec41458cbffeb9be3fb990167efda7cbd20aff2eabd3c44439d3344a48bdfd5ada4cb208287961

data/README.md

@@ -2,4 +2,4 @@
 
 [![Build Status](https://travis-ci.org/Nulu/ciql.png?branch=master)](https://travis-ci.org/Nulu/ciql) [![Dependency Status](https://gemnasium.com/Nulu/ciql.png)](https://gemnasium.com/Nulu/ciql)
 
-This project is currently small support utilities and extensions for the [cassandra-cql](https://github.com/kreynolds/cassandra-cql) and [cql-rb](https://github.com/iconara/cql-rb) drivers.
+This project is currently small support utilities and extensions for the [cql-rb](https://github.com/iconara/cql-rb) driver.

data/lib/ciql/version.rb

@@ -1,3 +1,3 @@
 module Ciql
-  VERSION = '0.3.4'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciql
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Justin Bradford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: simple_uuid
   requirement: !ruby/object:Gem::Requirement
@@ -49,14 +49,12 @@ files:
 - lib/ciql.rb
 - lib/ciql/client/binary.rb
 - lib/ciql/client/log.rb
-- lib/ciql/client/thrift.rb
 - lib/ciql/configuration.rb
 - lib/ciql/rails.rb
 - lib/ciql/sanitize.rb
 - lib/ciql/uuid.rb
 - lib/ciql/version.rb
 - spec/ciql/client/binary_spec.rb
-- spec/ciql/client/thrift_spec.rb
 - spec/ciql/configuration_spec.rb
 - spec/ciql/sanitize_spec.rb
 - spec/ciql/uuid_spec.rb
@@ -87,9 +85,7 @@ specification_version: 4
 summary: CQL Cassandra client for Ruby
 test_files:
 - spec/ciql/client/binary_spec.rb
-- spec/ciql/client/thrift_spec.rb
 - spec/ciql/configuration_spec.rb
 - spec/ciql/sanitize_spec.rb
 - spec/ciql/uuid_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/ciql/client/thrift.rb

@@ -1,54 +0,0 @@
-require 'cassandra-cql/1.2'
-require 'cassandra-cql'
-require 'benchmark'
-
-require 'ciql/client/log'
-
-module Ciql::Client
-  class Thrift < CassandraCQL::Database
-    include Log
-
-    attr_reader :connection
-
-    def initialize(options={})
-      options     = options.dup
-      @log_format = options.delete(:log_format)
-
-      retries = options.delete(:retries) { 2 }
-      port    = options.delete(:port) { 9160 }
-      hosts   = options.delete(:host) { '127.0.0.1' }.split(',')
-      hosts_with_port = hosts.map { |host| [host, port].join(':') }
-      super(hosts_with_port, options, retries: retries)
-    end
-
-    def execute(statement, *arguments)
-      bind_variables    = arguments.shift statement.count('?')
-      bound_statement   = Ciql::Sanitize.sanitize(statement, *bind_variables)
-      compression_type  = CassandraCQL::Thrift::Compression::NONE
-      consistency_level = (arguments.shift or :quorum).to_s.upcase
-
-      result = nil
-      times = Benchmark.measure do
-        result = CassandraCQL::Result.new(
-          @connection.execute_cql3_query(
-            bound_statement, compression_type,
-            CassandraCQL::Thrift::ConsistencyLevel.const_get(consistency_level)
-          )
-        )
-      end
-
-      log(
-        duration:    times.real * 10**3,
-        query:       bound_statement,
-        compression: compression_type,
-        consistency: consistency_level
-      )
-
-      result
-
-    rescue CassandraCQL::Thrift::InvalidRequestException
-      message = [$!.why, bound_statement].join(' -- ')
-      raise CassandraCQL::Error::InvalidRequestException.new(message)
-    end
-  end
-end

data/spec/ciql/client/thrift_spec.rb

@@ -1,35 +0,0 @@
-require 'spec_helper'
-require 'ciql/client/thrift'
-
-module Ciql::Client
-  describe Thrift do
-    let(:logger) { double(:debug? => true, debug: nil) }
-
-    subject { described_class.new(log: logger) }
-
-    before do
-      Ciql.logger = logger
-    end
-
-    it 'inherits from CassandraCQL::Database' do
-      subject.should be_kind_of CassandraCQL::Database
-    end
-
-    it 'defaults to two retries on connection exceptions' do
-      subject.instance_variable_get(:@thrift_client_options)[:retries].should eq 2
-    end
-
-    it 'accepts :retries as an option' do
-      instance = described_class.new(log: logger, retries: 5)
-      instance.instance_variable_get(:@thrift_client_options)[:retries].should eq 5
-    end
-
-    describe '#execute' do
-      it 'logs the query' do
-        subject # instantiate
-        logger.should_receive(:debug).with(/system.local where key = 'local' \[ONE\]/)
-        subject.execute('select * from system.local where key = ?', :local, :one)
-      end
-    end
-  end
-end