cassandra 0.11.3 → 0.11.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.11.4
+- Fix get_range to invoke blocks
+- Fix current distribution urls in Rakfile. Resolves Issue# 97.
+
 v0.11.3
 - Fix login after reconnect
 

data/Rakefile

@@ -18,8 +18,8 @@ end
 
 CassandraBinaries = {
   '0.6' => 'http://www.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz',
-  '0.7' => 'http://www.apache.org/dist/cassandra/0.7.5/apache-cassandra-0.7.5-bin.tar.gz',
-  '0.8' => 'http://www.apache.org/dist/cassandra/0.8.0/apache-cassandra-0.8.0-bin.tar.gz'
+  '0.7' => 'http://www.apache.org/dist/cassandra/0.7.7/apache-cassandra-0.7.7-bin.tar.gz',
+  '0.8' => 'http://www.apache.org/dist/cassandra/0.8.1/apache-cassandra-0.8.1-bin.tar.gz'
 }
 
 CASSANDRA_HOME = ENV['CASSANDRA_HOME'] || "#{ENV['HOME']}/cassandra"

data/cassandra.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.11.3"
+  s.version = "0.11.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver, Ryan King}]
-  s.date = %q{2011-07-05}
+  s.date = %q{2011-07-22}
   s.description = %q{A Ruby client for the Cassandra distributed database.}
   s.email = %q{}
   s.executables = [%q{cassandra_helper}]

data/lib/cassandra/cassandra.rb

@@ -680,11 +680,11 @@ class Cassandra
   #   * :reversed     - If set to true the results will be returned in reverse order.
   #   * :consistency  - Uses the default read consistency if none specified.
   #
-  def get_range(column_family, options = {})
+  def get_range(column_family, options = {}, &blk)
     if block_given? || options[:key_count] || options[:batch_size]
-      get_range_batch(column_family, options)
+      get_range_batch(column_family, options, &blk)
     else
-      get_range_single(column_family, options)
+      get_range_single(column_family, options, &blk)
     end
   end
 

data/lib/cassandra/mock.rb

@@ -191,7 +191,7 @@ class Cassandra
       end
     end
 
-    def get_range(column_family, options = {})
+    def get_range(column_family, options = {}, &blk)
       column_family, _, _, options = extract_and_validate_params_for_real(column_family, "", [options], 
                                                                           READ_DEFAULTS.merge(:start_key  => '',
                                                                                               :end_key    => '',
@@ -207,7 +207,7 @@ class Cassandra
                  options[:start],
                  options[:finish],
                  options[:count],
-                 options[:consistency])
+                 options[:consistency], &blk)
     end
 
     def get_range_keys(column_family, options = {})
@@ -337,7 +337,7 @@ class Cassandra
       @schema
     end
 
-    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency)
+    def _get_range(column_family, start_key, finish_key, key_count, columns, start, finish, count, consistency, &blk)
       ret = OrderedHash.new
       start  = to_compare_with_type(start,  column_family)
       finish = to_compare_with_type(finish, column_family)
@@ -347,9 +347,11 @@ class Cassandra
           if columns
             #ret[key] = columns.inject(OrderedHash.new){|hash, column_name| hash[column_name] = cf(column_family)[key][column_name]; hash;}
             ret[key] = columns_to_hash(column_family, cf(column_family)[key].select{|k,v| columns.include?(k)})
+            blk.call(key,ret[key]) unless blk.nil?
           else
             #ret[key] = apply_range(cf(column_family)[key], column_family, start, finish, !is_super(column_family))
             ret[key] = apply_range(columns_to_hash(column_family, cf(column_family)[key]), column_family, start, finish)
+            blk.call(key,ret[key]) unless blk.nil?
           end
         end
       end

data/test/cassandra_test.rb

@@ -259,6 +259,23 @@ class CassandraTest < Test::Unit::TestCase
     assert_equal(4, @twitter.get_range_keys(:Statuses, :key_count => 4).size)
   end
 
+  def test_get_range_block
+    k = key
+    5.times do |i|
+      @twitter.insert(:Statuses, k+i.to_s, {"body-#{i.to_s}" => 'v'})
+    end
+
+    values = (0..4).collect{|n| { :key => "test_get_range_block#{n}", :columns => { "body-#{n}" => "v" }} }.reverse
+
+    @twitter.get_range(:Statuses, :start_key => k.to_s, :key_count => 5) { |key,columns|
+       expected = values.pop
+       assert_equal expected[:key], key
+       assert_equal expected[:columns], columns
+    }
+    assert_equal [],values
+
+  end
+
   def test_each_key
     k = key
     keys_yielded = []

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 11
-  - 3
-  version: 0.11.3
+  - 4
+  version: 0.11.4
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-07-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thrift_client