Skip to content

Commit

Permalink
Mongoid V4 uses bson v2 which is not compatible with mongo and theref…
Browse files Browse the repository at this point in the history
…ore mongo_mapper
  • Loading branch information
reidmorrison committed Feb 14, 2015
1 parent 4535955 commit 4a7a87b
Show file tree
Hide file tree
Showing 9 changed files with 57 additions and 16 deletions.
7 changes: 5 additions & 2 deletions .travis.yml
Expand Up @@ -10,21 +10,24 @@ rvm:
- 2.1
- 2.2
# - jruby-18mode # JRuby in 1.8 mode
- jruby-19mode # JRuby in 1.9 mode
- jruby-1.7 # JRuby in 1.9 mode
- rbx-2.2.1

services: mongodb

gemfile:
- gemfiles/rails_3.2.gemfile
- gemfiles/rails_4.0.gemfile
- gemfiles/rails_4.0_bson1.gemfile
- gemfiles/rails_4.1.gemfile
- gemfiles/rails_4.1_bson1.gemfile
- gemfiles/rails_4.2.gemfile
- gemfiles/rails_4.2_bson1.gemfile

matrix:
allow_failures:
- rvm: rbx-2.2.1
- rvm: jruby-19mode
- rvm: jruby-1.7
exclude:
- rvm: 1.9.3
gemfile: gemfiles/rails_4.1.gemfile
Expand Down
8 changes: 5 additions & 3 deletions Gemfile
Expand Up @@ -6,9 +6,11 @@ gem 'rubysl', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "~>4.1"
gem 'mongoid'
gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'bson_ext', :platforms => :ruby
# Since mongoid V4 requires incompatible bson V2, cannot have mongoid (V4 or greater)
# and mongo_mapper ( or mongo ) in the same application
#gem 'mongo_mapper', '~> 0.13'
#gem 'bson_ext', :platforms => :ruby

gemspec
4 changes: 2 additions & 2 deletions gemfiles/rails_3.2.gemfile
Expand Up @@ -7,9 +7,9 @@ gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "3.2.21"
gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'mongoid', '~>3.1' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'mongo_mapper', '~>0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
4 changes: 1 addition & 3 deletions gemfiles/rails_4.0.gemfile
Expand Up @@ -7,9 +7,7 @@ gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.0.13"
gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
14 changes: 14 additions & 0 deletions gemfiles/rails_4.0_bson1.gemfile
@@ -0,0 +1,14 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.0.13"
gem 'sequel'
gem 'mongo_mapper', '~>0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
4 changes: 1 addition & 3 deletions gemfiles/rails_4.1.gemfile
Expand Up @@ -7,9 +7,7 @@ gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.1.9"
gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
14 changes: 14 additions & 0 deletions gemfiles/rails_4.1_bson1.gemfile
@@ -0,0 +1,14 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.1.9"
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
4 changes: 1 addition & 3 deletions gemfiles/rails_4.2.gemfile
Expand Up @@ -7,9 +7,7 @@ gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.2.0"
gem 'mongoid' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'mongoid', '~>4.0' if Gem::Version.create(RUBY_VERSION.dup) >= Gem::Version.create('1.9.3')
gem 'sequel'
gem 'mongo_mapper', '~> 0.13'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"
14 changes: 14 additions & 0 deletions gemfiles/rails_4.2_bson1.gemfile
@@ -0,0 +1,14 @@
source "https://rubygems.org"

gem "sqlite3", :platforms => :ruby
gem "coveralls"
gem 'rubysl', :platforms => :rbx
gem 'rubinius-developer_tools', :platforms => :rbx
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rails", "4.2.0"
gem 'sequel'
gem 'mongo_mapper'
gem 'bson_ext', :platforms => :ruby

gemspec :path => "../"

0 comments on commit 4a7a87b

Please sign in to comment.