cassandra 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0a23f0b09b8e2fa2d98f2d5f1574f1014089a04
-  data.tar.gz: 4bd4c264e1b03836219ae41b06ad5bf4ff275f73
+  metadata.gz: aaa67500c0b2d0287c8e400852f63b34f56cf11e
+  data.tar.gz: b06c254bdb33a7419af717b592ae324fbc709977
 SHA512:
-  metadata.gz: 3dfe8d4d0adfbc7b99c2154bf3abb7997fa492169e77ffa9b629f65630acfaecbbe86f2a6d89ad45717dc1e2d28dbf8a1042b526b6d9df4428d0cb8f7213f897
-  data.tar.gz: 9db54828890bda117a3db3c094b8238fa092c6f894f226ef76b1788fb8ca47836fb3f9a1dca8f67c2865e5c705b1d916b68d4e6c16e15cd7b503369d8d01bcab
+  metadata.gz: e3f3f0c03074f682aa7dded476788a44a953549feef39485ff1c9a17154ba68ce0a1d1019c782d76d6ebddc6ce187f2f29701aac3ab40c8543ed2d4e519d929c
+  data.tar.gz: dd8c8caf83a77878d1bad23e6f268d832081fe34c83207f5f143c26a39124d3b0e28130c18d6c057a063ba586abd3f33360b9eb3170589dc44479a32c5494f5e

data/CHANGELOG

@@ -1,3 +1,6 @@
+v0.20.0
+- Allow new versions of thrift_client (issue #173)
+
 v0.19.0
 - Fixed windows build by disabling native extensions (issue #188, courtesy @jacek99)
 - Speed improvement to native composite column extension (issue #186, courtesy @muirmanders)

data/Gemfile

@@ -3,6 +3,5 @@ source "http://rubygems.org"
 gemspec
 
 group :development do
-  gem 'echoe'
   gem 'eventmachine'
 end

data/Rakefile

@@ -1,21 +1,6 @@
 require 'fileutils'
-
-unless ENV['FROM_BIN_CASSANDRA_HELPER']
-  require 'rubygems'
-  require 'echoe'
-
-  Echoe.new("cassandra") do |p|
-    p.author = "Evan Weaver, Ryan King"
-    p.url = 'http://github.com/twitter/cassandra'
-    p.summary = "A Ruby client for the Cassandra distributed database."
-    p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift_client >=0.7.0 <0.9', 'json', 'rake', 'simple_uuid ~>0.2.0']
-    p.development_dependencies = ['echoe']
-    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
-  end
-end
+require 'rake/testtask'
+require 'rake/extensiontask'
 
 CassandraBinaries = {
   '0.6' => 'http://archive.apache.org/dist/cassandra/0.6.13/apache-cassandra-0.6.13-bin.tar.gz',
@@ -193,3 +178,14 @@ task :fix_perms do
 end
 
 task :pkg => [:fix_perms]
+
+Rake::ExtensionTask.new('cassandra_native') do |ext|
+  ext.ext_dir = 'ext'
+end
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/*.rb']
+end
+
+task :default => :test
+task :test => :compile

data/cassandra.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandra"
-  s.version = "0.19.0"
+  s.version = "0.20.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-09-26"
   s.description = "A Ruby client for the Cassandra distributed database."
   s.email = ""
+  s.license = "Apache 2.0"
   s.executables = ["cassandra_helper"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.md", "bin/cassandra_helper", "ext/cassandra_native.c", "ext/extconf.rb", "lib/cassandra.rb", "lib/cassandra/0.6.rb", "lib/cassandra/0.6/cassandra.rb", "lib/cassandra/0.6/columns.rb", "lib/cassandra/0.6/protocol.rb", "lib/cassandra/0.7.rb", "lib/cassandra/0.7/cassandra.rb", "lib/cassandra/0.7/columns.rb", "lib/cassandra/0.7/protocol.rb", "lib/cassandra/0.8.rb", "lib/cassandra/0.8/cassandra.rb", "lib/cassandra/0.8/columns.rb", "lib/cassandra/0.8/protocol.rb", "lib/cassandra/1.0.rb", "lib/cassandra/1.0/cassandra.rb", "lib/cassandra/1.0/columns.rb", "lib/cassandra/1.0/protocol.rb", "lib/cassandra/1.1.rb", "lib/cassandra/1.1/cassandra.rb", "lib/cassandra/1.1/columns.rb", "lib/cassandra/1.1/protocol.rb", "lib/cassandra/array.rb", "lib/cassandra/batch.rb", "lib/cassandra/cassandra.rb", "lib/cassandra/column_family.rb", "lib/cassandra/columns.rb", "lib/cassandra/comparable.rb", "lib/cassandra/composite.rb", "lib/cassandra/constants.rb", "lib/cassandra/debug.rb", "lib/cassandra/dynamic_composite.rb", "lib/cassandra/helpers.rb", "lib/cassandra/keyspace.rb", "lib/cassandra/long.rb", "lib/cassandra/mock.rb", "lib/cassandra/ordered_hash.rb", "lib/cassandra/protocol.rb", "lib/cassandra/time.rb"]
@@ -21,27 +21,9 @@ Gem::Specification.new do |s|
   s.summary = "A Ruby client for the Cassandra distributed database."
   s.test_files = ["test/cassandra_client_test.rb", "test/cassandra_mock_test.rb", "test/cassandra_test.rb", "test/comparable_types_test.rb", "test/composite_type_test.rb", "test/eventmachine_test.rb", "test/ordered_hash_test.rb", "test/test_helper.rb"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift_client>, ["< 0.9", ">= 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.2.0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
-    else
-      s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
-  end
+  s.add_runtime_dependency('thrift_client', ['< 0.9', '~> 0.7'])
+  s.add_runtime_dependency('json', '>= 0')
+  s.add_runtime_dependency('rake', '>= 0')
+  s.add_runtime_dependency('simple_uuid', '~> 0.2.0')
+  s.add_development_dependency('rake-compiler', '~> 0.8.0')
 end

data/lib/cassandra.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'thrift_client', '>= 0.7.0', '< 0.9'
+gem 'thrift_client', '~> 0.7'
 require 'thrift_client'
 gem 'simple_uuid' , '~> 0.2.0'
 require 'simple_uuid'

data/lib/cassandra/composite.rb

@@ -78,9 +78,12 @@ class Cassandra
     end
 
     def slice_end_of_component
-      return "\x01" if @column_slice == :after
-      return "\xFF" if @column_slice == :before
-      return "\x00"
+      ret = "\x00"
+      ret = "\x01" if @column_slice == :after
+      ret = "\xFF" if @column_slice == :before
+
+      ret.force_encoding('BINARY') if ret.respond_to?(:force_encoding)
+      return ret
     end
 
     def fast_unpack(packed_string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassandra
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Evan Weaver, Ryan King
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift_client
@@ -17,9 +17,9 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '0.9'
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: echoe
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 description: A Ruby client for the Cassandra distributed database.
 email: ''
 executables:
@@ -234,7 +234,8 @@ files:
 - vendor/1.1/gen-rb/cassandra_types.rb
 - cassandra.gemspec
 homepage: http://github.com/twitter/cassandra
-licenses: []
+licenses:
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -261,7 +262,7 @@ requirements: []
 rubyforge_project: cassandra
 rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Ruby client for the Cassandra distributed database.
 test_files:
 - test/cassandra_client_test.rb