cassandra 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.7.2 Switch to newly-extraced simple_uuid gem, minor bugfixes.
+
 v0.7.1 update thrift-generated code to 0.5
 
 v0.7 Various improvements. 

data/Manifest

@@ -1,7 +1,7 @@
 CHANGELOG
 LICENSE
 Manifest
-README
+README.mkd
 Rakefile
 bin/cassandra_helper
 conf/cassandra.in.sh
@@ -18,9 +18,9 @@ lib/cassandra/long.rb
 lib/cassandra/ordered_hash.rb
 lib/cassandra/protocol.rb
 lib/cassandra/time.rb
-lib/cassandra/uuid.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

data/README.mkd

@@ -0,0 +1,72 @@
+# cassandra
+
+A Ruby client for the Cassandra distributed database. 
+
+## License
+
+Copyright 2009 Twitter, Inc. See included LICENSE file. Portions copyright 2004-2009 David Heinemeier Hansson, and used with permission.
+
+## 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.
+
+## Installation
+
+You need Ruby 1.8 or 1.9. If you have those, just run:
+
+  sudo gem install cassandra
+
+Cassandra itself is a rapidly moving target. In order to get a working server, use the `bin/cassandra_helper` script:
+
+  cassandra_helper cassandra
+
+A server will be installed in `$HOME/cassandra/server`, and started in debug mode.
+
+WARNING: Don't use the test folder for your data, as it will get overwritten when you update the gem.
+
+## Usage
+
+Now, start IRb and require the library:
+
+  require 'cassandra'
+
+Connect to a server and keyspace:
+
+  client = Cassandra.new('Twitter', '127.0.0.1:9160')
+
+Insert into a column family. You can insert a `Cassandra::OrderedHash`, or a regular Hash, if order doesn't matter:
+
+  client.insert(:Users, "5", {'screen_name' => "buttonscat"})
+
+Insert into a super column family:
+
+  client.insert(:UserRelationships, "5", {"user_timeline" => {UUID.new => "1"}})
+
+Query a super column:
+
+  timeline = client.get(:UserRelationships, "5", "user_timeline")
+
+The returned result will always be a Cassandra::OrderedHash.
+
+See Cassandra for more methods.
+
+## 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
+
+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
+
+* [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/).
+

data/Rakefile

@@ -1,4 +1,3 @@
-
 unless ENV['FROM_BIN_CASSANDRA_HELPER']
   require 'rubygems'
   require 'echoe'
@@ -8,7 +7,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
     p.project = "fauna"
     p.summary = "A Ruby client for the Cassandra distributed database."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift_client', 'json', 'rake']
+    p.dependencies = ['thrift_client', 'json', 'rake', ['simple_uuid', '>= 0.0.2']]
     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/"
@@ -16,7 +15,7 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "c4cc3505855c157a0887611cd9abe6f996bde345"
+REVISION = "450cfa10f0b82d9d5af9ffda182a5097afee402b"
 
 PATCHES = []
 

data/cassandra.gemspec

@@ -2,26 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/ryan/.gemkeys/gem-public_cert.pem"]
-  s.date = %q{2010-01-11}
+  s.date = %q{2010-01-25}
   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", "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", "lib/cassandra/uuid.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "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", "lib/cassandra/uuid.rb", "test/cassandra_test.rb", "test/comparable_types_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.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.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.mkd"]
   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/test_helper.rb"]
+  s.test_files = ["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
@@ -31,14 +31,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thrift_client>, [">= 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"])
     else
       s.add_dependency(%q<thrift_client>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<simple_uuid>, [">= 0.0.2"])
     end
   else
     s.add_dependency(%q<thrift_client>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<simple_uuid>, [">= 0.0.2"])
   end
 end

data/conf/storage-conf.xml

@@ -38,6 +38,7 @@
           <ColumnFamily CompareWith="UTF8Type" Name="Statuses" />
           <ColumnFamily CompareWith="UTF8Type" Name="StatusAudits" />
           <ColumnFamily CompareWith="UTF8Type" CompareSubcolumnsWith="TimeUUIDType" ColumnType="Super" Name="StatusRelationships" />  
+          <ColumnFamily CompareWith="UTF8Type" ColumnType="Super" Name="Index" />
       </Keyspace>
 
       <Keyspace Name="Multiblog">      

