right_support 2.8.2 → 2.8.3

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.8.2
1
+ 2.8.3
@@ -240,10 +240,15 @@ module RightSupport::DB
240
240
 
241
241
  config = env_config
242
242
 
243
- thrift_client_options = {:timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT}
244
- thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})\
245
- if defined? Thrift::BinaryProtocolAccelerated
243
+ thrift_client_options = {
244
+ :timeout => RightSupport::DB::CassandraModel::DEFAULT_TIMEOUT,
245
+ :server_retry_period => nil,
246
+ }
246
247
 
248
+ if defined? Thrift::BinaryProtocolAccelerated
249
+ thrift_client_options.merge!({:protocol => Thrift::BinaryProtocolAccelerated})
250
+ end
251
+
247
252
  @@connections[self.keyspace] ||= Cassandra.new(self.keyspace, config["server"], thrift_client_options)
248
253
  @@connections[self.keyspace].disable_node_auto_discovery!
249
254
  @@connections[self.keyspace]
@@ -24,7 +24,7 @@ require 'rbconfig'
24
24
 
25
25
  module RightSupport::Ruby
26
26
  module StringExtensions
27
- if require_succeeds?('active_support/core_ext')
27
+ if require_succeeds?('active_support') && require_succeeds?('active_support/core_ext')
28
28
  ACTIVE_SUPPORT_WORKALIKES = false
29
29
  else
30
30
  ACTIVE_SUPPORT_WORKALIKES = true
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{right_support}
8
- s.version = "2.8.2"
8
+ s.version = "2.8.3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
12
- s.date = %q{2013-09-06}
12
+ s.date = %q{2013-10-03}
13
13
  s.description = %q{A toolkit of useful, reusable foundation code created by RightScale.}
14
14
  s.email = %q{support@rightscale.com}
15
15
  s.extra_rdoc_files = [
data/right_support.rconf CHANGED
@@ -1,8 +1,7 @@
1
1
  ruby do
2
- version 'ree-1.8.7-2010.02'
3
- rubygems '1.3.7'
2
+ version 'ree-1.8.7-2012.02'
4
3
  gemset 'right_support'
5
4
  end
6
5
  bundler do
7
- version '1.1.4'
6
+ version '1.2.5'
8
7
  end
@@ -43,8 +43,8 @@ describe RightSupport::DB::CassandraModel do
43
43
  default_keyspace_connection.should_receive(:disable_node_auto_discovery!).and_return(true)
44
44
  default_keyspace_connection.should_receive(:name).and_return('connection2')
45
45
 
46
- flexmock(Cassandra).should_receive(:new).with(keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10}).and_return(current_keyspace_connection)
47
- flexmock(Cassandra).should_receive(:new).with(default_keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10}).and_return(default_keyspace_connection)
46
+ flexmock(Cassandra).should_receive(:new).with(keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10, :server_retry_period=>nil}).and_return(current_keyspace_connection)
47
+ flexmock(Cassandra).should_receive(:new).with(default_keyspace + '_' + (ENV['RACK_ENV'] || 'development') + "_testns", "localhost:9160", {:timeout=>10, :server_retry_period=>nil}).and_return(default_keyspace_connection)
48
48
  end
49
49
 
50
50
  it 'raises a meaningful exception when a config stanza is missing' do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: right_support
3
3
  version: !ruby/object:Gem::Version
4
- hash: 43
4
+ hash: 41
5
5
  prerelease: false
6
6
  segments:
7
7
  - 2
8
8
  - 8
9
- - 2
10
- version: 2.8.2
9
+ - 3
10
+ version: 2.8.3
11
11
  platform: ruby
12
12
  authors:
13
13
  - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2013-10-03 00:00:00 -07:00
23
+ date: 2013-10-21 00:00:00 -07:00
24
24
  default_executable:
25
25
  dependencies:
26
26
  - !ruby/object:Gem::Dependency