cassandra 0.7.2 → 0.7.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.7.4 Fix thrift_client dependency
+
+v0.7.3 New Cassandra::Mock - a pure ruby mock of cassanra; bugfixes.
+
 v0.7.2 Switch to newly-extraced simple_uuid gem, minor bugfixes.
 
 v0.7.1 update thrift-generated code to 0.5

data/Manifest

@@ -1,7 +1,7 @@
 CHANGELOG
 LICENSE
 Manifest
-README.mkd
+README.rdoc
 Rakefile
 bin/cassandra_helper
 conf/cassandra.in.sh

data/{README.mkd → README.rdoc}

@@ -1,20 +1,20 @@
-# cassandra
+= cassandra
 
 A Ruby client for the Cassandra distributed database. 
 
-## License
+== License
 
 Copyright 2009 Twitter, Inc. See included LICENSE file. Portions copyright 2004-2009 David Heinemeier Hansson, and used with permission.
 
-## Features
+== Features
 
 * clean encapsulation of the Thrift API
 * compatible UUID and Long classes, for GUID generation
 * Ruby 1.9 compatibility
 
-The Github source repository is [here](http://github.com/fauna/cassandra/). Patches and contributions are very welcome.
+The Github source repository is {here}[http://github.com/fauna/cassandra/]. Patches and contributions are very welcome.
 
-## Installation
+== Installation
 
 You need Ruby 1.8 or 1.9. If you have those, just run:
 
@@ -28,7 +28,7 @@ A server will be installed in `$HOME/cassandra/server`, and started in debug mod
 
 WARNING: Don't use the test folder for your data, as it will get overwritten when you update the gem.
 
-## Usage
+== Usage
 
 Now, start IRb and require the library:
 
@@ -54,19 +54,18 @@ The returned result will always be a Cassandra::OrderedHash.
 
 See Cassandra for more methods.
 
-## Configuration
+== Configuration
 
 By default, cassandra is setup to listen on localhost. If you want to move your clients to another host, you're going to need to change which interface it binds to in the storage-conf.xml. You should also change the seed address.
 
-## Node Auto-Discovery
+== Node Auto-Discovery
 
 The list of hosts you pass to the client is only used to auto-discover all the nodes in your cluster. You don't need to give the client a list of all of your nodes.
 
-## Further reading
+== Further reading
 
-* [Up and Running With Cassandra](http://blog.evanweaver.com/articles/2009/07/06/up-and-running-with-cassandra)
+* {Up and Running With Cassandra}[http://blog.evanweaver.com/articles/2009/07/06/up-and-running-with-cassandra]
 
-## Reporting problems
-
-The Github issue tracker is [here](http://github.com/fauna/cassandra/issues). If you have problems with this library or Cassandra itself, please use the [cassandra-user mailing list](http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/).
+== Reporting problems
 
+The Github issue tracker is {here}[http://github.com/fauna/cassandra/issues]. If you have problems with this library or Cassandra itself, please use the {cassandra-user mailing list}[http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/].

data/Rakefile

@@ -3,11 +3,11 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   require 'echoe'
 
   Echoe.new("cassandra") do |p|
-    p.author = "Evan Weaver"
+    p.author = "Evan Weaver, Ryan King"
     p.project = "fauna"
     p.summary = "A Ruby client for the Cassandra distributed database."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift_client', 'json', 'rake', ['simple_uuid', '>= 0.0.2']]
+    p.dependencies = ['thrift_client >= 0.4.0', 'json', 'rake', 'simple_uuid >= 0.1.0']
     p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra/"
@@ -15,7 +15,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "450cfa10f0b82d9d5af9ffda182a5097afee402b"
+REVISION = "298a0e66ba66c5d2a1e5d4a70f2f619ae3fbf72a"
 
 PATCHES = []
 
@@ -55,8 +55,8 @@ end
 
 desc "Check Git version"
 task :git do
-  unless `git --version 2>&1` =~ /git version 1.6/
-    puts "You need to install git 1.6."
+  unless `git --version 2>&1` =~ /git version 1.(6|7)/
+    puts "You need to install git 1.6 or 1.7"
     exit(1)
   end
 end

data/cassandra.gemspec

@@ -2,46 +2,46 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.7.2"
+  s.version = "0.7.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Evan Weaver"]
+  s.authors = ["Evan Weaver, Ryan King"]
   s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-01-25}
+  s.date = %q{2010-02-19}
   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.mkd", "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/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.mkd", "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/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.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.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/long.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/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.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/cassandra_mock_test.rb"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.mkd"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
   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_test.rb", "test/comparable_types_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
+  s.test_files = ["test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_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
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift_client>, [">= 0"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<simple_uuid>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
     else
-      s.add_dependency(%q<thrift_client>, [">= 0"])
+      s.add_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<simple_uuid>, [">= 0.0.2"])
+      s.add_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
     end
   else
-    s.add_dependency(%q<thrift_client>, [">= 0"])
+    s.add_dependency(%q<thrift_client>, [">= 0", "= 0.4.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<simple_uuid>, [">= 0.0.2"])
+    s.add_dependency(%q<simple_uuid>, [">= 0", "= 0.1.0"])
   end
 end

data/lib/cassandra.rb

@@ -8,6 +8,8 @@ $LOAD_PATH << "#{here}/../vendor/gen-rb"
 require "#{here}/../vendor/gen-rb/cassandra"
 
 $LOAD_PATH << "#{here}"
+
+require 'cassandra/helpers'
 require 'cassandra/array'
 require 'cassandra/time'
 require 'cassandra/comparable'

data/lib/cassandra/cassandra.rb

@@ -29,6 +29,7 @@ For write methods, valid option parameters are:
 class Cassandra
   include Columns
   include Protocol
+  include Helpers
 
   class AccessError < StandardError #:nodoc:
   end
@@ -52,7 +53,7 @@ class Cassandra
   }.freeze
   
   THRIFT_DEFAULTS = {
-    :transport => Thrift::BufferedTransport
+    :transport_wrapper => Thrift::BufferedTransport
   }.freeze
 
   attr_reader :keyspace, :servers, :schema, :thrift_client_options
@@ -99,7 +100,7 @@ class Cassandra
   # a nested hash for a super column family. Supports the <tt>:consistency</tt>
   # and <tt>:timestamp</tt> options.
   def insert(column_family, key, hash, options = {})
-    column_family, _, _, options = validate_params(column_family, key, [options], WRITE_DEFAULTS)
+    column_family, _, _, options = extract_and_validate_params(column_family, key, [options], WRITE_DEFAULTS)
 
     timestamp = options[:timestamp] || Time.stamp
     cfmap = hash_to_cfmap(column_family, hash, timestamp)
@@ -114,7 +115,7 @@ class Cassandra
   # path you request. Supports the <tt>:consistency</tt> and <tt>:timestamp</tt>
   # options.
   def remove(column_family, key, *columns_and_options)
-    column_family, column, sub_column, options = validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
+    column_family, column, sub_column, options = extract_and_validate_params(column_family, key, columns_and_options, WRITE_DEFAULTS)
 
     args = {:column_family => column_family}
     columns = is_super(column_family) ? {:super_column => column, :column => sub_column} : {:column => column}
@@ -149,7 +150,7 @@ class Cassandra
   # request. Supports the <tt>:consistency</tt> option.
   def count_columns(column_family, key, *columns_and_options)
     column_family, super_column, _, options = 
-      validate_params(column_family, key, columns_and_options, READ_DEFAULTS)      
+      extract_and_validate_params(column_family, key, columns_and_options, READ_DEFAULTS)      
     _count_columns(column_family, key, super_column, options[:consistency])
   end
 
@@ -165,7 +166,7 @@ class Cassandra
   # <tt>:consistency</tt> option.
   def get_columns(column_family, key, *columns_and_options)
     column_family, columns, sub_columns, options = 
-      validate_params(column_family, key, columns_and_options, READ_DEFAULTS)      
+      extract_and_validate_params(column_family, key, columns_and_options, READ_DEFAULTS)      
     _get_columns(column_family, key, columns, sub_columns, options[:consistency])
   end
 
@@ -188,7 +189,7 @@ class Cassandra
   # <tt>:start</tt>, <tt>:finish</tt>, <tt>:reversed</tt>, and <tt>:consistency</tt>.
   def multi_get(column_family, keys, *columns_and_options)
     column_family, column, sub_column, options = 
-      validate_params(column_family, keys, columns_and_options, READ_DEFAULTS)
+      extract_and_validate_params(column_family, keys, columns_and_options, READ_DEFAULTS)
 
     hash = _multiget(column_family, keys, column, sub_column, options[:count], options[:start], options[:finish], options[:reversed], options[:consistency])
     # Restore order
@@ -201,7 +202,7 @@ class Cassandra
   # request exists. Supports the <tt>:consistency</tt> option.
   def exists?(column_family, key, *columns_and_options)
     column_family, column, sub_column, options = 
-      validate_params(column_family, key, columns_and_options, READ_DEFAULTS)
+      extract_and_validate_params(column_family, key, columns_and_options, READ_DEFAULTS)
     _multiget(column_family, [key], column, sub_column, 1, nil, nil, nil, options[:consistency])[key]
   end
 
@@ -211,7 +212,7 @@ class Cassandra
   # options.
   def get_range(column_family, options = {})
     column_family, _, _, options = 
-      validate_params(column_family, "", [options], READ_DEFAULTS)
+      extract_and_validate_params(column_family, "", [options], READ_DEFAULTS)
     _get_range(column_family, options[:start].to_s, options[:finish].to_s, options[:count], options[:consistency])
   end
 
@@ -221,7 +222,7 @@ class Cassandra
   def count_range(column_family, options = {})
     count = 0
     l = []
-    start_key = ''
+    start_key = options[:start]
     while (l = get_range(column_family, options.merge(:count => 1000, :start => start_key))).size > 0
       count += l.size
       start_key = l.last.succ
@@ -235,7 +236,7 @@ class Cassandra
   # the individual commands.
   def batch(options = {})
     _, _, _, options = 
-      validate_params(schema.keys.first, "", [options], WRITE_DEFAULTS)
+      extract_and_validate_params(schema.keys.first, "", [options], WRITE_DEFAULTS)
 
     @batch = []
     yield
@@ -255,47 +256,10 @@ class Cassandra
 
   private
 
-  # Extract and validate options.
-  # FIXME Should be done as a decorator
-  def validate_params(column_family, keys, args, options)
-    options = options.dup
-    column_family = column_family.to_s
-    # Keys
-    [keys].flatten.each do |key|
-      raise ArgumentError, "Key #{key.inspect} must be a String for #{calling_method}" unless key.is_a?(String)
-    end
-    
-    # Options
-    if args.last.is_a?(Hash)
-      extras = args.last.keys - options.keys
-      raise ArgumentError, "Invalid options #{extras.inspect[1..-2]} for #{calling_method}" if extras.any?
-      options.merge!(args.pop)      
-    end
-
-    # Ranges
-    column, sub_column = args[0], args[1]
-    klass, sub_klass = column_name_class(column_family), sub_column_name_class(column_family)        
-    range_class = column ? sub_klass : klass
-    options[:start] = options[:start] ? range_class.new(options[:start]).to_s : ""
-    options[:finish] = options[:finish] ? range_class.new(options[:finish]).to_s : ""
-    
-    [column_family, s_map(column, klass), s_map(sub_column, sub_klass), options]
-  end
-  
   def calling_method
      "#{self.class}##{caller[0].split('`').last[0..-3]}"
   end
 
-  # Convert stuff to strings.
-  def s_map(el, klass)
-    case el
-    when Array then el.map { |i| s_map(i, klass) }
-    when NilClass then nil
-    else
-      klass.new(el).to_s
-    end
-  end
-
   # Roll up queued mutations, to improve atomicity.
   def compact_mutations!
     #TODO re-do this rollup

data/lib/cassandra/columns.rb

@@ -28,9 +28,10 @@ class Cassandra
     end
 
     def column_family_property(column_family, key)
+      unless schema[column_family]
+        raise AccessError, "Invalid column family \"#{column_family}\""
+      end
       schema[column_family][key]
-    rescue NoMethodError
-      raise AccessError, "Invalid column family \"#{column_family}\""    
     end
 
     def multi_column_to_hash!(hash)

data/lib/cassandra/long.rb

@@ -2,7 +2,7 @@
 class Cassandra
   # A temporally-ordered Long class for use in Cassandra column names
   class Long < Comparable
-  
+
     # FIXME Should unify with or subclass Cassandra::UUID
     def initialize(bytes = nil)
       case bytes
@@ -15,7 +15,7 @@ class Cassandra
         when 18 # Human-readable UUID-like representation; inverse of #to_guid
           elements = bytes.split("-")
           raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (malformed UUID-like representation)" if elements.size != 3
-          @bytes = elements.join.to_a.pack('H32')
+          @bytes = [elements.join].pack('H32')
         else
           raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (invalid bytecount)"
         end
@@ -38,14 +38,14 @@ class Cassandra
         ints[1]
       end
     end
-    
+
     def to_guid
       "%08x-%04x-%04x" % @bytes.unpack("Nnn")
     end    
 
     def inspect
       "<Cassandra::Long##{object_id} time: #{
-        Time.at((to_i >> 12) / 1_000_000).inspect
+        Time.at((to_i >> 12) / 1_000_000).utc.inspect
       }, usecs: #{
         (to_i >> 12) % 1_000_000
       }, jitter: #{

data/test/cassandra_mock_test.rb

@@ -0,0 +1,61 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require 'cassandra_test'
+require 'cassandra/mock'
+
+class CassandraMockTest < CassandraTest
+  include Cassandra::Constants
+
+  def setup
+    storage_xml_path = File.expand_path(File.join(File.dirname(File.dirname(__FILE__)), 'conf', 'storage-conf.xml'))
+    @twitter = Cassandra::Mock.new('Twitter', nil, :storage_xml => storage_xml_path)
+    @twitter.clear_keyspace!
+
+    @blogs = Cassandra::Mock.new('Multiblog', nil, :storage_xml => storage_xml_path)
+    @blogs.clear_keyspace!
+
+    @blogs_long = Cassandra::Mock.new('MultiblogLong', nil, :storage_xml => storage_xml_path)
+    @blogs_long.clear_keyspace!
+
+    @uuids = (0..6).map {|i| UUID.new(Time.at(2**(24+i))) }
+    @longs = (0..6).map {|i| Long.new(Time.at(2**(24+i))) }
+  end
+
+  def test_setup
+    assert @twitter
+    assert @blogs
+    assert @blogs_long
+  end
+  
+  def test_schema_for_keyspace
+    data = {
+      "StatusRelationships"=>{
+          "CompareSubcolumnsWith"=>"org.apache.cassandra.db.marshal.TimeUUIDType", 
+          "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type",
+          "Type"=>"Super"},
+      "StatusAudits"=>{
+        "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type",
+        "Type"=>"Standard"}, 
+      "Statuses"=>{
+        "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type",
+        "Type"=>"Standard"}, 
+      "UserRelationships"=>{
+        "CompareSubcolumnsWith"=>"org.apache.cassandra.db.marshal.TimeUUIDType", 
+        "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type",
+        "Type"=>"Super"}, 
+      "UserAudits"=>{
+        "CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type", 
+        "Type"=>"Standard"},
+      "Users"=>{"CompareWith"=>"org.apache.cassandra.db.marshal.UTF8Type", "Type"=>"Standard"}
+    }
+    stuff = @twitter.send(:schema_for_keyspace, 'Twitter')
+    data.keys.each do |k|
+      assert_equal data[k], stuff[k], k
+    end
+  end
+
+  def test_sorting_row_keys
+    @twitter.insert(:Statuses, 'b', {:text => 'foo'})
+    @twitter.insert(:Statuses, 'a', {:text => 'foo'})
+    assert_equal ['a'], @twitter.get_range(:Statuses, :count => 1)
+  end
+end

data/test/cassandra_test.rb

@@ -57,19 +57,19 @@ class CassandraTest < Test::Unit::TestCase
   def test_get_first_long_column
     @blogs_long.insert(:Blogs, key, 
       {@longs[0] => 'I like this cat', @longs[1] => 'Buttons is cuter', @longs[2] => 'I disagree'})
-    
+
     assert_equal({@longs[0] => 'I like this cat'}, @blogs_long.get(:Blogs, key, :count => 1))
     assert_equal({@longs[2] => 'I disagree'}, @blogs_long.get(:Blogs, key, :count => 1, :reversed => true))
     assert_equal({}, @blogs_long.get(:Blogs, 'bogus'))
   end
-  
+
   def test_long_remove_bug
     @blogs_long.insert(:Blogs, key, {@longs[0] => 'I like this cat'})
     @blogs_long.remove(:Blogs, key)
     assert_equal({}, @blogs_long.get(:Blogs, key, :count => 1))
 
-    @blogs_long.insert(:Blogs, key, {@longs[0] => 'I like this cat'})
-    assert_equal({@longs[0] => 'I like this cat'}, @blogs_long.get(:Blogs, key, :count => 1))
+    @blogs_long.insert(:Blogs, key, {@longs[0] => 'I really like this cat'})
+    assert_equal({@longs[0] => 'I really like this cat'}, @blogs_long.get(:Blogs, key, :count => 1))
   end
 
   def test_get_with_count
@@ -84,7 +84,7 @@ class CassandraTest < Test::Unit::TestCase
     assert_nil @twitter.get(:Statuses, 'bogus', 'body')
 
     assert @twitter.exists?(:Statuses, key, 'body')
-    assert_nil @twitter.exists?(:Statuses, 'bogus', 'body')
+    assert !@twitter.exists?(:Statuses, 'bogus', 'body')
   end
 
   def test_get_super_key
@@ -157,7 +157,7 @@ class CassandraTest < Test::Unit::TestCase
   def test_multi_get
     @twitter.insert(:Users, key + '1', {'body' => 'v1', 'user' => 'v1'})
     @twitter.insert(:Users, key + '2', {'body' => 'v2', 'user' => 'v2'})
-    
+
     expected = OrderedHash[key + '1', {'body' => 'v1', 'user' => 'v1'}, key + '2', {'body' => 'v2', 'user' => 'v2'}, 'bogus', {}]
     result = @twitter.multi_get(:Users, [key + '1', key + '2', 'bogus'])
     assert_equal expected, result

data/test/comparable_types_test.rb

@@ -35,7 +35,11 @@ class ComparableTypesTest < Test::Unit::TestCase
 
   def test_long_inspect
     obj = Long.new("\000\000\000\000\000\000\000\000")
-    assert_equal "<Cassandra::Long##{obj.object_id} time: Wed Dec 31 16:00:00 -0800 1969, usecs: 0, jitter: 0, guid: 00000000-0000-0000>", obj.inspect
+    if RUBY_VERSION < '1.9'
+      assert_equal "<Cassandra::Long##{obj.object_id} time: Thu Jan 01 00:00:00 UTC 1970, usecs: 0, jitter: 0, guid: 00000000-0000-0000>", obj.inspect
+    else
+      assert_equal "<Cassandra::Long##{obj.object_id} time: 1970-01-01 00:00:00 UTC, usecs: 0, jitter: 0, guid: 00000000-0000-0000>", obj.inspect
+    end
   end
 
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors: 
-- Evan Weaver
+- Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: 
@@ -30,7 +30,7 @@ cert_chain:
   zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2010-01-25 00:00:00 -08:00
+date: 2010-02-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -71,7 +74,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.2
+        version: "0"
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.1.0
     version: 
 description: A Ruby client for the Cassandra distributed database.
 email: ""
@@ -82,7 +88,7 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
-- README.mkd
+- README.rdoc
 - bin/cassandra_helper
 - lib/cassandra.rb
 - lib/cassandra/array.rb
@@ -99,7 +105,7 @@ files:
 - CHANGELOG
 - LICENSE
 - Manifest
-- README.mkd
+- README.rdoc
 - Rakefile
 - bin/cassandra_helper
 - conf/cassandra.in.sh
@@ -135,7 +141,7 @@ rdoc_options:
 - --title
 - Cassandra
 - --main
-- README.mkd
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -158,6 +164,7 @@ signing_key:
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.
 test_files: 
+- test/cassandra_mock_test.rb
 - test/cassandra_test.rb
 - test/comparable_types_test.rb
 - test/ordered_hash_test.rb