cassandra 0.8.0 → 0.8.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.8.1 Adding the ability to compose ThriftClient classes.
+
 v0.8.0 Compatibility with Cassandra 0.6 betas (no longer compatible with 0.5); assorted bugfixes.
 
 v0.7.6 Bugfixes.

data/cassandra.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]
   s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-03-30}
   s.default_executable = %q{cassandra_helper}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = ["cassandra_helper"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "bin/cassandra_helper", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "bin/cassandra_helper", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra.rb", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/helpers.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb", "test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb", "vendor/gen-rb/cassandra.rb", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb", "cassandra.gemspec", "test/eventmachine_test.rb"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.signing_key = %q{/Users/ryan/.gemkeys/gem-private_key.pem}
   s.summary = %q{A Ruby client for the Cassandra distributed database.}
-  s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/cassandra/cassandra.rb

@@ -24,6 +24,8 @@ For write methods, valid option parameters are:
 <tt>:timestamp </tt>:: The transaction timestamp. Defaults to the current time in milliseconds. This is used for conflict resolution by the server; you normally never need to change it.
 <tt>:consistency</tt>:: See above.
 
+For the initial client instantiation, you may also pass in <tt>:thrift_client<tt> with a ThriftClient subclass attached. On connection, that class will be used instead of the default ThriftClient class, allowing you to add additional behavior to the connection (e.g. query logging).
+
 =end rdoc
 
 class Cassandra
@@ -53,10 +55,11 @@ class Cassandra
   }.freeze
   
   THRIFT_DEFAULTS = {
-    :transport_wrapper => Thrift::BufferedTransport
+    :transport_wrapper => Thrift::BufferedTransport,
+    :thrift_client_class => ThriftClient
   }.freeze
 
-  attr_reader :keyspace, :servers, :schema, :thrift_client_options
+  attr_reader :keyspace, :servers, :schema, :thrift_client_options, :thrift_client_class
 
   # Create a new Cassandra instance and open the connection.
   def initialize(keyspace, servers = "127.0.0.1:9160", thrift_client_options = {})
@@ -64,7 +67,7 @@ class Cassandra
     @column_name_class = {}
     @sub_column_name_class = {}
     @thrift_client_options = THRIFT_DEFAULTS.merge(thrift_client_options)
-
+    @thrift_client_class = @thrift_client_options[:thrift_client_class]
     @keyspace = keyspace
     @servers = Array(servers)
   end
@@ -286,7 +289,7 @@ class Cassandra
   end
 
   def new_client
-    ThriftClient.new(CassandraThrift::Cassandra::Client, @servers, @thrift_client_options)
+    thrift_client_class.new(CassandraThrift::Cassandra::Client, @servers, @thrift_client_options)
   end
 
   def all_nodes

data/test/eventmachine_test.rb

@@ -0,0 +1,42 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+if RUBY_VERSION < '1.9'
+  puts "Skipping EventMachine test"
+else
+
+require 'thrift_client/event_machine'
+
+class EventmachineTest < Test::Unit::TestCase
+  
+  def test_twitter
+    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :exception_classes => [], :transport => Thrift::EventMachineTransport, :transport_wrapper => nil)
+    @twitter.clear_keyspace!
+  end
+
+  private
+  
+  def em_test(name)
+    EM.run do
+      Fiber.new do
+        begin
+          send("raw_#{name}".to_sym)
+        ensure
+          EM.stop
+        end
+      end.resume
+    end
+  end
+  
+  def self.wrap_tests
+    self.public_instance_methods.select { |m| m =~ /^test_/ }.each do |meth|
+      alias_method :"raw_#{meth}", meth
+      define_method(meth) do
+        em_test(meth)
+      end
+    end
+  end
+  
+  wrap_tests
+  
+end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -30,7 +30,7 @@ cert_chain:
   zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-03-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,5 +168,6 @@ test_files:
 - test/cassandra_mock_test.rb
 - test/cassandra_test.rb
 - test/comparable_types_test.rb
+- test/eventmachine_test.rb
 - test/ordered_hash_test.rb
 - test/test_helper.rb