mongo 2.2.1 → 2.2.2

data/spec/mongo/grid/file/chunk_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stringio'
 
 describe Mongo::Grid::File::Chunk do
 

data/spec/mongo/grid/file_spec.rb

@@ -57,13 +57,13 @@ describe Mongo::Grid::File do
         described_class.new(data, :filename => 'test.txt')
       end
 
-      it 'sets the data' do
-        expect(file.data).to eq(data)
-      end
-
       it 'creates the chunks' do
         expect(file.chunks.size).to eq(4)
       end
+
+      it 'returns data' do
+        expect(file.data).to eq(data)
+      end
     end
 
     context 'when data is a ruby file' do
@@ -80,12 +80,31 @@ describe Mongo::Grid::File do
         described_class.new(data, :filename => File.basename(ruby_file.path))
       end
 
-      it 'sets the data' do
+      it 'creates the chunks' do
+        expect(file.chunks.size).to eq(4)
+      end
+
+      it 'returns data' do
         expect(file.data).to eq(data)
       end
+    end
+
+    context 'when data is an IO object' do
+
+      let(:io) do
+        StringIO.new('testing')
+      end
+
+      let(:file) do
+        described_class.new(io, filename: "test.txt")
+      end
 
       it 'creates the chunks' do
-        expect(file.chunks.size).to eq(4)
+        expect(file.chunks).not_to be_empty
+      end
+
+      it 'returns data' do
+        expect(file.data).to eq 'testing'
       end
     end
 

data/spec/mongo/grid/stream/write_spec.rb

@@ -66,6 +66,17 @@ describe Mongo::Grid::FSBucket::Stream::Write do
       end
     end
 
+    context 'when the fs does not have a write concern' do
+
+      let(:fs) do
+        authorized_client.with(write: nil).database.fs
+      end
+
+      it 'uses the write concern default at the operation level' do
+        expect(stream.write(file).closed?).to eq(false)
+      end
+    end
+
     context 'when provided options' do
 
       context 'when provided a write option' do

data/spec/mongo/protocol/reply_spec.rb

@@ -97,6 +97,19 @@ describe Mongo::Protocol::Reply do
       end
     end
 
+    context 'when the max message size is nil' do
+
+      let(:reply) { described_class.deserialize(io, nil) }
+
+      let(:length) { Mongo::Protocol::Message::MAX_MESSAGE_SIZE + 1 }
+
+      it 'uses the default max message size for comparison' do
+        expect {
+          reply
+        }.to raise_error(Mongo::Error::MaxMessageSize)
+      end
+    end
+
     describe 'response flags' do
 
       context 'no flags' do

data/spec/mongo/server/connection_spec.rb

@@ -140,8 +140,8 @@ describe Mongo::Server::Connection do
           connection.connect!
         end
 
-        it 'sets the connection as authenticated' do
-          expect(connection).to be_authenticated
+        it 'sets the connection as connected' do
+          expect(connection).to be_connected
         end
       end
     end
@@ -433,8 +433,8 @@ describe Mongo::Server::Connection do
         )
       end
 
-      it 'sets the authentication strategy for the connection' do
-        expect(connection.authenticator.user).to eq(user)
+      it 'sets the auth options' do
+        expect(connection.options[:user]).to eq(user.name)
       end
     end
   end

data/spec/mongo/write_concern_spec.rb

@@ -122,5 +122,20 @@ describe Mongo::WriteConcern do
         expect(Mongo::WriteConcern.get(options).options).to eq(options)
       end
     end
+
+    context 'when w is a symbol' do
+
+      let(:options) do
+        { w: :majority, journal: true }
+      end
+
+      it 'returns an Acknowledged write concern object' do
+        expect(Mongo::WriteConcern.get(options)).to be_a(Mongo::WriteConcern::Acknowledged)
+      end
+
+      it 'sets w to a string' do
+        expect(Mongo::WriteConcern.get(options).options[:w]).to eq('majority')
+      end
+    end
   end
 end

data/spec/support/command_monitoring.rb

@@ -129,6 +129,9 @@ module Mongo
       #
       # @since 2.1.0
       def hash_matches?(actual, expected)
+        if expected['writeConcern']
+          expected['writeConcern'] = Options::Mapper.transform_keys_to_symbols(expected['writeConcern'])
+        end
         if expected.keys.first == '$numberLong'
           converted = expected.values.first.to_i
           (actual == converted) || actual >= 0

data/spec/support/sdam/rs/equal_electionids.yml

@@ -12,6 +12,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }],
             ["b:27017", {
@@ -19,6 +20,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }]
         ],
@@ -29,11 +31,13 @@ phases: [
                 "a:27017": {
                     type: "Unknown",
                     setName: ,
+                    setVersion: ,
                     electionId:
                 },
                 "b:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000001"}
                 }
             },

data/spec/support/sdam/rs/new_primary_new_electionid.yml

@@ -1,4 +1,4 @@
-description: "New primary with greater electionId"
+description: "New primary with greater setVersion and electionId"
 
 uri: "mongodb://a/?replicaSet=rs"
 
@@ -12,6 +12,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }]
         ],
@@ -21,6 +22,7 @@ phases: [
                 "a:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000001"}
                 },
                 "b:27017": {
@@ -42,6 +44,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"}
             }]
         ],
@@ -56,6 +59,7 @@ phases: [
                 "b:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000002"}
                 }
             },
