committee 2.5.1 → 3.0.0.alpha

data/test/test_helper.rb

@@ -21,6 +21,7 @@ require "minitest/spec"
 require "minitest/autorun"
 require "rack/test"
 require "rr"
+require "pry"
 
 require_relative "../lib/committee"
 
@@ -47,27 +48,40 @@ ValidPet = {
 }.freeze
 
 def hyper_schema
-  @hyper_schema ||= Committee::Drivers.load_from_file(hyper_schema_schema_path)
+  @hyper_schema ||= begin
+    driver = Committee::Drivers::HyperSchema.new
+    driver.parse(hyper_schema_data)
+  end
 end
 
 def open_api_2_schema
-  @open_api_2_schema ||= Committee::Drivers.load_from_data(open_api_2_data)
+  @open_api_2_schema ||= begin
+    driver = Committee::Drivers::OpenAPI2.new
+    driver.parse(open_api_2_data)
+  end
+end
+
+def open_api_3_schema
+  @open_api_3_schema ||= begin
+    driver = Committee::Drivers::OpenAPI3.new
+    driver.parse(open_api_3_data)
+  end
 end
 
 # Don't cache this because we'll often manipulate the created hash in tests.
 def hyper_schema_data
-  JSON.parse(File.read(hyper_schema_schema_path))
+  JSON.parse(File.read("./test/data/hyperschema/paas.json"))
 end
 
 # Don't cache this because we'll often manipulate the created hash in tests.
 def open_api_2_data
-  JSON.parse(File.read(open_api_2_schema_path))
+  JSON.parse(File.read("./test/data/openapi2/petstore-expanded.json"))
 end
 
-def hyper_schema_schema_path
-  "./test/data/hyperschema/paas.json"
+def open_api_3_data
+  OpenAPIParser.parse(YAML.load_file(open_api_3_data_path))
 end
 
-def open_api_2_schema_path
-  "./test/data/openapi2/petstore-expanded.json"
+def open_api_3_data_path
+  "./test/data/openapi3/normal.yml"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.0.0.alpha
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2018-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -37,14 +37,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: openapi_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +172,7 @@ files:
 - lib/committee/drivers.rb
 - lib/committee/drivers/hyper_schema.rb
 - lib/committee/drivers/open_api_2.rb
+- lib/committee/drivers/open_api_3.rb
 - lib/committee/errors.rb
 - lib/committee/middleware/base.rb
 - lib/committee/middleware/request_validation.rb
@@ -165,11 +180,18 @@ files:
 - lib/committee/middleware/stub.rb
 - lib/committee/parameter_coercer.rb
 - lib/committee/request_unpacker.rb
-- lib/committee/request_validator.rb
-- lib/committee/response_generator.rb
-- lib/committee/response_validator.rb
-- lib/committee/router.rb
-- lib/committee/string_params_coercer.rb
+- lib/committee/schema_validator/hyper_schema.rb
+- lib/committee/schema_validator/hyper_schema/request_validator.rb
+- lib/committee/schema_validator/hyper_schema/response_generator.rb
+- lib/committee/schema_validator/hyper_schema/response_validator.rb
+- lib/committee/schema_validator/hyper_schema/router.rb
+- lib/committee/schema_validator/hyper_schema/string_params_coercer.rb
+- lib/committee/schema_validator/open_api_3.rb
+- lib/committee/schema_validator/open_api_3/operation_wrapper.rb
+- lib/committee/schema_validator/open_api_3/request_validator.rb
+- lib/committee/schema_validator/open_api_3/response_validator.rb
+- lib/committee/schema_validator/open_api_3/router.rb
+- lib/committee/schema_validator/option.rb
 - lib/committee/test/methods.rb
 - lib/committee/validation_error.rb
 - test/bin/committee_stub_test.rb
@@ -177,18 +199,24 @@ files:
 - test/committee_test.rb
 - test/drivers/hyper_schema_test.rb
 - test/drivers/open_api_2_test.rb
+- test/drivers/open_api_3_test.rb
 - test/drivers_test.rb
 - test/middleware/base_test.rb
+- test/middleware/request_validation_open_api_3_test.rb
 - test/middleware/request_validation_test.rb
+- test/middleware/response_validation_open_api_3_test.rb
 - test/middleware/response_validation_test.rb
 - test/middleware/stub_test.rb
 - test/parameter_coercer_test.rb
 - test/request_unpacker_test.rb
-- test/request_validator_test.rb
-- test/response_generator_test.rb
-- test/response_validator_test.rb
-- test/router_test.rb
-- test/string_params_coercer_test.rb
+- test/schema_validator/hyper_schema/request_validator_test.rb
+- test/schema_validator/hyper_schema/response_generator_test.rb
+- test/schema_validator/hyper_schema/response_validator_test.rb
+- test/schema_validator/hyper_schema/router_test.rb
+- test/schema_validator/hyper_schema/string_params_coercer_test.rb
+- test/schema_validator/open_api_3/operation_wrapper_test.rb
+- test/schema_validator/open_api_3/request_validator_test.rb
+- test/schema_validator/open_api_3/response_validator_test.rb
 - test/test/methods_new_version_test.rb
 - test/test/methods_test.rb
 - test/test_helper.rb
@@ -205,15 +233,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.