mongo 2.1.0.beta → 2.1.0.rc0

data/lib/mongo/operation/write/bulk/bulk_update/result.rb

@@ -1,174 +0,0 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'mongo/operation/write/bulk/bulk_mergable'
-require 'mongo/operation/write/bulk/legacy_bulk_mergable'
-
-module Mongo
-  module Operation
-    module Write
-      class BulkUpdate
-
-        # Defines custom behaviour of results when updating.
-        #
-        # @since 2.0.0
-        class Result < Operation::Result
-          include BulkMergable
-
-          # The number of modified docs field in the result.
-          #
-          # @since 2.0.0
-          MODIFIED = 'nModified'.freeze
-
-          # The upserted docs field in the result.
-          #
-          # @since 2.0.0
-          UPSERTED = 'upserted'.freeze
-
-          # Gets the number of documents upserted.
-          #
-          # @example Get the upserted count.
-          #   result.n_upserted
-          #
-          # @return [ Integer ] The number of documents upserted.
-          #
-          # @since 2.0.0
-          def n_upserted
-            return 0 unless acknowledged?
-            @replies.reduce(0) do |n, reply|
-              if upsert?(reply)
-                n += 1
-              else
-                n += 0
-              end
-            end
-          end
-
-          # Gets the number of documents matched.
-          #
-          # @example Get the matched count.
-          #   result.n_matched
-          #
-          # @return [ Integer ] The number of documents matched.
-          #
-          # @since 2.0.0
-          def n_matched
-            return 0 unless acknowledged?
-            @replies.reduce(0) do |n, reply|
-              if upsert?(reply)
-                n += 0
-              else
-                n += reply.documents.first[N]
-              end
-            end
-          end
-
-          # Gets the number of documents modified.
-          #
-          # @example Get the modified count.
-          #   result.n_modified
-          #
-          # @return [ Integer ] The number of documents modified.
-          #
-          # @since 2.0.0
-          def n_modified
-            return 0 unless acknowledged?
-            @replies.reduce(0) do |n, reply|
-              n += reply.documents.first[MODIFIED] || 0
-            end
-          end
-
-          # Get the upserted documents.
-          #
-          # @example Get upserted documents.
-          #   result.upserted
-          #
-          # @return [ Array<BSON::Document> ] The upserted document info
-          #
-          # @since 2.1.0
-          def upserted
-            reply.documents.first[UPSERTED] || []
-          end
-
-          private
-
-          def upsert?(reply)
-            upserted.any?
-          end
-        end
-
-        # Defines custom behaviour of results when updating.
-        # For server versions < 2.5.5 (that don't use write commands).
-        #
-        # @since 2.0.0
-        class LegacyResult < Operation::Result
-          include LegacyBulkMergable
-
-          # The updated existing field in the result.
-          #
-          # @since 2.0.0
-          UPDATED_EXISTING = 'updatedExisting'.freeze
-
-          # Gets the number of documents upserted.
-          #
-          # @example Get the upserted count.
-          #   result.n_upserted
-          #
-          # @return [ Integer ] The number of documents upserted.
-          #
-          # @since 2.0.0
-          def n_upserted
-            return 0 unless acknowledged?
-            @replies.reduce(0) do |n, reply|
-              if upsert?(reply)
-                n += reply.documents.first[N]
-              else
-                n
-              end
-            end
-          end
-
-          # Gets the number of documents matched.
-          #
-          # @example Get the matched count.
-          #   result.n_matched
-          #
-          # @return [ Integer ] The number of documents matched.
-          #
-          # @since 2.0.0
-          def n_matched
-            return 0 unless acknowledged?
-            @replies.reduce(0) do |n, reply|
-              if upsert?(reply)
-                n
-              else
-                n += reply.documents.first[N]
-              end
-            end
-          end
-
-          private
-
-          def upsert?(reply)
-            !updated_existing?(reply) && reply.documents.first[N] == 1
-          end
-
-          def updated_existing?(reply)
-            reply.documents.first[UPDATED_EXISTING]
-          end
-        end
-      end
-    end
-  end
-end

