ciql 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfaee067156de5c21c4464d6e363f146e2af07d8
-  data.tar.gz: 682634838722e35ba3d18e65ffc2df5cbc3d496d
+  metadata.gz: 7db3d33bb56c654865ff2e3ad3e46f6798c3093b
+  data.tar.gz: b4eccb76bd74c58d5e9be208b92d6c9b9bb9db29
 SHA512:
-  metadata.gz: 0d8c09472cf40154fd5db8c60a13aa4d15b5fdd97df158b9c1015c9cc3c9b5928463f14612725b0022067f9812072a9f03b43e7c96aac560a0558dd67d7d969c
-  data.tar.gz: ec2bcbd27c692293f6f480362663ea63f61e512ca8832781c70b936d24caeef037d3248e4bd5ebad1943d4537d405195193eede7d5354fdedfa7f0cb31f70577
+  metadata.gz: bb62bd623430c38c570892686f993b329b82dd7d35b709bbf6e35563f6a830eb7417ff86eccdd76db2f2325ce71b1e786f0e6ed9e31ca76bed099673310c5482
+  data.tar.gz: dc9ec7029fbfd82c131d665dc2a3cb157d9af6819a7b40c821c275ecb1c16ab454073d09b362f15d4337ea5f6394b031f39195be19b6daf1a4fc08ab2f9174db

data/lib/ciql.rb

@@ -1,6 +1,16 @@
 module Ciql
   Error = Class.new(StandardError)
+
+  def self.logger
+    @logger ||= Logger.new($stdout)
+  end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
 end
 
 require 'ciql/configuration'
+require 'ciql/sanitize'
 require 'ciql/client/thrift'
+require 'ciql/rails' if defined?(Rails)

data/lib/ciql/client/log.rb

@@ -0,0 +1,10 @@
+module Ciql::Client
+  module Log
+    DEFAULT_LOG_FORMAT = 'CQL %{query} [%{consistency}] (%<duration>.3fms) '.freeze
+
+    def log(message)
+      return unless Ciql.logger.debug?
+      Ciql.logger.debug (@log_format or DEFAULT_LOG_FORMAT) % message
+    end
+  end
+end

data/lib/ciql/client/thrift.rb

@@ -1,30 +1,51 @@
 require 'cassandra-cql/1.2'
 require 'cassandra-cql'
+require 'benchmark'
+
+require 'ciql/client/log'
 
 module Ciql::Client
   class Thrift < CassandraCQL::Database
+    include Log
+
     def initialize(options={})
+      options = options.dup
+      @log_format = options.delete(:log_format)
+
       port = options.delete(:port) { 9160 }
-      hosts = options.delete(:host) { 'localhost' }.split(',')
+      hosts = options.delete(:host) { '127.0.0.1' }.split(',')
       hosts_with_port = hosts.map { |host| [host, port].join(':') }
       super(hosts_with_port, options)
     end
 
     def execute(statement, *arguments)
       bind_variables = arguments.shift statement.count('?')
-      bound_statement = CassandraCQL::Statement.sanitize(statement, bind_variables)
+      bound_statement = Ciql::Sanitize.sanitize(statement, *bind_variables)
       compression_type = CassandraCQL::Thrift::Compression::NONE
-      consistency_level = CassandraCQL::Thrift::ConsistencyLevel.const_get(
-        (arguments.shift or :quorum).to_s.upcase
-      )
+      consistency_level = (arguments.shift or :quorum).to_s.upcase
 
