From 2ae857afaf5a377cf8eacbe404fc4312ae292a46 Mon Sep 17 00:00:00 2001 From: Josh Starcher Date: Mon, 23 Jul 2012 17:17:39 -0400 Subject: [PATCH] allow multiple versioning strategies simultaneously --- lib/versionist/routing.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/versionist/routing.rb b/lib/versionist/routing.rb index 68f595a..46eafaa 100644 --- a/lib/versionist/routing.rb +++ b/lib/versionist/routing.rb @@ -14,10 +14,12 @@ def api_version(config, &block) raise ArgumentError, "you must specify :header, :path, or :parameter in configuration Hash passed to api_version" if !config.has_key?(:header) && !config.has_key?(:path) && !config.has_key?(:parameter) raise ArgumentError, ":defaults must be a Hash" if config.has_key?(:defaults) && !config[:defaults].is_a?(Hash) if config.has_key?(:header) - return configure_header(config, &block) - elsif config.has_key?(:path) - return configure_path(config, &block) - elsif config.has_key?(:parameter) + configure_header(config, &block) + end + if config.has_key?(:path) + configure_path(config, &block) + end + if config.has_key?(:parameter) configure_parameter(config, &block) end end