gotime-cassandra_object 2.2.1 → 2.2.2

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.
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- gotime-cassandra_object (2.2.0)
4
+ gotime-cassandra_object (2.2.1)
5
5
  cassandra (~> 0.11.3)
6
6
  rails (~> 3.0)
7
7
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = 'gotime-cassandra_object'
5
- s.version = '2.2.1'
5
+ s.version = '2.2.2'
6
6
  s.description = 'Cassandra ActiveModel'
7
7
  s.summary = 'Cassandra ActiveModel'
8
8
 
@@ -7,8 +7,13 @@ module CassandraObject
7
7
  end
8
8
 
9
9
  module ClassMethods
10
+ DEFAULT_OPTIONS = {
11
+ servers: "127.0.0.1:9160",
12
+ thrift: {}
13
+ }
10
14
  def establish_connection(spec)
11
- self.connection = Cassandra.new(spec[:keyspace], spec[:servers])
15
+ spec.reverse_merge!(DEFAULT_OPTIONS)
16
+ self.connection = Cassandra.new(spec[:keyspace], spec[:servers], spec[:thrift])
12
17
  end
13
18
  end
14
19
  end
@@ -7,11 +7,22 @@ class CassandraObject::ConnectionTest < CassandraObject::TestCase
7
7
  test 'establish_connection' do
8
8
  TestObject.establish_connection(
9
9
  keyspace: 'place_directory_development',
10
- servers: '192.168.0.100:9160'
10
+ servers: '192.168.0.100:9160',
11
+ thrift: {'timeout' => 10}
11
12
  )
12
13
 
13
14
  assert_not_equal CassandraObject::Base.connection, TestObject.connection
14
15
  assert_equal 'place_directory_development', TestObject.connection.keyspace
15
16
  assert_equal ["192.168.0.100:9160"], TestObject.connection.servers
17
+ assert_equal 10, TestObject.connection.thrift_client_options['timeout']
18
+ end
19
+
20
+ test 'establish_connection defaults' do
21
+ TestObject.establish_connection(
22
+ keyspace: 'place_directory_development'
23
+ )
24
+
25
+ assert_equal 'place_directory_development', TestObject.connection.keyspace
26
+ assert_equal ["127.0.0.1:9160"], TestObject.connection.servers
16
27
  end
17
28
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gotime-cassandra_object
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.1
4
+ version: 2.2.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -14,7 +14,7 @@ date: 2011-07-27 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &2165601520 !ruby/object:Gem::Requirement
17
+ requirement: &2152750980 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: '3.0'
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2165601520
25
+ version_requirements: *2152750980
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: cassandra
28
- requirement: &2165601060 !ruby/object:Gem::Requirement
28
+ requirement: &2152750520 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 0.11.3
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2165601060
36
+ version_requirements: *2152750520
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: bundler
39
- requirement: &2165600600 !ruby/object:Gem::Requirement
39
+ requirement: &2152750060 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,7 +44,7 @@ dependencies:
44
44
  version: 1.0.0
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *2165600600
47
+ version_requirements: *2152750060
48
48
  description: Cassandra ActiveModel
49
49
  email: gems@gotime.com
50
50
  executables: []