From b3f8aac82ff9ff0d621bbad30f40261a46d7a752 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 1 Feb 2011 14:18:33 +0000 Subject: [PATCH] removed yaml dependency by getting rid of now useless #load_yaml and #load_file methods from Failover::Configurations --- lib/amqp/failover.rb | 2 -- lib/amqp/failover/configurations.rb | 9 --------- 2 files changed, 11 deletions(-) diff --git a/lib/amqp/failover.rb b/lib/amqp/failover.rb index 1c1130d..4c68b01 100644 --- a/lib/amqp/failover.rb +++ b/lib/amqp/failover.rb @@ -1,7 +1,5 @@ # encoding: utf-8 -require 'yaml' - require 'amqp/failover_client' require 'amqp/failover/config' require 'amqp/failover/configurations' diff --git a/lib/amqp/failover/configurations.rb b/lib/amqp/failover/configurations.rb index 8c87b1f..24b24bc 100644 --- a/lib/amqp/failover/configurations.rb +++ b/lib/amqp/failover/configurations.rb @@ -66,15 +66,6 @@ module AMQP self[(current+1 == self.size) ? 0 : current+1] if current end - def load_file(file, env = nil) - raise ArgumentError, "Can't find #{file}" unless File.exists?(file) - load(YAML.load_file(file)[env || "development"]) - end - - def load_yaml(data, env = nil) - load(YAML.load(data)[env || "development"]) - end - def load(conf) if conf.is_a?(Array) load_array(conf)