data/lib/cassandra.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'thrift_client'
 require 'json'
-
+require 'simple_uuid'
 here = File.expand_path(File.dirname(__FILE__))
 
 $LOAD_PATH << "#{here}/../vendor/gen-rb"
@@ -11,7 +11,6 @@ $LOAD_PATH << "#{here}"
 require 'cassandra/array'
 require 'cassandra/time'
 require 'cassandra/comparable'
-require 'cassandra/uuid'
 require 'cassandra/long'
 require 'cassandra/ordered_hash'
 require 'cassandra/columns'

data/lib/cassandra/cassandra.rb

@@ -2,7 +2,7 @@
 =begin rdoc
 Create a new Cassandra client instance. Accepts a keyspace name, and optional host and port.
 
-  client = Cassandra.new('twitter', '127.0.0.1', 9160)
+  client = Cassandra.new('twitter', '127.0.0.1:9160')
 
 You can then make calls to the server via the <tt>client</tt> instance.
 
@@ -68,7 +68,6 @@ class Cassandra
     @servers = Array(servers)
   end
 
-
   def client
     return @client if defined?(@client)
     client!

data/lib/cassandra/columns.rb

@@ -83,7 +83,7 @@ class Cassandra
               :columns => sub_columns.collect { |sub_column_name, sub_column_value|
                 CassandraThrift::Column.new(
                   :name      => sub_column_name_class(column_family).new(sub_column_name).to_s,
-                  :value     => sub_column_value,
+                  :value     => sub_column_value.to_s,
                   :timestamp => timestamp
                 )
               }

data/lib/cassandra/ordered_hash.rb

@@ -1,44 +1,39 @@
-
+# OrderedHash is namespaced to prevent conflicts with other implementations
 class Cassandra
   # Hash is ordered in Ruby 1.9!
   if RUBY_VERSION >= '1.9'
     OrderedHash = ::Hash
-  else  
-    #  Copyright (c) 2004-2009 David Heinemeier Hansson
-    #  
-    #  Permission is hereby granted, free of charge, to any person obtaining
-    #  a copy of this software and associated documentation files (the
-    #  "Software"), to deal in the Software without restriction, including
-    #  without limitation the rights to use, copy, modify, merge, publish,
-    #  distribute, sublicense, and/or sell copies of the Software, and to
-    #  permit persons to whom the Software is furnished to do so, subject to
-    #  the following conditions:
-    #  
-    #  The above copyright notice and this permission notice shall be
-    #  included in all copies or substantial portions of the Software.
-    #  
-    #  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    #  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    #  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    #  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    #  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    #  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    #  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  
-    class OrderedHash < Hash #:nodoc: all
-      require 'enumerator'    
-    
-      def self.[](*array)
-        hash = new
-        array.each_slice(2) { |key, value| hash[key] = value }
-        hash
-      end
-
+  else
+    class OrderedHash < Hash #:nodoc:
       def initialize(*args, &block)
         super
         @keys = []
       end
 
+      def self.[](*args)
+        ordered_hash = new
+
+        if (args.length == 1 && args.first.is_a?(Array))
+          args.first.each do |key_value_pair|
+            next unless (key_value_pair.is_a?(Array))
+            ordered_hash[key_value_pair[0]] = key_value_pair[1]
+          end
+
+          return ordered_hash
+        end
+
+        unless (args.size % 2 == 0)
+          raise ArgumentError.new("odd number of arguments for Hash")
+        end
+
+        args.each_with_index do |val, ind|
+          next if (ind % 2 != 0)
+          ordered_hash[val] = args[ind + 1]
+        end
+
+        ordered_hash
+      end
+
       def initialize_copy(other)
         super
         # make a deep copy of keys
@@ -86,6 +81,10 @@ class Cassandra
         self
       end
 
+      def to_a
+        @keys.map { |key| [ key, self[key] ] }
+      end
+
       def each_key
         @keys.each { |key| yield key }
       end
@@ -121,6 +120,13 @@ class Cassandra
         dup.merge!(other_hash)
       end
 
+      # When replacing with another hash, the initial order of our keys must come from the other hash -ordered or not.
+      def replace(other)
+        super
+        @keys = other.keys
+        self
+      end
+
       def inspect
         "#<OrderedHash #{super}>"
       end