data/lib/mongo/operation/write/bulk/legacy_bulk_mergable.rb

@@ -1,83 +0,0 @@
-# Copyright (C) 2014-2015 MongoDB, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-module Mongo
-  module Operation
-    module Write
-
-      module LegacyBulkMergable
-
-        # Aggregate the write errors returned from this result.
-        #
-        # @example Aggregate the write errors.
-        #   result.aggregate_write_errors([0, 1, 2, 3])
-        #
-        # @param [ Array ] indexes The indexes of each operation as they
-        #   were listed in the Bulk API.
-        #
-        # @return [ Array ] The aggregate write errors.
-        #
-        # @since 2.0.0
-        def aggregate_write_errors(indexes)
-          @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-            if reply_write_errors?(reply)
-              errors ||= []
-              errors << { 'errmsg' => reply.documents.first[Error::ERROR],
-                          'index' => indexes[i],
-                          'code' => reply.documents.first[Error::CODE] }
-            end
-            errors
-          end
-        end
-
-        # Aggregate the write concern errors returned from this result.
-        #
-        # @example Aggregate the write concern errors.
-        #   result.aggregate_write_concern_errors([0, 1, 2, 3])
-        #
-        # @param [ Array ] indexes The indexes of each operation as they
-        #   were listed in the Bulk API.
-        #
-        # @return [ Array ] The aggregate write concern errors.
-        #
-        # @since 2.0.0
-        def aggregate_write_concern_errors(indexes)
-          @replies.each_with_index.reduce(nil) do |errors, (reply, i)|
-            if error = reply_write_errors?(reply)
-              errors ||= []
-              if note = reply.documents.first['wnote'] || reply.documents.first['jnote']
-                code = reply.documents.first['code'] || Error::BAD_VALUE
-                error_string = "#{code}: #{note}"
-              elsif error == 'timeout'
-                code = reply.documents.first['code'] || Error::UNKNOWN_ERROR
-                error_string = "#{code}: #{error}"
-              end
-              errors << { 'errmsg' => error_string,
-                          'index' => indexes[i],
-                          'code' => code } if error_string
-            end
-            errors
-          end
-        end
-
-        private
-
-        def reply_write_errors?(reply)
-          reply.documents.first[Error::ERROR] ||
-            reply.documents.first[Error::ERRMSG]
-        end
-      end
-    end
-  end
-end

data/spec/mongo/grid/fs_spec.rb

