test/unit/integrity_test.rb @@ -11,8 +11,8 @@ require "integrity" # # require "notifier/email" -# Load Integrity's configuration. -Integrity.config = File.dirname(__FILE__) + "/config.yml") +# Load configuration and initialize Integrity +Integrity.new(File.dirname(__FILE__) + "/config.yml") # You probably don't want to edit anything below Integrity::App.set :environment, ENV["RACK_ENV"] || :production config/config.sample.ru @@ -31,7 +31,7 @@ module Integrity autoload :App, "integrity/app" def self.new(config_file = nil) - self.config = config_file unless config_file.nil? + self.config = YAML.load_file(config_file) unless config_file.nil? DataMapper.setup(:default, config[:database_uri]) end @@ -53,8 +53,8 @@ module Integrity @config ||= default_configuration end - def self.config=(file) - @config = default_configuration.merge(YAML.load_file(file)) + def self.config=(options) + @config = default_configuration.merge(options) end def self.log(message, &block) @@ -72,7 +72,6 @@ module Integrity end private - class LogFormatter < Logger::Formatter def call(severity, time, progname, msg) time.strftime("[%H:%M:%S] ") + msg2str(msg) + "\n" lib/integrity.rb @@ -9,11 +9,7 @@ module Integrity configure :development do config = Integrity.root / "config" / "config.yml" - Integrity.config = config if File.exists? config - end - - configure do - Integrity.new + Integrity.new(config) if File.exists?(config) end not_found do lib/integrity/app.rb @@ -46,8 +46,8 @@ class Test::Unit::TestCase before(:each) do RR.reset - DataMapper.auto_migrate! + Integrity.instance_variable_set(:@config, nil) repository(:default) do transaction = DataMapper::Transaction.new(repository) test/helpers.rb d145890f20a76c14635a787a45a423217d08a621 Simon Rozet simon@rozet.name http://github.com/foca/integrity/commit/0fc1fcac7cd1eeb8db061e93b47b95ca24fefd56 0fc1fcac7cd1eeb8db061e93b47b95ca24fefd56 2009-02-21T11:27:58-08:00 2009-02-21T09:51:37-08:00 Change how Integrity#new and #config works Integrity.new now takes a config file to load d2c472f351f3c96eb3c63939ce0e87931e3eb07c Simon Rozet simon@rozet.name