Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dependencies changes for rails 7 #127

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.1
3.2.0
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source "https://rubygems.org"
gemspec
gemspec
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ require "rspec/core/rake_task"
RSpec::Core::RakeTask.new

task :default => :spec
task :test => :spec
task :test => :spec
10 changes: 5 additions & 5 deletions apivore.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 3 additions & 5 deletions lib/apivore/validator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/apivore/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Apivore
VERSION = "1.6.2"
VERSION = '2.0.0.rc.1'
end