Skip to content

Commit 84751ff

Browse files
committed
Initial Rails4 support
1 parent aeba76f commit 84751ff

File tree

4 files changed

+78
-8
lines changed

4 files changed

+78
-8
lines changed

lib/active_admin/mongoid.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require 'active_admin/mongoid/version'
2-
# require 'active_admin/mongoid/engine'
2+
require 'active_support/core_ext' # needed by ransack
33
require 'active_admin'
44
require 'devise'
55
require 'rails'

lib/active_admin/mongoid/document.rb

-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
require 'delegate'
2-
require 'meta_search/searches/mongoid'
32

43
module ActiveAdmin::Mongoid::Document
54
extend ActiveSupport::Concern
@@ -37,8 +36,6 @@ def quote_column_name name
3736
# CLASS METHODS
3837

3938
included do
40-
include MetaSearch::Searches::Mongoid
41-
4239
unless respond_to? :primary_key
4340
class << self
4441
attr_accessor :primary_key
@@ -140,6 +137,3 @@ def reflections *a
140137
end
141138

142139
Mongoid::Document.send :include, ActiveAdmin::Mongoid::Document
143-
Mongoid::Document.send :include, MetaSearch::Searches::Mongoid
144-
145-

test_app/config/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# require "active_record/railtie"
66
require "action_controller/railtie"
77
require "action_mailer/railtie"
8-
require "active_resource/railtie"
8+
# require "active_resource/railtie"
99
require "sprockets/railtie"
1010
require "rails/test_unit/railtie"
1111

test_app/config/mongoid.4.yml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
development:
2+
# Configure available database sessions. (required)
3+
sessions:
4+
# Defines the default session. (required)
5+
default:
6+
# Defines the name of the default database that Mongoid can connect to.
7+
# (required).
8+
database: activeadmin_mongoid_test
9+
# Provides the hosts the default session can connect to. Must be an array
10+
# of host:port pairs. (required)
11+
hosts:
12+
- localhost:27017
13+
options:
14+
# Change the default write concern. (default = { w: 1 })
15+
# write:
16+
# w: 1
17+
18+
# Change the default consistency model to primary, secondary.
19+
# 'secondary' will send reads to secondaries, 'primary' sends everything
20+
# to master. (default: primary)
21+
# read: secondary_preferred
22+
23+
# How many times Moped should attempt to retry an operation after
24+
# failure. (default: 30)
25+
# max_retries: 30
26+
27+
# The time in seconds that Moped should wait before retrying an
28+
# operation on failure. (default: 1)
29+
# retry_interval: 1
30+
# Configure Mongoid specific options. (optional)
31+
options:
32+
# Enable the identity map, needed for eager loading. (default: false)
33+
# identity_map_enabled: false
34+
35+
# Includes the root model name in json serialization. (default: false)
36+
# include_root_in_json: false
37+
38+
# Include the _type field in serializaion. (default: false)
39+
# include_type_for_serialization: false
40+
41+
# Preload all models in development, needed when models use
42+
# inheritance. (default: false)
43+
# preload_models: false
44+
45+
# Protect id and type from mass assignment. (default: true)
46+
# protect_sensitive_fields: true
47+
48+
# Raise an error when performing a #find and the document is not found.
49+
# (default: true)
50+
# raise_not_found_error: true
51+
52+
# Raise an error when defining a scope with the same name as an
53+
# existing method. (default: false)
54+
# scope_overwrite_exception: false
55+
56+
# Skip the database version check, used when connecting to a db without
57+
# admin access. (default: false)
58+
# skip_version_check: false
59+
60+
# Use Active Support's time zone in conversions. (default: true)
61+
# use_activesupport_time_zone: true
62+
63+
# Ensure all times are UTC in the app side. (default: false)
64+
# use_utc: false
65+
test:
66+
sessions:
67+
default:
68+
database: activeadmin_mongoid_test
69+
hosts:
70+
- localhost:27017
71+
options:
72+
read: primary
73+
# In the test environment we lower the retries and retry interval to
74+
# low amounts for fast failures.
75+
max_retries: 1
76+
retry_interval: 0

0 commit comments

Comments
 (0)