mongoid-history 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d77abcedc5d3a8dd4dc76cc8d6320fbce3aaa1da
-  data.tar.gz: 7ea0951e39d1ce44841a92dacd55d576c6542612
+  metadata.gz: 3e9cb97f94a3cb084d92c85412f2e4cf2cc67895
+  data.tar.gz: c61a511effb8ee2ebb559aad5a77c3ec800eff78
 SHA512:
-  metadata.gz: 332314784de0fa89013bab41d9586eeae0e72ee743ce964561d384df270a255970fe23abbc6081f7b0a592085bba8d7cf4f056a3bf24e4deff0099a23628d2b2
-  data.tar.gz: '0228bacf2516b4da7bd57db5171d3e92bc4b418c0df3fcc49fc366d783ed3bf789b2487abb9c32036996fb8ad975dd4adcfad1edeecfff72671bb3da5384b200'
+  metadata.gz: 0a6079af9f6834d5c65d38106fca027a243871087fd0669e1120b4b2c074dde16ddd5d992e01208c73cd4cd7959c0ef6d03e49af4de4b4fc8783a7445d9fac41
+  data.tar.gz: 3dd2f512a2591d3e2123ae2fcbacd615d70be5983b9d955e393bf0f54463a18cb08fec3afb8259cabe87163e4d1baa384f7225e91d181492ce01954f92c022ad

data/.rubocop_todo.yml

@@ -1,47 +1,56 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-12-08 18:06:04 +0530 using RuboCop version 0.48.1.
+# on 2018-06-20 23:31:54 -0400 using RuboCop version 0.48.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: Include.
 # Include: **/Gemfile, **/gems.rb
 Bundler/DuplicatedGem:
   Exclude:
     - 'Gemfile'
 
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleAlignWith, SupportedStylesAlignWith, AutoCorrect.
+# SupportedStylesAlignWith: keyword, variable, start_of_line
+Lint/EndAlignment:
+  Exclude:
+    - 'lib/mongoid/history/options.rb'
+
 # Offense count: 3
 Lint/HandleExceptions:
   Exclude:
     - 'spec/unit/trackable_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 Lint/ParenthesesAsGroupedExpression:
   Exclude:
     - 'spec/integration/integration_spec.rb'
+    - 'spec/integration/nested_embedded_polymorphic_documents_spec.rb'
 
 # Offense count: 21
 Metrics/AbcSize:
-  Max: 50
+  Max: 52
 
-# Offense count: 111
+# Offense count: 117
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 807
+  Max: 820
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 126
+  Max: 114
 
-# Offense count: 5
+# Offense count: 6
 Metrics/CyclomaticComplexity:
-  Max: 10
+  Max: 13
 
-# Offense count: 462
+# Offense count: 392
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -55,11 +64,11 @@ Metrics/MethodLength:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 180
+  Max: 182
 
-# Offense count: 5
+# Offense count: 6
 Metrics/PerceivedComplexity:
-  Max: 12
+  Max: 15
 
 # Offense count: 12
 Style/Documentation:
@@ -90,11 +99,6 @@ Style/FileName:
     - 'Dangerfile'
     - 'lib/mongoid-history.rb'
 
-# Offense count: 1
-Style/IfInsideElse:
-  Exclude:
-    - 'lib/mongoid/history/trackable.rb'
-
 # Offense count: 1
 Style/MultilineBlockChain:
   Exclude:

data/.travis.yml

@@ -12,6 +12,7 @@ env:
   - MONGOID_VERSION=4
   - MONGOID_VERSION=5
   - MONGOID_VERSION=6
+  - MONGOID_VERSION=7
   - MONGOID_VERSION=HEAD
 
 rvm:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.8.1 (2018/06/28)