@@ -72,6 +76,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }]
         ],
@@ -85,6 +90,7 @@ phases: [
                 "b:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000002"}
                 }
             },

data/spec/support/sdam/rs/new_primary_new_setversion.yml

@@ -0,0 +1,101 @@
+description: "New primary with greater setVersion"
+
+uri: "mongodb://a/?replicaSet=rs"
+
+phases: [
+
+    # Primary A is discovered and tells us about B.
+    {
+        responses: [
+            ["a:27017", {
+                ok: 1,
+                ismaster: true,
+                hosts: ["a:27017", "b:27017"],
+                setName: "rs",
+                setVersion: 1,
+                electionId: {"$oid": "000000000000000000000001"}
+            }]
+        ],
+
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "RSPrimary",
+                    setName: "rs",
+                    setVersion: 1,
+                    electionId: {"$oid": "000000000000000000000001"}
+                },
+                "b:27017": {
+                    type: "Unknown",
+                    setName: ,
+                    electionId:
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs",
+        }
+    },
+
+    # RS is reconfigured and B is elected.
+    {
+        responses: [
+            ["b:27017", {
+                ok: 1,
+                ismaster: true,
+                hosts: ["a:27017", "b:27017"],
+                setName: "rs",
+                setVersion: 2,
+                electionId: {"$oid": "000000000000000000000001"}
+            }]
+        ],
+
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "Unknown",
+                    setName: ,
+                    electionId:
+                },
+                "b:27017": {
+                    type: "RSPrimary",
+                    setName: "rs",
+                    setVersion: 2,
+                    electionId: {"$oid": "000000000000000000000001"}
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs",
+        }
+    },
+
+    # A still claims to be primary but it's ignored.
+    {
+        responses: [
+            ["a:27017", {
+                ok: 1,
+                ismaster: true,
+                hosts: ["a:27017", "b:27017"],
+                setName: "rs",
+                setVersion: 1,
+                electionId: {"$oid": "000000000000000000000001"}
+            }]
+        ],
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "Unknown",
+                    setName: ,
+                    electionId:
+                },
+                "b:27017": {
+                    type: "RSPrimary",
+                    setName: "rs",
+                    setVersion: 2,
+                    electionId: {"$oid": "000000000000000000000002"}
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs",
+        }
+    }
+]

data/spec/support/sdam/rs/null_election_id.yml

@@ -11,6 +11,7 @@ phases: [
                 ok: 1,
                 ismaster: true,
                 hosts: ["a:27017", "b:27017", "c:27017"],
+                setVersion: 1,
                 setName: "rs"
             }]
         ],
@@ -20,6 +21,7 @@ phases: [
                 "a:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId:
                 },
                 "b:27017": {
@@ -46,6 +48,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017", "c:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"}
             }]
         ],
@@ -60,6 +63,7 @@ phases: [
                 "b:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000002"}
                 },
                 "c:27017": {
@@ -80,6 +84,7 @@ phases: [
                 ok: 1,
                 ismaster: true,
                 hosts: ["a:27017", "b:27017", "c:27017"],
+                setVersion: 1,
                 setName: "rs"
             }]
         ],
@@ -88,6 +93,7 @@ phases: [
                 "a:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId:
                 },
                 "b:27017": {
@@ -106,7 +112,7 @@ phases: [
         }
     },
 
-    # But we remember A's electionId, so when we finally hear from C
+    # But we remember B's electionId, so when we finally hear from C
     # claiming it is primary, we ignore it due to its outdated electionId
     {
         responses: [
@@ -115,6 +121,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017", "c:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }]
         ],

data/spec/support/sdam/rs/primary_disconnect_electionid.yml

@@ -1,4 +1,4 @@
-description: "Disconnected from primary, reject stale primary"
+description: "Disconnected from primary, reject primary with stale electionId"
 
 uri: "mongodb://a/?replicaSet=rs"
 
@@ -12,6 +12,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }],
             ["b:27017", {
@@ -19,6 +20,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000002"}
             }]
         ],
@@ -33,6 +35,7 @@ phases: [
                 "b:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000002"}
                 }
             },
@@ -72,6 +75,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000001"}
             }]
         ],
@@ -101,6 +105,7 @@ phases: [
                 ismaster: true,
                 hosts: ["a:27017", "b:27017"],
                 setName: "rs",
+                setVersion: 1,
                 electionId: {"$oid": "000000000000000000000003"}
             }]
         ],
@@ -109,6 +114,7 @@ phases: [
                 "a:27017": {
                     type: "RSPrimary",
                     setName: "rs",
+                    setVersion: 1,
                     electionId: {"$oid": "000000000000000000000003"}
                 },
                 "b:27017": {
@@ -120,5 +126,35 @@ phases: [
             topologyType: "ReplicaSetWithPrimary",
             setName: "rs",
         }
+    },
+
+    # B comes back as secondary.
+    {
+        responses: [
+            ["b:27017", {
+                ok: 1,
+                ismaster: false,
+                secondary: true,
+                hosts: ["a:27017", "b:27017"],
+                setName: "rs",
+                setVersion: 2
+            }]
+        ],
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "RSPrimary",
+                    setName: "rs",
+                    setVersion: 1,
+                    electionId: {"$oid": "000000000000000000000002"}
+                },
+                "b:27017": {
+                    type: "RSSecondary",
+                    setName: "rs"
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs",
+        }
     }
 ]