Skip to content

Commit 018812e

Browse files
authored
Bump version for release, update readme (#126)
1 parent 89bcd52 commit 018812e

File tree

5 files changed

+32
-29
lines changed

5 files changed

+32
-29
lines changed

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin application. This repo was pulled into the ActiveAdmin org from previous work done by Elia Schito, and will be maintained by Nic Boie, JD Guzman, Elia Schito and other ActiveAdmin and community members.
66

7-
### Requirements for version 0.6.0
7+
### Requirements for version 0.7.0
88
* Ruby 2.2.2 or greater. (Note, ruby-2.4.0 fails specs, see [this issue](https://github.com/DatabaseCleaner/database_cleaner/issues/466))
9-
* Requires Rails 5.0.x (also tested working on Rails 5.1.x)
9+
* Tested working on Rails 5.1.x
1010
* 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!)
1111
* ActiveAdmin 1.3
1212

@@ -17,7 +17,7 @@ ActiveAdmin is holding off on pulling Mongoid support into the core ActiveAdmin
1717

1818
## ♻️ INFO
1919

20-
This gem has been brought into the ActiveAdmin org for support and maintenance.
20+
This gem has been brought into the ActiveAdmin org for support and maintenance.
2121

2222
<!-- [![Build Status](https://secure.travis-ci.org/elia/activeadmin-mongoid.svg?branch=master)](http://travis-ci.org/elia/activeadmin-mongoid)
2323
[![Gem Version](https://badge.fury.io/rb/activeadmin-mongoid.svg)](http://badge.fury.io/rb/activeadmin-mongoid) -->
@@ -38,7 +38,7 @@ For more on Mongoid support in ActiveAdmin see [this issue](https://github.com/g
3838
Add the following gems to your application's Gemfile, and lock the version:
3939

4040
```ruby
41-
gem 'activeadmin-mongoid', '0.4.0'
41+
gem 'activeadmin-mongoid', '0.7.0'
4242
```
4343

4444
You can safely remove the following lines, since are already activeadmin-mongoid dependencies:
@@ -48,13 +48,13 @@ gem 'activeadmin'
4848
```
4949

5050
### Remove Application Dependencies
51-
In your config/application.rb, replace :
51+
In your config/application.rb, replace:
5252

5353
```ruby
5454
require 'rails/all'
5555
```
5656

57-
with :
57+
with:
5858

5959
```ruby
6060
require "action_controller/railtie"
@@ -64,7 +64,7 @@ require "sprockets/railtie"
6464
require "rails/test_unit/railtie"
6565
```
6666

67-
rails/all includes elements requiring ActiveRecord::Connection ...
67+
NOTE: This gem will NOT work if you use both ActiveRecord AND Mongoid in the same app. rails/all includes elements requiring ActiveRecord::Connection
6868

6969
### Bundle & Crank
7070

@@ -81,10 +81,10 @@ You may find a line like this :
8181
require 'devise/orm/mongoid'
8282
```
8383

84-
Then create the admin user:
84+
Then create an admin user:
8585

86-
$ rails console
87-
>> AdminUser.create :email => 'admin@example.com', :password => 'password', :password_confirmation => 'password'
86+
$ bundle exec rails console
87+
>> AdminUser.create email: 'admin@example.com', password: 'password', password_confirmation: 'password'
8888

8989
And that's pretty much it !
9090

activeadmin-mongoid.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
1919
gem.license = 'MIT'
2020

2121
gem.add_runtime_dependency 'mongoid', ['~> 6.0']
22-
gem.add_runtime_dependency 'activeadmin', '~> 1.3.0'
22+
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
2323
gem.add_runtime_dependency 'jquery-rails'
2424
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']
2525

lib/active_admin/mongoid/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module ActiveAdmin
22
module Mongoid
3-
VERSION = '0.6.0'
3+
VERSION = '0.7.0'
44
end
55
end

test_app/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ gem 'kaminari', '~> 1.0'
1616
gem 'kaminari-mongoid'
1717
gem 'ransack', '< 1.8.7'
1818

19+
gem 'sprockets', '>= 3.7.2'
20+
1921
# Gems used only for assets and not required
2022
# in production environments by default.
2123
gem 'sass-rails'

test_app/Gemfile.lock

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
PATH
22
remote: ..
33
specs:
4-
activeadmin-mongoid (0.5.0)
5-
activeadmin (~> 1.2.0)
4+
activeadmin-mongoid (0.6.0)
5+
activeadmin (>= 1.3.0)
66
jquery-rails
7-
mongoid (~> 6.0.3)
8-
sass-rails (>= 3.1.4, <= 5.0.6)
7+
mongoid (~> 6.0)
8+
sass-rails (>= 3.1.4)
99

1010
GEM
1111
remote: https://rubygems.org/
@@ -33,15 +33,15 @@ GEM
3333
erubi (~> 1.4)
3434
rails-dom-testing (~> 2.0)
3535
rails-html-sanitizer (~> 1.0, >= 1.0.3)
36-
activeadmin (1.2.1)
36+
activeadmin (1.3.0)
3737
arbre (>= 1.1.1)
3838
coffee-rails
3939
formtastic (~> 3.1)
4040
formtastic_i18n
41-
inherited_resources (~> 1.7)
41+
inherited_resources (>= 1.7.0)
4242
jquery-rails (>= 4.2.0)
43-
kaminari (>= 0.15, < 2.0)
44-
railties (>= 4.2, < 5.2)
43+
kaminari (>= 0.15)
44+
railties (>= 4.2, < 5.3)
4545
ransack (~> 1.3)
4646
sass (~> 3.1)
4747
sprockets (< 4.1)
@@ -64,7 +64,7 @@ GEM
6464
arbre (1.1.1)
6565
activesupport (>= 3.0.0)
6666
arel (8.0.0)
67-
bcrypt (3.1.11)
67+
bcrypt (3.1.12)
6868
bson (4.3.0)
6969
builder (3.2.3)
7070
capybara (2.15.1)
@@ -85,10 +85,10 @@ GEM
8585
coffee-script-source (1.12.2)
8686
concurrent-ruby (1.0.5)
8787
crass (1.0.4)
88-
devise (4.3.0)
88+
devise (4.4.3)
8989
bcrypt (~> 3.0)
9090
orm_adapter (~> 0.1)
91-
railties (>= 4.1.0, < 5.2)
91+
railties (>= 4.1.0, < 6.0)
9292
responders
9393
warden (~> 1.2.3)
9494
docile (1.1.5)
@@ -151,7 +151,7 @@ GEM
151151
activemodel (~> 5.0)
152152
mongo (~> 2.3)
153153
nio4r (2.3.0)
154-
nokogiri (1.8.2)
154+
nokogiri (1.8.4)
155155
mini_portile2 (~> 2.3.0)
156156
orm_adapter (0.5.0)
157157
poltergeist (1.16.0)
@@ -165,8 +165,8 @@ GEM
165165
method_source (~> 0.8.1)
166166
slop (~> 3.4)
167167
public_suffix (3.0.0)
168-
rack (2.0.4)
169-
rack-test (1.0.0)
168+
rack (2.0.5)
169+
rack-test (1.1.0)
170170
rack (>= 1.0, < 3)
171171
rails (5.1.6)
172172
actioncable (= 5.1.6)
@@ -221,7 +221,7 @@ GEM
221221
simplecov-html (~> 0.10.0)
222222
simplecov-html (0.10.2)
223223
slop (3.6.0)
224-
sprockets (3.7.1)
224+
sprockets (3.7.2)
225225
concurrent-ruby (~> 1.0)
226226
rack (> 1, < 3)
227227
sprockets-rails (3.2.1)
@@ -247,7 +247,7 @@ PLATFORMS
247247
ruby
248248

249249
DEPENDENCIES
250-
activeadmin (~> 1.2.0)
250+
activeadmin (~> 1.3.0)
251251
activeadmin-mongoid!
252252
capybara
253253
coffee-rails
@@ -265,7 +265,8 @@ DEPENDENCIES
265265
ransack (< 1.8.7)
266266
sass-rails
267267
simplecov
268+
sprockets (>= 3.7.2)
268269
uglifier
269270

270271
BUNDLED WITH
271-
1.16.1
272+
1.16.3

0 commit comments

Comments
 (0)