+
+* [#221](https://github.com/mongoid/mongoid-history/pull/221): Mongoid 7 support - [@dblock](https://github.com/dblock).
+
 ### 0.8.0 (2018/01/16)
 
 * [#180](https://github.com/mongoid/mongoid-history/pull/180): Removed deprecation notice - [@sivagollapalli](https://github.com/sivagollapalli).

data/CONTRIBUTING.md

@@ -1,16 +1,16 @@
 Contributing to Mongoid-History
 ===============================
 
-Mongoid-History is work of [many of contributors](https://github.com/intridea/mongoid-history/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/intridea/mongoid-history/pulls), [propose features, ask questions and discuss issues](https://github.com/intridea/mongoid-history/issues).
+Mongoid-History is work of [many of contributors](https://github.com/mongoid/mongoid-history/graphs/contributors). You're encouraged to submit [pull requests](https://github.com/mongoid/mongoid-history/pulls), [propose features, ask questions and discuss issues](https://github.com/mongoid/mongoid-history/issues).
 
 #### Fork the Project
 
-Fork the [project on Github](https://github.com/intridea/mongoid-history) and check out your copy.
+Fork the [project on Github](https://github.com/mongoid/mongoid-history) and check out your copy.
 
 ```
 git clone https://github.com/contributor/mongoid-history.git
 cd mongoid-history
-git remote add upstream https://github.com/intridea/mongoid-history.git
+git remote add upstream https://github.com/mongoid/mongoid-history.git
 ```
 
 #### Create a Topic Branch
@@ -95,7 +95,7 @@ git push origin my-feature-branch -f
 Update the [CHANGELOG](CHANGELOG.md) with the pull request number. A typical entry looks as follows.
 
 ```
-* [#123](https://github.com/intridea/mongoid-history/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
+* [#123](https://github.com/mongoid/mongoid-history/pull/123): Reticulated splines - [@contributor](https://github.com/contributor).
 ```
 
 Amend your previous commit and force push the changes.

data/Gemfile

@@ -2,19 +2,21 @@ source 'https://rubygems.org'
 
 gemspec
 
-case version = ENV['MONGOID_VERSION'] || '~> 6.0.0'
+case version = ENV['MONGOID_VERSION'] || '~> 7.0.0'
 when 'HEAD'
   gem 'mongoid', github: 'mongodb/mongoid'
-when /6/
+when /\b7/
+  gem 'mongoid', '~> 7.0.0'
+when /\b6/
   gem 'mongoid', '~> 6.0.0'
-when /5/
+when /\b5/
   gem 'mongoid', '~> 5.0'
   gem 'mongoid-observers', '~> 0.2.0'
-when /4/
+when /\b4/
   gem 'mongoid', '~> 4.0'
   gem 'mongoid-observers', '~> 0.2.0'
-when /3/
-  gem 'mongoid', '~> 3.1'
+when /\b3/
+  gem 'mongoid', '~> 3.1.7'
 else
   gem 'mongoid', version
 end

data/README.md

@@ -3,7 +3,6 @@ mongoid-history
 
 [![Gem Version](https://badge.fury.io/rb/mongoid-history.svg)](http://badge.fury.io/rb/mongoid-history)
 [![Build Status](https://secure.travis-ci.org/mongoid/mongoid-history.svg?branch=master)](http://travis-ci.org/mongoid/mongoid-history)
-[![Dependency Status](https://gemnasium.com/mongoid/mongoid-history.svg)](https://gemnasium.com/mongoid/mongoid-history)
 [![Code Climate](https://codeclimate.com/github/mongoid/mongoid-history.svg)](https://codeclimate.com/github/mongoid/mongoid-history)
 [![Coverage Status](https://coveralls.io/repos/mongoid/mongoid-history/badge.svg)](https://coveralls.io/r/mongoid/mongoid-history?branch=coveralls)
 
@@ -14,7 +13,7 @@ This gem also implements multi-user undo, which allows users to undo any history
 Install
 -------
 
-This gem supports Mongoid 3, 4, 5 on Ruby 1.9.3 or newer and Mongoid 6 on Ruby 2.2.2+. Add it to your `Gemfile` or run `gem install mongoid-history`.
+This gem supports Mongoid 3, 4, 5 on Ruby 1.9.3 or newer and Mongoid 6 and 7 on Ruby 2.2.2+. Add it to your `Gemfile` or run `gem install mongoid-history`.
 
 ```ruby
 gem 'mongoid-history'
@@ -389,7 +388,7 @@ In your View, you might do something like (example in HAML format):
 
 **Adding Userstamp on History Trackers**
 
-To track the User in the application who created the HistoryTracker, please add the
+To track the User in the application who created the HistoryTracker, add the
 [Mongoid::Userstamp gem](https://github.com/tbpro/mongoid_userstamp) to your HistoryTracker class.
 This will add a field called `created_by` and an accessor `creator` to the model (you can rename these via gem config).
 
@@ -400,15 +399,6 @@ class MyHistoryTracker
 end
 ```
 
-*Migrating Userstamp from Previous Versions*
-
-Since October 2013 (mongoid-history version 0.4.1 and onwards), Mongoid::History itself no longer supports the userstamp natively. In order to migrate, follow the
-instructions above then run the following command:
-
-```
-MyHistoryTracker.all.rename(modifier_id: :created_by)
-```
-
 **Setting Modifier Class Name**
 
 If your app will track history changes to a user, Mongoid History looks for these modifiers in the ``User`` class by default.  If you have named your 'user' accounts differently, you will need to add that to your Mongoid History config:

data/UPGRADING.md

@@ -31,4 +31,23 @@ See [#202](https://github.com/mongoid/mongoid-history/pull/202) for more informa
 
 See [#189](https://github.com/mongoid/mongoid-history/pull/189) for more information.
 
-* Currently, the `:all` option behaves identically to `:fields`. Future versions will track all fields and relations of trackable class when using `:all`. 
+* Currently, the `:all` option behaves identically to `:fields`. Future versions will track all fields and relations of trackable class when using `:all`.
+
+### Upgrading to 0.4.1
+
+#### Migrate Userstamp
+
+`Mongoid::History` no longer supports the userstamp natively. To track the User in the application who created the HistoryTracker, add the [Mongoid::Userstamp gem](https://github.com/tbpro/mongoid_userstamp) to your HistoryTracker class.
+
+```ruby
+class MyHistoryTracker
+  include Mongoid::History::Tracker
+  include Mongoid::Userstamp
+end
+```
+
+Rename the field.
+
+```ruby
+MyHistoryTracker.all.rename(modifier_id: :created_by)
+```

data/lib/mongoid/history.rb

@@ -42,11 +42,15 @@ module Mongoid
       def trackable_class_settings(trackable_class)
         trackable_settings[trackable_class.name.to_sym] || default_settings
       end
+
+      def reset!
+        Mongoid::History.modifier_class_name = 'User'
+        Mongoid::History.trackable_class_options = {}
+        Mongoid::History.trackable_settings = {}
+        Mongoid::History.current_user_method ||= :current_user
+      end
     end
   end
 end
 
-Mongoid::History.modifier_class_name = 'User'
-Mongoid::History.trackable_class_options = {}
-Mongoid::History.trackable_settings = {}
-Mongoid::History.current_user_method ||= :current_user
+Mongoid::History.reset!

data/lib/mongoid/history/attributes/base.rb

@@ -32,7 +32,7 @@ module Mongoid
 
         def format_embeds_one_relation(rel, obj)
           rel = trackable_class.database_field_name(rel)
-          relation_class = trackable_class.embeds_one_class(rel)
+          relation_class = trackable_class.relation_class_of(rel)
           permitted_attrs = trackable_class.tracked_embeds_one_attributes(rel)
           formats = trackable_class.field_format(rel)
           format_relation(relation_class, obj, permitted_attrs, formats)
@@ -40,7 +40,7 @@ module Mongoid
 
         def format_embeds_many_relation(rel, obj)
           rel = trackable_class.database_field_name(rel)
-          relation_class = trackable_class.embeds_many_class(rel)
+          relation_class = trackable_class.relation_class_of(rel)
           permitted_attrs = trackable_class.tracked_embeds_many_attributes(rel)
           formats = trackable_class.field_format(rel)
           format_relation(relation_class, obj, permitted_attrs, formats)

data/lib/mongoid/history/attributes/create.rb

@@ -22,7 +22,7 @@ module Mongoid
 
         def insert_embeds_one_changes
           trackable_class.tracked_embeds_one.each do |rel|
-            rel_class = trackable_class.embeds_one_class(rel)
+            rel_class = trackable_class.relation_class_of(rel)
             paranoia_field = Mongoid::History.trackable_class_settings(rel_class)[:paranoia_field]
             paranoia_field = rel_class.aliased_fields.key(paranoia_field) || paranoia_field
             rel = aliased_fields.key(rel) || rel
@@ -34,7 +34,7 @@ module Mongoid
 
         def insert_embeds_many_changes
           trackable_class.tracked_embeds_many.each do |rel|
-            rel_class = trackable_class.embeds_many_class(rel)
+            rel_class = trackable_class.relation_class_of(rel)
             paranoia_field = Mongoid::History.trackable_class_settings(rel_class)[:paranoia_field]
             paranoia_field = rel_class.aliased_fields.key(paranoia_field) || paranoia_field
             rel = aliased_fields.key(rel) || rel

data/lib/mongoid/history/attributes/update.rb

@@ -20,7 +20,7 @@ module Mongoid
 
         def insert_embeds_one_changes(relation, value)
           relation = trackable_class.database_field_name(relation)
-          relation_class = trackable_class.embeds_one_class(relation)
+          relation_class = trackable_class.relation_class_of(relation)
           paranoia_field = Mongoid::History.trackable_class_settings(relation_class)[:paranoia_field]
           original_value = value[0][paranoia_field].present? ? {} : format_embeds_one_relation(relation, value[0])
           modified_value = value[1][paranoia_field].present? ? {} : format_embeds_one_relation(relation, value[1])
@@ -30,7 +30,7 @@ module Mongoid
 
         def insert_embeds_many_changes(relation, value)
           relation = trackable_class.database_field_name(relation)
-          relation_class = trackable_class.embeds_many_class(relation)
+          relation_class = trackable_class.relation_class_of(relation)
           paranoia_field = Mongoid::History.trackable_class_settings(relation_class)[:paranoia_field]
           original_value = value[0].reject { |rel| rel[paranoia_field].present? }
                                    .map { |v_attrs| format_embeds_many_relation(relation, v_attrs) }

data/lib/mongoid/history/options.rb

@@ -57,10 +57,10 @@ module Mongoid
             field = trackable.database_field_name(field)
 
             if format.class == Hash && trackable.embeds_many?(field)
-              relation_class = trackable.embeds_many_class(field)
+              relation_class = trackable.relation_class_of(field)
               formats[field] = format.inject({}) { |a, e| a.merge(relation_class.database_field_name(e.first) => e.last) }
             elsif format.class == Hash && trackable.embeds_one?(field)
-              relation_class = trackable.embeds_one_class(field)
+              relation_class = trackable.relation_class_of(field)
               formats[field] = format.inject({}) { |a, e| a.merge(relation_class.database_field_name(e.first) => e.last) }
             else
               formats[field] = format
@@ -143,9 +143,9 @@ module Mongoid
         field_options = Array(field_options)
 
         if trackable.embeds_one?(field)
-          track_embeds_one(field, field_options)
+          track_relation(field, :embeds_one, field_options)
         elsif trackable.embeds_many?(field)
-          track_embeds_many(field, field_options)
+          track_relation(field, :embeds_many, field_options)
         elsif trackable.fields.keys.include?(field)
           @options[:fields] << field
         else
@@ -153,22 +153,13 @@ module Mongoid
         end
       end
 
-      def track_embeds_one(field, field_options)
-        relation_class = trackable.embeds_one_class(field)
-        @options[:relations][:embeds_one][field] = if field_options.blank?
-                                                     relation_class.fields.keys
-                                                   else
-                                                     %w[_id] | field_options.map { |opt| relation_class.database_field_name(opt) }
-                                                   end
-      end
-
-      def track_embeds_many(field, field_options)
-        relation_class = trackable.embeds_many_class(field)
-        @options[:relations][:embeds_many][field] = if field_options.blank?
-                                                      relation_class.fields.keys
-                                                    else
-                                                      %w[_id] | field_options.map { |opt| relation_class.database_field_name(opt) }
-                                                    end
+      def track_relation(field, kind, field_options)
+        relation_class = trackable.relation_class_of(field)
+        @options[:relations][kind][field] = if field_options.blank?
+                                              relation_class.fields.keys
+                                            else
+                                              %w[_id] | field_options.map { |opt| relation_class.database_field_name(opt) }
+                                               end
       end
 
       def reserved_fields

data/lib/mongoid/history/trackable.rb

@@ -5,7 +5,7 @@ module Mongoid
 
       module ClassMethods
         def track_history(options = {})
-          extend EmbeddedMethods
+          extend RelationMethods
 
           history_options = Mongoid::History::Options.new(self, options)
 
@@ -114,12 +114,12 @@ module Mongoid
           end
         end
 
-        def get_embedded(name)
-          send(self.class.embedded_alias(name))
+        def _get_relation(name)
+          send(self.class.relation_alias(name))
         end
 
-        def create_embedded(name, value)
-          send("create_#{self.class.embedded_alias(name)}!", value)
+        def _create_relation(name, value)
+          send("create_#{self.class.relation_alias(name)}!", value)
         end
 
         private
@@ -157,8 +157,10 @@ module Mongoid
             scope = _parent.collection_name.to_s.singularize.to_sym if scope.is_a?(Array)
             if Mongoid::Compatibility::Version.mongoid3?
               scope = metadata.inverse_class_name.tableize.singularize.to_sym if metadata.present? && scope == metadata.as
-            else
+            elsif Mongoid::Compatibility::Version.mongoid6_or_older?
               scope = relation_metadata.inverse_class_name.tableize.singularize.to_sym if relation_metadata.present? && scope == relation_metadata.as
+            elsif Mongoid::Compatibility::Version.mongoid7_or_newer?
+              scope = _association.inverse_class_name.tableize.singularize.to_sym if _association.present? && scope == _association.as
             end
           end
 
@@ -173,15 +175,18 @@ module Mongoid
 
         def association_hash(node = self)
           # We prefer to look up associations through the parent record because
-          # we're assured, through the object creation, it'll exist. Whereas we're not guarenteed
+          # we're assured, through the object creation, it'll exist. Whereas we're not guaranteed
           # the child to parent (embedded_in, belongs_to) relation will be defined
           if node._parent
             meta = node._parent.relations.values.find do |relation|
               if Mongoid::Compatibility::Version.mongoid3?
                 relation.class_name == node.metadata.class_name.to_s && relation.name == node.metadata.name
-              else
+              elsif Mongoid::Compatibility::Version.mongoid6_or_older?
                 relation.class_name == node.relation_metadata.class_name.to_s &&
                   relation.name == node.relation_metadata.name
+              elsif Mongoid::Compatibility::Version.mongoid7_or_newer?
+                relation.class_name == node._association.class_name.to_s &&
+                  relation.name == node._association.name
               end
             end
           end
@@ -267,6 +272,12 @@ module Mongoid
           [original, modified]
         end
 
+        def increment_current_version
+          current_version = (send(history_trackable_options[:version_field]) || 0) + 1
+          send("#{history_trackable_options[:version_field]}=", current_version)
+          current_version
+        end
+
         protected
 
         def track_history_for_action?(action)
@@ -275,8 +286,7 @@ module Mongoid
 
         def track_history_for_action(action)
           if track_history_for_action?(action)
-            current_version = (send(history_trackable_options[:version_field]) || 0) + 1
-            send("#{history_trackable_options[:version_field]}=", current_version)
+            current_version = increment_current_version
             last_track = self.class.tracker_class.create!(history_tracker_attributes(action.to_sym).merge(version: current_version, action: action.to_s, trackable: self))
           end
 
@@ -294,80 +304,85 @@ module Mongoid
         end
       end
 
-      module EmbeddedMethods
-        # Indicates whether there is an Embedded::One relation for the given embedded field.
+      module RelationMethods
+        # Returns a relation class for the given field.
         #
-        # @param [ String | Symbol ] embed The name of the embedded field
+        # @param [ String | Symbol ] field The name of the field.
         #
-        # @return [ Boolean ] true if there is an Embedded::One relation for the given embedded field
-        def embeds_one?(embed)
-          relation_of(embed) == Mongoid::Relations::Embedded::One
+        # @return [ nil | Constant ] Class being related.
+        def relation_class_of(field)
+          meta = meta_of(field)
+          return meta.class_name.constantize if meta
         end
 
-        # Return the class for embeds_one relation
+        # Indicates whether there is an Embedded::One relation for the given embedded field.
         #
-        # @param [ String ] field The database field name for embedded relation
+        # @param [ String | Symbol ] embed The name of the embedded field.
         #
-        # @return [ nil | Constant ]
-        def embeds_one_class(field)
-          @embeds_one_class ||= {}
-          return @embeds_one_class[field] if @embeds_one_class.key?(field)
-          field_alias = aliased_fields.key(field)
-          relation = relations
-                     .select { |_, v| v.relation == Mongoid::Relations::Embedded::One }
-                     .detect { |rel_k, _| rel_k == field_alias }
-          @embeds_one_class[field] = relation && relation.last.class_name.constantize
+        # @return [ Boolean ] true if there is an Embedded::One relation for the given embedded field.
+        def embeds_one?(field)
+          relation_of(field) == if Mongoid::Compatibility::Version.mongoid7_or_newer?
+                                  Mongoid::Association::Embedded::EmbedsOne::Proxy
+                                else
+                                  Mongoid::Relations::Embedded::One
+                                end
         end
 
         # Indicates whether there is an Embedded::Many relation for the given embedded field.
         #
-        # @param [ String | Symbol ] embed The name of the embedded field
+        # @param [ String | Symbol ] field The name of the embedded field.
         #
-        # @return [ Boolean ] true if there is an Embedded::Many relation for the given embedded field
-        def embeds_many?(embed)
-          relation_of(embed) == Mongoid::Relations::Embedded::Many
+        # @return [ Boolean ] true if there is an Embedded::Many relation for the given embedded field.
+        def embeds_many?(field)
+          relation_of(field) == if Mongoid::Compatibility::Version.mongoid7_or_newer?
+                                  Mongoid::Association::Embedded::EmbedsMany::Proxy
+                                else
+                                  Mongoid::Relations::Embedded::Many
+                                end
         end
 
-        # Return the class for embeds_many relation
+        # Retrieves the database representation of an embedded field name, in case the :store_as option is used.
         #
-        # @param [ String ] field The database field name for embedded relation
+        # @param [ String | Symbol ] embed The name or alias of the embedded field.
         #
-        # @return [ nil | Constant ]
-        def embeds_many_class(field)
-          @embeds_many_class ||= {}
-          return @embeds_many_class[field] if @embeds_many_class.key?(field)
-          field_alias = aliased_fields.key(field)
-          relation = relations
-                     .select { |_, v| v.relation == Mongoid::Relations::Embedded::Many }
-                     .detect { |rel_k, _| rel_k == field_alias }
-          @embeds_many_class[field] = relation && relation.last.class_name.constantize
+        # @return [ String ] The database name of the embedded field.
+        def relation_alias(embed)
+          relation_aliases[embed]
         end
 
-        # Retrieves the database representation of an embedded field name, in case the :store_as option is used.
+        protected
+
+        # Return the reflected metadata for a relation.
         #
-        # @param [ String | Symbol ] embed The name or alias of the embedded field
+        # @param [ String ] field The database field name for a relation.
         #
-        # @return [ String ] the database name of the embedded field
-        def embedded_alias(embed)
-          embedded_aliases[embed]
+        # @return [ nil | Mongoid::Relations::Metadata ]
+        def meta_of(field)
+          @meta_of ||= {}
+          return @meta_of[field] if @meta_of.key?(field)
+          @meta_of[field] = reflect_on_association(relation_alias(field))
         end
 
-        protected
+        # Returns a relation for the given field.
+        #
+        # @param [ String | Symbol ] field The name of the field.
+        #
+        # @return [ nil | Constant ] Type of relation.
+        def relation_of(field)
+          meta = meta_of(field)
+          meta ? meta.relation : nil
+        end
 
         # Retrieves the memoized hash of embedded aliases and their associated database representations.
         #
         # @return [ Hash < String, String > ] hash of embedded aliases (keys) to database representations (values)
-        def embedded_aliases
-          @embedded_aliases ||= relations.inject(HashWithIndifferentAccess.new) do |h, (k, v)|
-            h[v[:store_as] || k] = k
+        def relation_aliases
+          @relation_aliases ||= relations.inject(HashWithIndifferentAccess.new) do |h, (k, v)|
+            store_as = Mongoid::Compatibility::Version.mongoid7_or_newer? ? v.store_as : v[:store_as]
+            h[store_as || k] = k
             h
           end
         end
-
-        def relation_of(embed)
-          meta = reflect_on_association(embedded_alias(embed))
-          meta ? meta.relation : nil
-        end
       end
 
       module SingletonMethods