mongo 2.1.2 → 2.2.0.rc0

data/spec/mongo/dbref_spec.rb

@@ -69,7 +69,7 @@ describe Mongo::DBRef do
     end
 
     it 'converts the underlying document to bson' do
-      expect(dbref.to_bson).to eq(dbref.as_json.to_bson)
+      expect(dbref.to_bson.to_s).to eq(dbref.as_json.to_bson.to_s)
     end
   end
 
@@ -100,12 +100,12 @@ describe Mongo::DBRef do
 
   describe '#from_bson' do
 
-    let(:bson) do
-      StringIO.new(dbref.to_bson)
+    let(:buffer) do
+      dbref.to_bson
     end
 
     let(:decoded) do
-      BSON::Document.from_bson(bson)
+      BSON::Document.from_bson(BSON::ByteBuffer.new(buffer.to_s))
     end
 
     context 'when a database exists' do

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

@@ -140,7 +140,7 @@ describe Mongo::Grid::File::Chunk do
     end
 
     it 'returns the document as bson' do
-      expect(chunk.to_bson).to eq(document.to_bson)
+      expect(chunk.to_bson.to_s).to eq(document.to_bson.to_s)
     end
   end
 

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -124,14 +124,14 @@ describe Mongo::Grid::FSBucket do
       end
     end
 
-    context 'when provided a selector' do
+    context 'when provided a filter' do
 
       let(:view) do
         fs.find(filename: 'test.txt')
       end
 
-      it 'returns a collection view for the selector' do
-        expect(view.selector).to eq(filename: 'test.txt')
+      it 'returns a collection view for the filter' do
+        expect(view.filter).to eq('filename' => 'test.txt')
       end
     end
 

data/spec/mongo/index/view_spec.rb

@@ -196,6 +196,47 @@ describe Mongo::Index::View do
         expect(view.get('random_name')).to_not be_nil
       end
     end
+
+    context 'when providing an invalid partial index filter', if: find_command_enabled? do
+
+      it 'raises an exception' do
+        expect {
+          view.create_one({'x' => 1}, partial_filter_expression: 5)
+        }.to raise_error(Mongo::Error::OperationFailure)
+      end
+    end
+
+    context 'when providing a valid partial index filter', if: find_command_enabled? do
+
+      let(:expression) do
+        {'a' => {'$lte' => 1.5}}
+      end
+
+      let!(:result) do
+        view.create_one({'x' => 1}, partial_filter_expression: expression)
+      end
+
+      let(:indexes) do
+        authorized_collection.indexes.get('x_1')
+      end
+
+      after do
+        view.drop_one('x_1')
+      end
+
+      it 'returns ok' do
+        expect(result).to be_successful
+      end
+
+      it 'creates an index' do
+        expect(indexes).to_not be_nil
+      end
+
+      it 'passes partialFilterExpression correctly' do
+        expect(indexes[:partialFilterExpression]).to eq(expression)
+      end
+
+    end
   end
 
   describe '#get' do

data/spec/mongo/operation/{aggregate → commands/aggregate}/result_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Aggregate::Result do
+describe Mongo::Operation::Commands::Aggregate::Result do
 
   let(:result) do
     described_class.new(reply)

data/spec/mongo/operation/commands/aggregate_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Aggregate do
+describe Mongo::Operation::Commands::Aggregate do
   include_context 'operation'
 
   let(:selector) do

data/spec/mongo/operation/commands/collections_info_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::CollectionsInfo do
+describe Mongo::Operation::Commands::CollectionsInfo do
 
   let(:spec) do
     { :db_name => TEST_DB }

data/spec/mongo/operation/commands/command_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Command do
+describe Mongo::Operation::Commands::Command do
 
   let(:selector) { { :ismaster => 1 } }
   let(:options) { { :limit => -1 } }

data/spec/mongo/operation/commands/indexes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::Indexes do
+describe Mongo::Operation::Commands::Indexes do
 
   describe '#execute' do
 

