Support for Ruby 1.9.x (thanks flexd!)

dwhenry-archive · Nov 25, 2010 · eb0d5ad · eb0d5ad
1 parent c291ca3
commit eb0d5ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/application.rb b/application.rb
@@ -1,6 +1,7 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'sinatra'
-require 'environment'
+require_relative 'environment'
 
 configure do
   set :views, "#{File.dirname(__FILE__)}/views"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -10,7 +10,7 @@
 Sinatra::Base.set :raise_errors, true
 Sinatra::Base.set :logging, false
 
-require 'application'
+require File.join(File.dirname(__FILE__), '../application')
 
 # establish in-memory database for testing
 DataMapper.setup(:default, "sqlite3::memory:")