committee 3.0.0.alpha → 3.0.0.beta

data/test/test/methods_test.rb

@@ -27,7 +27,6 @@ describe Committee::Test::Methods do
     @committee_router = nil
     @committee_schema = nil
     @committee_options = nil
-    @validate_errors = nil
   end
 
   describe "Hyper-Schema" do
@@ -58,7 +57,7 @@ describe Committee::Test::Methods do
 
   describe "OpenAPI3" do
     before do
-      @committee_options = {open_api_3: open_api_3_schema}
+      @committee_options = {schema: open_api_3_schema}
 
       @correct_response = { string_1: :honoka }
     end
@@ -70,26 +69,34 @@ describe Committee::Test::Methods do
         assert_schema_conform
       end
 
-      # TODO: raise don't exist content-type error option
-=begin
       it "detects an invalid response Content-Type" do
         @app = new_rack_app(JSON.generate([@correct_response]), {})
         get "/characters"
         e = assert_raises(Committee::InvalidResponse) do
           assert_schema_conform
         end
-        assert_match(/response header must be set to/i, e.message)
+        assert_match(/don't exist response definition/i, e.message)
+      end
+
+      it "detects an invalid response status code" do
+        @app = new_rack_app(JSON.generate([@correct_response]), {}, 419)
+
+        get "/characters"
+
+        e = assert_raises(Committee::InvalidResponse) do
+          assert_schema_conform
+        end
+        assert_match(/don't exist status code definition/i, e.message)
       end
-=end
     end
   end
 
   private
 
-  def new_rack_app(response, headers={ "Content-Type" => "application/json" })
+  def new_rack_app(response, headers={ "Content-Type" => "application/json" }, status_code = 200)
     Rack::Builder.new {
       run lambda { |_|
-        [200, headers, [response]]
+        [status_code, headers, [response]]
       }
     }
   end

data/test/test_helper.rb

@@ -48,40 +48,39 @@ ValidPet = {
 }.freeze
 
 def hyper_schema
-  @hyper_schema ||= begin
-    driver = Committee::Drivers::HyperSchema.new
-    driver.parse(hyper_schema_data)
-  end
+  @hyper_schema ||= Committee::Drivers.load_from_json(hyper_schema_filepath)
 end
 
 def open_api_2_schema
-  @open_api_2_schema ||= begin
-    driver = Committee::Drivers::OpenAPI2.new
-    driver.parse(open_api_2_data)
-  end
+  @open_api_2_schema ||= Committee::Drivers.load_from_file(open_api_2_filepath)
 end
 
 def open_api_3_schema
-  @open_api_3_schema ||= begin
-    driver = Committee::Drivers::OpenAPI3.new
-    driver.parse(open_api_3_data)
-  end
+  @open_api_3_schema ||= Committee::Drivers.load_from_data(open_api_3_data)
 end
 
 # Don't cache this because we'll often manipulate the created hash in tests.
 def hyper_schema_data
-  JSON.parse(File.read("./test/data/hyperschema/paas.json"))
+  JSON.parse(File.read(hyper_schema_filepath))
 end
 
 # Don't cache this because we'll often manipulate the created hash in tests.
 def open_api_2_data
-  JSON.parse(File.read("./test/data/openapi2/petstore-expanded.json"))
+  JSON.parse(File.read(open_api_2_filepath))
 end
 
 def open_api_3_data
-  OpenAPIParser.parse(YAML.load_file(open_api_3_data_path))
+  YAML.load_file(open_api_3_filepath)
+end
+
+def hyper_schema_filepath
+  "./test/data/hyperschema/paas.json"
+end
+
+def open_api_2_filepath
+  "./test/data/openapi2/petstore-expanded.json"
 end
 
-def open_api_3_data_path
+def open_api_3_filepath
   "./test/data/openapi3/normal.yml"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 3.0.0.alpha
+  version: 3.0.0.beta
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-26 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -51,14 +51,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +178,9 @@ files:
 - lib/committee/middleware/request_validation.rb
 - lib/committee/middleware/response_validation.rb
 - lib/committee/middleware/stub.rb
-- lib/committee/parameter_coercer.rb
 - lib/committee/request_unpacker.rb
 - lib/committee/schema_validator/hyper_schema.rb
+- lib/committee/schema_validator/hyper_schema/parameter_coercer.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
@@ -192,6 +192,7 @@ files:
 - 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/schema_validator/schema_validator.rb
 - lib/committee/test/methods.rb
 - lib/committee/validation_error.rb
 - test/bin/committee_stub_test.rb
@@ -207,8 +208,8 @@ files:
 - 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/schema_validator/hyper_schema/parameter_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
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.