committee 3.1.0 → 3.1.1

data/test/drivers/{open_api_3_test.rb → open_api_3/driver_test.rb}

@@ -1,8 +1,10 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
 
-describe Committee::Drivers::OpenAPI3 do
+require "test_helper"
+
+describe Committee::Drivers::OpenAPI3::Driver do
   before do
-    @driver = Committee::Drivers::OpenAPI3.new
+    @driver = Committee::Drivers::OpenAPI3::Driver.new
   end
 
   it "has a name" do

data/test/drivers_test.rb

@@ -1,4 +1,6 @@
-require_relative "test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Drivers do
   DRIVERS = [
@@ -99,13 +101,13 @@ end
 
 describe Committee::Drivers::Driver do
   DRIVER_METHODS = {
-    :default_allow_get_body     => [],
-    :default_coerce_form_params => [],
-    :default_path_params        => [],
-    :default_query_params       => [],
-    :name                       => [],
-    :parse                      => [nil],
-    :schema_class               => [],
+    default_allow_get_body: [],
+    default_coerce_form_params: [],
+    default_path_params: [],
+    default_query_params: [],
+    name: [],
+    parse: [nil],
+    schema_class: [],
   }
 
   it "has a set of abstract methods" do
@@ -122,8 +124,8 @@ end
 
 describe Committee::Drivers::Schema do
   SCHEMA_METHODS = {
-    :driver => [],
-    :build_router => [validator_option: nil, prefix: nil]
+    driver: [],
+    build_router: [validator_option: nil, prefix: nil]
   }
 
   it "has a set of abstract methods" do

data/test/middleware/base_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::Base do
   include Rack::Test::Methods

data/test/middleware/request_validation_open_api_3_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::RequestValidation do
   include Rack::Test::Methods
@@ -254,7 +256,7 @@ describe Committee::Middleware::RequestValidation do
   it "rescues JSON errors" do
     @app = new_rack_app(schema: open_api_3_schema)
     header "Content-Type", "application/json"
-    post "/apps", "{x:y}"
+    post "/characters", "{x:y}"
     assert_equal 400, last_response.status
     assert_match(/valid json/i, last_response.body)
   end

data/test/middleware/request_validation_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::RequestValidation do
   include Rack::Test::Methods
@@ -61,9 +63,21 @@ describe Committee::Middleware::RequestValidation do
     assert_equal 200, last_response.status
   end
 
-  it "doesn't call error_handler when request is valid" do
+  it "doesn't call error_handler (has a arg) when request is valid" do
     called_error = false
-    pr = ->(_) { called_error = true }
+    pr = ->(_e) { called_error = true }
+    @app = new_rack_app(schema: hyper_schema, error_handler: pr)
+    params = {
+      "name" => "cloudnasium"
+    }
+    header "Content-Type", "application/json"
+    post "/apps", JSON.generate(params)
+    assert !called_error
+  end
+
+  it "doesn't call error_handler (has 2 args) when request is valid" do
+    called_error = false
+    pr = ->(_e, _env) { called_error = true }
     @app = new_rack_app(schema: hyper_schema, error_handler: pr)
     params = {
       "name" => "cloudnasium"
@@ -282,7 +296,7 @@ describe Committee::Middleware::RequestValidation do
     assert_match(/invalid request/i, last_response.body)
   end
 
-  it "calls error_handler when request is invalid" do
+  it "calls error_handler (has a arg) when request is invalid" do
     called_err = nil
     pr = ->(e) { called_err = e }
     @app = new_rack_app(schema: hyper_schema, error_handler: pr)
@@ -290,6 +304,21 @@ describe Committee::Middleware::RequestValidation do
     params = {
       "name" => 1
     }
+    _, err = capture_io do
+      post "/apps", JSON.generate(params)
+    end
+    assert_kind_of Committee::InvalidRequest, called_err
+    assert_match(/\[DEPRECATION\]/i, err)
+  end
+
+  it "calls error_handler (has two args) when request is invalid" do
+    called_err = nil
+    pr = ->(e, _env) { called_err = e }
+    @app = new_rack_app(schema: hyper_schema, error_handler: pr)
+    header "Content-Type", "application/json"
+    params = {
+      "name" => 1
+    }
     post "/apps", JSON.generate(params)
     assert_kind_of Committee::InvalidRequest, called_err
   end
@@ -302,11 +331,23 @@ describe Committee::Middleware::RequestValidation do
     assert_match(/valid json/i, last_response.body)
   end
 
-  it "calls error_handler when it rescues JSON errors" do
+  it "calls error_handler (has a arg) when it rescues JSON errors" do
     called_err = nil
     pr = ->(e) { called_err = e }
     @app = new_rack_app(schema: hyper_schema, error_handler: pr)
     header "Content-Type", "application/json"
+    _, err = capture_io do
+      post "/apps", "{x:y}"
+    end
+    assert_kind_of JSON::ParserError, called_err
+    assert_match(/\[DEPRECATION\]/i, err)
+  end
+
+  it "calls error_handler (has two args) when it rescues JSON errors" do
+    called_err = nil
+    pr = ->(e, _env) { called_err = e }
+    @app = new_rack_app(schema: hyper_schema, error_handler: pr)
+    header "Content-Type", "application/json"
     post "/apps", "{x:y}"
     assert_kind_of JSON::ParserError, called_err
   end

data/test/middleware/response_validation_open_api_3_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::ResponseValidation do
   include Rack::Test::Methods

data/test/middleware/response_validation_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::ResponseValidation do
   include Rack::Test::Methods
@@ -13,7 +15,7 @@ describe Committee::Middleware::ResponseValidation do
     assert_equal 200, last_response.status
   end
 
-  it "doesn't call error_handler when response is valid" do
+  it "doesn't call error_handler (has a arg) when response is valid" do
     called = false
     pr = ->(_e) { called = true }
     @app = new_rack_app(JSON.generate([ValidApp]), {}, schema: hyper_schema, error_handler: pr)
@@ -21,6 +23,14 @@ describe Committee::Middleware::ResponseValidation do
     assert !called, "error_handler is called"
   end
 
+  it "doesn't call error_handler (has two args) when response is valid" do
+    called = false
+    pr = ->(_e, _env) { called = true }
+    @app = new_rack_app(JSON.generate([ValidApp]), {}, schema: hyper_schema, error_handler: pr)
+    get "/apps"
+    assert !called, "error_handler is called"
+  end
+
   it "detects a response invalid due to schema" do
     @app = new_rack_app("{}", {}, schema: hyper_schema)
     get "/apps"
@@ -75,10 +85,21 @@ describe Committee::Middleware::ResponseValidation do
     assert_match(/valid json/i, last_response.body)
   end
 
-  it "calls error_handler when it rescues JSON errors" do
+  it "calls error_handler (has a arg) when it rescues JSON errors" do
     called_err = nil
     pr = ->(e) { called_err = e }
     @app = new_rack_app("[{x:y}]", {}, schema: hyper_schema, error_handler: pr)
+    _, err = capture_io do
+      get "/apps"
+    end
+    assert_kind_of JSON::ParserError, called_err
+    assert_match(/\[DEPRECATION\]/i, err)
+  end
+
+  it "calls error_handler (has two args) when it rescues JSON errors" do
+    called_err = nil
+    pr = ->(e, _env) { called_err = e }
+    @app = new_rack_app("[{x:y}]", {}, schema: hyper_schema, error_handler: pr)
     get "/apps"
     assert_kind_of JSON::ParserError, called_err
   end
@@ -97,10 +118,24 @@ describe Committee::Middleware::ResponseValidation do
     end
   end
 
-  it "calls error_handler when it rescues JSON errors" do
+  it "calls error_handler (has a arg) when it rescues JSON errors" do
     called_err = nil
     pr = ->(e) { called_err = e }
     @app = new_rack_app("[{x:y}]", {}, raise: true, schema: hyper_schema, error_handler: pr)
+    assert_raises(Committee::InvalidResponse) do
+      _, err = capture_io do
+        get "/apps"
+      end
+
+      assert_kind_of JSON::ParserError, called_err
+      assert_match(/\[DEPRECATION\]/i, err)
+    end
+  end
+
+  it "calls error_handler (has two args) when it rescues JSON errors" do
+    called_err = nil
+    pr = ->(e, _env) { called_err = e }
+    @app = new_rack_app("[{x:y}]", {}, raise: true, schema: hyper_schema, error_handler: pr)
     assert_raises(Committee::InvalidResponse) do
       get "/apps"
       assert_kind_of JSON::ParserError, called_err

data/test/middleware/stub_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Middleware::Stub do
   include Rack::Test::Methods

data/test/request_unpacker_test.rb

@@ -1,6 +1,6 @@
-require_relative "test_helper"
+# frozen_string_literal: true
 
-require "stringio"
+require "test_helper"
 
 describe Committee::RequestUnpacker do
   it "unpacks JSON on Content-Type: application/json" do

data/test/schema_validator/hyper_schema/parameter_coercer_test.rb

@@ -1,6 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
 
-require "stringio"
+require "test_helper"
 
 describe Committee::SchemaValidator::HyperSchema::ParameterCoercer do
   before do

data/test/schema_validator/hyper_schema/request_validator_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 require "stringio"
 

data/test/schema_validator/hyper_schema/response_generator_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::HyperSchema::ResponseGenerator do
   before do

data/test/schema_validator/hyper_schema/response_validator_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::HyperSchema::ResponseValidator do
   before do

data/test/schema_validator/hyper_schema/router_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::HyperSchema::Router do
   it "builds routes without parameters" do
@@ -67,14 +69,14 @@ describe Committee::SchemaValidator::HyperSchema::Router do
   end
 
   def hyper_schema_router(options = {})
-    schema = Committee::Drivers::HyperSchema.new.parse(hyper_schema_data)
+    schema = Committee::Drivers::HyperSchema::Driver.new.parse(hyper_schema_data)
     validator_option = Committee::SchemaValidator::Option.new(options, schema, :hyper_schema)
 
     Committee::SchemaValidator::HyperSchema::Router.new(schema, validator_option)
   end
 
   def open_api_2_router(options = {})
-    schema = Committee::Drivers::OpenAPI2.new.parse(open_api_2_data)
+    schema = Committee::Drivers::OpenAPI2::Driver.new.parse(open_api_2_data)
     validator_option = Committee::SchemaValidator::Option.new(options, schema, :hyper_schema)
 
     Committee::SchemaValidator::HyperSchema::Router.new(schema, validator_option)

data/test/schema_validator/hyper_schema/string_params_coercer_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::HyperSchema::StringParamsCoercer do
   before do

data/test/schema_validator/open_api_3/operation_wrapper_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 require "stringio"
 

data/test/schema_validator/open_api_3/request_validator_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
   describe 'OpenAPI3' do
@@ -8,6 +10,14 @@ describe Committee::SchemaValidator::OpenAPI3::RequestValidator do
       @app
     end
 
+    it "skip validaiton when link does not exist" do
+      @app = new_rack_app(schema: open_api_3_schema)
+      params = {}
+      header "Content-Type", "application/json"
+      post "/unknown", JSON.generate(params)
+      assert_equal 200, last_response.status
+    end
+
     it "optionally content_type check" do
       @app = new_rack_app(check_content_type: true, schema: open_api_3_schema)
       params = {

data/test/schema_validator/open_api_3/response_validator_test.rb

@@ -1,4 +1,6 @@
-require_relative "../../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::SchemaValidator::OpenAPI3::ResponseValidator do
   before do

data/test/test/methods_new_version_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Test::Methods do
   include Committee::Test::Methods

data/test/test/methods_test.rb

@@ -1,4 +1,6 @@
-require_relative "../test_helper"
+# frozen_string_literal: true
+
+require "test_helper"
 
 describe Committee::Test::Methods do
   include Committee::Test::Methods
@@ -33,7 +35,7 @@ describe Committee::Test::Methods do
     before do
       sc = JsonSchema.parse!(hyper_schema_data)
       sc.expand_references!
-      s = Committee::Drivers::HyperSchema.new.parse(sc)
+      s = Committee::Drivers::HyperSchema::Driver.new.parse(sc)
       @committee_options = {schema: s}
     end
 

data/test/test_helper.rb

@@ -1,19 +1,18 @@
-if RUBY_VERSION >= '2.0.0'
-  require 'simplecov'
-
-  SimpleCov.start do
-    # We do our utmost to test our executables by modularizing them into
-    # testable pieces, but testing them to completion is nearly impossible as
-    # far as I can tell, so include them in our tests but don't calculate
-    # coverage.
-    add_filter "/bin/"
-
-    add_filter "/test/"
-
-    # This library has a pretty modest number of lines, so let's try to stick
-    # to a 100% coverage target for a while and see what happens.
-    minimum_coverage 100
-  end
+# frozen_string_literal: true
+
+require 'simplecov'
+
+SimpleCov.start do
+  # We do our utmost to test our executables by modularizing them into
+  # testable pieces, but testing them to completion is nearly impossible as
+  # far as I can tell, so include them in our tests but don't calculate
+  # coverage.
+  add_filter "/bin/"
+  add_filter "/test/"
+
+  # This library has a pretty modest number of lines, so let's try to stick
+  # to a 100% coverage target for a while and see what happens.
+  minimum_coverage 100
 end
 
 require "minitest"
@@ -22,6 +21,7 @@ require "minitest/autorun"
 require "rack/test"
 require "rr"
 require "pry"
+require "stringio"
 
 require_relative "../lib/committee"