lib/exceptional/api.rb lib/exceptional/bootstrap.rb spec/api_spec.rb spec/bootstrap_spec.rb @@ -1,2 +1,2 @@ require 'exceptional' -Exceptional.setup(RAILS_ENV, RAILS_ROOT) \ No newline at end of file +Exceptional.bootstrap(RAILS_ENV, RAILS_ROOT) \ No newline at end of file init.rb @@ -6,34 +6,16 @@ require 'exceptional/version' require 'exceptional/log' require 'exceptional/config' require 'exceptional/remote' -require 'exceptional/handler' - +require 'exceptional/api' +require 'exceptional/bootstrap' module Exceptional class << self include Exceptional::Config - include Exceptional::ExceptionalHandler + include Exceptional::Api include Exceptional::Remote include Exceptional::Log - - # called from init.rb - def setup(environment, application_root) - begin - setup_config(environment, File.join(application_root,"config", "exceptional.yml")) - setup_log(File.join(application_root, "log"), log_level) - - if enabled? - if authenticate - require File.join('exceptional', 'integration', 'rails') - else - STDERR.puts "Exceptional plugin not authenticated, check your API Key" - end - end - rescue Exception => e - STDERR.puts e - STDERR.puts "Exceptional Plugin disabled." - end - end + include Exceptional::Bootstrap end end \ No newline at end of file lib/exceptional.rb @@ -22,55 +22,4 @@ describe Exceptional do end end - describe "setup" do - - TEST_ENVIRONMENT= "development" - - it "should initialize the config and log" do - Exceptional.should_receive(:setup_config) - Exceptional.should_receive(:setup_log) - - Exceptional.setup(TEST_ENVIRONMENT, File.dirname(__FILE__)) - end - - it "should authenticate if enabled" do - Exceptional.should_receive(:setup_config) - Exceptional.should_receive(:setup_log) - Exceptional.should_receive(:enabled?).and_return(true) - Exceptional.should_receive(:authenticate).and_return(true) - STDERR.should_not_receive(:puts) #Should be no errors to report - - Exceptional.setup(TEST_ENVIRONMENT, File.dirname(__FILE__)) - end - - it "should not authenticate if not enabled" do - Exceptional.should_receive(:setup_config) - Exceptional.should_receive(:setup_log) - Exceptional.should_receive(:enabled?).and_return(false) - Exceptional.should_not_receive(:authenticate) - STDERR.should_not_receive(:puts) # Will silently not enable itself - - - Exceptional.setup(TEST_ENVIRONMENT, File.dirname(__FILE__)) - end - - it "should report to STDERR if authentication fails" do - Exceptional.should_receive(:setup_config) - Exceptional.should_receive(:setup_log) - Exceptional.should_receive(:enabled?).and_return(true) - Exceptional.should_receive(:authenticate).and_return(false) - STDERR.should_receive(:puts) #Should be no errors to report - - Exceptional.setup(TEST_ENVIRONMENT, File.dirname(__FILE__)) - end - - it "should report to STDERR if error during config initialization" do - Exceptional.should_receive(:setup_config).and_raise(Exceptional::Config::ConfigurationException) - Exceptional.should_not_receive(:setup_log) - Exceptional.should_not_receive(:authenticate).and_return(false) - STDERR.should_receive(:puts).twice() #Should be no errors to report - - Exceptional.setup(TEST_ENVIRONMENT, File.dirname(__FILE__)) - end - end end \ No newline at end of file spec/exceptional_spec.rb lib/exceptional/handler.rb spec/handler_spec.rb 9d164f715c07bfadc3c842300b0e967fcb18d5d6 wal walter.mcconnell@gmail.com http://github.com/contrast/exceptional/commit/486bd5e3f3ebde4b779c483371516fb6e5ede5a0 486bd5e3f3ebde4b779c483371516fb6e5ede5a0 2009-03-23T13:01:51-07:00 2009-03-23T13:01:51-07:00 Third phase plugin refactor 7595de570606ba4f90eea0f8e3e3572aaf16da6b wal walter.mcconnell@gmail.com