cassandra 0.2.3 → 0.4

data/CHANGELOG

@@ -0,0 +1,12 @@
+
+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

@@ -0,0 +1,202 @@
+
+                                 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,19 +1,26 @@
-cassandra.gemspec
+CHANGELOG
+conf/cassandra.in.sh
+conf/log4j.properties
+conf/storage-conf.xml
+lib/cassandra/array.rb
+lib/cassandra/cassandra.rb
+lib/cassandra/comparable.rb
+lib/cassandra/constants.rb
+lib/cassandra/helper.rb
+lib/cassandra/long.rb
+lib/cassandra/ordered_hash.rb
+lib/cassandra/safe_client.rb
+lib/cassandra/serialization.rb
+lib/cassandra/time.rb
+lib/cassandra/uuid.rb
 lib/cassandra.rb
-lib/properties.rb
-lib/tags.rb
+LICENSE
 Manifest
-misc/dan.rb
-misc/meyer_reset.css
-README.rdoc
-site/basic.cssy
-site/basic.rb
-site/cssy_title.jpg
-site/flower.png
-site/index.mab
-site/ruby.cssy
-test/basics.rb
-test/dan.cssy
-test/fiddle.css
-test/fiddle.cssy
-test/helper.rb
+quickstart.sh
+Rakefile
+README
+test/cassandra_client_test.rb
+test/comparable_types_test.rb
+vendor/gen-rb/cassandra.rb
+vendor/gen-rb/cassandra_constants.rb
+vendor/gen-rb/cassandra_types.rb

data/README

@@ -0,0 +1,65 @@
+
+cassandra
+
+A 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
+* pluggable serialization and compression
+* Ruby 1.9 compatibility
+
+This is an alpha release and does not yet support the full Thrift API. 
+
+Cassandra is a rapidly moving target, but this library should always run against the bundle available {here}[http://github.com/fauna/cassandra/raw/6546d1155b77ca7bc5ebf58bdcce79ddda36f611/vendor/cassandra.tar.bz2]. Don't expect it to work against any other version right now.
+
+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, and Thrift. 
+
+If you don't want to install Thrift from {source}[http://incubator.apache.org/thrift/download/], you can use {this pre-packaged gem}[http://blog.evanweaver.com/files/cassandra/thrift-0.1.0.gem]. Once you have Thrift, just run:
+
+  sudo gem install cassandra
+  
+== Usage
+
+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" => {"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/Rakefile

@@ -0,0 +1,13 @@
+require 'echoe'
+
+Echoe.new("cassandra") do |p|
+  p.author = "Evan Weaver"
+  p.project = "fauna"
+  p.summary = "A Ruby client for CassandraDB."
+  p.rubygems_version = ">= 0.8"
+  p.dependencies = ['json']
+  p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift)/
+  p.rdoc_pattern = /^(lib|bin|tasks|ext)|_types.rb|_constants.rb|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
+  p.url = "http://blog.evanweaver.com/files/doc/fauna/cassandra/"
+  p.docs_host = "blog.evanweaver.com:~/www/bax/public/files/doc/"
+end

data/cassandra.gemspec

