queryable.rb in mongoid-7.1.0.rc0

- old
+ new

@@ -1,18 +1,21 @@
+# frozen_string_literal: true
 # encoding: utf-8
+
+require "mongoid/criteria/queryable/expandable"
 require "mongoid/criteria/queryable/extensions"
-require "mongoid/criteria/queryable/forwardable"
 require "mongoid/criteria/queryable/key"
 require "mongoid/criteria/queryable/macroable"
 require "mongoid/criteria/queryable/mergeable"
 require "mongoid/criteria/queryable/smash"
 require "mongoid/criteria/queryable/aggregable"
 require "mongoid/criteria/queryable/pipeline"
 require "mongoid/criteria/queryable/optional"
 require "mongoid/criteria/queryable/options"
 require "mongoid/criteria/queryable/selectable"
 require "mongoid/criteria/queryable/selector"
+require "mongoid/criteria/queryable/storable"
 
 module Mongoid
   class Criteria
 
     # A queryable is any object that needs queryable's dsl injected into it to build
@@ -21,10 +24,12 @@
     # @example Include queryable functionality.
     #   class Criteria
     #     include Queryable
     #   end
     module Queryable
+      include Storable
+      include Expandable
       include Mergeable
       include Aggregable
       include Selectable
       include Optional
 
@@ -48,10 +53,10 @@
         return false unless other.is_a?(Queryable)
         selector == other.selector && options == other.options
       end
 
       # Initialize the new queryable. Will yield itself to the block if a block
-      # is provided for objects that need additional behaviour.
+      # is provided for objects that need additional behavior.
       #
       # @example Initialize the queryable.
       #   Queryable.new
       #
       # @param [ Hash ] aliases The optional field aliases.