cassandra 0.5.5 → 0.5.6

data/Rakefile

@@ -16,12 +16,11 @@ unless ENV['FROM_BIN_CASSANDRA_HELPER']
   end
 end
 
-REVISION = "c4992f48ce9c26ce4fd028240447b4cbe85ecf26"
+REVISION = "33ac4dddb02c4b99dda34eefe842b2fcf4e81c6b"
 
 PATCHES = [
-  "http://issues.apache.org/jira/secure/attachment/12417533/388.patch",
-  "http://issues.apache.org/jira/secure/attachment/12417682/CASSANDRA-336-code.diff",
-  "http://issues.apache.org/jira/secure/attachment/12417683/CASSANDRA-336-thrift.diff"]
+  "http://issues.apache.org/jira/secure/attachment/12418212/CASSANDRA-336-code.diff",
+  "http://issues.apache.org/jira/secure/attachment/12418213/CASSANDRA-336-thrift.diff"]
 
 CASSANDRA_HOME = "#{ENV['HOME']}/cassandra/server"
 

data/cassandra.gemspec

@@ -2,18 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-08-27}
-  s.default_executable = %q{cassandra_helper}
+  s.date = %q{2009-09-01}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
-  s.executables = ["cassandra_helper"]
-  s.extra_rdoc_files = ["bin/cassandra_helper", "CHANGELOG", "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/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "README"]
-  s.files = ["bin/cassandra_helper", "CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "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/safe_client.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "Manifest", "Rakefile", "README", "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.files = ["cassandra.gemspec", "Rakefile", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/test_helper.rb"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/cassandra/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README"]
   s.require_paths = ["lib"]

data/test/cassandra_test.rb

@@ -143,6 +143,8 @@ class CassandraTest < Test::Unit::TestCase
     @twitter.insert(:StatusRelationships, key, {'user_timelines' => columns})
     assert_equal(columns, @twitter.get(:StatusRelationships, key, 'user_timelines'))
     assert_equal({}, @twitter.get(:StatusRelationships, 'bogus', 'user_timelines'))
+    # FIXME Not sure if this is valid
+    # assert_nil @twitter.exists?(:StatusRelationships, 'bogus', 'user_timelines')
   end
 
   def test_get_super_value
@@ -164,12 +166,16 @@ 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'})
-    assert_equal(
-      OrderedHash[key + '1', {'body' => 'v1', 'user' => 'v1'}, key + '2', {'body' => 'v2', 'user' => 'v2'}, 'bogus', {}],
-      @twitter.multi_get(:Users, [key + '1', key + '2', 'bogus']))
-    assert_equal(
-      OrderedHash[key + '2', {'body' => 'v2', 'user' => 'v2'}, 'bogus', {}, key + '1', {'body' => 'v1', 'user' => 'v1'}],
-      @twitter.multi_get(:Users, [key + '2', 'bogus', key + '1']))
+    
+    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
+    assert_equal expected.keys, result.keys
+
+    expected = OrderedHash[key + '2', {'body' => 'v2', 'user' => 'v2'}, 'bogus', {}, key + '1', {'body' => 'v1', 'user' => 'v1'}]
+    result = @twitter.multi_get(:Users, [key + '2', 'bogus', key + '1'])
+    assert_equal expected, result
+    assert_equal expected.keys, result.keys
   end
 
   def test_remove_key

data/test/comparable_types_test.rb

@@ -11,6 +11,7 @@ class ComparableTypesTest < Test::Unit::TestCase
   
   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)  
@@ -31,6 +32,7 @@ class ComparableTypesTest < Test::Unit::TestCase
   
   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)  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-08-27 00:00:00 -07:00
+date: 2009-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,58 +55,15 @@ dependencies:
     version: 
 description: A Ruby client for the Cassandra distributed database.
 email: ""
-executables: 
-- cassandra_helper
+executables: []
+
 extensions: []
 
-extra_rdoc_files: 
-- bin/cassandra_helper
-- CHANGELOG
-- 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/safe_client.rb
-- lib/cassandra/time.rb
-- lib/cassandra/uuid.rb
-- lib/cassandra.rb
-- LICENSE
-- README
+extra_rdoc_files: []
+
 files: 
-- bin/cassandra_helper
-- CHANGELOG
-- conf/cassandra.in.sh
-- conf/log4j.properties
-- conf/storage-conf.xml
-- 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/safe_client.rb
-- lib/cassandra/time.rb
-- lib/cassandra/uuid.rb
-- lib/cassandra.rb
-- LICENSE
-- Manifest
-- Rakefile
-- README
-- 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
+- Rakefile
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/cassandra/
 licenses: []

data/CHANGELOG

@@ -1,24 +0,0 @@
-
-v0.5.5. to_guid for Long. Don't continually re-checkout the Git mirror. Use curl instead of wget, sigh. Use new unified insert API.
-
-v0.5.4. Use wget instead of curl.
-
-v0.5.3. Update Multiblog sample schema.
-
-v0.5.2. Update server version so CommitLog replay is fixed.
-
-v0.5.1. Add bin/cassandra_helper script, to build and start the server for you. Improve build error reporting.
-
-v0.5. More API changes. Working temporal comparators.
-
-v0.4. Use new comparator API. Namespace Thrift bindings; rename gem and class to Cassandra. Make tokens and limits actually work. Retry UnavailableExceptions.
-
-v0.3. Use new Thrift API.
-
-v0.2.2. Use nil for empty byte array, not empty string. Improves API.
-
-v0.2.1. Don't write serialization overhead on nulls.
-
-v0.2. Re-factor table vs. column family interface per discussion with jbellis.
-
-v0.1. First release.

data/LICENSE

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/Manifest

@@ -1,28 +0,0 @@
-bin/cassandra_helper
-CHANGELOG
-conf/cassandra.in.sh
-conf/log4j.properties
-conf/storage-conf.xml
-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/safe_client.rb
-lib/cassandra/time.rb
-lib/cassandra/uuid.rb
-lib/cassandra.rb
-LICENSE
-Manifest
-Rakefile
-README
-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

data/README

@@ -1,65 +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")
-  
-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/].
-