diff options
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | lib/environment.rb | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -30,6 +30,7 @@ begin "ohm", "rjb" ].each { |dep| gem.add_dependency dep } +=begin [ "dm-core", 'dm-serializer', 'dm-timestamps', @@ -38,6 +39,7 @@ begin "dm-mysql-adapter", "dm-validations", ].each {|dep| gem.add_dependency dep, ">= 1" } +=end gem.add_dependency "haml", ">=3" ['jeweler'].each { |dep| gem.add_development_dependency dep } gem.files = FileList["[A-Z]*", "{bin,generators,lib,test}/**/*", 'lib/jeweler/templates/.gitignore'] diff --git a/lib/environment.rb b/lib/environment.rb index 73df64e..4f04e48 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -23,10 +23,9 @@ else end # database +=begin if CONFIG[:database] ['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types', 'dm-migrations', 'dm-validations' ].each{|lib| require lib } -=begin -=end case CONFIG[:database][:adapter] when /sqlite/i db_dir = File.join(basedir, "db") @@ -52,9 +51,10 @@ if CONFIG[:database] #DataMapper.setup(:default, {:adapter => "redis"}) #DataMapper::Model.raise_on_save_failure = true - require 'ohm' - Ohm.connect :thread_safe => true end +=end +require 'ohm' +Ohm.connect :thread_safe => true # load mail settings for error messages load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") |