Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updating README and environment

  • Loading branch information...
commit d7d7cc6ab8cf642eeaa9713371a88bba16d37240 1 parent 6b15bc8
@guilleiguaran guilleiguaran authored
Showing with 6 additions and 6 deletions.
  1. +3 −3 README.rdoc
  2. +3 −3 enviroment.rb
View
6 README.rdoc
@@ -1,13 +1,13 @@
= My Sinatra Template
-This is my Sinatra template with Bundler, Rack config, MongoMapper, RSpec/RCov and some useful Rake tasks.
+This is my Sinatra template with Bundler, Rack config, Mongoid, RSpec, SimpleCov and some useful Rake tasks.
== Note on Patches/Pull Requests
-
+
* Fork the project.
* Make your feature addition or bug fix.
* Send me a pull request. Bonus points for topic branches.
== Copyright
-Copyright (c) 2010 Guillermo Iguaran. See LICENSE for details.
+Copyright (c) 2010-2011 Guillermo Iguaran. See LICENSE for details.
View
6 enviroment.rb
@@ -2,10 +2,10 @@
require "bundler"
require "yaml"
-ENV["RACK_ENV"] ||= "development" unless ENV["RACK_ENV"]
+ENV["RACK_ENV"] ||= "development"
AppConfig = YAML.load_file(File.join(File.dirname(__FILE__),'app_config.yml'))[ENV['RACK_ENV']]
-ENV["MONGOHQ_URL"] ||= AppConfig['mongo_url'] unless ENV["MONGOHQ_URL"]
+ENV["MONGOH_URL"] ||= ENV["MONGOHQ_URL"] || AppConfig['mongo_url']
Bundler.require(:default, ENV["RACK_ENV"].to_sym)
-require File.join(File.dirname(__FILE__), 'application.rb')
+require File.join(File.dirname(__FILE__), 'application.rb')
Please sign in to comment.
Something went wrong with that request. Please try again.