MONGOID-5267 remove driver argument in queryable constructor (#5190)

* MONGOID-5267 remove driver argument in queryable constructor

* MONGOID-5267 remove mongo-1.x tests

* MONGOID-5267 fix marshalable tests

* MONGOID-5267 raise on mongo1x

* MONGOID-5267 add comment and remove instance var

Author: neilshweky

lib/mongoid/criteria/marshalable.rb

@@ -9,9 +9,12 @@ module Marshalable
       # @example Dump the criteria.
       #   Marshal.dump(criteria)
       #
+      # Note :mongo is written here for backwards compatibility with Mongoid 7
+      # and earlier.
+      #
       # @return [ Array<Object> ] The dumped data.
       def marshal_dump
-        data = [ klass, driver, inclusions, documents, strategy, negating ]
+        data = [ klass, :mongo, inclusions, documents, strategy, negating ]
         data.push(scoping_options).push(dump_hash(:selector)).push(dump_hash(:options))
       end
 
@@ -23,7 +26,12 @@ def marshal_dump
       # @param [ Array ] data The raw data.
       def marshal_load(data)
         @scoping_options, raw_selector, raw_options = data.pop(3)
-        @klass, @driver, @inclusions, @documents, @strategy, @negating = data
+        @klass, driver, @inclusions, @documents, @strategy, @negating = data
+
+        if driver == :mongo1x
+          raise NotImplementedError, "Mongoid no longer supports marshalling with driver version 1.x."
+        end
+
         @selector = load_hash(Queryable::Selector, raw_selector)
         @options = load_hash(Queryable::Options, raw_options)
       end

lib/mongoid/criteria/queryable.rb

@@ -33,9 +33,10 @@ module Queryable
       include Optional
 
       # @attribute [r] aliases The aliases.
-      # @attribute [r] driver The Mongo driver being used.
+      attr_reader :aliases
+
       # @attribute [r] serializers The serializers.
-      attr_reader :aliases, :driver, :serializers
+      attr_reader :serializers
 
       # Is this queryable equal to another object? Is true if the selector and
       # options are equal.
@@ -64,8 +65,8 @@ def ==(other)
       # @param [ Symbol ] driver The driver being used.
       #
       # @api private
-      def initialize(aliases = {}, serializers = {}, associations = {}, aliased_associations = {}, driver = :mongo)
-        @aliases, @driver, @serializers = aliases, driver.to_sym, serializers
+      def initialize(aliases = {}, serializers = {}, associations = {}, aliased_associations = {})
+        @aliases, @serializers = aliases, serializers
         @options = Options.new(aliases, serializers, associations, aliased_associations)
         @selector = Selector.new(aliases, serializers, associations, aliased_associations)
         @pipeline = Pipeline.new(aliases)

lib/mongoid/criteria/queryable/optional.rb

@@ -318,15 +318,9 @@ def collation(collation_doc)
         #
         # @return [ Optional ] The cloned optional.
         def add_sort_option(options, field, direction)
-          if driver == :mongo1x
-            sorting = (options[:sort] || []).dup
-            sorting.push([ field, direction ])
-            options.store(:sort, sorting)
-          else
-            sorting = (options[:sort] || {}).dup
-            sorting[field] = direction
-            options.store(:sort, sorting)
-          end
+          sorting = (options[:sort] || {}).dup
+          sorting[field] = direction
+          options.store(:sort, sorting)
         end
 
         # Take the provided criterion and store it as an option in the query

spec/mongoid/criteria/marshalable_spec.rb

@@ -3,7 +3,6 @@
 require "spec_helper"
 
 describe Mongoid::Criteria::Marshalable do
-
   describe "Marshal.dump" do
 
     let(:criteria) do
@@ -26,5 +25,23 @@
     it "loads the proper attributes" do
       expect(Marshal.load(Marshal.dump(criteria))).to eq(criteria)
     end
+
+    context "when it receives driver mongo1x" do
+      let(:dump) { Marshal.dump(criteria) }
+
+      before do
+        expect_any_instance_of(Mongoid::Criteria).to receive(:marshal_dump).and_wrap_original do |m, *args|
+          data = m.call(*args)
+          data[1] = :mongo1x
+          data
+        end
+      end
+
+      it "raises an error" do
+        expect do
+          Marshal.load(dump)
+        end.to raise_error(NotImplementedError, /Mongoid no longer supports marshalling with driver version 1.x./)
+      end
+    end
   end
 end