-      CassandraCQL::Result.new(
-        @connection.execute_cql3_query(
-          bound_statement, compression_type, consistency_level
+      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
-      raise CassandraCQL::Error::InvalidRequestException.new($!.why)
+      message = [$!.why, bound_statement].join(' -- ')
+      raise CassandraCQL::Error::InvalidRequestException.new(message)
     end
   end
 end

data/lib/ciql/rails.rb

@@ -0,0 +1,21 @@
+module Ciql
+  class Railtie < Rails::Railtie
+    initializer 'ciql.logger', after: 'data_mapper.logger' do
+      Ciql.logger = DataMapper.logger
+    end
+  end
+
+  module LogListener
+    def log(message)
+      ActiveSupport::Notifications.instrument('sql.data_mapper',
+        :name          => 'CQL',
+        :sql           => '%{query} [%{consistency}]' % message,
+        :duration      => message[:duration]
+      )
+    rescue Exception => e
+      Ciql.logger.error "[ciql] #{e.class.name}: #{e.message}: #{message.inspect}}"
+    end
+  end
+
+  Client::Thrift.send(:include, LogListener)
+end

data/lib/ciql/sanitize.rb

@@ -1,5 +1,4 @@
 require 'simple_uuid'
-require 'cql'
 
 module Ciql
   module Sanitize
@@ -30,20 +29,16 @@ module Ciql
     def self.cast(obj)
       case obj
       when Hash
-        obj.map do |key, value|
-          [cast(key), cast(value)].join(':')
-        end.join(',')
+        obj.map { |pair| pair.map(&method(:cast)).join(':') }.join(',')
 
       when Enumerable
         obj.map { |member| cast(member) }.join(',')
 
-      when Numeric;  obj
-      when DateTime; (obj.to_time.to_f * 1000).to_i
-      when Time;     (obj.to_f * 1000).to_i
-      when Date;     quote(obj.strftime('%Y-%m-%d'))
+      when Numeric        then obj
+      when DateTime, Time then obj.strftime('%s%3N').to_i
+      when Date           then quote(obj.strftime('%Y-%m-%d'))
 
-      when ::Cql::Uuid;        obj.to_s
-      when ::SimpleUUID::UUID; obj.to_guid
+      when ::SimpleUUID::UUID then obj.to_guid
 
       when String
         if obj.encoding == ::Encoding::BINARY
@@ -52,6 +47,9 @@ module Ciql
           quote obj.encode(::Encoding::UTF_8)
         end
 
+      when TrueClass, FalseClass
+        obj.to_s
+
       else
         quote obj.to_s.dup.force_encoding(::Encoding::BINARY)
       end

data/lib/ciql/version.rb

@@ -1,3 +1,3 @@
 module Ciql
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/spec/ciql/client/thrift_spec.rb

@@ -2,10 +2,24 @@ require 'spec_helper'
 
 module Ciql::Client
   describe Thrift do
-    subject { described_class.new }
+    let(:logger) { mock(: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
+
+    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

data/spec/ciql/sanitize_spec.rb

@@ -61,18 +61,13 @@ module Ciql
       end
 
       it 'converts times' do
-        subject.sanitize('?', Time.new(2013, 3, 26, 23, 1, 2.544, 0))
-          .should == 1364338862544.to_s
+        subject.sanitize('?', Time.new(2013, 3, 26, 23, 1, 2.123, 0))
+          .should == 1364338862123.to_s
       end
 
       it 'converts DateTime instances as a time' do
-        subject.sanitize('?', DateTime.new(2013, 3, 26, 23, 1, 2.544, 0))
-          .should == 1364338862544.to_s
-      end
-
-      it 'converts Cql::Uuid to a bare string representation' do
-        subject.sanitize('?', Cql::Uuid.new(2**127 - 1))
-          .should == "7fffffff-ffff-ffff-ffff-ffffffffffff"
+        subject.sanitize('?', DateTime.new(2013, 3, 26, 23, 1, 2.123, 0))
+          .should == 1364338862123.to_s
       end
 
       it 'converts SimpleUUID::UUID to a bare string representation' do
@@ -85,6 +80,14 @@ module Ciql
           .should == "0x01020304"
       end
 
+      it 'converts TrueClass instances to true, without quotes' do
+        subject.sanitize('?', [true]).should == 'true'
+      end
+
+      it 'converts FalseClass instances to false, without quotes' do
+        subject.sanitize('?', [false]).should == 'false'
+      end
+
       it 'joins elements of an array with a comma separator' do
         subject.sanitize('?', [1,2,3]).should == '1,2,3'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciql
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Justin Bradford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-cql
@@ -59,15 +59,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/ciql/client/log.rb
 - lib/ciql/client/thrift.rb
-- lib/ciql/client.rb
 - lib/ciql/configuration.rb
+- lib/ciql/rails.rb
 - lib/ciql/sanitize.rb
 - lib/ciql/version.rb
 - lib/ciql.rb
 - README.md
 - spec/ciql/client/thrift_spec.rb
-- spec/ciql/client_spec.rb
 - spec/ciql/configuration_spec.rb
 - spec/ciql/sanitize_spec.rb
 - spec/spec_helper.rb
@@ -97,7 +97,6 @@ specification_version: 4
 summary: CQL Cassandra client for Ruby
 test_files:
 - spec/ciql/client/thrift_spec.rb
-- spec/ciql/client_spec.rb
 - spec/ciql/configuration_spec.rb
 - spec/ciql/sanitize_spec.rb
 - spec/spec_helper.rb

data/lib/ciql/client.rb

@@ -1,23 +0,0 @@
-require 'ciql/sanitize'
-
-module Ciql
-  module Client
-    class AsynchronousClient < Cql::Client::AsynchronousClient
-      def execute(statement, *arguments)
-        bind_variables = arguments.shift statement.count('?')
-        bound_statement = Ciql::Sanitize.sanitize statement, *bind_variables
-        super(bound_statement, *arguments)
-      end
-    end
-
-    class SynchronousClient < Cql::Client::SynchronousClient
-      def execute(statement, *arguments)
-        @async_client.execute(statement, *arguments).get
-      end
-    end
-
-    def self.connect(options={})
-      SynchronousClient.new(AsynchronousClient.new(options)).connect
-    end
-  end
-end

data/spec/ciql/client_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-require 'ciql/client'
-
-module Ciql::Client
-  describe AsynchronousClient do
-    let(:client) { described_class.new }
-
-    describe '#execute' do
-      before do
-        client.instance_variable_set(:@connected, true)
-        client.stub(:execute_request) do |request|
-          Cql::Future.completed(request)
-        end
-      end
-
-      it 'returns a Cql::Future' do
-        client.execute('x').should be_kind_of Cql::Future
-      end
-
-      it 'binds query parameters' do
-        client.execute('a = ? and b = ?', "a'b", [1,2].pack('C*'))
-          .get.cql.should == "a = 'a''b' and b = 0x0102"
-      end
-
-      it 'uses an extra trailing argument as the consistency level' do
-        client.execute('update', :any).get.consistency.should == :any
-        client.execute('update ?', :any).get.consistency.should == :quorum
-        client.execute('update ?', :any, :one).get.consistency.should == :one
-      end
-    end
-  end
-
-  describe SynchronousClient do
-    let(:async_client) { mock('async client') }
-    let(:client) { described_class.new(async_client) }
-
-    describe '#execute' do
-      before do
-        async_client.should_receive(:execute) do |*arguments|
-          Cql::Future.completed(arguments)
-        end
-      end
-
-      it "returns the value of the async client's #execute result" do
-        client.execute('??', 'a', 'b', :two).should == ['??', 'a', 'b', :two]
-      end
-    end
-  end
-
-  describe '.connect' do
-    let(:reactor) { FakeReactor.new }
-
-    before(:each) do
-      Cql::Io::IoReactor.stub(:new).and_return(reactor)
-    end
-
-    subject { Ciql::Client.connect(port: 4000) }
-
-    it 'returns a SynchronousClient' do
-      subject.should be_instance_of Ciql::Client::SynchronousClient
-    end
-
-    it 'passes the options to the internal async client' do
-      subject.async.instance_variable_get(:@port).should == 4000
-    end
-  end
-end