diff --git a/.ruby-version b/.ruby-version index c043eea..944880f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.1 +3.2.0 diff --git a/.travis.yml b/.travis.yml index 7143f42..736f60a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,9 @@ language: ruby rvm: -- 2.0 -- 2.1 -- 2.2 -- 2.2.1 -- 2.2.2 -- 2.2.3 -- 2.2.4 +- 2.7 +- 3.3 before_install: -- gem install bundler +- gem install bundler -v 2.4.22 install: - bundle install --retry=3 deploy: diff --git a/Gemfile b/Gemfile index 1291498..3be9c3c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,2 @@ source "https://rubygems.org" -gemspec \ No newline at end of file +gemspec diff --git a/Rakefile b/Rakefile index 5786e6a..df733a8 100644 --- a/Rakefile +++ b/Rakefile @@ -4,4 +4,4 @@ require "rspec/core/rake_task" RSpec::Core::RakeTask.new task :default => :spec -task :test => :spec \ No newline at end of file +task :test => :spec diff --git a/apivore.gemspec b/apivore.gemspec index 982db74..f0d9110 100644 --- a/apivore.gemspec +++ b/apivore.gemspec @@ -15,20 +15,20 @@ Gem::Specification.new do |s| s.licenses = ['Apache 2.0'] s.add_runtime_dependency 'json-schema', '~> 2.5' - s.add_runtime_dependency 'rspec', '~> 3' + s.add_runtime_dependency 'rspec', '~> 3.12' s.add_runtime_dependency 'rspec-expectations', '~> 3.1' s.add_runtime_dependency 'rspec-mocks', '~> 3.1' s.add_runtime_dependency 'hashie', '~> 3.3' s.add_development_dependency 'pry', '~> 0' - s.add_development_dependency 'rake', '~> 10.3' - s.add_development_dependency 'rspec-rails', '~> 3' + s.add_development_dependency 'rake', '~> 12.2' + s.add_development_dependency 'rspec-rails', '~> 6' # Rails 5 stopped support for ruby < 2.2.2 # 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', '>= 4', '< 6' - s.add_development_dependency 'activesupport', '>= 4', '< 6' + s.add_runtime_dependency 'actionpack', '>= 5' + s.add_development_dependency 'activesupport', '>= 5' 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 6163c0d..4f30f9e 100644 --- a/lib/apivore/validator.rb +++ b/lib/apivore/validator.rb @@ -21,11 +21,9 @@ def matches?(swagger_checker) unless has_errors? send( method, - *RailsShim.action_dispatch_request_args( - full_path(swagger_checker), - params: params['_data'] || {}, - headers: params['_headers'] || {} - ) + full_path(swagger_checker), + params: params['_data'] || {}, + headers: params['_headers'] || {} ) swagger_checker.response = response post_checks(swagger_checker) diff --git a/lib/apivore/version.rb b/lib/apivore/version.rb index 2e1f05c..0a37e6c 100644 --- a/lib/apivore/version.rb +++ b/lib/apivore/version.rb @@ -1,3 +1,3 @@ module Apivore - VERSION = "1.6.2" + VERSION = '2.0.0.rc.1' end