fixing mongo.rb initializer to use mongoid 3

Arthur Neves · Ábner Oliveira
1 parent 9d8e5c7e
Showing 1 changed file with 17 additions and 9 deletions Show diff stats
config/initializers/mongo.rb
@@ -20,14 +20,22 @@ elsif ENV[&#39;HEROKU&#39;] || ENV[&#39;USE_ENV&#39;]
   end
   Mongoid.configure do |config|
-    config.master = Mongo::Connection.new(
-      settings.host,
-      settings.port
-    ).db(database_name)
-    config.master.authenticate(settings.user, settings.password) if settings.user
+
+    hash = {
+      sessions: {
+        default: {
+          database: database_name,
+          hosts: [ "#{settings.host}:#{settings.port}" ]
+        }
+      },
+      options: { allow_dynamic_fields: false, use_activesupport_time_zone: true, identity_map_enabled: true }
+    }
+
+    if settings.user && settings.password
+      hash[:sessions][:default][:username] = settings.user
+      hash[:sessions][:default][:password] = settings.password
+    end
+
+    config.load_configuration(hash)
   end
 end
-
-Mongoid.allow_dynamic_fields = false
-Mongoid.use_activesupport_time_zone = true
-Mongoid.identity_map_enabled = true
	@@ -20,14 +20,22 @@ elsif ENV['HEROKU'] \|\| ENV['USE_ENV']		@@ -20,14 +20,22 @@ elsif ENV['HEROKU'] \|\| ENV['USE_ENV']
20	end	20	end
21		21
22	Mongoid.configure do \|config\|	22	Mongoid.configure do \|config\|
23	- config.master = Mongo::Connection.new(
24	- settings.host,
25	- settings.port
26	- ).db(database_name)
27	- config.master.authenticate(settings.user, settings.password) if settings.user	23	+
		24	+ hash = {
		25	+ sessions: {
		26	+ default: {
		27	+ database: database_name,
		28	+ hosts: [ "#{settings.host}:#{settings.port}" ]
		29	+ }
		30	+ },
		31	+ options: { allow_dynamic_fields: false, use_activesupport_time_zone: true, identity_map_enabled: true }
		32	+ }
		33	+
		34	+ if settings.user && settings.password
		35	+ hash[:sessions][:default][:username] = settings.user
		36	+ hash[:sessions][:default][:password] = settings.password
		37	+ end
		38	+
		39	+ config.load_configuration(hash)
28	end	40	end
29	end	41	end
30	-
31	-Mongoid.allow_dynamic_fields = false
32	-Mongoid.use_activesupport_time_zone = true
33	-Mongoid.identity_map_enabled = true