@@ -132,4 +138,4 @@ class Cassandra
       end
     end
   end
-end
+end

data/test/cassandra_test.rb

@@ -4,7 +4,7 @@ class CassandraTest < Test::Unit::TestCase
   include Cassandra::Constants
 
   def setup
-    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2)
+    @twitter = Cassandra.new('Twitter', "127.0.0.1:9160", :retries => 2, :exception_classes => [])
     @twitter.clear_keyspace!
 
     @blogs = Cassandra.new('Multiblog')
@@ -322,6 +322,10 @@ class CassandraTest < Test::Unit::TestCase
     end
   end
 
+  def test_nil_sub_column_value
+    @twitter.insert(:Index, 'asdf', {"thing" => {'jkl' => nil} })
+  end
+
   private
 
   def key

data/test/comparable_types_test.rb

@@ -8,44 +8,34 @@ class ComparableTypesTest < Test::Unit::TestCase
     10.times { ary << Long.new }
     assert_equal ary.sort, ary
   end
-  
+
   def test_long_equality
     long = Long.new
-    assert_equal long, Long.new(long)  
-    assert_equal long, Long.new(long.to_s)  
-    assert_equal long, Long.new(long.to_i)  
-    assert_equal long, Long.new(long.to_guid)  
+    assert_equal long, Long.new(long)
+    assert_equal long, Long.new(long.to_s)
+    assert_equal long, Long.new(long.to_i)
+    assert_equal long, Long.new(long.to_guid)
   end
-  
+
   def test_long_error
     assert_raises(Cassandra::Comparable::TypeError) do
       Long.new("bogus")
     end
   end
 
-  def test_uuid_sort
-    ary = []
-    5.times { ary << UUID.new(Time.at(rand(2**31))) }
-    assert_equal ary.map { |_| _.seconds }.sort, ary.sort.map { |_| _.seconds }
-    assert_not_equal ary.sort, ary.sort_by {|_| _.to_guid }
-  end
-  
-  def test_uuid_equality
-    uuid = UUID.new
-    assert_equal uuid, UUID.new(uuid)  
-    assert_equal uuid, UUID.new(uuid.to_s)  
-    assert_equal uuid, UUID.new(uuid.to_i)  
-    assert_equal uuid, UUID.new(uuid.to_guid)  
+  def test_types_behave_well
+    assert !(Long.new() == false)
   end
-  
-  def test_uuid_error
+
+  def test_casting_unknown_class
     assert_raises(Cassandra::Comparable::TypeError) do
-      UUID.new("bogus")
+      Cassandra::Long.new({})
     end
   end
-  
-  def test_types_behave_well
-    assert !(UUID.new() == false)
-    assert !(Long.new() == false)
+
+  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
   end
+
 end

data/test/ordered_hash_test.rb

