cassilds 0.9.2 → 0.12.1

data/test/eventmachine_test.rb

@@ -1,42 +1,42 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper')
 
-if RUBY_VERSION < '1.9'
+if RUBY_VERSION < '1.9' || CASSANDRA_VERSION == '0.6'
   puts "Skipping EventMachine test"
 else
 
-require 'thrift_client/event_machine'
+  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
+  class EventmachineTest < Test::Unit::TestCase
 
-  private
-  
-  def em_test(name)
-    EM.run do
-      Fiber.new do
-        begin
-          send("raw_#{name}".to_sym)
-        ensure
-          EM.stop
-        end
-      end.resume
+    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
-  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)
+
+    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
-  
-  wrap_tests
-  
 end
-end

data/test/ordered_hash_test.rb

@@ -198,6 +198,11 @@ class OrderedHashTestInt < Test::Unit::TestCase
     assert_same original, @ordered_hash
     assert_equal @other_ordered_hash.keys, @ordered_hash.keys
   end
+  
+  def test_reverse
+    assert_equal @keys.reverse, @ordered_hash.reverse.keys
+    assert_equal @values.reverse, @ordered_hash.reverse.values
+  end
 end
 
 class OrderedHashTest < Test::Unit::TestCase
@@ -321,6 +326,7 @@ class OrderedHashTest < Test::Unit::TestCase
     @ordered_hash.reject! { |k, _| k == 'pink' }
     assert_equal copy, @ordered_hash
     assert !@ordered_hash.keys.include?('pink')
+    assert !@ordered_hash.timestamps.keys.include?('pink')
   end
 
   def test_reject

data/test/test_helper.rb

@@ -1,6 +1,7 @@
+CASSANDRA_VERSION = ENV['CASSANDRA_VERSION'] || '0.8' unless defined?(CASSANDRA_VERSION)
 
 require 'test/unit'
-require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra/#{CASSANDRA_VERSION}"
 begin; require 'ruby-debug'; rescue LoadError; end
 
 begin
@@ -8,7 +9,7 @@ begin
 rescue Thrift::TransportException => e
   #FIXME Make server automatically start if not running
   if e.message =~ /Could not connect/
-    puts "*** Please start the Cassandra server by running 'rake cassandra'. ***" 
+    puts "*** Please start the Cassandra server by running 'rake cassandra'. ***"
     exit 1
   end
 end

data/vendor/0.7/gen-rb/cassandra_types.rb

@@ -13,8 +13,10 @@ module CassandraThrift
       EACH_QUORUM = 4
       ALL = 5
       ANY = 6
-      VALUE_MAP = {1 => "ONE", 2 => "QUORUM", 3 => "LOCAL_QUORUM", 4 => "EACH_QUORUM", 5 => "ALL", 6 => "ANY"}
-      VALID_VALUES = Set.new([ONE, QUORUM, LOCAL_QUORUM, EACH_QUORUM, ALL, ANY]).freeze
+      TWO = 7
+      THREE = 8
+      VALUE_MAP = {1 => "ONE", 2 => "QUORUM", 3 => "LOCAL_QUORUM", 4 => "EACH_QUORUM", 5 => "ALL", 6 => "ANY", 7 => "TWO", 8 => "THREE"}
+      VALID_VALUES = Set.new([ONE, QUORUM, LOCAL_QUORUM, EACH_QUORUM, ALL, ANY, TWO, THREE]).freeze
     end
 
     module IndexOperator