ciql 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0c24dfc6f7e95361c405a08d552c4e88b296e79
-  data.tar.gz: b4f6eae5dc11907751b959994858cbd663ecdca4
+  metadata.gz: d970154542794f5068a3eb1c3db01626c0043dac
+  data.tar.gz: 6fa0c48171ecbcb7eaadf406612a556ea181474d
 SHA512:
-  metadata.gz: 371cc72b3bf7886fe99c124ab5a18be855c07e5a6867d2a5c27bea4de40de6cf13a96f0a8b51b79a8e29c760b6a0d803be6e2366c56fa0725233fcfefc9079d4
-  data.tar.gz: 2948ca1f3c9c7e8d812aade4f5436b2e56a01559dcfd8a3a11e462458a7602cc9dd220b78705992f4589484ff6ff3d6d1c3b0abd72c6bba9b006e702fd59f422
+  metadata.gz: f8617949842428fab81a257d449b7e48c2cf56e5f4babc0f5b53860a8c3d0b7413fd69472f018b247eb30dad144305014a462495d5e02c37df91838806cf0957
+  data.tar.gz: 16e5a590c5820eba2909d849a57c87e629bbac5d7a84421aa62b41b1227f2350d48636441d1f04ac161fa5ff4e4daeb12ee6936ea941c780b5a900aad94e4ead

data/lib/ciql/sanitize.rb

@@ -1,4 +1,5 @@
 require 'simple_uuid'
+require 'set'
 
 module Ciql
   module Sanitize
@@ -29,10 +30,13 @@ module Ciql
     def self.cast(obj)
       case obj
       when Hash
-        obj.map { |pair| pair.map(&method(:cast)).join(':') }.join(',')
+        "{#{obj.map { |pair| pair.map(&method(:cast)).join(':') }.join(',')}}"
+
+      when Set
+        "{#{obj.map { |member| cast(member) }.join(',')}}"
 
       when Enumerable
-        obj.map { |member| cast(member) }.join(',')
+        "[#{obj.map { |member| cast(member) }.join(',')}]"
 
       when NilClass       then 'NULL'
       when Numeric        then obj

data/lib/ciql/version.rb

@@ -1,3 +1,3 @@
 module Ciql
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/spec/ciql/client/binary_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Ciql::Client
   describe Binary do
     let(:logger) do
-      mock(:debug? => true, debug: nil, info: nil, warn: nil)
+      double(:debug? => true, debug: nil, info: nil, warn: nil)
     end
 
     subject { described_class.new(log: logger) }

data/spec/ciql/client/thrift_spec.rb

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

data/spec/ciql/sanitize_spec.rb

@@ -85,19 +85,24 @@ module Ciql
       end
 
       it 'converts TrueClass instances to true, without quotes' do
-        subject.sanitize('?', [true]).should == 'true'
+        subject.sanitize('?', true).should == 'true'
       end
 
       it 'converts FalseClass instances to false, without quotes' do
-        subject.sanitize('?', [false]).should == 'false'
+        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'
+      it 'joins casted elements of an array with a comma separator wrapped in []' do
+        subject.sanitize('?', [1,true,Time.at(0).to_date])
+          .should == "[1,true,'1969-12-31']"
       end
 
-      it 'joins key/value pairs of a hash with colon and comma separators' do
-        subject.sanitize('?', {a: 1, b: 'z'}).should == "'a':1,'b':'z'"
+      it 'joins casted elements of a set with a comma separator wrapped in {}' do
+        subject.sanitize('?', [1,nil,'a'].to_set).should == "{1,NULL,'a'}"
+      end
+
+      it 'joins casted key/value pairs of a hash with colon and comma separators wrapped in {}' do
+        subject.sanitize('?', {a: 1, b: 'z'}).should == "{'a':1,'b':'z'}"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ciql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Justin Bradford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
-  name: cassandra-cql
+  name: simple_uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :development
+        version: 0.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: simple_uuid
+  name: cassandra-cql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 1.2.1
 description: A CQL-based Cassandra client for Ruby
 email:
 - justin@nulu.com