@@ -0,0 +1,201 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+
+class OrderedHashTest < Test::Unit::TestCase
+  def setup
+    @keys =   %w( blue   green  red    pink   orange )
+    @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
+    @hash = Hash.new
+    @ordered_hash = Cassandra::OrderedHash.new
+
+    @keys.each_with_index do |key, index|
+      @hash[key] = @values[index]
+      @ordered_hash[key] = @values[index]
+    end
+  end
+
+  def test_order
+    assert_equal @keys,   @ordered_hash.keys
+    assert_equal @values, @ordered_hash.values
+  end
+
+  def test_access
+    assert @hash.all? { |k, v| @ordered_hash[k] == v }
+  end
+
+  def test_assignment
+    key, value = 'purple', '5422a8'
+
+    @ordered_hash[key] = value
+    assert_equal @keys.length + 1, @ordered_hash.length
+    assert_equal key, @ordered_hash.keys.last
+    assert_equal value, @ordered_hash.values.last
+    assert_equal value, @ordered_hash[key]
+  end
+
+  def test_delete
+    key, value = 'white', 'ffffff'
+    bad_key = 'black'
+
+    @ordered_hash[key] = value
+    assert_equal @keys.length + 1, @ordered_hash.length
+    assert_equal @ordered_hash.keys.length, @ordered_hash.length
+
+    assert_equal value, @ordered_hash.delete(key)
+    assert_equal @keys.length, @ordered_hash.length
+    assert_equal @ordered_hash.keys.length, @ordered_hash.length
+
+    assert_nil @ordered_hash.delete(bad_key)
+  end
+
+  def test_to_hash
+    assert_same @ordered_hash, @ordered_hash.to_hash
+  end
+
+  def test_to_a
+    assert_equal @keys.zip(@values), @ordered_hash.to_a
+  end
+
+  def test_has_key
+    assert_equal true, @ordered_hash.has_key?('blue')
+    assert_equal true, @ordered_hash.key?('blue')
+    assert_equal true, @ordered_hash.include?('blue')
+    assert_equal true, @ordered_hash.member?('blue')
+
+    assert_equal false, @ordered_hash.has_key?('indigo')
+    assert_equal false, @ordered_hash.key?('indigo')
+    assert_equal false, @ordered_hash.include?('indigo')
+    assert_equal false, @ordered_hash.member?('indigo')
+  end
+
+  def test_has_value
+    assert_equal true, @ordered_hash.has_value?('000099')
+    assert_equal true, @ordered_hash.value?('000099')
+    assert_equal false, @ordered_hash.has_value?('ABCABC')
+    assert_equal false, @ordered_hash.value?('ABCABC')
+  end
+
+  def test_each_key
+    keys = []
+    @ordered_hash.each_key { |k| keys << k }
+    assert_equal @keys, keys
+  end
+
+  def test_each_value
+    values = []
+    @ordered_hash.each_value { |v| values << v }
+    assert_equal @values, values
+  end
+
+  def test_each
+    values = []
+    @ordered_hash.each {|key, value| values << value}
+    assert_equal @values, values
+  end
+
+  def test_each_with_index
+    @ordered_hash.each_with_index { |pair, index| assert_equal [@keys[index], @values[index]], pair}
+  end
+
+  def test_each_pair
+    values = []
+    keys = []
+    @ordered_hash.each_pair do |key, value|
+      keys << key
+      values << value
+    end
+    assert_equal @values, values
+    assert_equal @keys, keys
+  end
+
+  def test_delete_if
+    copy = @ordered_hash.dup
+    copy.delete('pink')
+    assert_equal copy, @ordered_hash.delete_if { |k, _| k == 'pink' }
+    assert !@ordered_hash.keys.include?('pink')
+  end
+
+  def test_reject!
+    (copy = @ordered_hash.dup).delete('pink')
+    @ordered_hash.reject! { |k, _| k == 'pink' }
+    assert_equal copy, @ordered_hash
+    assert !@ordered_hash.keys.include?('pink')
+  end
+
+  def test_reject
+    copy = @ordered_hash.dup
+    new_ordered_hash = @ordered_hash.reject { |k, _| k == 'pink' }
+    assert_equal copy, @ordered_hash
+    assert !new_ordered_hash.keys.include?('pink')
+    assert @ordered_hash.keys.include?('pink')
+  end
+
+  def test_clear
+    @ordered_hash.clear
+    assert_equal [], @ordered_hash.keys
+  end
+
+  def test_merge
+    other_hash =  Cassandra::OrderedHash.new
+    other_hash['purple'] = '800080'
+    other_hash['violet'] = 'ee82ee'
+    merged = @ordered_hash.merge other_hash
+    assert_equal merged.length, @ordered_hash.length + other_hash.length
+    assert_equal @keys + ['purple', 'violet'], merged.keys
+
+    @ordered_hash.merge! other_hash
+    assert_equal @ordered_hash, merged
+    assert_equal @ordered_hash.keys, merged.keys
+  end
+
+  def test_shift
+    pair = @ordered_hash.shift
+    assert_equal [@keys.first, @values.first], pair
+    assert !@ordered_hash.keys.include?(pair.first)
+  end
+  
+  def test_keys
+    original = @ordered_hash.keys.dup
+    @ordered_hash.keys.pop
+    assert_equal original, @ordered_hash.keys
+  end
+
+  def test_inspect
+    assert @ordered_hash.inspect.include?(@hash.inspect)
+  end
+
+  def test_alternate_initialization_with_splat
+    alternate = Cassandra::OrderedHash[1,2,3,4]
+    assert_kind_of Cassandra::OrderedHash, alternate
+    assert_equal [1, 3], alternate.keys
+  end
+
+  def test_alternate_initialization_with_array
+    alternate = Cassandra::OrderedHash[ [
+      [1, 2],
+      [3, 4],
+      "bad key value pair",
+      [ 'missing value' ]
+    ]]
+
+    assert_kind_of Cassandra::OrderedHash, alternate
+    assert_equal [1, 3, 'missing value'], alternate.keys
+    assert_equal [2, 4, nil ], alternate.values
+  end
+
+  def test_alternate_initialization_raises_exception_on_odd_length_args
+    begin
+      alternate = Cassandra::OrderedHash[1,2,3,4,5]
+      flunk "Hash::[] should have raised an exception on initialization " +
+          "with an odd number of parameters"
+    rescue
+      assert_equal "odd number of arguments for Hash", $!.message
+    end
+  end
+
+  def test_replace_updates_keys
+    @other_ordered_hash = Cassandra::OrderedHash[:black, '000000', :white, '000000']
+    original = @ordered_hash.replace(@other_ordered_hash)
+    assert_same original, @ordered_hash
+    assert_equal @other_ordered_hash.keys, @ordered_hash.keys
+  end
+end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require "#{File.expand_path(File.dirname(__FILE__))}/../lib/cassandra"
 begin; require 'ruby-debug'; rescue LoadError; end
 
 begin
