cassandra 0.19.0 → 0.20.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f0a23f0b09b8e2fa2d98f2d5f1574f1014089a04
4
- data.tar.gz: 4bd4c264e1b03836219ae41b06ad5bf4ff275f73
3
+ metadata.gz: aaa67500c0b2d0287c8e400852f63b34f56cf11e
4
+ data.tar.gz: b06c254bdb33a7419af717b592ae324fbc709977
5
5
  SHA512:
6
- metadata.gz: 3dfe8d4d0adfbc7b99c2154bf3abb7997fa492169e77ffa9b629f65630acfaecbbe86f2a6d89ad45717dc1e2d28dbf8a1042b526b6d9df4428d0cb8f7213f897
7
- data.tar.gz: 9db54828890bda117a3db3c094b8238fa092c6f894f226ef76b1788fb8ca47836fb3f9a1dca8f67c2865e5c705b1d916b68d4e6c16e15cd7b503369d8d01bcab
6
+ metadata.gz: e3f3f0c03074f682aa7dded476788a44a953549feef39485ff1c9a17154ba68ce0a1d1019c782d76d6ebddc6ce187f2f29701aac3ab40c8543ed2d4e519d929c
7
+ data.tar.gz: dd8c8caf83a77878d1bad23e6f268d832081fe34c83207f5f143c26a39124d3b0e28130c18d6c057a063ba586abd3f33360b9eb3170589dc44479a32c5494f5e
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ v0.20.0
2
+ - Allow new versions of thrift_client (issue #173)
3
+
1
4
  v0.19.0
2
5
  - Fixed windows build by disabling native extensions (issue #188, courtesy @jacek99)
3
6
  - Speed improvement to native composite column extension (issue #186, courtesy @muirmanders)
data/Gemfile CHANGED
@@ -3,6 +3,5 @@ source "http://rubygems.org"
3
3
  gemspec
4
4
 
5
5
  group :development do
6
- gem 'echoe'
7
6
  gem 'eventmachine'
8
7
  end
data/Rakefile CHANGED
@@ -1,21 +1,6 @@
1
1
  require 'fileutils'
2
-
3
- unless ENV['FROM_BIN_CASSANDRA_HELPER']
4
- require 'rubygems'
5
- require 'echoe'
6
-
7
- Echoe.new("cassandra") do |p|
8
- p.author = "Evan Weaver, Ryan King"
9
- p.url = 'http://github.com/twitter/cassandra'
10
- p.summary = "A Ruby client for the Cassandra distributed database."
11
- p.rubygems_version = ">= 0.8"
12
- p.dependencies = ['thrift_client >=0.7.0 <0.9', 'json', 'rake', 'simple_uuid ~>0.2.0']
13
- p.development_dependencies = ['echoe']
14
- p.ignore_pattern = /^(data|vendor\/cassandra|cassandra|vendor\/thrift|.*\.rbc)/
15
- p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
16
- p.retain_gemspec = true
17
- end
18
- end
2
+ require 'rake/testtask'
3
+ require 'rake/extensiontask'
19
4
 
20
5
  CassandraBinaries = {
21
6
  '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
193
178
  end
194
179
 
195
180
  task :pkg => [:fix_perms]
181
+
182
+ Rake::ExtensionTask.new('cassandra_native') do |ext|
183
+ ext.ext_dir = 'ext'
184
+ end
185
+
186
+ Rake::TestTask.new do |t|
187
+ t.test_files = FileList['test/*.rb']
188
+ end
189
+
190
+ task :default => :test
191
+ task :test => :compile
@@ -2,13 +2,13 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "cassandra"
5
- s.version = "0.19.0"
5
+ s.version = "0.20.0"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Evan Weaver, Ryan King"]
9
- s.date = "2012-09-26"
10
9
  s.description = "A Ruby client for the Cassandra distributed database."
11
10
  s.email = ""
11
+ s.license = "Apache 2.0"
12
12
  s.executables = ["cassandra_helper"]
13
13
  s.extensions = ["ext/extconf.rb"]
14
14
  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|
21
21
  s.summary = "A Ruby client for the Cassandra distributed database."
22
22
  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"]
23
23
 
24
- if s.respond_to? :specification_version then
25
- s.specification_version = 3
26
-
27
- if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
28
- s.add_runtime_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
29
- s.add_runtime_dependency(%q<json>, [">= 0"])
30
- s.add_runtime_dependency(%q<rake>, [">= 0"])
31
- s.add_runtime_dependency(%q<simple_uuid>, ["~> 0.2.0"])
32
- s.add_development_dependency(%q<echoe>, [">= 0"])
33
- else
34
- s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
35
- s.add_dependency(%q<json>, [">= 0"])
36
- s.add_dependency(%q<rake>, [">= 0"])
37
- s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
38
- s.add_dependency(%q<echoe>, [">= 0"])
39
- end
40
- else
41
- s.add_dependency(%q<thrift_client>, ["< 0.9", ">= 0.7.0"])
42
- s.add_dependency(%q<json>, [">= 0"])
43
- s.add_dependency(%q<rake>, [">= 0"])
44
- s.add_dependency(%q<simple_uuid>, ["~> 0.2.0"])
45
- s.add_dependency(%q<echoe>, [">= 0"])
46
- end
24
+ s.add_runtime_dependency('thrift_client', ['< 0.9', '~> 0.7'])
25
+ s.add_runtime_dependency('json', '>= 0')
26
+ s.add_runtime_dependency('rake', '>= 0')
27
+ s.add_runtime_dependency('simple_uuid', '~> 0.2.0')
28
+ s.add_development_dependency('rake-compiler', '~> 0.8.0')
47
29
  end
@@ -1,5 +1,5 @@
1
1
  require 'rubygems'
2
- gem 'thrift_client', '>= 0.7.0', '< 0.9'
2
+ gem 'thrift_client', '~> 0.7'
3
3
  require 'thrift_client'
4
4
  gem 'simple_uuid' , '~> 0.2.0'
5
5
  require 'simple_uuid'
@@ -78,9 +78,12 @@ class Cassandra
78
78
  end
79
79
 
80
80
  def slice_end_of_component
81
- return "\x01" if @column_slice == :after
82
- return "\xFF" if @column_slice == :before
83
- return "\x00"
81
+ ret = "\x00"
82
+ ret = "\x01" if @column_slice == :after
83
+ ret = "\xFF" if @column_slice == :before
84
+
85
+ ret.force_encoding('BINARY') if ret.respond_to?(:force_encoding)
86
+ return ret
84
87
  end
85
88
 
86
89
  def fast_unpack(packed_string)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cassandra
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.19.0
4
+ version: 0.20.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Evan Weaver, Ryan King
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2012-09-26 00:00:00.000000000 Z
11
+ date: 2013-08-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thrift_client
@@ -17,9 +17,9 @@ dependencies:
17
17
  - - <
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0.9'
20
- - - '>='
20
+ - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.7.0
22
+ version: '0.7'
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
27
27
  - - <
28
28
  - !ruby/object:Gem::Version
29
29
  version: '0.9'
30
- - - '>='
30
+ - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: 0.7.0
32
+ version: '0.7'
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: json
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -73,19 +73,19 @@ dependencies:
73
73
  - !ruby/object:Gem::Version
74
74
  version: 0.2.0
75
75
  - !ruby/object:Gem::Dependency
76
- name: echoe
76
+ name: rake-compiler
77
77
  requirement: !ruby/object:Gem::Requirement
78
78
  requirements:
79
- - - '>='
79
+ - - ~>
80
80
  - !ruby/object:Gem::Version
81
- version: '0'
81
+ version: 0.8.0
82
82
  type: :development
83
83
  prerelease: false
84
84
  version_requirements: !ruby/object:Gem::Requirement
85
85
  requirements:
86
- - - '>='
86
+ - - ~>
87
87
  - !ruby/object:Gem::Version
88
- version: '0'
88
+ version: 0.8.0
89
89
  description: A Ruby client for the Cassandra distributed database.
90
90
  email: ''
91
91
  executables:
@@ -234,7 +234,8 @@ files:
234
234
  - vendor/1.1/gen-rb/cassandra_types.rb
235
235
  - cassandra.gemspec
236
236
  homepage: http://github.com/twitter/cassandra
237
- licenses: []
237
+ licenses:
238
+ - Apache 2.0
238
239
  metadata: {}
239
240
  post_install_message:
240
241
  rdoc_options:
@@ -261,7 +262,7 @@ requirements: []
261
262
  rubyforge_project: cassandra
262
263
  rubygems_version: 2.0.3
263
264
  signing_key:
264
- specification_version: 3
265
+ specification_version: 4
265
266
  summary: A Ruby client for the Cassandra distributed database.
266
267
  test_files:
267
268
  - test/cassandra_client_test.rb