Skip to content

Commit

Permalink
Bump version for release, update readme
Browse files Browse the repository at this point in the history
  • Loading branch information
boie0025 committed Aug 1, 2018
1 parent 89bcd52 commit 30fe1de
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 29 deletions.
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

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.

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

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

## ♻️ INFO

This gem has been brought into the ActiveAdmin org for support and maintenance.
This gem has been brought into the ActiveAdmin org for support and maintenance.

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

```ruby
gem 'activeadmin-mongoid', '0.4.0'
gem 'activeadmin-mongoid', '0.7.0'
```

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

### Remove Application Dependencies
In your config/application.rb, replace :
In your config/application.rb, replace:

```ruby
require 'rails/all'
```

with :
with:

```ruby
require "action_controller/railtie"
Expand All @@ -64,7 +64,7 @@ require "sprockets/railtie"
require "rails/test_unit/railtie"
```

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

### Bundle & Crank

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

Then create the admin user:
Then create an admin user:

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

And that's pretty much it !

Expand Down
2 changes: 1 addition & 1 deletion activeadmin-mongoid.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
gem.license = 'MIT'

gem.add_runtime_dependency 'mongoid', ['~> 6.0']
gem.add_runtime_dependency 'activeadmin', '~> 1.3.0'
gem.add_runtime_dependency 'activeadmin', '>= 1.3.0'
gem.add_runtime_dependency 'jquery-rails'
gem.add_runtime_dependency 'sass-rails', ['>= 3.1.4']

Expand Down
2 changes: 1 addition & 1 deletion lib/active_admin/mongoid/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module ActiveAdmin
module Mongoid
VERSION = '0.6.0'
VERSION = '0.7.0'
end
end
2 changes: 2 additions & 0 deletions test_app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ gem 'kaminari', '~> 1.0'
gem 'kaminari-mongoid'
gem 'ransack', '< 1.8.7'

gem 'sprockets', '>= 3.7.2'

# Gems used only for assets and not required
# in production environments by default.
gem 'sass-rails'
Expand Down
35 changes: 18 additions & 17 deletions test_app/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
PATH
remote: ..
specs:
activeadmin-mongoid (0.5.0)
activeadmin (~> 1.2.0)
activeadmin-mongoid (0.6.0)
activeadmin (>= 1.3.0)
jquery-rails
mongoid (~> 6.0.3)
sass-rails (>= 3.1.4, <= 5.0.6)
mongoid (~> 6.0)
sass-rails (>= 3.1.4)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -33,15 +33,15 @@ GEM
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activeadmin (1.2.1)
activeadmin (1.3.0)
arbre (>= 1.1.1)
coffee-rails
formtastic (~> 3.1)
formtastic_i18n
inherited_resources (~> 1.7)
inherited_resources (>= 1.7.0)
jquery-rails (>= 4.2.0)
kaminari (>= 0.15, < 2.0)
railties (>= 4.2, < 5.2)
kaminari (>= 0.15)
railties (>= 4.2, < 5.3)
ransack (~> 1.3)
sass (~> 3.1)
sprockets (< 4.1)
Expand All @@ -64,7 +64,7 @@ GEM
arbre (1.1.1)
activesupport (>= 3.0.0)
arel (8.0.0)
bcrypt (3.1.11)
bcrypt (3.1.12)
bson (4.3.0)
builder (3.2.3)
capybara (2.15.1)
Expand All @@ -85,10 +85,10 @@ GEM
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
devise (4.3.0)
devise (4.4.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.2)
railties (>= 4.1.0, < 6.0)
responders
warden (~> 1.2.3)
docile (1.1.5)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
activemodel (~> 5.0)
mongo (~> 2.3)
nio4r (2.3.0)
nokogiri (1.8.2)
nokogiri (1.8.4)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
poltergeist (1.16.0)
Expand All @@ -165,8 +165,8 @@ GEM
method_source (~> 0.8.1)
slop (~> 3.4)
public_suffix (3.0.0)
rack (2.0.4)
rack-test (1.0.0)
rack (2.0.5)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
Expand Down Expand Up @@ -221,7 +221,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
sprockets (3.7.1)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand All @@ -247,7 +247,7 @@ PLATFORMS
ruby

DEPENDENCIES
activeadmin (~> 1.2.0)
activeadmin (~> 1.3.0)
activeadmin-mongoid!
capybara
coffee-rails
Expand All @@ -265,7 +265,8 @@ DEPENDENCIES
ransack (< 1.8.7)
sass-rails
simplecov
sprockets (>= 3.7.2)
uglifier

BUNDLED WITH
1.16.1
1.16.3

0 comments on commit 30fe1de

Please sign in to comment.