Support Mongoid 5.
This commit is contained in:
parent
b65c97e49e
commit
9e5faf4ab9
17
.travis.yml
17
.travis.yml
|
@ -12,12 +12,14 @@ rvm:
|
||||||
- 1.9
|
- 1.9
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- RAILS=4-2-stable DB=mongodb
|
- RAILS=4-2-stable DB=mongoid4
|
||||||
|
- RAILS=4-2-stable DB=mongoid5
|
||||||
- RAILS=4-2-stable DB=sqlite3
|
- RAILS=4-2-stable DB=sqlite3
|
||||||
- RAILS=4-2-stable DB=mysql
|
- RAILS=4-2-stable DB=mysql
|
||||||
- RAILS=4-2-stable DB=postgres
|
- RAILS=4-2-stable DB=postgres
|
||||||
|
|
||||||
- RAILS=4-1-stable DB=mongodb
|
- RAILS=4-1-stable DB=mongoid4
|
||||||
|
- RAILS=4-1-stable DB=mongoid5
|
||||||
- RAILS=4-1-stable DB=sqlite3
|
- RAILS=4-1-stable DB=sqlite3
|
||||||
- RAILS=4-1-stable DB=mysql
|
- RAILS=4-1-stable DB=mysql
|
||||||
- RAILS=4-1-stable DB=postgres
|
- RAILS=4-1-stable DB=postgres
|
||||||
|
@ -37,7 +39,9 @@ env:
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- rvm: 2.3.0
|
- rvm: 2.3.0
|
||||||
env: RAILS=master DB=mongodb
|
env: RAILS=master DB=mongoid5
|
||||||
|
- rvm: 2.3.0
|
||||||
|
env: RAILS=master DB=mongoid4
|
||||||
- rvm: 2.3.0
|
- rvm: 2.3.0
|
||||||
env: RAILS=master DB=sqlite3
|
env: RAILS=master DB=sqlite3
|
||||||
- rvm: 2.3.0
|
- rvm: 2.3.0
|
||||||
|
@ -46,7 +50,9 @@ matrix:
|
||||||
env: RAILS=master DB=postgres
|
env: RAILS=master DB=postgres
|
||||||
|
|
||||||
- rvm: 2.2.4
|
- rvm: 2.2.4
|
||||||
env: RAILS=master DB=mongodb
|
env: RAILS=master DB=mongoid5
|
||||||
|
- rvm: 2.2.4
|
||||||
|
env: RAILS=master DB=mongoid4
|
||||||
- rvm: 2.2.4
|
- rvm: 2.2.4
|
||||||
env: RAILS=master DB=sqlite3
|
env: RAILS=master DB=sqlite3
|
||||||
- rvm: 2.2.4
|
- rvm: 2.2.4
|
||||||
|
@ -55,7 +61,8 @@ matrix:
|
||||||
env: RAILS=master DB=postgres
|
env: RAILS=master DB=postgres
|
||||||
|
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- env: RAILS=master DB=mongodb
|
- env: RAILS=master DB=mongoid5
|
||||||
|
- env: RAILS=master DB=mongoid4
|
||||||
- env: RAILS=master DB=sqlite3
|
- env: RAILS=master DB=sqlite3
|
||||||
- env: RAILS=master DB=mysql
|
- env: RAILS=master DB=mysql
|
||||||
- env: RAILS=master DB=postgres
|
- env: RAILS=master DB=postgres
|
||||||
|
|
6
Gemfile
6
Gemfile
|
@ -42,10 +42,14 @@ else
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if ENV['DB'] =~ /mongodb/
|
if ENV['DB'] =~ /mongoid4/
|
||||||
gem 'mongoid', '~> 4.0.0', require: false
|
gem 'mongoid', '~> 4.0.0', require: false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if ENV['DB'] =~ /mongoid5/
|
||||||
|
gem 'mongoid', '~> 5.0.0', require: false
|
||||||
|
end
|
||||||
|
|
||||||
# Removed from Ruby 2.2 but needed for testing Rails 3.x.
|
# Removed from Ruby 2.2 but needed for testing Rails 3.x.
|
||||||
group :test do
|
group :test do
|
||||||
gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
|
gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
|
||||||
|
|
2
Rakefile
2
Rakefile
|
@ -17,7 +17,7 @@ RSpec::Core::RakeTask.new(:mongoid) do |rspec|
|
||||||
end
|
end
|
||||||
|
|
||||||
task :default do
|
task :default do
|
||||||
if ENV['DB'] =~ /mongodb/
|
if ENV['DB'] =~ /mongoid/
|
||||||
Rake::Task["mongoid"].invoke
|
Rake::Task["mongoid"].invoke
|
||||||
else
|
else
|
||||||
Rake::Task["spec"].invoke
|
Rake::Task["spec"].invoke
|
||||||
|
|
|
@ -1,4 +1,9 @@
|
||||||
test:
|
test:
|
||||||
|
clients:
|
||||||
|
default:
|
||||||
|
database: ransack_mongoid_test
|
||||||
|
hosts:
|
||||||
|
- localhost:27017
|
||||||
sessions:
|
sessions:
|
||||||
default:
|
default:
|
||||||
database: ransack_mongoid_test
|
database: ransack_mongoid_test
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
require 'mongoid'
|
require 'mongoid'
|
||||||
|
|
||||||
Mongoid.load!(File.expand_path("../mongoid.yml", __FILE__), :test)
|
Mongoid.load!(File.expand_path("../mongoid.yml", __FILE__), :test)
|
||||||
|
Mongo::Logger.logger.level = Logger::WARN if defined?(Mongo)
|
||||||
|
Mongoid.purge!
|
||||||
|
|
||||||
class Person
|
class Person
|
||||||
include Mongoid::Document
|
include Mongoid::Document
|
||||||
|
|
|
@ -30,9 +30,14 @@ RSpec.configure do |config|
|
||||||
config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior'
|
config.alias_it_should_behave_like_to :it_has_behavior, 'has behavior'
|
||||||
|
|
||||||
config.before(:suite) do
|
config.before(:suite) do
|
||||||
message = "Running Ransack specs with #{Mongoid.default_session.inspect
|
if ENV['DB'] == 'mongoid4'
|
||||||
}, Mongoid #{Mongoid::VERSION}, Moped #{Moped::VERSION
|
message = "Running Ransack specs with #{Mongoid.default_session.inspect
|
||||||
}, Origin #{Origin::VERSION} and Ruby #{RUBY_VERSION}"
|
}, Mongoid #{Mongoid::VERSION}, Moped #{Moped::VERSION
|
||||||
|
}, Origin #{Origin::VERSION} and Ruby #{RUBY_VERSION}"
|
||||||
|
else
|
||||||
|
message = "Running Ransack specs with #{Mongoid.default_client.inspect
|
||||||
|
}, Mongoid #{Mongoid::VERSION}, Mongo driver #{Mongo::VERSION}"
|
||||||
|
end
|
||||||
line = '=' * message.length
|
line = '=' * message.length
|
||||||
puts line, message, line
|
puts line, message, line
|
||||||
Schema.create
|
Schema.create
|
||||||
|
|
Loading…
Reference in New Issue