data/spec/mongo/operation/commands/map_reduce_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Mongo::Operation::MapReduce do
+describe Mongo::Operation::Commands::MapReduce do
 
   let(:map) do
   %Q{

data/spec/mongo/operation/write/command/delete_spec.rb

@@ -56,6 +56,31 @@ describe Mongo::Operation::Write::Command::Delete do
     end
   end
 
+  describe 'write concern' do
+
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :deletes       => deletes,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
+    end
+
+    context 'when write concern is specified' do
+
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
+    end
+  end
+
   describe '#execute' do
 
     context 'server' do

data/spec/mongo/operation/write/command/insert_spec.rb

@@ -56,6 +56,31 @@ describe Mongo::Operation::Write::Command::Insert do
     end
   end
 
+  describe 'write concern' do
+
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :documents     => documents,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
+    end
+
+    context 'when write concern is specified' do
+
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
+    end
+  end
+
   describe '#execute' do
 
     context 'server' do

data/spec/mongo/operation/write/command/update_spec.rb

@@ -62,6 +62,31 @@ describe Mongo::Operation::Write::Command::Update do
     end
   end
 
+  describe 'write concern' do
+
+    context 'when write concern is not specified' do
+
+      let(:spec) do
+        { :updates       => updates,
+          :db_name       => db_name,
+          :coll_name     => coll_name,
+          :ordered       => true
+        }
+      end
+
+      it 'does not include write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to be_nil
+      end
+    end
+
+    context 'when write concern is specified' do
+
+      it 'includes write concern in the selector' do
+        expect(op.send(:selector)[:writeConcern]).to eq(write_concern.options)
+      end
+    end
+  end
+
   describe '#execute' do
 
     context 'server' do

data/spec/mongo/protocol/delete_spec.rb

@@ -122,7 +122,7 @@ describe Mongo::Protocol::Delete do
     include_examples 'message with a header'
 
     describe 'zero' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       it 'serializes a zero' do
         expect(field).to be_int32(0)
@@ -130,14 +130,14 @@ describe Mongo::Protocol::Delete do
     end
 
     describe 'namespace' do
-      let(:field) { bytes[20..36] }
+      let(:field) { bytes.to_s[20..36] }
       it 'serializes the namespace' do
         expect(field).to be_cstring(ns)
       end
     end
 
     describe 'flags' do
-      let(:field) { bytes[37..40] }
+      let(:field) { bytes.to_s[37..40] }
 
       context 'when no flags are provided' do
         it 'does not set any bits' do
@@ -158,7 +158,7 @@ describe Mongo::Protocol::Delete do
     end
 
     describe 'selector' do
-      let(:field) { bytes[41..-1] }
+      let(:field) { bytes.to_s[41..-1] }
       it 'serializes the selector' do
         expect(field).to be_bson(selector)
       end

data/spec/mongo/protocol/get_more_spec.rb

@@ -115,7 +115,7 @@ describe Mongo::Protocol::GetMore do
     include_examples 'message with a header'
 
     describe 'zero' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       it 'does not set any bits' do
         expect(field).to be_int32(0)
@@ -123,21 +123,21 @@ describe Mongo::Protocol::GetMore do
     end
 
     describe 'namespace' do
-      let(:field) { bytes[20..36] }
+      let(:field) { bytes.to_s[20..36] }
       it 'serializes the namespace' do
         expect(field).to be_cstring(ns)
       end
     end
 
     describe 'number to return' do
-      let(:field) { bytes[37..40] }
+      let(:field) { bytes.to_s[37..40] }
       it 'serializes the number to return' do
         expect(field).to be_int32(limit)
       end
     end
 
     describe 'cursor id' do
-      let(:field) { bytes[41..48] }
+      let(:field) { bytes.to_s[41..48] }
       it 'serializes the cursor id' do
         expect(field).to be_int64(cursor_id)
       end

data/spec/mongo/protocol/insert_spec.rb

@@ -124,7 +124,7 @@ describe Mongo::Protocol::Insert do
     include_examples 'message with a header'
 
     describe 'flags' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       context 'when no flags are provided' do
         it 'does not set any bits' do
@@ -145,14 +145,14 @@ describe Mongo::Protocol::Insert do
     end
 
     describe 'namespace' do
-      let(:field) { bytes[20..36] }
+      let(:field) { bytes.to_s[20..36] }
       it 'serializes the namespace' do
         expect(field).to be_cstring(ns)
       end
     end
 
     describe 'documents' do
-      let(:field) { bytes[37..-1] }
+      let(:field) { bytes.to_s[37..-1] }
       it 'serializes the documents' do
         expect(field).to be_bson_sequence(docs)
       end

data/spec/mongo/protocol/kill_cursors_spec.rb

@@ -79,7 +79,7 @@ describe Mongo::Protocol::KillCursors do
     include_examples 'message with a header'
 
     describe 'zero' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       it 'serializes a zero' do
         expect(field).to be_int32(0)
@@ -87,14 +87,14 @@ describe Mongo::Protocol::KillCursors do
     end
 
     describe 'number of cursors' do
-      let(:field) { bytes[20..23] }
+      let(:field) { bytes.to_s[20..23] }
       it 'serializes the cursor count' do
         expect(field).to be_int32(id_count)
       end
     end
 
     describe 'cursor ids' do
-      let(:field) { bytes[24..-1] }
+      let(:field) { bytes.to_s[24..-1] }
       it 'serializes the selector' do
         expect(field).to be_int64_sequence(cursor_ids)
       end

data/spec/mongo/protocol/query_spec.rb

@@ -147,7 +147,7 @@ describe Mongo::Protocol::Query do
     include_examples 'message with a header'
 
     describe 'flags' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       context 'when no flags are provided' do
         it 'does not set any bits' do
@@ -217,13 +217,13 @@ describe Mongo::Protocol::Query do
     end
 
     describe 'namespace' do
-      let(:field) { bytes[20..36] }
+      let(:field) { bytes.to_s[20..36] }
       it 'serializes the namespace' do
         expect(field).to be_cstring(ns)
       end
 
       context 'when the namespace contains unicode characters' do
-        let(:field) { bytes[20..40] }
+        let(:field) { bytes.to_s[20..40] }
 
         let(:coll) do
           'områder'
@@ -237,7 +237,7 @@ describe Mongo::Protocol::Query do
     end
 
     describe 'skip' do
-      let(:field) { bytes[37..40] }
+      let(:field) { bytes.to_s[37..40] }
 
       context 'when no skip is provided' do
         it 'serializes a zero' do
@@ -255,7 +255,7 @@ describe Mongo::Protocol::Query do
     end
 
     describe 'limit' do
-      let(:field) { bytes[41..44] }
+      let(:field) { bytes.to_s[41..44] }
 
       context 'when no limit is provided' do
         it 'serializes a zero' do
@@ -272,14 +272,14 @@ describe Mongo::Protocol::Query do
     end
 
     describe 'selector' do
-      let(:field) { bytes[45..65] }
+      let(:field) { bytes.to_s[45..65] }
       it 'serializes the selector' do
         expect(field).to be_bson(selector)
       end
     end
 
     describe 'project' do
-      let(:field) { bytes[66..-1] }
+      let(:field) { bytes.to_s[66..-1] }
       context 'when no projection is provided' do
         it 'does not serialize a projection' do
           expect(field).to be_empty

data/spec/mongo/protocol/update_spec.rb

@@ -127,7 +127,7 @@ describe Mongo::Protocol::Update do
     include_examples 'message with a header'
 
     describe 'zero' do
-      let(:field) { bytes[16..19] }
+      let(:field) { bytes.to_s[16..19] }
 
       it 'serializes a zero' do
         expect(field).to be_int32(0)
@@ -135,14 +135,14 @@ describe Mongo::Protocol::Update do
     end
 
     describe 'namespace' do
-      let(:field) { bytes[20..36] }
+      let(:field) { bytes.to_s[20..36] }
       it 'serializes the namespace' do
         expect(field).to be_cstring(ns)
       end
     end
 
     describe 'flags' do
-      let(:field) { bytes[37..40] }
+      let(:field) { bytes.to_s[37..40] }
 
       context 'when no flags are provided' do
         it 'does not set any bits' do
@@ -170,14 +170,14 @@ describe Mongo::Protocol::Update do
     end
 
     describe 'selector' do
-      let(:field) { bytes[41..61] }
+      let(:field) { bytes.to_s[41..61] }
       it 'serializes the selector' do
         expect(field).to be_bson(selector)
       end
     end
 
     describe 'update' do
-      let(:field) { bytes[62..80] }
+      let(:field) { bytes.to_s[62..80] }
       it 'serializes the update' do
         expect(field).to be_bson(update_doc)
       end