From 8f5b70670a12e9d7591dde2c11c9aa2504889d90 Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Mon, 25 May 2020 09:43:56 +0200 Subject: [PATCH 1/2] Bump dependencies to be able to use apivore with rails 6 --- .ruby-version | 2 +- .travis.yml | 10 +++------- apivore.gemspec | 19 +++++-------------- lib/apivore/swagger.rb | 2 ++ 4 files changed, 11 insertions(+), 22 deletions(-) diff --git a/.ruby-version b/.ruby-version index c043eea..ecd7ee5 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.2.1 +2.5.8 diff --git a/.travis.yml b/.travis.yml index 7143f42..744e71d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,8 @@ language: ruby rvm: -- 2.0 -- 2.1 -- 2.2 -- 2.2.1 -- 2.2.2 -- 2.2.3 -- 2.2.4 +- 2.5 +- 2.6 +- 2.7 before_install: - gem install bundler install: diff --git a/apivore.gemspec b/apivore.gemspec index 982db74..a571378 100644 --- a/apivore.gemspec +++ b/apivore.gemspec @@ -13,28 +13,19 @@ Gem::Specification.new do |s| s.files += Dir['data/custom_schemata/*.json'] s.homepage = 'http://github.com/westfieldlabs/apivore' s.licenses = ['Apache 2.0'] + s.required_ruby_version = ">= 2.5.0" s.add_runtime_dependency 'json-schema', '~> 2.5' s.add_runtime_dependency 'rspec', '~> 3' 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_runtime_dependency 'hashie', '~> 4.0' s.add_development_dependency 'pry', '~> 0' s.add_development_dependency 'rake', '~> 10.3' s.add_development_dependency 'rspec-rails', '~> 3' - # 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' - else - s.add_runtime_dependency 'actionpack', '< 5' - s.add_development_dependency 'activesupport', '< 5' - end + s.add_runtime_dependency 'actionpack', '>= 4', '< 7' + s.add_development_dependency 'activesupport', '>= 4', '< 7' - if RUBY_VERSION >= '2.2.0' - s.add_development_dependency 'test-unit', '~> 3' - end + s.add_development_dependency 'test-unit', '~> 3' end diff --git a/lib/apivore/swagger.rb b/lib/apivore/swagger.rb index 78fed66..3972490 100644 --- a/lib/apivore/swagger.rb +++ b/lib/apivore/swagger.rb @@ -4,6 +4,8 @@ module Apivore class Swagger < Hashie::Mash + disable_warnings + NONVERB_PATH_ITEMS = %q(parameters) def validate From 28aafb1e2fa08faee6bdc9f45345f6ff6688eb83 Mon Sep 17 00:00:00 2001 From: "Renato \"Lond\" Cerqueira" Date: Mon, 25 May 2020 09:44:23 +0200 Subject: [PATCH 2/2] Bump version to beta --- lib/apivore/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/apivore/version.rb b/lib/apivore/version.rb index 2e1f05c..a9c96c8 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.beta1" end