-  @test_client = Cassandra.new('Twitter')
+  @test_client = Cassandra.new('Twitter', 'localhost:9160', {:exception_classes => []})
 rescue Thrift::TransportException => e
   #FIXME Make server automatically start if not running
   if e.message =~ /Could not connect/

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   zyKMYVRO0z/58g==
   -----END CERTIFICATE-----
 
-date: 2010-01-11 00:00:00 -08:00
+date: 2010-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: simple_uuid
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
+    version: 
 description: A Ruby client for the Cassandra distributed database.
 email: ""
 executables: 
@@ -72,7 +82,7 @@ extensions: []
 extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
-- README
+- README.mkd
 - bin/cassandra_helper
 - lib/cassandra.rb
 - lib/cassandra/array.rb
@@ -85,12 +95,11 @@ extra_rdoc_files:
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/time.rb
-- lib/cassandra/uuid.rb
 files: 
 - CHANGELOG
 - LICENSE
 - Manifest
-- README
+- README.mkd
 - Rakefile
 - bin/cassandra_helper
 - conf/cassandra.in.sh
@@ -107,9 +116,9 @@ files:
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/time.rb
-- lib/cassandra/uuid.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
@@ -126,7 +135,7 @@ rdoc_options:
 - --title
 - Cassandra
 - --main
-- README
+- README.mkd
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -151,4 +160,5 @@ summary: A Ruby client for the Cassandra distributed database.
 test_files: 
 - test/cassandra_test.rb
 - test/comparable_types_test.rb
+- test/ordered_hash_test.rb
 - test/test_helper.rb

data/README

