Merge pull request #10 from department-of-veterans-affairs/sjc-ruby-3-json-schema-4.1.1

drop rails 4 support, upgrade json-schema, Ruby 3 compatibility

Author: stevenjcumming

.ruby-version

@@ -1 +1 @@
-2.7.3
+3.2.2

README.md

@@ -3,3 +3,17 @@
 ## About
 
 The repo is a fork of [apivore 1.6.2](https://github.com/westfieldlabs/apivore/tree/0ccda01d79c8760a6efa2df38b68d58832e47665) for use with [vets-api](https://github.com/department-of-veterans-affairs/vets-api).  `apivore` is [no longer being maintained](https://github.com/westfieldlabs/apivore/issues/121) and is incompatible with Rails 6.  The code here has been changed to remove that restriction.
+
+### Version Compatibility 
+
+- Ruby 3 
+- Rails 5+
+
+Tested with Ruby 3.2.2
+
+## CHANGELOG
+
+### v2.0.0
+- Drop support for Rails 4
+- Upgraded json-schema version to 4+
+- Ruby 3 compatible 

apivore.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'actionpack', '>= 4'
   s.add_runtime_dependency 'hashie', '~> 5.0'
-  s.add_runtime_dependency 'json-schema', '~> 3.0'
+  s.add_runtime_dependency 'json-schema', '~> 4.0'
   s.add_runtime_dependency 'rspec', '~> 3'
   s.add_runtime_dependency 'rspec-expectations', '~> 3.1'
   s.add_runtime_dependency 'rspec-mocks', '~> 3.1'

lib/apivore/rails_shim.rb

@@ -7,16 +7,16 @@ class Swagger < Hashie::Mash
     NONVERB_PATH_ITEMS = %q(parameters)
 
     def validate
-      case version
+      case openapi_version
       when '2.0'
         schema = File.read(File.expand_path("../../../data/swagger_2.0_schema.json", __FILE__))
       else
-        raise "Unknown/unsupported Swagger version to validate against: #{version}"
+        raise "Unknown/unsupported Swagger version to validate against: #{openapi_version}"
       end
       JSON::Validator.fully_validate(schema, self)
     end
 
-    def version
+    def openapi_version
       swagger
     end
 

lib/apivore/swagger.rb

@@ -1,6 +1,5 @@
 require 'action_controller'
 require 'action_dispatch'
-require 'apivore/rails_shim'
 
 module Apivore
   class Validator
@@ -19,14 +18,11 @@ def matches?(swagger_checker)
       pre_checks(swagger_checker)
 
       unless has_errors?
-        send(
-          method,
-          *RailsShim.action_dispatch_request_args(
-            full_path(swagger_checker),
-            params: params['_data'] || {},
-            headers: params['_headers'] || {}
-          )
-        )
+        data = params['_data'] || {}
+        headers = params['_headers'] || {}
+
+        send(method, full_path(swagger_checker), params: data, headers: headers)
+
         swagger_checker.response = response
         post_checks(swagger_checker)
 

lib/apivore/validator.rb

@@ -2,5 +2,5 @@
 
 module Apivore
   # Forked from https://rubygems.org/gems/apivore at 1.6.2
-  VERSION = '1.6.2.1.vsp'
+  VERSION = '2.0.0.vsp'
 end

lib/apivore/version.rb

@@ -8,13 +8,13 @@
 
     subject { swagger }
     it { should be_an_instance_of(Apivore::Swagger) }
-    it { should respond_to(:version) }
+    it { should respond_to(:openapi_version) }
     it { should respond_to(:validate) }
     it { should respond_to(:each_response) }
     it { should respond_to(:base_path) }
 
     describe 'swagger version' do
-      subject { swagger.version }
+      subject { swagger.openapi_version }
       it { should == '2.0' }
     end