committee 3.0.0.alpha → 3.0.0.beta

data/lib/committee/schema_validator/schema_validator.rb

@@ -0,0 +1,15 @@
+class Committee::SchemaValidator
+  class << self
+    def request_media_type(request)
+      request.content_type.to_s.split(";").first.to_s
+    end
+
+    # @param [String] prefix
+    # @return [Regexp]
+    def build_prefix_regexp(prefix)
+      return nil unless prefix
+
+      /\A#{Regexp.escape(prefix)}/.freeze
+    end
+  end
+end

data/lib/committee/test/methods.rb

@@ -3,7 +3,6 @@ module Committee::Test
     def assert_schema_conform
       @schema ||= Committee::Middleware::Base.get_schema(committee_options)
       @router ||= @schema.build_router(committee_options)
-      @validate_errors ||= committee_options[:validate_errors]
 
       v = @router.build_schema_validator(request_object)
 
@@ -13,7 +12,7 @@ module Committee::Test
       end
 
       status, headers, body = response_data
-      v.response_validate(status, headers, [body]) if validate?(status)
+      v.response_validate(status, headers, [body], true) if validate_response?(status)
     end
 
     def committee_options
@@ -28,9 +27,8 @@ module Committee::Test
       raise "please set response data like 'last_response.status, last_response.headers, last_response.body'"
     end
 
-    # TODO: refactoring
-    def validate?(status)
-      status != 204 and @validate_errors || (200...300).include?(status)
+    def validate_response?(status)
+      Committee::Middleware::ResponseValidation.validate?(status, committee_options.fetch(:validate_success_only, false))
     end
   end
 end

data/lib/committee.rb

@@ -1,10 +1,10 @@
 require "json"
+require "yaml"
 require "json_schema"
 require "rack"
 require 'openapi_parser'
 
 require_relative "committee/errors"
-require_relative "committee/parameter_coercer"
 require_relative "committee/request_unpacker"
 
 require_relative "committee/validation_error"
@@ -20,6 +20,7 @@ require_relative "committee/middleware/response_validation"
 require_relative "committee/middleware/stub"
 
 require_relative "committee/schema_validator/option"
+require_relative "committee/schema_validator/schema_validator"
 require_relative "committee/schema_validator/open_api_3"
 require_relative "committee/schema_validator/open_api_3/router"
 require_relative "committee/schema_validator/open_api_3/operation_wrapper"
@@ -31,6 +32,7 @@ require_relative "committee/schema_validator/hyper_schema/response_generator"
 require_relative "committee/schema_validator/hyper_schema/response_validator"
 require_relative "committee/schema_validator/hyper_schema/router"
 require_relative "committee/schema_validator/hyper_schema/string_params_coercer"
+require_relative "committee/schema_validator/hyper_schema/parameter_coercer"
 
 require_relative "committee/bin/committee_stub"
 

data/test/drivers/open_api_3_test.rb

@@ -14,7 +14,8 @@ describe Committee::Drivers::OpenAPI3 do
   end
 
   it "override methods" do
-    schema = @driver.parse(open_api_3_data)
+    parser = OpenAPIParser.parse(open_api_3_data)
+    schema = @driver.parse(parser)
 
     assert_kind_of Committee::Drivers::OpenAPI3::Schema, schema
     assert_kind_of OpenAPIParser::Schemas::OpenAPI, schema.open_api

data/test/drivers_test.rb

@@ -20,6 +20,75 @@ describe Committee::Drivers do
     end
     assert_equal %{Committee: unknown driver "blueprint".}, e.message
   end
+
+  describe 'load_from_file(filepath)' do
+    it 'load OpenAPI2' do
+      s = Committee::Drivers.load_from_file(open_api_2_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI2::Schema, s
+    end
+
+    it 'load Hyper-Schema' do
+      s = Committee::Drivers.load_from_file(hyper_schema_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::HyperSchema::Schema, s
+    end
+
+    it 'load OpenAPI3' do
+      s = Committee::Drivers.load_from_file(open_api_3_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI3::Schema, s
+    end
+
+    it 'load unsupported file extension' do
+      e = assert_raises(StandardError) do
+        Committee::Drivers.load_from_file('test.xml')
+      end
+      assert_equal "committee filepath option support '.yaml', '.yml', '.json' files only", e.message
+    end
+  end
+
+  describe 'load_from_json(filepath)' do
+    it 'load OpenAPI2' do
+      s = Committee::Drivers.load_from_json(open_api_2_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI2::Schema, s
+    end
+
+    it 'load Hyper-Schema' do
+      s = Committee::Drivers.load_from_json(hyper_schema_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::HyperSchema::Schema, s
+    end
+  end
+
+  describe 'load_from_yaml(filepath)' do
+    it 'load OpenAPI3' do
+      s = Committee::Drivers.load_from_yaml(open_api_3_filepath)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI3::Schema, s
+    end
+  end
+
+  describe 'load_from_data(filepath)' do
+    it 'load OpenAPI3' do
+      s = Committee::Drivers.load_from_data(open_api_3_data)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI3::Schema, s
+    end
+
+    it 'load OpenAPI2' do
+      s = Committee::Drivers.load_from_data(open_api_2_data)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::OpenAPI2::Schema, s
+    end
+
+    it 'load Hyper-Schema' do
+      s = Committee::Drivers.load_from_data(hyper_schema_data)
+      assert_kind_of Committee::Drivers::Schema, s
+      assert_kind_of Committee::Drivers::HyperSchema::Schema, s
+    end
+  end
 end
 
 describe Committee::Drivers::Driver do

data/test/middleware/base_test.rb

@@ -20,7 +20,7 @@ describe Committee::Middleware::Base do
   end
 
   it "accepts just a OpenAPI3 schema object" do
-    @app = new_rack_app(open_api_3: open_api_3_schema)
+    @app = new_rack_app(schema: open_api_3_schema)
     params = {
         "name" => "cloudnasium"
     }
@@ -87,9 +87,7 @@ describe Committee::Middleware::Base do
     e = assert_raises(ArgumentError) do
       post "/apps"
     end
-
-    assert_equal "Committee: schema expected to be an instance " +
-                     "of Committee::Drivers::Schema.", e.message
+    assert_equal "Committee: schema expected to be an instance of Committee::Drivers::Schema.", e.message
   end
 
   it "schema not exist" do
@@ -98,7 +96,24 @@ describe Committee::Middleware::Base do
       post "/apps"
     end
 
-    assert_equal "Committee: need option `schema` or `open_api_3`", e.message
+    assert_equal "Committee: need option `schema` or `filepath`", e.message
+  end
+
+  describe 'initialize option' do
+    it "filepath option with hyper-schema" do
+      b = Committee::Middleware::Base.new(nil, filepath: hyper_schema_filepath)
+      assert_kind_of Committee::Drivers::HyperSchema::Schema, b.instance_variable_get(:@schema)
+    end
+
+    it "filepath option with OpenAPI2" do
+      b = Committee::Middleware::Base.new(nil, filepath: open_api_2_filepath)
+      assert_kind_of Committee::Drivers::OpenAPI2::Schema, b.instance_variable_get(:@schema)
+    end
+
+    it "filepath option with OpenAPI3" do
+      b = Committee::Middleware::Base.new(nil, filepath: open_api_3_filepath)
+      assert_kind_of Committee::Drivers::OpenAPI3::Schema, b.instance_variable_get(:@schema)
+    end
   end
 
   private