diff --git a/apivore.gemspec b/apivore.gemspec index f375d38..77130e4 100644 --- a/apivore.gemspec +++ b/apivore.gemspec @@ -27,8 +27,8 @@ Gem::Specification.new do |s| # Hack to support currently suported ruby versions # TODO: remove and explicitly require ruby 2.2.2 as min version in version 2 of apivore if RUBY_VERSION >= '2.2.2' - s.add_runtime_dependency 'actionpack', '~> 6' - s.add_development_dependency 'activesupport', '~> 6' + s.add_runtime_dependency 'actionpack', '>= 4' + s.add_development_dependency 'activesupport', '>= 4' else s.add_runtime_dependency 'actionpack', '< 5' s.add_development_dependency 'activesupport', '< 5' diff --git a/lib/apivore/validator.rb b/lib/apivore/validator.rb index 223c14e..41518b5 100644 --- a/lib/apivore/validator.rb +++ b/lib/apivore/validator.rb @@ -19,13 +19,12 @@ def matches?(swagger_checker) pre_checks(swagger_checker) unless has_errors? + args = RailsShim.action_dispatch_request_args(full_path(swagger_checker), params: params['_data'] || {}, headers: params['_headers'] || {}) + send( method, - *RailsShim.action_dispatch_request_args( - full_path(swagger_checker), - params: params['_data'] || {}, - headers: params['_headers'] || {} - ) + args[0], + **args[1] ) swagger_checker.response = response post_checks(swagger_checker)