lib/padrino-gen/generators/components/orms/mongoid.rb in padrino-gen-0.11.3 vs lib/padrino-gen/generators/components/orms/mongoid.rb in padrino-gen-0.11.4
- old
+ new
@@ -1,7 +1,7 @@
MONGOID = (<<-MONGO) unless defined?(MONGOID)
-# Connection.new takes host, port
+# Connection.new takes host and port
host = 'localhost'
port = Mongo::Connection::DEFAULT_PORT
database_name = case Padrino.env
when :development then '!NAME!_development'
@@ -9,54 +9,54 @@
when :test then '!NAME!_test'
end
Mongoid.database = Mongo::Connection.new(host, port).db(database_name)
-# You can also configure Mongoid this way
+# You can also configure Mongoid this way:
# Mongoid.configure do |config|
# name = @settings["database"]
# host = @settings["host"]
# config.master = Mongo::Connection.new.db(name)
# config.slaves = [
# Mongo::Connection.new(host, @settings["slave_one"]["port"], :slave_ok => true).db(name),
# Mongo::Connection.new(host, @settings["slave_two"]["port"], :slave_ok => true).db(name)
# ]
# end
#
-# More installation and setup notes are on http://mongoid.org/
+# More installation and setup notes are on http://mongoid.org/.
MONGO
MONGOID3 = (<<-MONGO) unless defined?(MONGOID3)
-# Connection.new takes host, port
+# Connection.new takes host and port.
host = 'localhost'
port = 27017
database_name = case Padrino.env
when :development then '!NAME!_development'
when :production then '!NAME!_production'
when :test then '!NAME!_test'
end
-# Use MONGO_URI if it's set as an environmental variable
+# Use MONGO_URI if it's set as an environmental variable.
Mongoid::Config.sessions =
if ENV['MONGO_URI']
{default: {uri: ENV['MONGO_URI'] }}
else
{default: {hosts: ["#\{host\}:#\{port\}"], database: database_name}}
end
# If you want to use a YML file for config, use this instead:
#
-# Mongoid.load!(File.join(Padrino.root, 'config', 'database.yml'), Padrino.env)
+# Mongoid.load!(File.join(Padrino.root, 'config', 'database.yml'), Padrino.env)
#
# And add a config/database.yml file like this:
# development:
# sessions:
# default:
# database: !NAME!_development
# hosts:
-# - localhost:27017
+# - localhost:27017
# production:
# sessions:
# default:
# database: !NAME!_production
# hosts: