Compatibility with mongoid 5.

derekharmel · Oct 20, 2015 · ea89fb0 · ea89fb0
1 parent 44c03cf
commit ea89fb0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,11 +5,13 @@ services:
 
 rvm:
   - 1.9.3
-  - 2.1.2
+  - 2.1
+  - 2.2
 
 env:
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
+  - MONGOID_VERSION=5
   - MONGO_MAPPER_VERSION=0.13.1
 
 language: ruby

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 #### 1.2.1 (Next)
 
+* [#11](https://github.com/derekharmel/sunspot_mongo/pull/11): Support for Mongoid 5 - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 #### 1.2.0 (2015/08/28)

diff --git a/Gemfile b/Gemfile
@@ -1,12 +1,14 @@
 source 'https://rubygems.org'
 
-ENV['MONGOID_VERSION'] = '4' unless ENV['MONGOID_VERSION'] || ENV['MONGO_MAPPER_VERSION']
+ENV['MONGOID_VERSION'] = '5.0' unless ENV['MONGOID_VERSION'] || ENV['MONGO_MAPPER_VERSION']
 
 if ENV['MONGOID_VERSION']
-  case version = ENV['MONGOID_VERSION'] || '~> 4.0'
-  when /4/
+  case version = ENV['MONGOID_VERSION']
+  when /^5/
+    gem 'mongoid', '~> 5.0'
+  when /^4/
     gem 'mongoid', '~> 4.0'
-  when /3/
+  when /^3/
     gem 'mongoid', '~> 3.1'
   else
     gem 'mongoid', version