Merge pull request #100 from sivagollapalli/mongoid_HEAD

Running build with mongoid beta
mongoid · Jul 27, 2016 · 24cac58 · 24cac58
2 parents 3f3a997 + 9647eca
commit 24cac58
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,12 @@
 language: ruby
 rvm:
+  - 2.3.0
   - 2.2.3
   - 1.9.3
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-2.1.1
+  - rbx-2.1.1
+env:                                                                                                          
+  - MONGOID_VERSION=3                                                                                         
+  - MONGOID_VERSION=4                                                                                         
+  - MONGOID_VERSION=5
+  - MONGOID_VERSION=6
diff --git a/Gemfile b/Gemfile
@@ -8,4 +8,16 @@ platforms :jruby do
   gemspec :name => "mongoid_search-java"
 end
 
-gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
+gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
+case version = ENV['MONGOID_VERSION'] || '~> 6.0.0.beta'                                                             
+when /6/
+  gem 'mongoid', '~> 6.0.0.beta'                                                                                     
+when /5/                                                                                                      
+  gem 'mongoid', '~> 5.0'                                                                                     
+when /4/                                                                                                      
+  gem 'mongoid', '~> 4.0'                                                                                     
+when /3/                                                                                                      
+  gem 'mongoid', '~> 3.1'                                                                                     
+else                                                                                                          
+  gem 'mongoid', version                                                                                      
+end
diff --git a/spec/models/category.rb b/spec/models/category.rb
@@ -1,5 +1,7 @@
 class Category
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if ::Mongoid::VERSION >= '4'
+
   field :name, localize: true
   field :description
 

diff --git a/spec/models/product.rb b/spec/models/product.rb
@@ -1,6 +1,8 @@
 class Product
   include Mongoid::Document
   include Mongoid::Search
+  include Mongoid::Attributes::Dynamic if ::Mongoid::VERSION >= '4'
+
   field :brand
   field :name
   field :attrs, :type => Array

diff --git a/spec/models/subproduct.rb b/spec/models/subproduct.rb
@@ -1,5 +1,6 @@
 class Subproduct
   include Mongoid::Document
+  include Mongoid::Attributes::Dynamic if ::Mongoid::VERSION >= '4'
 
   field :brand
   field :name

diff --git a/spec/models/tag.rb b/spec/models/tag.rb
@@ -1,6 +1,7 @@
 class Tag
   include Mongoid::Document
   include Mongoid::Search
+  include Mongoid::Attributes::Dynamic if ::Mongoid::VERSION >= '4'
 
   field :name