Skip to content

Commit e6d0c61

Browse files
Merge pull request #133 from xfynx/installation-fix
simplified installation
2 parents 1ebaa13 + 0e60fa9 commit e6d0c61

File tree

8 files changed

+392
-98
lines changed

8 files changed

+392
-98
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
*.rbc
33
.config
44
.yardoc
5-
/Gemfile.lock
65
InstalledFiles
76
_yardoc
87
coverage

Gemfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,11 @@ source 'https://rubygems.org'
55
# development dependencies will be added by default to the :development group.
66
gemspec
77

8-
gem 'ransack', github: 'activerecord-hackery/ransack'
98
gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
109

1110
# Test app stuff
1211

1312
gem 'rails', '~> 5.1'
14-
gem 'kaminari', '~> 1.0'
15-
gem 'kaminari-mongoid'
1613

1714
gem 'devise'
1815

Gemfile.lock

Lines changed: 300 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,300 @@
1+
GIT
2+
remote: git://github.com/activerecord-hackery/ransack-mongoid.git
3+
revision: bd1935293d2f285fa7cf33d2c5c90d981bf67338
4+
specs:
5+
ransack-mongoid (0.1.0)
6+
7+
PATH
8+
remote: .
9+
specs:
10+
activeadmin-mongoid (0.8.0)
11+
activeadmin (>= 1.3.0)
12+
jquery-rails
13+
kaminari-mongoid
14+
mongoid (~> 6.0)
15+
sass-rails (>= 3.1.4)
16+
17+
GEM
18+
remote: https://rubygems.org/
19+
specs:
20+
actioncable (5.2.2)
21+
actionpack (= 5.2.2)
22+
nio4r (~> 2.0)
23+
websocket-driver (>= 0.6.1)
24+
actionmailer (5.2.2)
25+
actionpack (= 5.2.2)
26+
actionview (= 5.2.2)
27+
activejob (= 5.2.2)
28+
mail (~> 2.5, >= 2.5.4)
29+
rails-dom-testing (~> 2.0)
30+
actionpack (5.2.2)
31+
actionview (= 5.2.2)
32+
activesupport (= 5.2.2)
33+
rack (~> 2.0)
34+
rack-test (>= 0.6.3)
35+
rails-dom-testing (~> 2.0)
36+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
37+
actionview (5.2.2)
38+
activesupport (= 5.2.2)
39+
builder (~> 3.1)
40+
erubi (~> 1.4)
41+
rails-dom-testing (~> 2.0)
42+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
43+
activeadmin (1.4.3)
44+
arbre (>= 1.1.1)
45+
coffee-rails
46+
formtastic (~> 3.1)
47+
formtastic_i18n
48+
inherited_resources (>= 1.9.0)
49+
jquery-rails (>= 4.2.0)
50+
kaminari (>= 0.15)
51+
railties (>= 4.2, < 5.3)
52+
ransack (>= 1.8.7)
53+
sass (~> 3.1)
54+
sprockets (< 4.1)
55+
activejob (5.2.2)
56+
activesupport (= 5.2.2)
57+
globalid (>= 0.3.6)
58+
activemodel (5.2.2)
59+
activesupport (= 5.2.2)
60+
activerecord (5.2.2)
61+
activemodel (= 5.2.2)
62+
activesupport (= 5.2.2)
63+
arel (>= 9.0)
64+
activestorage (5.2.2)
65+
actionpack (= 5.2.2)
66+
activerecord (= 5.2.2)
67+
marcel (~> 0.3.1)
68+
activesupport (5.2.2)
69+
concurrent-ruby (~> 1.0, >= 1.0.2)
70+
i18n (>= 0.7, < 2)
71+
minitest (~> 5.1)
72+
tzinfo (~> 1.1)
73+
addressable (2.5.2)
74+
public_suffix (>= 2.0.2, < 4.0)
75+
arbre (1.1.1)
76+
activesupport (>= 3.0.0)
77+
arel (9.0.0)
78+
bcrypt (3.1.12)
79+
bson (4.3.0)
80+
builder (3.2.3)
81+
capybara (3.12.0)
82+
addressable
83+
mini_mime (>= 0.1.3)
84+
nokogiri (~> 1.8)
85+
rack (>= 1.6.0)
86+
rack-test (>= 0.6.3)
87+
regexp_parser (~> 1.2)
88+
xpath (~> 3.2)
89+
cliver (0.3.2)
90+
coderay (1.1.2)
91+
coffee-rails (4.2.2)
92+
coffee-script (>= 2.2.0)
93+
railties (>= 4.0.0)
94+
coffee-script (2.4.1)
95+
coffee-script-source
96+
execjs
97+
coffee-script-source (1.12.2)
98+
concurrent-ruby (1.1.3)
99+
crass (1.0.4)
100+
devise (4.5.0)
101+
bcrypt (~> 3.0)
102+
orm_adapter (~> 0.1)
103+
railties (>= 4.1.0, < 6.0)
104+
responders
105+
warden (~> 1.2.3)
106+
diff-lcs (1.3)
107+
docile (1.3.1)
108+
erubi (1.7.1)
109+
execjs (2.7.0)
110+
ffi (1.9.25)
111+
formtastic (3.1.5)
112+
actionpack (>= 3.2.13)
113+
formtastic_i18n (0.6.0)
114+
globalid (0.4.1)
115+
activesupport (>= 4.2.0)
116+
has_scope (0.7.2)
117+
actionpack (>= 4.1)
118+
activesupport (>= 4.1)
119+
i18n (1.2.0)
120+
concurrent-ruby (~> 1.0)
121+
inherited_resources (1.9.0)
122+
actionpack (>= 4.2, < 5.3)
123+
has_scope (~> 0.6)
124+
railties (>= 4.2, < 5.3)
125+
responders
126+
jquery-rails (4.3.3)
127+
rails-dom-testing (>= 1, < 3)
128+
railties (>= 4.2.0)
129+
thor (>= 0.14, < 2.0)
130+
jquery-ui-rails (6.0.1)
131+
railties (>= 3.2.16)
132+
jslint (1.2.0)
133+
json
134+
json (2.1.0)
135+
kaminari (1.1.1)
136+
activesupport (>= 4.1.0)
137+
kaminari-actionview (= 1.1.1)
138+
kaminari-activerecord (= 1.1.1)
139+
kaminari-core (= 1.1.1)
140+
kaminari-actionview (1.1.1)
141+
actionview
142+
kaminari-core (= 1.1.1)
143+
kaminari-activerecord (1.1.1)
144+
activerecord
145+
kaminari-core (= 1.1.1)
146+
kaminari-core (1.1.1)
147+
kaminari-mongoid (1.0.1)
148+
kaminari-core (~> 1.0)
149+
mongoid
150+
launchy (2.4.3)
151+
addressable (~> 2.3)
152+
loofah (2.2.3)
153+
crass (~> 1.0.2)
154+
nokogiri (>= 1.5.9)
155+
mail (2.7.1)
156+
mini_mime (>= 0.1.1)
157+
marcel (0.3.3)
158+
mimemagic (~> 0.3.2)
159+
method_source (0.9.2)
160+
mimemagic (0.3.2)
161+
mini_mime (1.0.1)
162+
mini_portile2 (2.3.0)
163+
minitest (5.11.3)
164+
mongo (2.6.2)
165+
bson (>= 4.3.0, < 5.0.0)
166+
mongoid (6.4.2)
167+
activemodel (>= 5.1, < 6.0.0)
168+
mongo (>= 2.5.1, < 3.0.0)
169+
nio4r (2.3.1)
170+
nokogiri (1.8.5)
171+
mini_portile2 (~> 2.3.0)
172+
orm_adapter (0.5.0)
173+
poltergeist (1.18.1)
174+
capybara (>= 2.1, < 4)
175+
cliver (~> 0.3.1)
176+
websocket-driver (>= 0.2.0)
177+
pry (0.12.2)
178+
coderay (~> 1.1.0)
179+
method_source (~> 0.9.0)
180+
pry-rails (0.3.8)
181+
pry (>= 0.10.4)
182+
public_suffix (3.0.3)
183+
rack (2.0.6)
184+
rack-test (1.1.0)
185+
rack (>= 1.0, < 3)
186+
rails (5.2.2)
187+
actioncable (= 5.2.2)
188+
actionmailer (= 5.2.2)
189+
actionpack (= 5.2.2)
190+
actionview (= 5.2.2)
191+
activejob (= 5.2.2)
192+
activemodel (= 5.2.2)
193+
activerecord (= 5.2.2)
194+
activestorage (= 5.2.2)
195+
activesupport (= 5.2.2)
196+
bundler (>= 1.3.0)
197+
railties (= 5.2.2)
198+
sprockets-rails (>= 2.0.0)
199+
rails-dom-testing (2.0.3)
200+
activesupport (>= 4.2.0)
201+
nokogiri (>= 1.6)
202+
rails-html-sanitizer (1.0.4)
203+
loofah (~> 2.2, >= 2.2.2)
204+
railties (5.2.2)
205+
actionpack (= 5.2.2)
206+
activesupport (= 5.2.2)
207+
method_source
208+
rake (>= 0.8.7)
209+
thor (>= 0.19.0, < 2.0)
210+
rake (12.3.2)
211+
ransack (2.1.1)
212+
actionpack (>= 5.0)
213+
activerecord (>= 5.0)
214+
activesupport (>= 5.0)
215+
i18n
216+
rb-fsevent (0.10.3)
217+
rb-inotify (0.9.10)
218+
ffi (>= 0.5.0, < 2)
219+
regexp_parser (1.3.0)
220+
responders (2.4.0)
221+
actionpack (>= 4.2.0, < 5.3)
222+
railties (>= 4.2.0, < 5.3)
223+
rspec-core (3.8.0)
224+
rspec-support (~> 3.8.0)
225+
rspec-expectations (3.8.2)
226+
diff-lcs (>= 1.2.0, < 2.0)
227+
rspec-support (~> 3.8.0)
228+
rspec-mocks (3.8.0)
229+
diff-lcs (>= 1.2.0, < 2.0)
230+
rspec-support (~> 3.8.0)
231+
rspec-rails (3.8.1)
232+
actionpack (>= 3.0)
233+
activesupport (>= 3.0)
234+
railties (>= 3.0)
235+
rspec-core (~> 3.8.0)
236+
rspec-expectations (~> 3.8.0)
237+
rspec-mocks (~> 3.8.0)
238+
rspec-support (~> 3.8.0)
239+
rspec-support (3.8.0)
240+
sass (3.7.2)
241+
sass-listen (~> 4.0.0)
242+
sass-listen (4.0.0)
243+
rb-fsevent (~> 0.9, >= 0.9.4)
244+
rb-inotify (~> 0.9, >= 0.9.7)
245+
sass-rails (5.0.7)
246+
railties (>= 4.0.0, < 6)
247+
sass (~> 3.1)
248+
sprockets (>= 2.8, < 4.0)
249+
sprockets-rails (>= 2.0, < 4.0)
250+
tilt (>= 1.1, < 3)
251+
simplecov (0.16.1)
252+
docile (~> 1.1)
253+
json (>= 1.8, < 3)
254+
simplecov-html (~> 0.10.0)
255+
simplecov-html (0.10.2)
256+
sprockets (3.7.2)
257+
concurrent-ruby (~> 1.0)
258+
rack (> 1, < 3)
259+
sprockets-rails (3.2.1)
260+
actionpack (>= 4.0)
261+
activesupport (>= 4.0)
262+
sprockets (>= 3.0.0)
263+
thor (0.20.3)
264+
thread_safe (0.3.6)
265+
tilt (2.0.9)
266+
tzinfo (1.2.5)
267+
thread_safe (~> 0.1)
268+
uglifier (4.1.20)
269+
execjs (>= 0.3.0, < 3)
270+
warden (1.2.8)
271+
rack (>= 2.0.6)
272+
websocket-driver (0.7.0)
273+
websocket-extensions (>= 0.1.0)
274+
websocket-extensions (0.1.3)
275+
xpath (3.2.0)
276+
nokogiri (~> 1.8)
277+
278+
PLATFORMS
279+
ruby
280+
281+
DEPENDENCIES
282+
activeadmin-mongoid!
283+
capybara
284+
coffee-rails (~> 4.0)
285+
devise
286+
jquery-rails
287+
jquery-ui-rails
288+
jslint
289+
launchy
290+
poltergeist
291+
pry-rails
292+
rails (~> 5.1)
293+
ransack-mongoid!
294+
rspec-rails (~> 3.6)
295+
sass-rails (>= 5.0.6)
296+
simplecov
297+
uglifier (>= 1.0.3)
298+
299+
BUNDLED WITH
300+
1.17.1

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin
1010
* Tested working on Rails 5.1.x
1111
* Mongoid 6.x (**WARNING**:, using a Mongoid version >= 6.1.x has resulted in a fair amount of errors seen in the wild. Test your upgrade very carefully with any apps in which you're using this gem with Mongoid >= 6.1.x!)
1212
* ActiveAdmin 1.3
13+
* `ransack-mongoid` - it needs to be explicitly declared in Gemfile, pointing to github's master since it has no releases on rubygems yet.
1314

1415
## Previous versions
1516
* Rails 4.x with Mongoid 5.x use branch rails4-mongoid5
@@ -36,7 +37,8 @@ For more on Mongoid support in ActiveAdmin see [this issue](https://github.com/g
3637
Add the following gems to your application's Gemfile, and lock the version:
3738

3839
```ruby
39-
gem 'activeadmin-mongoid', '0.7.0'
40+
gem 'activeadmin-mongoid', '0.8.0'
41+
gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
4042
```
4143

4244
You can safely remove the following lines, since are already activeadmin-mongoid dependencies:

activeadmin-mongoid.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
2222

2323
gem.add_runtime_dependency 'mongoid', ['~> 6.0']
2424
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
25+
gem.add_runtime_dependency 'kaminari-mongoid'
2526
gem.add_runtime_dependency 'jquery-rails'
2627
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']
2728

lib/active_admin/mongoid.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
require 'active_model'
33
require 'mongoid'
44
require 'ransack'
5+
require 'kaminari/mongoid'
56
# require 'active_admin/mongoid/engine'
67
require 'active_admin'
78
require 'devise'

test_app/Gemfile

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
source 'https://rubygems.org'
22

33
gem 'activeadmin-mongoid', path: '../'
4-
gem 'activeadmin', '~> 1.3.0'
5-
6-
# Test app stuff
74

85
gem 'rails', '~> 5.1.6'
96

107
gem 'pry'
118

129
gem 'devise'
1310

14-
gem 'mongoid', '~> 6.0.3', require: true
15-
gem 'kaminari', '~> 1.0'
16-
gem 'kaminari-mongoid'
17-
gem 'ransack', '< 1.8.7'
11+
gem 'ransack-mongoid', github: 'activerecord-hackery/ransack-mongoid'
1812

1913
gem 'sprockets', '>= 3.7.2'
2014

0 commit comments

Comments
 (0)