Revert to a0be241b7e9bd53ccfce8e37c927d6bb6e17e29e, the upgrade to Mongoid 5 has got now its own branch

did committed Oct 10, 2015

commit bfb7d56521135080e04480c2b2c08116d8ff180d

Gemfile.lock +7 -3

locomotive/steam/adapters/mongodb.rb b/lib/locomotive/steam/adapters/mongodb.rb +6 -8

@@	@@ -1,4 +1,4 @@
-	require 'mongo'
+	require 'moped'
	require 'origin'

	require_relative 'mongodb/origin'
@@	@@ -82,15 +82,13 @@ module Locomotive::Steam
	end

	def session
-	Thread.current[:mongo_session] \|\|= if uri
-	Mongo::Client.new(uri)
+	Thread.current[:moped_session] \|\|= if uri
+	Moped::Session.connect(uri)
	else
-	options = { database: database }
-	if username && password
-	options[:user] = username
-	options[:password] = password
+	Moped::Session.new([*hosts]).tap do \|session\|
+	session.use database
+	session.login(username, password) if username && password
	end
-	Mongo::Client.new([*hosts], options)
	end
	end

locomotive/steam/adapters/mongodb/command.rb b/lib/locomotive/steam/adapters/mongodb/command.rb +2 -2

@@	@@ -15,13 +15,13 @@ module Locomotive::Steam

	serialized_entity = @mapper.serialize(entity)

-	@collection.insert_one(serialized_entity)
+	@collection.insert(serialized_entity)

	entity
	end

	def delete(entity)
-	@collection.find(_id: entity._id).delete_one if entity._id
+	@collection.find(_id: entity._id).remove if entity._id
	end

	end

locomotive/steam/adapters/mongodb/query.rb b/lib/locomotive/steam/adapters/mongodb/query.rb +6 -8

@@	@@ -47,14 +47,12 @@ module Locomotive::Steam
	_query = to_origin
	selector, fields, sort = _query.selector, _query.options[:fields], _query.options[:sort]

-	# FIXME: not very elegant (a proxy class would be better)
-	chainable = collection.find(selector)
-	chainable = chainable.sort(sort) if sort
-	chainable = chainable.projection(fields) if fields
-	chainable = chainable.skip(@skip) if @skip
-	chainable = chainable.limit(@limit) if @limit
-
-	chainable
+	collection.find(selector).tap do \|results\|
+	results.sort(sort) if sort
+	results.select(fields) if fields
+	results.skip(@skip) if @skip
+	results.limit(@limit) if @limit
+	end
	end

	def to_origin

locomotive/steam/server.rb b/lib/locomotive/steam/server.rb +1 -1

@@	@@ -13,7 +13,7 @@ require 'dragonfly/middleware'
	require_relative 'middlewares'

	if ENV['PROFILER']
-	require 'mongo'
+	require 'moped'
	require 'rack-mini-profiler'
	end

locomotivecms_steam.gemspec +1 -1

@@	@@ -18,7 +18,7 @@ Gem::Specification.new do \|spec\|
	spec.add_development_dependency 'bundler', '~> 1.7'
	spec.add_development_dependency 'rake', '~> 10.4.2'

-	spec.add_development_dependency 'mongo', '~> 2.1.0'
+	spec.add_development_dependency 'moped', '~> 2.0.6'
	spec.add_development_dependency 'origin', '~> 2.1.1'

	spec.add_dependency 'sanitize', '~> 4.0.0'

spec/integration/repositories/page_repository_spec.rb +5 -0

@@	@@ -5,6 +5,11 @@ require_relative '../../../lib/locomotive/steam/adapters/mongodb.rb'

	describe Locomotive::Steam::PageRepository do

+	# before(:all) do
+	# Moped.logger = Logger.new($stdout)
+	# Moped.logger.level = Logger::DEBUG
+	# end
+
	shared_examples_for 'a repository' do

	let(:site) { Locomotive::Steam::Site.new(_id: site_id, locales: %w(en fr nb)) }

spec/support.rb +0 -1

@@	@@ -1,5 +1,4 @@
	require_relative 'support/helpers'
-	require_relative 'support/mongo'
	require_relative 'support/cache_store'
	require_relative 'support/liquid'
	require_relative 'support/matchers/hash'

spec/support/mongo.rb +0 -7

@@	@@ -1,7 +0,0 @@
-	require 'mongo'
-
-	Mongo::Logger.logger.level = Logger::INFO
-
-	# DEBUG
-	# Mongo::Logger.logger = Logger.new($stdout)
-	# Mongo::Logger.logger.level = Logger::DEBUG