mongo 1.2.rc2 → 1.2.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.
data/Rakefile CHANGED
@@ -26,7 +26,7 @@ namespace :build do
26
26
  jar_dir = File.join(java_dir, 'jar')
27
27
 
28
28
  jruby_jar = File.join(jar_dir, 'jruby.jar')
29
- mongo_jar = File.join(jar_dir, 'mongo-2.2.jar')
29
+ mongo_jar = File.join(jar_dir, 'mongo-2.4.jar')
30
30
  bson_jar = File.join(jar_dir, 'bson-2.2.jar')
31
31
 
32
32
  src_base = File.join(java_dir, 'src')
@@ -1,5 +1,10 @@
1
1
  # MongoDB Ruby Driver History
2
2
 
3
+ 1.2.0
4
+ 2011-1-18
5
+ * Some minor improvements. See commit history.
6
+ * Since nothing major was reported for the RC, we're releasing.
7
+
3
8
  1.2.rc0
4
9
  2011-1-5
5
10
 
@@ -1,9 +1,25 @@
1
1
  # encoding: UTF-8
2
+ #
3
+ # --
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
+ #
6
+ # Licensed under the Apache License, Version 2.0 (the "License");
7
+ # you may not use this file except in compliance with the License.
8
+ # You may obtain a copy of the License at
9
+ #
10
+ # http://www.apache.org/licenses/LICENSE-2.0
11
+ #
12
+ # Unless required by applicable law or agreed to in writing, software
13
+ # distributed under the License is distributed on an "AS IS" BASIS,
14
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15
+ # See the License for the specific language governing permissions and
16
+ # limitations under the License.
17
+ # ++
2
18
 
3
19
  $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
4
20
 
5
21
  module Mongo
6
- VERSION = "1.2.rc2"
22
+ VERSION = "1.2.0"
7
23
  end
8
24
 
9
25
  module Mongo
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -470,6 +470,7 @@ module Mongo
470
470
  def read_primary?
471
471
  @read_primary
472
472
  end
473
+ alias :primary? :read_primary?
473
474
 
474
475
  # Close the connection to the database.
475
476
  def close
@@ -750,7 +751,8 @@ module Mongo
750
751
  # Requires length and an available socket.
751
752
  def receive_message_on_socket(length, socket)
752
753
  begin
753
- message = socket.read(length)
754
+ message = new_binary_string
755
+ socket.read(length, message)
754
756
  raise ConnectionFailure, "connection closed" unless message.length > 0
755
757
  if message.length < length
756
758
  chunk = new_binary_string
@@ -1,6 +1,6 @@
1
1
  # encoding: UTF-8
2
2
 
3
- # Copyright (C) 2008-2010 10gen Inc.
3
+ # Copyright (C) 2008-2011 10gen Inc.
4
4
  #
5
5
  # Licensed under the Apache License, Version 2.0 (the "License");
6
6
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -2,7 +2,7 @@
2
2
 
3
3
  #
4
4
  # --
5
- # Copyright (C) 2008-2010 10gen Inc.
5
+ # Copyright (C) 2008-2011 10gen Inc.
6
6
  #
7
7
  # Licensed under the Apache License, Version 2.0 (the "License");
8
8
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -137,6 +137,7 @@ module Mongo
137
137
  def read_primary?
138
138
  !@read_pool || @read_pool.length.zero?
139
139
  end
140
+ alias :primary? :read_primary?
140
141
 
141
142
  # Close the connection to the database.
142
143
  def close
@@ -0,0 +1,20 @@
1
+
2
+ class Foo
3
+
4
+ def zed
5
+ puts "Foo"
6
+ end
7
+
8
+ end
9
+
10
+ class Bar < Foo
11
+
12
+ def zed(n=nil)
13
+ if n.nil?
14
+ puts "Bar"
15
+ else
16
+ super()
17
+ end
18
+ end
19
+
20
+ end
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
1
1
  # encoding: UTF-8
2
2
 
3
3
  # --
4
- # Copyright (C) 2008-2010 10gen Inc.
4
+ # Copyright (C) 2008-2011 10gen Inc.
5
5
  #
6
6
  # Licensed under the Apache License, Version 2.0 (the "License");
7
7
  # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ module Mongo
20
20
  class URIParser
21
21
 
22
22
  DEFAULT_PORT = 27017