@@ -1,131 +1,36 @@
-
-# Gem::Specification for Cassandra-0.2.3
-# Originally generated by Echoe
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.2.3"
+  s.version = "0.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matthew King"]
-  s.date = %q{2008-09-08}
-  s.description = %q{Generates CSS using Ruby, like Markaby}
-  s.email = %q{automatthew@gmail.com}
-  s.extra_rdoc_files = ["lib/cassandra.rb", "lib/properties.rb", "lib/tags.rb", "README.rdoc"]
-  s.files = ["cassandra.gemspec", "lib/cassandra.rb", "lib/properties.rb", "lib/tags.rb", "Manifest", "misc/dan.rb", "misc/meyer_reset.css", "README.rdoc", "site/basic.cssy", "site/basic.rb", "site/cssy_title.jpg", "site/flower.png", "site/index.mab", "site/ruby.cssy", "test/basics.rb", "test/dan.cssy", "test/fiddle.css", "test/fiddle.cssy", "test/helper.rb"]
-  s.has_rdoc = true
-  s.homepage = %q{}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Cassandra", "--main", "README.rdoc"]
+  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-07-30}
+  s.description = %q{A Ruby client for CassandraDB.}
+  s.email = %q{}
+  s.extra_rdoc_files = ["CHANGELOG", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/helper.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/serialization.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "README", "vendor/gen-rb/cassandra_constants.rb", "vendor/gen-rb/cassandra_types.rb"]
+  s.files = ["CHANGELOG", "conf/cassandra.in.sh", "conf/log4j.properties", "conf/storage-conf.xml", "lib/cassandra/array.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/comparable.rb", "lib/cassandra/constants.rb", "lib/cassandra/helper.rb", "lib/cassandra/long.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/safe_client.rb", "lib/cassandra/serialization.rb", "lib/cassandra/time.rb", "lib/cassandra/uuid.rb", "lib/cassandra.rb", "LICENSE", "Manifest", "quickstart.sh", "Rakefile", "README", "test/cassandra_client_test.rb", "test/comparable_types_test.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.require_paths = ["lib"]
-  s.rubyforge_project = %q{cassandra}
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{Generates CSS using Ruby, like Markaby}
-  s.test_files = ["test/basics.rb", "test/helper.rb"]
+  s.rubyforge_project = %q{fauna}
+  s.rubygems_version = %q{1.3.4}
+  s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
+  s.summary = %q{A Ruby client for CassandraDB.}
+  s.test_files = ["test/cassandra_client_test.rb", "test/comparable_types_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
-    if current_version >= 3 then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
-
-
-# # Original Rakefile source (requires the Echoe gem):
-# 
-# require 'rubygems'
-# 
-# Version = '0.2.3'
-# 
-# task :default => [ :test ]
-# 
-# begin
-#   gem 'echoe', '>=2.7'
-#   require 'echoe'
-#   Echoe.new('cassandra', Version) do |p|
-#     p.project = 'cassandra'
-#     p.summary = "Generates CSS using Ruby, like Markaby"
-#     p.author = "Matthew King"
-#     p.email = "automatthew@gmail.com"
-#     p.ignore_pattern = /^(\.git).+/
-#     p.test_pattern = "test/*.rb"
-#   end
-# rescue
-#   "(ignored echoe gemification, as you don't have the Right Stuff)"
-# end
-# 
-# module Rake::TaskManager
-#   def delete_task(task_class, *args, &block)
-#     task_name, deps = resolve_args(args)
-#     @tasks.delete(task_class.scope_name(@scope, task_name).to_s)
-#   end
-# end
-# class Rake::Task
-#   def self.delete_task(args, &block) Rake.application.delete_task(self, args, &block) end
-# end
-# def delete_task(args, &block) Rake::Task.delete_task(args, &block) end
-#   
-# delete_task :publish_docs
-# 
-# desc "Publish rdocs to rubyforge"
-# task :publish_docs => [ :clean, :docs ] do
-#   config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-#   pub = Rake::SshDirPublisher.new "#{config["username"]}@rubyforge.org", 
-#     "/var/www/gforge-projects/cassandra/rdoc", 
-#     'doc'
-#   pub.upload
-# end
-# 
-# task :publish_site => [ :compile ] do
-#   cmd = "scp -qr site/*.{html,css,jpg,png} automatthew@rubyforge.org:/var/www/gforge-projects/cassandra"
-#   puts "Uploading: #{cmd}"
-#   system(cmd)
-# end
-# 
-# def rubyforge_config
-#   @rubyforge_config ||= YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-# end
-# 
-# 
-# 
-# # List all the desired pages as dependencies on :compile
-# task :compile => %w{ site/index.html site/basic.css site/ruby.css }
-# 
-# task :clean do
-#   f = FileList['site/**/*.html', 'site/*.css']
-#   puts f; rm f
-# end
-# 
-# rule '.html' => [ '.mab' ] do |t|
-#   mab(t.source, t.name)
-# end
-# 
-# file 'site/index.mab' => [ 'site/basic.rb' ]
-# 
-# rule '.css' => [ '.cssy' ] do |t|
-#   cssify(t.source, t.name)
-# end
-#   
-# require 'markaby'
-# $:.unshift "lib"
-# require 'cassandra'
-# 
-# def mab(source, target)
-#   mab = Markaby::Builder.new
-#   result = mab.instance_eval(File.read(source))
-#   File.open(target, 'w') do |f|
-#     f.puts result
-#   end
-# end
-# 
-# def cssify(source, target)
-#   c = Cssy.new.process(File.read(source))
-#   File.open(target, 'w') do |f|
-#     f.puts c.to_s
-#   end
-# end
-# 
-#