Skip to content

Commit 94e5500

Browse files
committed
chore: fix mongoid 8 issue
1 parent ff3abaa commit 94e5500

File tree

6 files changed

+31
-11
lines changed

6 files changed

+31
-11
lines changed

Gemfile.lock

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ PATH
1111
activeadmin (>= 3.3)
1212
jquery-rails
1313
kaminari-mongoid
14-
mongoid (>= 6.0, < 9.1)
14+
mongoid (~> 8.0)
1515
sass-rails (>= 3.1.4)
1616

1717
GEM
@@ -209,10 +209,11 @@ GEM
209209
minitest (5.25.5)
210210
mongo (2.21.0)
211211
bson (>= 4.14.1, < 6.0.0)
212-
mongoid (9.0.6)
212+
mongoid (8.1.10)
213213
activemodel (>= 5.1, < 8.1, != 7.0.0)
214214
concurrent-ruby (>= 1.0.5, < 2.0)
215215
mongo (>= 2.18.0, < 3.0.0)
216+
ruby2_keywords (~> 0.0.5)
216217
net-imap (0.5.6)
217218
date
218219
net-protocol

activeadmin-mongoid.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
1919

2020
gem.required_ruby_version = '>= 2.4'
2121

22-
gem.add_runtime_dependency 'mongoid', '>= 6.0', '< 9.1'
22+
gem.add_runtime_dependency 'mongoid', '~> 8.0'
2323
gem.add_runtime_dependency 'activeadmin', '>= 3.3'
2424
gem.add_runtime_dependency 'kaminari-mongoid'
2525
gem.add_runtime_dependency 'jquery-rails'

lib/active_admin/mongoid.rb

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
require 'active_admin/mongoid/controllers/resource_controller'
2222
require 'active_admin/mongoid/resource/attributes'
2323
require 'active_admin/mongoid/csv_builder'
24+
require 'inherited_resources'
2425

2526
module ActiveAdmin
2627
module Mongoid
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
require 'active_admin/engine'
2-
require 'inherited_resources'
32

43
ActiveAdmin::Engine.module_eval do
5-
initializer 'active_admin.mongoid.resource_controller' do
6-
class ActiveAdmin::ResourceController
7-
def build_new_resource
8-
scoped_collection.send(
9-
method_for_build,
10-
*resource_params
11-
)
4+
config.after_initialize do
5+
if defined?(ActiveAdmin::ResourceController)
6+
ActiveAdmin::ResourceController.class_eval do
7+
def build_new_resource
8+
scoped_collection.send(
9+
method_for_build,
10+
*resource_params
11+
)
12+
end
1213
end
14+
else
15+
warn "⚠️ ActiveAdmin::ResourceController is not loaded yet — skipping patch"
1316
end
1417
end
1518
end

test_app/config/environment.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Load the rails application
22
require File.expand_path('application', __dir__)
3+
require 'inherited_resources'
34

45
# Initialize the rails application
56
Rails.application.initialize!

test_app/config/mongoid.8.yml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
development:
2+
clients:
3+
default:
4+
database: activeadmin_mongoid_development
5+
hosts:
6+
- localhost:27017
7+
8+
test:
9+
clients:
10+
default:
11+
database: activeadmin_mongoid_test
12+
hosts:
13+
- localhost:27017
14+
#scope_overwrite_exception: true

0 commit comments

Comments
 (0)