Support Mongoid 7.0

Closes #3013

Author: mshibuya

Appraisals

@@ -121,7 +121,7 @@ appraise "rails-5.0" do
   end
 
   group :mongoid do
-    gem 'mongoid', '>= 6.0.0.beta'
+    gem 'mongoid', '~> 6.1'
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
@@ -150,7 +150,7 @@ appraise "rails-5.1" do
   end
 
   group :mongoid do
-    gem 'mongoid', '~> 6.0'
+    gem 'mongoid', '~> 7.0'
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'
@@ -173,7 +173,7 @@ appraise "rails-5.2" do
   end
 
   group :mongoid do
-    gem 'mongoid', '~> 6.4'
+    gem 'mongoid', '~> 7.0'
     gem 'kaminari-mongoid'
     gem 'mongoid-paperclip', '>= 0.0.8', require: 'mongoid_paperclip'
     gem 'carrierwave-mongoid', '>= 0.6.3', require: 'carrierwave/mongoid'

gemfiles/rails_5.0.gemfile

@@ -52,7 +52,7 @@ group :test do
 end
 
 group :mongoid do
-  gem "mongoid", ">= 6.0.0.beta"
+  gem "mongoid", "~> 6.1"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"

gemfiles/rails_5.1.gemfile

@@ -53,7 +53,7 @@ group :test do
 end
 
 group :mongoid do
-  gem "mongoid", "~> 6.0"
+  gem "mongoid", "~> 7.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"

gemfiles/rails_5.2.gemfile

@@ -47,7 +47,7 @@ group :test do
 end
 
 group :mongoid do
-  gem "mongoid", "~> 6.4"
+  gem "mongoid", "~> 7.0"
   gem "kaminari-mongoid"
   gem "mongoid-paperclip", ">= 0.0.8", require: "mongoid_paperclip"
   gem "carrierwave-mongoid", ">= 0.6.3", require: "carrierwave/mongoid"

lib/rails_admin/adapters/mongoid.rb

@@ -83,7 +83,7 @@ def encoding
       end
 
       def embedded?
-        model.relations.values.detect { |a| a.macro.to_sym == :embedded_in }
+        associations.detect { |a| a.macro == :embedded_in }
       end
 
       def cyclic?
@@ -150,7 +150,7 @@ def filter_conditions(filters, fields = config.list.fields.select(&:filterable?)
 
       def parse_collection_name(column)
         collection_name, column_name = column.split('.')
-        if [:embeds_one, :embeds_many].include?(model.relations[collection_name].try(:macro).try(:to_sym))
+        if associations.detect { |a| a.name == collection_name.to_sym }.try(:embeds?)
           [table_name, column]
         else
           [collection_name, column_name]

lib/rails_admin/adapters/mongoid/abstract_object.rb

@@ -7,6 +7,7 @@ class AbstractObject < RailsAdmin::Adapters::ActiveRecord::AbstractObject
         def initialize(object)
           super
           object.associations.each do |name, association|
+            association = Association.new(association, object.class)
             if [:has_many, :references_many].include? association.macro
               instance_eval <<-RUBY, __FILE__, __LINE__ + 1
                 def #{name.to_s.singularize}_ids
@@ -28,9 +29,7 @@ def #{name.to_s.singularize}_ids=(item_ids)
                 def #{name}_id=(item_id)
                   item = (#{association.klass}.find(item_id) rescue nil)
                   return unless item
-                  unless persisted?
-                    item.update_attribute('#{association.foreign_key}', id)
-                  end
+                  item.update_attribute('#{association.foreign_key}', id) unless persisted?
                   super item.id
                 end
 RUBY

lib/rails_admin/adapters/mongoid/association.rb

@@ -45,7 +45,7 @@ def primary_key
         end
 
         def foreign_key
-          return unless [:embeds_one, :embeds_many].exclude?(macro.to_sym)
+          return if embeds?
           association.foreign_key.to_sym rescue nil
         end
 
@@ -82,7 +82,7 @@ def read_only?
 
         def nested_options
           nested = nested_attributes_options.try { |o| o[name] }
-          if !nested && [:embeds_one, :embeds_many].include?(macro.to_sym) && !association.cyclic
+          if !nested && [:embeds_one, :embeds_many].include?(macro.to_sym) && !cyclic?
             raise <<-MSG.gsub(/^\s+/, '')
             Embbeded association without accepts_nested_attributes_for can't be handled by RailsAdmin,
             because embedded model doesn't have top-level access.
@@ -96,13 +96,24 @@ def association?
           true
         end
 
+        def macro
+          association.try(:macro) || association.class.name.split('::').last.underscore.to_sym
+        end
+
+        def embeds?
+          [:embeds_one, :embeds_many].include?(macro)
+        end
+
       private
 
         def inverse_of_field
           association.respond_to?(:inverse_of_field) && association.inverse_of_field
         end
 
-        delegate :macro, :options, to: :association, prefix: false
+        def cyclic?
+          association.respond_to?(:cyclic?) ? association.cyclic? : association.cyclic
+        end
+
         delegate :nested_attributes_options, to: :model, prefix: false
         delegate :polymorphic_parents, to: RailsAdmin::AbstractModel
       end

lib/rails_admin/adapters/mongoid/property.rb

@@ -70,8 +70,8 @@ def read_only?
       private
 
         def object_field_type
-          if [:belongs_to, :referenced_in, :embedded_in].
-             include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
+          association = Association.new model.relations.values.detect { |r| r.try(:foreign_key).try(:to_sym) == name }, model
+          if [:belongs_to, :referenced_in, :embedded_in].include?(association.macro)
             :bson_object_id
           else
             :string