@@ -77,7 +77,7 @@ module Mack @response = Mack::Response.new @cookies = Mack::CookieJar.new(self.request, self.response) @runner_helpers = [] - Mack::RunnerHelpers::Registry.instance.runner_helpers.each do |helper| + Mack::RunnerHelpers::Registry.registered_items.each do |helper| help = helper.new help.start(self.request, self.response, self.cookies) @runner_helpers << help lib/runner.rb @@ -2,44 +2,10 @@ require File.join(File.dirname(__FILE__), "request_logger") require File.join(File.dirname(__FILE__), "session") module Mack module RunnerHelpers - class Registry - include Singleton + class Registry < Mack::Utils::Registry - attr_accessor :runner_helpers - - def initialize - self.runner_helpers = [Mack::RunnerHelpers::RequestLogger, Mack::RunnerHelpers::Session] - end - - def add(klass, position = self.runner_helpers.size) - self.runner_helpers.insert(position, klass) - self.runner_helpers.uniq! - self.runner_helpers.compact! - end - - class << self - - def helpers - Mack::RunnerHelpers::Registry.instance.runner_helpers - end - - def add(klass, position = helpers.size) - Mack::RunnerHelpers::Registry.instance.add(klass, position) - end - - def remove(klass) - helpers.delete(klass) - end - - def move_to_top(klass) - Mack::RunnerHelpers::Registry.instance.add(klass, 0) - end - - def move_to_bottom(klass) - remove(klass) - Mack::RunnerHelpers::Registry.instance.add(klass) - end - + def initial_state + [Mack::RunnerHelpers::RequestLogger, Mack::RunnerHelpers::Session] end end lib/runner_helpers/registry.rb test/unit/runner_helpers/registry_spec.rb 5669f63306e50ec51f89402fc1bd98ca7a1535d1 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/cf79466670e3b3710cd702d3d978a2aca32e4e35 cf79466670e3b3710cd702d3d978a2aca32e4e35 2008-07-21T11:47:33-07:00 2008-07-21T11:47:33-07:00 Mack::RunnerHelpers::Registry now uses Mack::Utils::Registry class [#43] 3ee275209511a6b168dcc9399c75a684dd3e1cdf Mark Bates mark@markbates.com