Merge 315158b into ff3ad20

Gemfile

@@ -3,6 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in virsandra.gemspec
 
 gem 'coveralls', require: false
-gem "cassandra-cql", :git => "git://github.com/ottbot/cassandra-cql", :branch => "1.2-set-consistency"
+
 
 gemspec

lib/virsandra.rb

@@ -1,5 +1,6 @@
 require "virtus"
-require "cassandra-cql/1.2"
+require "cql"
+require "simple_uuid"
 
 require "virsandra/version"
 require "virsandra/configuration"

lib/virsandra/configuration.rb

@@ -6,9 +6,7 @@ module Configuration
     OPTIONS = [
       :keyspace,
       :servers,
-      :thrift_options,
       :consistency,
-      :cql_version
     ]
 
     attr_accessor *OPTIONS
@@ -19,9 +17,7 @@ def self.extended(base)
 
     def reset!
       self.servers = '127.0.0.1:9160'
-      self.cql_version = '3.0.0'
       self.consistency = :quorum
-      self.thrift_options = {retries: 5, connect_timeout: 10, timeout: 10}
       self.keyspace = nil
     end
 

lib/virsandra/connection.rb

@@ -13,11 +13,13 @@ def initialize(options)
     end
 
     def connect!
-      cql_options = @options.select {|k| [:keyspace, :cql_version, :consistency].include?(k) }
+      @handle = Cql::Client.connect(hosts: @options[:servers])
+      @handle.use(@options[:keyspace])
+      @handle
+    end
 
-      @handle = CassandraCQL::Database.new(@options[:servers],
-                                           cql_options,
-                                           @options[:thrift_options])
+    def disconnect!
+      @handle.close
     end
 
     # Delegate to CassandraCQL::Database handle

lib/virsandra/query.rb

@@ -72,7 +72,7 @@ def raw_query
     end
 
     def fetch_with_symbolized_keys
-      row_hash = @row && @row.fetch_hash
+      row_hash = @row && @row.first
       return {} unless row_hash
 
       Hash[row_hash.map{|(k,v)| [k.to_sym,v]}]

spec/lib/virsandra/connection_spec.rb

@@ -11,7 +11,7 @@
   end
 
   it "obtains a db connection" do
-    connection.handle.should be_a CassandraCQL::Database
+    connection.handle.should be_a Cql::Client::SynchronousClient
   end
 
   it "delegates to the cassandra handle" do

spec/lib/virsandra/query_spec.rb

@@ -9,7 +9,7 @@
   end
 
   it "should return empty hash when can't fetch hash from results" do
-    Virsandra.stub(:execute => double("row", :fetch_hash => nil))
+    Virsandra.stub(:execute => double("row", :first => nil))
     described_class.new.fetch.should eq({})
   end
 

spec/lib/virsandra_spec.rb

@@ -43,9 +43,7 @@
 
     defaults = {
       servers: '127.0.0.1:9160',
-      cql_version: '3.0.0',
       consistency: :quorum,
-      thrift_options: {retries: 5, connect_timeout: 10, timeout: 10},
       keyspace: nil
     }
 
@@ -65,12 +63,10 @@
   end
 
   it "reconnects if dirty" do
-    CassandraCQL::Database.stub(:new)
-
     Virsandra::Connection.should_receive(:new).twice.and_call_original
     Virsandra.connection
 
-    Virsandra.keyspace = 'foo'
+    Virsandra.keyspace = 'system'
     Virsandra.connection
     Virsandra.connection
   end

spec/spec_helper.rb

@@ -42,7 +42,7 @@ def build_up
   begin
     create_keyspace
     create_companies_table
-  rescue CassandraCQL::Error::InvalidRequestException
+  rescue Cql::QueryError
     drop_keyspace
 
     if defined?(retried)

virsandra.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
 
   #gem.add_dependency "cassandra-cql", #WHEN IT SUPPORTS CQL3
   gem.add_dependency "virtus", ">= 0.5.4"
+  gem.add_dependency "cql-rb", ">= 1.0.2"
   gem.add_dependency "simple_uuid", ">= 0.3.0"
 
   gem.add_development_dependency "rake", ">= 0.9.2"