cassandra 0.12.0 → 0.12.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.12.1
+- Fix issue with simple_uuid dependency.
+- Fix issue with get_range & get_range_batch keeping all results when a block is given. Resolves Issue# 112.
+
 v0.12.0 Changed thrift_client dependency to 0.7.0
 
 v0.11.4
@@ -64,7 +68,7 @@ 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. 
+v0.7 Various improvements.
 - Compatibility with Cassandra 0.5.
 - performance improvements
 

data/Rakefile

@@ -9,7 +9,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 >=0.7.0', 'json', 'rake', 'simple_uuid >=0.1.0']
+    p.dependencies = ['thrift_client >=0.7.0', 'json', 'rake', 'simple_uuid >=0.2.0']
     p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift|.*\.rbc)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.retain_gemspec = true

data/cassandra.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra}
-  s.version = "0.12.0"
+  s.version = "0.12.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Evan Weaver, Ryan King}]
@@ -27,17 +27,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<simple_uuid>, [">= 0.1.0"])
+      s.add_runtime_dependency(%q<simple_uuid>, [">= 0.2.0"])
     else
       s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])
+      s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
     end
   else
     s.add_dependency(%q<thrift_client>, [">= 0.7.0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<simple_uuid>, [">= 0.1.0"])
+    s.add_dependency(%q<simple_uuid>, [">= 0.2.0"])
   end
 end

data/lib/cassandra.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 gem 'thrift_client', '~> 0.7.0'
 require 'thrift_client'
-gem 'simple_uuid' , '~> 0.1.0'
+gem 'simple_uuid' , '~> 0.2.0'
 require 'simple_uuid'
 
 require 'json' unless defined?(JSON)

data/lib/cassandra/cassandra.rb

@@ -764,14 +764,17 @@ class Cassandra
         next if result.length == count
 
         unless columns == {}
-          yield key, columns if block_given?
-          result[key] = columns
+          if block_given?
+            yield key, columns
+          else
+            result[key] = columns
+          end
         end
         last_key = key
       end
     end
 
-    result
+    result if !block_given?
   end
 
   ##

data/lib/cassandra/mock.rb

@@ -204,7 +204,7 @@ class Cassandra
                                                                                               :reversed   => false
                                                                                              )
                                                                          )
-      _get_range(column_family,
+      res = _get_range(column_family,
                  options[:start_key],
                  options[:finish_key],
                  options[:key_count],
@@ -214,6 +214,12 @@ class Cassandra
                  options[:count],
                  options[:consistency],
                  options[:reversed], &blk)
+
+      if blk.nil?
+        res
+      else
+        nil
+      end
     end
 
     def get_range_keys(column_family, options = {})

data/test/cassandra_test.rb

@@ -286,13 +286,14 @@ class CassandraTest < Test::Unit::TestCase
 
     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|
+    returned_value = @twitter.get_range(:Statuses, :start_key => k.to_s, :key_count => 5) do |key,columns|
        expected = values.pop
        assert_equal expected[:key], key
        assert_equal expected[:columns], columns
-    }
-    assert_equal [],values
+    end
 
+    assert_equal [], values
+    assert_nil returned_value
   end
   
   def test_get_range_reversed

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cassandra
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Evan Weaver, Ryan King
@@ -69,12 +69,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 description: A Ruby client for the Cassandra distributed database.