@@ -1,160 +0,0 @@
-require 'spec_helper'
-
-describe Mongo::Grid::FS do
-
-  describe '#initialize' do
-
-    let(:fs) do
-      described_class.new(authorized_client.database)
-    end
-
-    let(:index) do
-      fs.chunks_collection.indexes.get(:files_id => 1, :n => 1)
-    end
-
-    it 'sets the files collection' do
-      expect(fs.files_collection.name).to eq('fs.files')
-    end
-
-    it 'sets the chunks collection' do
-      expect(fs.chunks_collection.name).to eq('fs.chunks')
-    end
-
-    it 'creates the index on the chunks collection' do
-      expect(index[:name]).to eq('files_id_1_n_1')
-    end
-  end
-
-  describe '#find_one' do
-
-    let(:fs) do
-      described_class.new(authorized_client.database)
-    end
-
-    let(:file) do
-      Mongo::Grid::File.new('hello world!', :filename => 'test.txt')
-    end
-
-    before do
-      fs.insert_one(file)
-    end
-
-    after do
-      fs.files_collection.find.delete_many
-      fs.chunks_collection.find.delete_many
-    end
-
-    let(:from_db) do
-      fs.find_one(:filename => 'test.txt')
-    end
-
-    it 'returns the assembled file from the db' do
-      expect(from_db.filename).to eq(file.metadata.filename)
-    end
-  end
-
-  describe '#insert_one' do
-
-    let(:fs) do
-      described_class.new(authorized_client.database)
-    end
-
-    let(:file) do
-      Mongo::Grid::File.new('Hello!', :filename => 'test.txt')
-    end
-
-    context 'when inserting the file once' do
-
-      let!(:result) do
-        fs.insert_one(file)
-      end
-
-      after do
-        fs.files_collection.find.delete_many
-        fs.chunks_collection.find.delete_many
-      end
-
-      let(:from_db) do
-        fs.find_one(:filename => 'test.txt')
-      end
-
-      it 'inserts the file into the database' do
-        expect(from_db.filename).to eq(file.metadata.filename)
-      end
-
-      it 'includes the chunks and data with the file' do
-        expect(from_db.data).to eq('Hello!')
-      end
-
-      it 'returns the file id' do
-        expect(result).to eq(file.id)
-      end
-    end
-
-    context 'when inserting the file more than once' do
-
-      after do
-        fs.files_collection.find.delete_many
-        fs.chunks_collection.find.delete_many
-      end
-
-      it 'raises an error' do
-        expect {
-          fs.insert_one(file)
-          fs.insert_one(file)
-        }.to raise_error(Mongo::Error::OperationFailure)
-      end
-    end
-
-    context 'when the file exceeds the max bson size' do
-
-      let(:fs) do
-        described_class.new(authorized_client.database)
-      end
-
-      let(:file) do
-        str = 'y' * 16777216
-        Mongo::Grid::File.new(str, :filename => 'large-file.txt')
-      end
-
-      before do
-        fs.insert_one(file)
-      end
-
-      after do
-        fs.files_collection.find.delete_many
-        fs.chunks_collection.find.delete_many
-      end
-
-      it 'successfully inserts the file' do
-        expect(
-          fs.find_one(:filename => 'large-file.txt').chunks
-        ).to eq(file.chunks)
-      end
-    end
-  end
-
-  describe '#delete_one' do
-
-    let(:fs) do
-      described_class.new(authorized_client.database)
-    end
-
-    let(:file) do
-      Mongo::Grid::File.new('Hello!', :filename => 'test.txt')
-    end
-
-    before do
-      fs.insert_one(file)
-      fs.delete_one(file)
-    end
-
-    let(:from_db) do
-      fs.find_one(:filename => 'test.txt')
-    end
-
-    it 'removes the file from the db' do
-      expect(from_db).to be_nil
-    end
-  end
-end

data/spec/mongo/loggable_spec.rb

@@ -1,63 +0,0 @@
-require 'spec_helper'
-
-describe Mongo::Loggable do
-
-  let(:operation) do
-    Class.new do
-      def log_message
-        'test'
-      end
-    end.new
-  end
-
-  describe '#log' do
-
-    let(:loggable) do
-      Class.new do
-        include Mongo::Loggable
-      end.new
-    end
-
-    let(:operation) do
-      double('operation')
-    end
-
-    before do
-      Mongo::Logger.level = Logger::DEBUG
-      expect(operation).to receive(:log_message).and_return('test')
-      expect(Mongo::Logger).to receive(:log).with(:debug, 'MONGO', 'test', anything())
-    end
-
-    context 'when a block is provided' do
-
-      context 'when an exception occurs' do
-
-        it 'logs the message' do
-          expect {
-            loggable.log(:debug, 'MONGO', [ operation ]) do
-              raise RuntimeError
-            end
-          }.to raise_error(RuntimeError)
-        end
-      end
-
-      context 'when no exception occurs' do
-
-        it 'executes the block and logs the message' do
-          expect(
-            loggable.log(:debug, 'MONGO', [ operation ]) do
-              'testing'
-            end
-          ).to eq('testing')
-        end
-      end
-    end
-
-    context 'when no block is provided' do
-
-      it 'logs the message' do
-        expect(loggable.log(:debug, 'MONGO', [ operation ])).to be_nil
-      end
-    end
-  end
-end