lib/active_wrapper.rb in winton-active_wrapper-0.1.0 vs lib/active_wrapper.rb in winton-active_wrapper-0.1.1

@@ -1,16 +1,23 @@
+require 'rubygems'
+require 'activerecord'
+require 'logger'
+require 'yaml'
+
 require File.dirname(__FILE__) + "/active_wrapper/db"
 require File.dirname(__FILE__) + "/active_wrapper/log"
 
-class ActiveWrapper
-  
-  def initialize(options={})
+module ActiveWrapper
+  class <<self
     
-    options = {
-      :base => File.dirname($0),
-      :env => 'development',
-      :log => 'development'
-    }.merge(options)
+    def setup(options={})
+      
+      options = {
+        :base => File.dirname($0),
+        :env => 'development',
+        :log => 'development'
+      }.merge(options.reject { |k, v| v.nil? })
     
-    [ Db.new(options), Log.new(options) ]
+      [ Db.new(options), Log.new(options) ]
+    end
   end
 end
\ No newline at end of file