23
- MONGODB_URI_MATCHER = /(([-_.\w\d]+):([-_\w\d]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
23
+ MONGODB_URI_MATCHER = /(([-_.\w\d]+):([^@]+)@)?([-.\w\d]+)(:([\w\d]+))?(\/([-\d\w]+))?/
24
24
  MONGODB_URI_SPEC = "mongodb://[username:password@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/database]"
25
25
  SPEC_ATTRS = [:nodes, :auths]
26
26
  OPT_ATTRS = [:connect, :replicaset, :slaveok, :safe, :w, :wtimeout, :fsync]
@@ -57,6 +57,8 @@ module Mongo
57
57
  # Parse a MongoDB URI. This method is used by Connection.from_uri.
58
58
  # Returns an array of nodes and an array of db authorizations, if applicable.
59
59
  #
60
+ # Note: passwords can contain any character except for a ','.
61
+ #
60
62
  # @core connections
61
63
  def initialize(string)
62
64
  if string =~ /^mongodb:\/\//
@@ -0,0 +1,224 @@
1
+ require 'test/test_helper'
2
+
3
+ class TestCollection < Test::Unit::TestCase
4
+ @@connection ||= Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost', ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
5
+ @@db = @@connection.db(MONGO_TEST_DB)
6
+ @@test = @@db.collection("test")
7
+ @@version = @@connection.server_version
8
+
9
+ def setup
10
+ @@test.remove
11
+ end
12
+
13
+ def wait_for_async
14
+ sleep 0.2
15
+ end
16
+
17
+ def test_async_update
18
+ id1 = @@test.save("x" => 5)
19
+ failsafe = mock('failsafe will get called in block', :call => true)
20
+
21
+ @@test.update({}, {"$inc" => {"x" => 1}}, :async => true) do |error, result|
22
+ assert_nil error
23
+ assert result
24
+ failsafe.call
25
+ end
26
+ wait_for_async
27
+
28
+ assert_equal 1, @@test.count()
29
+ assert_equal 6, @@test.find_one(:_id => id1)["x"]
30
+ end
31
+
32
+ if @@version >= "1.1.3"
33
+ def test_async_multi_update
34
+ failsafe = mock('failsafe will get called in block', :call => true)
35
+
36
+ @@test.save("num" => 10)
37
+ @@test.save("num" => 10)
38
+ @@test.save("num" => 10)
39
+ assert_equal 3, @@test.count
40
+
41
+ @@test.update({"num" => 10}, {"$set" => {"num" => 100}}, :multi => true, :async => true) do |error, result|
42
+ assert_nil error
43
+ assert result
44
+ failsafe.call
45
+ end
46
+ wait_for_async
47
+ end
48
+ end
49
+
50
+ def test_async_upsert
51
+ failsafe = mock('failsafe will get called in block')
52
+ failsafe.expects(:call).times(2)
53
+
54
+ @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
55
+ assert_nil error
56
+ assert result
57
+ failsafe.call
58
+ end
59
+
60
+ @@test.update({"page" => "/"}, {"$inc" => {"count" => 1}}, :upsert => true, :async => true) do |error, result|
61
+ assert_nil error
62
+ assert result
63
+ failsafe.call
64
+ end
65
+ wait_for_async
66
+
67
+ assert_equal 1, @@test.count()
68
+ assert_equal 2, @@test.find_one()["count"]
69
+ end
70
+
71
+ def test_async_save
72
+ failsafe = mock('failsafe will get called in block', :call => true)
73
+
74
+ # note that the first parameter has explicit curly brackets around
75
+ # the hash; without those brackets as a delimiter, the :async key is
76
+ # viewed as part of the required +document+ parameter
77
+ @@test.save({"hello" => "world"}, :async => true) do |error, result|
78
+ assert_nil error
79
+ assert result
80
+ failsafe.call
81
+ end
82
+ wait_for_async
83
+
84
+ assert_equal "world", @@test.find_one()["hello"]
85
+ end
86
+
87
+ def test_async_save_with_exception
88
+ failsafe = mock('failsafe will get called in block', :call => true)
89
+
90
+ @@test.create_index("hello", :unique => true)
91
+ @@test.save("hello" => "world")
92
+
93
+ # all async calls on collections occur in :safe mode
94
+ @@test.save({"hello" => "world"}, :async => true) do |error, result|
95
+ assert error
96
+ assert error.instance_of?(OperationFailure)
97
+ assert_nil result
98
+ failsafe.call
99
+ end
100
+ wait_for_async
101
+
102
+ assert_equal 1, @@test.count()
103
+ @@test.drop
104
+ end
105
+
106
+ def test_async_remove
107
+ failsafe = mock('failsafe will get called in block', :call => true)
108
+
109
+ @conn = Connection.new
110
+ @db = @conn[MONGO_TEST_DB]
111
+ @test = @db['test-async-remove']
112
+ @test.save({:a => 50})
113
+ @test.remove({}, :async => true) do |error, result|
114
+ assert_nil error
115
+ assert result
116
+ failsafe.call
117
+ end
118
+ wait_for_async
119
+
120
+ @test.drop
121
+ end
122
+
123
+ def test_async_count
124
+ failsafe = mock('failsafe will get called in block', :call => true)
125
+
126
+ @@test.drop
127
+
128
+ @@test.save("x" => 1)
129
+ @@test.save("x" => 2)
130
+
131
+ @@test.count(:async => true) do |error, result|
132
+ assert_nil error
133
+ assert_equal 2, result
134
+ failsafe.call
135
+ end
136
+ wait_for_async
137
+ end
138
+
139
+ # Note: #size is just an alias for #count.
140
+ def test_async_size
141
+ failsafe = mock('failsafe will get called in block', :call => true)
142
+
143
+ @@test.drop
144
+
145
+ @@test.save("x" => 1)
146
+ @@test.save("x" => 2)
147
+
148
+ @@test.size(:async => true) do |error, result|
149
+ assert_nil error
150
+ assert_equal 2, result
151
+ failsafe.call
152
+ end
153
+ wait_for_async
154
+ end
155
+
156
+ def test_async_find_one
157
+ failsafe = mock('failsafe will get called in block', :call => true)
158
+
159
+ id = @@test.save("hello" => "world", "foo" => "bar")
160
+
161
+ @@test.find_one({}, :async => true) do |error, result|
162
+ assert_nil error
163
+ assert_equal @@test.find_one(id), result
164
+ failsafe.call
165
+ end
166
+ wait_for_async
167
+ end
168
+
169
+ def test_async_insert
170
+ failsafe = mock('failsafe will get called in block', :call => true)
171
+
172
+ doc = {"hello" => "world"}
173
+ @@test.insert(doc, :async => true) do |error, result|
174
+ assert_nil error
175
+ assert result
176
+ failsafe.call
177
+ end
178
+ wait_for_async
179
+
180
+ assert_equal 1, @@test.count
181
+ end
182
+
183
+ def test_async_find
184
+ assert_raise RuntimeError do
185
+ @@test.find({}, :async => true)
186
+ end
187
+ end
188
+
189
+ if @@version > "1.3.0"
190
+ def test_async_find_and_modify
191
+ failsafe = mock('failsafe will get called in block', :call => true)
192
+
193
+ @@test << { :a => 1, :processed => false }
194
+ @@test << { :a => 2, :processed => false }
195
+ @@test << { :a => 3, :processed => false }
196
+
197
+ @@test.find_and_modify(:query => {}, :sort => [['a', -1]], :update => {"$set" => {:processed => true}}, :async => true) do |error, result|
198
+ assert_nil error
199
+ assert result
200
+ failsafe.call
201
+ end
202
+ wait_for_async
203
+
204
+ assert @@test.find_one({:a => 3})['processed']
205
+ end
206
+
207
+ def test_async_find_and_modify_with_invalid_options
208
+ failsafe = mock('failsafe will get called in block', :call => true)
209
+
210
+ @@test << { :a => 1, :processed => false }
211
+ @@test << { :a => 2, :processed => false }
212
+ @@test << { :a => 3, :processed => false }
213
+
214
+ @@test.find_and_modify(:blimey => {}, :async => true) do |error, result|
215
+ assert error
216
+ assert error.instance_of?(OperationFailure)
217
+ assert_nil result
218
+ failsafe.call
219
+ end
220
+ wait_for_async
221
+ end
222
+ end
223
+
224
+ end
@@ -0,0 +1,24 @@
1
+ require 'test/test_helper'
2
+ include Mongo
3
+
4
+ class ConnectionTest < Test::Unit::TestCase
5
+ context "Initialization: " do
6
+
7
+ context "given async connection options" do
8
+
9
+ should "default the workers pool to 1" do
10
+ Async::WorkerPool.expects(:new).with(1)
11
+
12
+ Connection.new('localhost', 27017)
13
+ end
14
+
15
+ should "override the workers pool size with the :worker_pool_size key" do
16
+ size = 6
17
+ Async::WorkerPool.expects(:new).with(size)
18
+
19
+ Connection.new('localhost', 27017, :worker_pool_size => size)
20
+ end
21
+ end # context 'given async connection options'
22
+
23
+ end # context 'Initialization'
24
+ end
@@ -0,0 +1,162 @@
1
+ require 'test/test_helper'
2
+ require 'logger'
3
+
4
+ class CursorTest < Test::Unit::TestCase
5
+
6
+ include Mongo
7
+
8
+ @@connection = Connection.new(ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost',
9
+ ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT)
10
+ @@db = @@connection.db(MONGO_TEST_DB)
11
+ @@coll = @@db.collection('test')
12
+ @@version = @@connection.server_version
13
+
14
+ def wait_for_async
15
+ sleep 0.2
16
+ end
17
+
18
+ def setup
19
+ @@coll.remove
20
+ @@coll.insert('a' => 1) # collection not created until it's used
21
+ @@coll_full_name = "#{MONGO_TEST_DB}.test"
22
+ end
23
+
24
+ def test_async_explain
25
+ failsafe = mock('failsafe will get called in block', :call => true)
26
+
27
+ cursor = @@coll.find('a' => 1)
28
+
29
+ cursor.explain(:async => true) do |error, result|
30
+ assert_not_nil result['cursor']
31
+ assert_kind_of Numeric, result['n']
32
+ assert_kind_of Numeric, result['millis']
33
+ assert_kind_of Numeric, result['nscanned']
34
+ failsafe.call
35
+ end
36
+ wait_for_async
37
+ end
38
+
39
+ def test_async_count
40
+ failsafe = mock('failsafe will get called in block')
41
+ failsafe.expects(:call).times(3)
42
+
43
+ @@coll.remove
44
+
45
+ @@coll.find.count(:async => true) do |error, count|
46
+ assert_equal 0, count
47
+ failsafe.call
48
+ end
49
+ wait_for_async
50
+
51
+ 10.times do |i|
52
+ @@coll.save("x" => i)
53
+ end
54
+
55
+ @@coll.find.count(:async => true) do |error, count|
56
+ assert_equal 10, count
57
+ failsafe.call
58
+ end
59
+ wait_for_async
60
+
61
+ @@coll.find({"x" => 1}).count(:async => true) do |error, count|
62
+ assert_equal 1, count
63
+ failsafe.call
64
+ end
65
+ wait_for_async
66
+ end
67
+
68
+ def test_async_close
69
+ failsafe = mock('failsafe will get called in block', :call => true)
70
+
71
+ @@coll.remove
72
+ cursor = @@coll.find
73
+
74
+ cursor.close(:async => true) do |error, result|
75
+ assert_nil error
76
+ assert result
77
+ assert cursor.closed?
78
+ failsafe.call
79
+ end
80
+ wait_for_async
81
+ end
82
+
83
+ def test_async_has_next
84
+ failsafe = mock('failsafe will get called in block', :call => true)
85
+
86
+ @@coll.remove
87
+ 200.times do |n|
88
+ @@coll.save("x" => n)
89
+ end
90
+
91
+ cursor = @@coll.find
92
+ cursor.has_next?(:async => true) do |error, result|
93
+ assert_nil error
94
+ assert result
95
+ failsafe.call
96
+ end
97
+ wait_for_async
98
+ end
99
+
100
+ def test_async_next_document
101
+ failsafe = mock('failsafe will get called in block')
102
+ failsafe.expects(:call).times(2)
103
+
104
+ @@coll.remove
105
+ 200.times do |n|
106
+ @@coll.save("x" => n)
107
+ end
108
+
109
+ cursor = @@coll.find
110
+ cursor.next_document(:async => true) do |error, result|
111
+ assert_nil error
112
+ assert result
113
+ failsafe.call
114
+ end
115
+ wait_for_async
116
+
117
+ callback = Proc.new do |error, result|
118
+ assert_nil error
119
+ assert result
120
+ failsafe.call
121
+ end
122
+
123
+ cursor.next_document(:async => true, :callback => callback)
124
+ wait_for_async
125
+ end
126
+
127
+ def test_async_to_a
128
+ failsafe = mock('failsafe will get called in block')
129
+ failsafe.expects(:call)
130
+
131
+ @@coll.remove
132
+ total = 200
133
+ total.times do |n|
134
+ @@coll.save("x" => n)
135
+ end
136
+
137
+ cursor = @@coll.find
138
+ cursor.to_a(:async => true) do |error, result|
139
+ assert_nil error
140
+ assert_equal total, result.size
141
+ failsafe.call
142
+ end
143
+ wait_for_async
144
+ end
145
+
146
+ def test_async_each
147
+ @@coll.remove
148
+ total = 200
149
+ total.times do |n|
150
+ @@coll.save("x" => n)
151
+ end
152
+
153
+ cursor = @@coll.find
154
+ count = 0
155
+ cursor.each(:async => true) do |error, result|
156
+ count += 1
157
+ end
158
+ wait_for_async
159
+
160
+ assert_equal total, count
161
+ end
162
+ end
@@ -0,0 +1,99 @@
1
+ require 'test/test_helper'
2
+ include Mongo
3
+
4
+ class WorkerPoolTest < Test::Unit::TestCase
5
+ context "Initialization: " do
6
+
7
+ def wait_for_async
8
+ sleep 0.2
9
+ end
10
+
11
+ setup do
12
+ def new_mock_queue
13
+ stub_everything('queue')
14
+ end
15
+
16
+ def new_mock_thread
17
+ stub_everything('thread')
18
+ end
19
+ end
20
+
21
+ context "given a size" do
22
+ setup do
23
+ @size = 5
24
+ end
25
+
26
+ should "allocate a Thread 'size' times" do
27
+ Queue.stubs(:new).returns(new_mock_queue)
28
+ Thread.expects(:new).times(@size).returns(new_mock_thread)
29
+ Async::WorkerPool.new @size
30
+ end
31
+
32
+ should "set 'abort_on_exception' for each current thread" do
33
+ Queue.stubs(:new).returns(new_mock_queue)
34
+ thread = new_mock_thread
35
+ Thread.stubs(:new).returns(thread)
36
+
37
+ thread.expects(:abort_on_exception=).with(true).times(@size)
38
+
39
+ Async::WorkerPool.new @size
40
+ end
41
+
42
+ should "save each thread into the workers queue" do
43
+ assert_equal @size, Async::WorkerPool.new(@size).workers.size
44
+ end
45
+
46
+ end # context 'given a size'
47
+
48
+
49
+ context "given a job" do
50
+ setup do
51
+ @pool = Async::WorkerPool.new 1
52
+ @command = stub_everything('command')
53
+ @cmd_args = stub_everything('command args')
54
+ @callback = stub_everything('callback')
55
+ end
56
+
57
+ should "remove nils from the command args array and pass the results to the callback" do
58
+ args = [nil, @cmd_args]
59
+ @command.expects(:call).with(@cmd_args).returns(2)
60
+ @callback.expects(:call).with(nil, 2)
61
+
62
+ @pool.enqueue @command, args, @callback
63
+ wait_for_async
64
+ end
65
+
66
+ should "execute the original command with args and pass the results to the callback" do
67
+ @cmd_args.expects(:compact).returns(@cmd_args)
68
+ @command.expects(:call).with(@cmd_args).returns(2)
69
+ @callback.expects(:call).with(nil, 2)
70
+
71
+ @pool.enqueue @command, @cmd_args, @callback
72
+ wait_for_async
73
+ end
74
+
75
+ should "capture any exceptions and pass them to the callback" do
76
+ args = [@cmd_args]
77
+ error = StandardError.new
78
+ @command.expects(:call).with(@cmd_args).raises(error)
79
+ @callback.expects(:call).with(error, nil)
80
+
81
+ @pool.enqueue @command, args, @callback
82
+ wait_for_async
83
+ end
84
+
85
+ should "abort the thread when the callback raises an exception" do
86
+ args = [@cmd_args]
87
+ error = StandardError.new
88
+ @callback.expects(:call).raises(error)
89
+
90
+ assert_raises(StandardError) do
91
+ @pool.enqueue @command, args, @callback
92
+ wait_for_async
93
+ end
94
+ end
95
+ end # context 'given a job'
96
+
97
+
98
+ end
99
+ end
@@ -32,6 +32,7 @@ class ConnectTest < Test::Unit::TestCase
32
32
  [RS.host, RS.ports[2]], :name => RS.name)
33
33
  assert @conn.connected?
34
34
  assert @conn.read_primary?
35
+ assert @conn.primary?
35
36
 
36
37
  assert_equal RS.primary, @conn.primary
37
38
  assert_equal RS.secondaries.sort, @conn.secondaries.sort
@@ -18,6 +18,7 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
18
18
 
19
19
  def test_read_primary
20
20
  assert !@conn.read_primary?
21
+ assert !@conn.primary?
21
22
  end
22
23
 
23
24
  def test_con
@@ -26,6 +26,22 @@ class TestThreading < Test::Unit::TestCase
26
26
  assert_equal 27017, parser.nodes[1][1]
27
27
  end
28
28
 
29
+ def test_complex_passwords
30
+ parser = Mongo::URIParser.new('mongodb://bob:secret.word@a.example.com:27018/test')
31
+ assert_equal "bob", parser.auths[0]["username"]
32
+ assert_equal "secret.word", parser.auths[0]["password"]
33
+
34
+ parser = Mongo::URIParser.new('mongodb://bob:s-_3#%R.t@a.example.com:27018/test')
35
+ assert_equal "bob", parser.auths[0]["username"]
36
+ assert_equal "s-_3#%R.t", parser.auths[0]["password"]
37
+ end
38
+
39
+ def test_passwords_contain_no_commas
40
+ assert_raise MongoArgumentError do
41
+ Mongo::URIParser.new('mongodb://bob:a,b@a.example.com:27018/test')
42
+ end
43
+ end
44
+
29
45
  def test_multiple_uris_with_auths
30
46
  parser = Mongo::URIParser.new('mongodb://bob:secret@a.example.com:27018/test,joe:secret2@b.example.com/test2')
31
47
  assert_equal 2, parser.nodes.length
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mongo
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424225
5
- prerelease: 4
4
+ hash: 31
5
+ prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 2
9
- - rc
10
- - 2
11
- version: 1.2.rc2
9
+ - 0
10
+ version: 1.2.0
12
11
  platform: ruby
13
12
  authors:
14
13
  - Jim Menard
@@ -18,7 +17,7 @@ autorequire:
18
17
  bindir: bin
19
18
  cert_chain: []
20
19
 
21
- date: 2011-01-06 00:00:00 -05:00
20
+ date: 2011-01-18 00:00:00 -05:00
22
21
  default_executable:
23
22
  dependencies:
24
23
  - !ruby/object:Gem::Dependency
@@ -29,13 +28,12 @@ dependencies:
29
28
  requirements:
30
29
  - - ">="
31
30
  - !ruby/object:Gem::Version
32
- hash: 15424225
31
+ hash: 31
33
32
  segments:
34
33
  - 1
35
34
  - 2
36
- - rc
37
- - 2
38
- version: 1.2.rc2
35
+ - 0
36
+ version: 1.2.0
39
37
  type: :runtime
40
38
  version_requirements: *id001
41
39
  description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
@@ -57,6 +55,7 @@ files:
57
55
  - lib/mongo/exceptions.rb
58
56
  - lib/mongo/connection.rb
59
57
  - lib/mongo/repl_set_connection.rb
58
+ - lib/mongo/test.rb
60
59
  - lib/mongo/gridfs/grid_io.rb
61
60
  - lib/mongo/gridfs/grid_file_system.rb
62
61
  - lib/mongo/gridfs/grid.rb
@@ -89,6 +88,10 @@ files:
89
88
  - test/unit/safe_test.rb
90
89
  - test/db_test.rb
91
90
  - test/collection_test.rb
91
+ - test/async/collection_test.rb
92
+ - test/async/cursor_test.rb
93
+ - test/async/connection_test.rb
94
+ - test/async/worker_pool_test.rb
92
95
  - test/cursor_test.rb
93
96
  - test/grid_test.rb
94
97
  - test/db_api_test.rb
@@ -151,14 +154,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
151
154
  required_rubygems_version: !ruby/object:Gem::Requirement
152
155
  none: false
153
156
  requirements:
154
- - - ">"
157
+ - - ">="
155
158
  - !ruby/object:Gem::Version
156
- hash: 25
159
+ hash: 3
157
160
  segments:
158
- - 1
159
- - 3
160
- - 1
161
- version: 1.3.1
161
+ - 0
162
+ version: "0"
162
163
  requirements: []
163
164
 
164
165
  rubyforge_project:
@@ -178,6 +179,10 @@ test_files:
178
179
  - test/unit/safe_test.rb
179
180
  - test/db_test.rb
180
181
  - test/collection_test.rb
182
+ - test/async/collection_test.rb
183
+ - test/async/cursor_test.rb
184
+ - test/async/connection_test.rb
185
+ - test/async/worker_pool_test.rb
181
186
  - test/cursor_test.rb
182
187
  - test/grid_test.rb
183
188
  - test/db_api_test.rb