cassandra 0.14.0 → 0.15.0

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.15.0
+- Fixes for ruby 1.8 (issue #158, courtesy @jarib)
+- get_indexed_slices returns an OrderedHash (issue #110)
+
 v0.14.0
 - Numerous performance improvements (courtesy @nearbuy)
 - Fixed many 0.6 bugs

data/cassandra.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra"
-  s.version = "0.14.0"
+  s.version = "0.15.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver, Ryan King"]
-  s.date = "2012-08-06"
+  s.date = "2012-09-12"
   s.description = "A Ruby client for the Cassandra distributed database."
   s.email = ""
   s.executables = ["cassandra_helper"]

data/lib/cassandra/0.8/columns.rb

@@ -5,7 +5,7 @@ class Cassandra
         :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
           :counter_column => CassandraThrift::CounterColumn.new(
             :name      => column_name_class(column_family).new(column_name).to_s,
-            :value     => value,
+            :value     => value
           )
         )
       )

data/lib/cassandra/1.0/columns.rb

@@ -5,7 +5,7 @@ class Cassandra
         :column_or_supercolumn => CassandraThrift::ColumnOrSuperColumn.new(
           :counter_column => CassandraThrift::CounterColumn.new(
             :name      => column_name_class(column_family).new(column_name).to_s,
-            :value     => value,
+            :value     => value
           )
         )
       )

data/lib/cassandra/cassandra.rb

@@ -991,7 +991,7 @@ class Cassandra
     key_slices = _get_indexed_slices(column_family, index_clause, columns, options[:count], options[:start],
       options[:finish], options[:reversed], options[:consistency])
 
-    key_slices.inject({}){|h, key_slice| h[key_slice.key] = key_slice.columns; h}
+    key_slices.inject(OrderedHash.new) {|h, key_slice| h[key_slice.key] = key_slice.columns; h }
   end
 
   protected

data/lib/cassandra/dynamic_composite.rb

@@ -35,7 +35,7 @@ class Cassandra
 
       packed_types = @types.map do |type|
         if type.length == 1
-          [0x8000 | type.ord].pack('n')
+          [0x8000 | type[0].ord].pack('n')
         else
           [type.length].pack('n') + type
         end

data/lib/cassandra/mock.rb

@@ -304,7 +304,7 @@ class Cassandra
         idx_clause = create_index_clause(idx_clause, start_key, options[:key_count])
       end
 
-      ret = {}
+      ret = OrderedHash.new
       cf(column_family).each do |key, row|
         next if idx_clause[:start] != '' && key < idx_clause[:start]
         next if ret.length == idx_clause[:count]

data/test/cassandra_test.rb

@@ -1172,23 +1172,23 @@ class CassandraTest < Test::Unit::TestCase
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
         :start => Cassandra::Composite.new([1].pack('N')),
-        :finish => Cassandra::Composite.new([10].pack('N')),
+        :finish => Cassandra::Composite.new([10].pack('N'))
       ).keys
       assert_equal(columns_in_order[0..-2], column_slice)
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
         :start => Cassandra::Composite.new([5].pack('N')),
-        :finish => Cassandra::Composite.new([5].pack('N'), :slice => :after),
+        :finish => Cassandra::Composite.new([5].pack('N'), :slice => :after)
       ).keys
       assert_equal(columns_in_order[1..2], column_slice)
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
-        :start => Cassandra::Composite.new([5].pack('N'), :slice => :after).to_s,
+        :start => Cassandra::Composite.new([5].pack('N'), :slice => :after).to_s
       ).keys
       assert_equal([columns_in_order[-1]], column_slice)
 
       column_slice = @type_conversions.get(:CompositeColumnConversion, key,
-        :finish => Cassandra::Composite.new([10].pack('N'), :slice => :before).to_s,
+        :finish => Cassandra::Composite.new([10].pack('N'), :slice => :before).to_s
       ).keys
       assert_equal(columns_in_order[0..-2], column_slice)
 
@@ -1212,23 +1212,23 @@ class CassandraTest < Test::Unit::TestCase
 
       column_slice = @type_conversions.get(:DynamicComposite, key,
         :start => Cassandra::DynamicComposite.new(['i', [1].pack('N')]),
-        :finish => Cassandra::DynamicComposite.new(['i', [10].pack('N')]),
+        :finish => Cassandra::DynamicComposite.new(['i', [10].pack('N')])
       ).keys
       assert_equal(columns_in_order[0..-2], column_slice)
 
       column_slice = @type_conversions.get(:DynamicComposite, key,
         :start => Cassandra::DynamicComposite.new(['IntegerType', [5].pack('N')]),
-        :finish => Cassandra::DynamicComposite.new(['IntegerType', [5].pack('N')], :slice => :after),
+        :finish => Cassandra::DynamicComposite.new(['IntegerType', [5].pack('N')], :slice => :after)
       ).keys
       assert_equal(columns_in_order[1..2], column_slice)
 
       column_slice = @type_conversions.get(:DynamicComposite, key,
-        :start => Cassandra::DynamicComposite.new(['i', [5].pack('N')], :slice => :after).to_s,
+        :start => Cassandra::DynamicComposite.new(['i', [5].pack('N')], :slice => :after).to_s
       ).keys
       assert_equal([columns_in_order[-1]], column_slice)
 
       column_slice = @type_conversions.get(:DynamicComposite, key,
-        :finish => Cassandra::DynamicComposite.new(['i', [10].pack('N')], :slice => :before).to_s,
+        :finish => Cassandra::DynamicComposite.new(['i', [10].pack('N')], :slice => :before).to_s
       ).keys
       assert_equal(columns_in_order[0..-2], column_slice)
 

metadata

@@ -1,81 +1,99 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: cassandra
-version: !ruby/object:Gem::Version
-  version: 0.14.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
-authors:
+authors: 
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-06 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-09-12 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: thrift_client
-  requirement: &70277980333560 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 7
+        - 0
+        version: 0.7.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70277980333560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70277980332520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: *70277980332520
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70277980331940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70277980331940
-- !ruby/object:Gem::Dependency
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: simple_uuid
-  requirement: &70277980331080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 0
         version: 0.2.0
   type: :runtime
-  prerelease: false
-  version_requirements: *70277980331080
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: echoe
-  requirement: &70277980330380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70277980330380
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A Ruby client for the Cassandra distributed database.
-email: ''
-executables:
+email: ""
+executables: 
 - cassandra_helper
-extensions:
+extensions: 
 - ext/extconf.rb
-extra_rdoc_files:
+extra_rdoc_files: 
 - CHANGELOG
 - LICENSE
 - README.md
@@ -115,7 +133,7 @@ extra_rdoc_files:
 - lib/cassandra/ordered_hash.rb
 - lib/cassandra/protocol.rb
 - lib/cassandra/time.rb
-files:
+files: 
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -198,38 +216,44 @@ files:
 - vendor/1.0/gen-rb/cassandra_constants.rb
 - vendor/1.0/gen-rb/cassandra_types.rb
 - cassandra.gemspec
+has_rdoc: true
 homepage: http://github.com/twitter/cassandra
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --line-numbers
 - --inline-source
 - --title
 - Cassandra
 - --main
 - README.md
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0.8'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      - 8
+      version: "0.8"
 requirements: []
+
 rubyforge_project: cassandra
-rubygems_version: 1.8.17
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby client for the Cassandra distributed database.
-test_files:
+test_files: 
 - test/cassandra_client_test.rb
 - test/cassandra_mock_test.rb
 - test/cassandra_test.rb