ciql 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef8937cc139e4f15b216b8d4c2a9803feab92d8
-  data.tar.gz: 4498237edc0cf34018bd3ab4603c45fdf875bf2b
+  metadata.gz: 5e9c50f26c2571d06b20a0af39bf3ab2ecccf4c2
+  data.tar.gz: a5d0b7fa17071fb32f1149de13480c24386bb854
 SHA512:
-  metadata.gz: 39f86c6452055ecbc701ce16eb6cfc4419b2b0d938e7161b8658ef23d7c5453d2b57803a1a605c29c0a542c75474ec87d9e2acdb5b5151be8a5ff488409f7866
-  data.tar.gz: ef5eba045ce56c4dcbcb8c375e035f5799329d989f3aca1d10ba8e0f4b44869de11fad4b7e96d0d8e3afc0f6b74099a775ec76ebfa32c035971e1ce436081790
+  metadata.gz: 989474129f432a99c90d264a14df177078bb071eb64acc496baee234b7553a9d2628bab218b31ecf50b87ac8fcc4b5c7f0793bd7bd8e64402f446988f37d9694
+  data.tar.gz: c911ed72fcaeb9823d7907bd14813bb15224ac89aa3cddc3d44723222e2bab5b4ff34239590fc021f3d49b17a4f4ebe9aefd0d49154c455bfeda6d70f33777c6

data/lib/ciql/client/binary.rb

@@ -0,0 +1,48 @@
+require 'cql'
+require 'benchmark'
+
+require 'ciql/client/log'
+
+module Ciql::Client
+  class Binary
+    include Log
+
+    attr_reader :connection
+
+    def initialize(options={})
+      options     = options.dup
+      @log_format = options.delete(:log_format)
+
+      options[:hosts]  = options.delete(:host) { '127.0.0.1' }.split(',')
+      options[:logger] = Ciql.logger
+
+      @connection = Cql::Client.connect(options)
+    end
+
+    def execute(statement, *arguments)
+      bind_variables    = arguments.shift statement.count('?')
+      bound_statement   = Ciql::Sanitize.sanitize(statement, *bind_variables)
+      consistency_level = arguments.shift or :quorum
+
+      result = nil
+      times = Benchmark.measure do
+        result = @connection.execute(
+          bound_statement,
+          consistency: consistency_level
+        )
+      end
+
+      log(
+        duration:    times.real * 10**3,
+        query:       bound_statement,
+        consistency: consistency_level.to_s.upcase
+      )
+
+      result
+    end
+
+    def disconnect!
+      @connection.close
+    end
+  end
+end

data/lib/ciql/client/thrift.rb

@@ -8,21 +8,23 @@ module Ciql::Client
   class Thrift < CassandraCQL::Database
     include Log
 
+    attr_reader :connection
+
     def initialize(options={})
-      options = options.dup
+      options     = options.dup
       @log_format = options.delete(:log_format)
 
-      port = options.delete(:port) { 9160 }
-      hosts = options.delete(:host) { '127.0.0.1' }.split(',')
-      hosts_with_port = hosts.map { |host| [host, port].join(':') }
       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
+      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

data/lib/ciql/configuration.rb

@@ -3,7 +3,7 @@ require 'ostruct'
 module Ciql
   @@client = nil
   def self.client
-    @@client ||= Client::Thrift.new(configuration.to_options)
+    @@client ||= Client::Binary.new(configuration.to_options)
   end
 
   @@configuration = nil

data/lib/ciql/version.rb

@@ -1,3 +1,3 @@
 module Ciql
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/lib/ciql.rb

@@ -12,5 +12,5 @@ end
 
 require 'ciql/configuration'
 require 'ciql/sanitize'
-require 'ciql/client/thrift'
+require 'ciql/client/binary'
 require 'ciql/rails' if defined?(Rails)

data/spec/ciql/client/binary_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+module Ciql::Client
+  describe Binary do
+    let(:logger) do
+      mock(:debug? => true, debug: nil, info: nil, warn: nil)
+    end
+
+    subject { described_class.new(log: logger) }
+
+    before do
+     Ciql.logger = logger
+    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
+
+    describe '#disconnect!' do
+      it 'closes the connection' do
+        subject.disconnect!
+        subject.connection.should_not be_connected
+      end
+    end
+  end
+end

data/spec/ciql/client/thrift_spec.rb

@@ -1,8 +1,9 @@
 require 'spec_helper'
+require 'ciql/client/thrift'
 
 module Ciql::Client
   describe Thrift do
-    let(:logger) { mock(:debug? => true, :debug => nil) }
+    let(:logger) { mock(:debug? => true, debug: nil) }
 
     subject { described_class.new(log: logger) }
 

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ciql
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Bradford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cassandra-cql
+  name: cql-rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
-  name: cql-rb
+  name: cassandra-cql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: simple_uuid
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ciql/client/binary.rb
 - lib/ciql/client/log.rb
 - lib/ciql/client/thrift.rb
 - lib/ciql/configuration.rb
@@ -67,6 +68,7 @@ files:
 - lib/ciql/version.rb
 - lib/ciql.rb
 - README.md
+- spec/ciql/client/binary_spec.rb
 - spec/ciql/client/thrift_spec.rb
 - spec/ciql/configuration_spec.rb
 - spec/ciql/sanitize_spec.rb
@@ -96,6 +98,7 @@ signing_key:
 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