@@ -1,64 +0,0 @@
-cassandra
-
-A Ruby client for the Cassandra distributed database. 
-
-== License
-
-Copyright 2009 Twitter, Inc. See included LICENSE file. Portions copyright 2004-2009 David Heinemeier Hansson, and used with permission.
-
-The public certificate for this gem is here[http://rubyforge.org/frs/download.php/25331/evan_weaver-original-public_cert.pem]. 
-
-== 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.
-
-== Installation
-
-You need Ruby 1.8 or 1.9. If you have those, just run:
-
-  sudo gem install cassandra
-  
-Cassandra itself is a rapidly moving target. In order to get a working server, use the <tt>bin/cassandra_helper</tt> script:
-
-  cassandra_helper cassandra
-  
-A server will be installed in <tt>$HOME/cassandra/server</tt>, and started in debug mode.
-
-== Usage
-  
-Now, start IRb and require the library:
-  
-  require 'cassandra'
-  
-Connect to a server and keyspace:
-  
-  client = Cassandra.new('Twitter', '127.0.0.1:9160')
-  
-Insert into a column family. You can insert a Cassandra::OrderedHash, or a regular Hash, if order doesn't matter:
-
-  client.insert(:Users, "5", {'screen_name' => "buttonscat"})  
-
-Insert into a super column family:
-
-  client.insert(:UserRelationships, "5", {"user_timeline" => {UUID.new => "1"}})
-
-Query a super column:
-
-  timeline = client.get(:UserRelationships, "5", "user_timeline")
-  
-The returned result will always be a Cassandra::OrderedHash.
-
-See Cassandra for more methods.
-
-== Further reading
-
-* {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 Cassandra itself, please use the {cassandra-user mailing list}[http://mail-archives.apache.org/mod_mbox/incubator-cassandra-user/].
-

data/lib/cassandra/uuid.rb

@@ -1,115 +0,0 @@
-
-class Cassandra
-
-  # UUID format version 1, as specified in RFC 4122, with jitter in place of the mac address and sequence counter.
-  class UUID < Comparable
-
-    class InvalidVersion < StandardError #:nodoc:
-    end
-
-    GREGORIAN_EPOCH_OFFSET = 0x01B2_1DD2_1381_4000 # Oct 15, 1582
-
-    VARIANT = 0b1000_0000_0000_0000
-
-    def initialize(bytes = nil)
-      case bytes
-      when self.class # UUID
-        @bytes = bytes.to_s
-      when String
-        case bytes.size
-        when 16 # Raw byte array
-          @bytes = bytes
-        when 36 # Human-readable UUID representation; inverse of #to_guid
-          elements = bytes.split("-")
-          raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (malformed UUID representation)" if elements.size != 5
-          @bytes = elements.join.to_a.pack('H32')
-        else
-          raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (invalid bytecount)"
-        end
-
-      when Integer
-        raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (integer out of range)" if bytes < 0 or bytes > 2**128
-        @bytes = [
-          (bytes >> 96) & 0xFFFF_FFFF,
-          (bytes >> 64) & 0xFFFF_FFFF,
-          (bytes >> 32) & 0xFFFF_FFFF,
-          bytes & 0xFFFF_FFFF
-        ].pack("NNNN")
-
-      when NilClass, Time
-        time = (bytes || Time).stamp * 10 + GREGORIAN_EPOCH_OFFSET
-        # See http://github.com/spectra/ruby-uuid/
-        @bytes = [
-          time & 0xFFFF_FFFF,
-          time >> 32,
-          ((time >> 48) & 0x0FFF) | 0x1000,
-          # Top 3 bytes reserved
-          rand(2**13) | VARIANT,
-          rand(2**16),
-          rand(2**32)
-        ].pack("NnnnnN")
-
-      else
-        raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (unknown source class)"
-      end
-    end
-
-    def to_i
-      ints = @bytes.unpack("NNNN")
-      (ints[0] << 96) +
-      (ints[1] << 64) +
-      (ints[2] << 32) +
-      ints[3]
-    end
-
-    def version
-      time_high = @bytes.unpack("NnnQ")[2]
-      version = (time_high & 0xF000).to_s(16)[0].chr.to_i
-      version > 0 and version < 6 ? version : -1
-    end
-
-    def variant
-      @bytes.unpack('QnnN')[1] >> 13
-    end
-
-    def to_guid
-      elements = @bytes.unpack("NnnCCa6")
-      node = elements[-1].unpack('C*')
-      elements[-1] = '%02x%02x%02x%02x%02x%02x' % node
-      "%08x-%04x-%04x-%02x%02x-%s" % elements
-    end
-
-    def seconds
-      total_usecs / 1_000_000
-    end
-
-    def usecs
-      total_usecs % 1_000_000
-    end
-
-    def <=>(other)
-      total_usecs <=> other.send(:total_usecs)
-    end
-
-    def ==(other)
-      to_s == other.to_s
-    end
-
-    def inspect(long = false)
-      "<Cassandra::UUID##{object_id} time: #{
-        Time.at(seconds).inspect
-      }, usecs: #{
-        usecs
-      } jitter: #{
-        @bytes.unpack('QQ')[1]
-      }" + (long ? ", version: #{version}, variant: #{variant}, guid: #{to_guid}>" :  ">")
-    end
-
-    private
-
-    def total_usecs
-      elements = @bytes.unpack("NnnQ")
-      (elements[0] + (elements[1] << 32) + ((elements[2] & 0x0FFF) << 48) - GREGORIAN_EPOCH_OFFSET) / 10
-    end
-  end
-end