lib/active_wrapper.rb in active_wrapper-0.2.4 vs lib/active_wrapper.rb in active_wrapper-0.2.5

@@ -20,10 +20,10 @@
     
     def setup(options={})
       
       options = {
         :base => File.dirname($0),
-        :env => 'development',
+        :env => ENV['RACK_ENV'] || ENV['RAILS_ENV'] || ENV['MERB_ENV'] || 'development',
         :log => options[:env] || 'development'
       }.merge(options.reject { |k, v| v.nil? })
       
       db = Db.new(options)
       log = Log.new(options)
\ No newline at end of file